Author: felix
Date: Wed Feb 25 06:53:35 2009
New Revision: 4464
URL: http://svn.slimdevices.com/jive?rev=4464&view=rev
Log:
Bug: 11152
Description:
- Replace no longer maintained zeroconf patch with official zcip applet in
busybox
- Disable CONFIG_FEATURE_UDHCP_ZEROCONF in busybox defconfig results in busybox
not compiling (but I guess that won't be an issue with newer busybox anyway)
- Static IP is broken due to missing changes in Networking.lua
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/udhcpc_action
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.7.0/busybox_udhcpd_syslog.patch
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.7.0/busybox_zeroconf.patch
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/files/defconfig
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/udhcpc_action
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/udhcpc_action?rev=4464&r1=4463&r2=4464&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/udhcpc_action
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/udhcpc_action
Wed Feb 25 06:53:35 2009
@@ -1,6 +1,7 @@
#!/bin/sh
# udhcpc script edited by Tim Riker <[email protected]>
+# zcip integration idea from here:
http://osdir.com/ml/network.zeroconf.workers/2005-06/msg00000.html
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
@@ -12,10 +13,18 @@
case "$1" in
deconfig)
+ killall zcip > /dev/null
/sbin/ifconfig $interface 0.0.0.0
;;
+ fail|leasefail)
+ killall zcip > /dev/null
+# -v is needed to work around a bug in zcip - probably fixed in newer version
+ /sbin/zcip -v $interface /etc/network/zcip_action > /dev/null &
+ ;;
+
renew|bound|zeroconf)
+ killall zcip > /dev/null
/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
while route del default gw 0.0.0.0 dev $interface ; do
Added:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action?rev=4464&view=auto
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
(added)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/files/zcip_action
Wed Feb 25 06:53:35 2009
@@ -1,0 +1,40 @@
+#!/bin/sh
+
+# zcip script from here:
http://sources.busybox.net/index.py/trunk/busybox/examples/zcip.script?revision=10206&view=markup
+
+# only for use as a "zcip" callback script
+if [ "x$interface" = x ]
+then
+ exit 1
+fi
+
+# zcip should start on boot/resume and various media changes
+case "$1" in
+init)
+ # for now, zcip requires the link to be already up,
+ # and it drops links when they go down. that isn't
+ # the most robust model...
+ exit 0
+ ;;
+config)
+ if [ "x$ip" = x ]
+ then
+ exit 1
+ fi
+ # remember $ip for $interface, to use on restart
+ if [ "x$IP" != x -a -w "$IP.$interface" ]
+ then
+ echo $ip > "$IP.$interface"
+ fi
+ exec ip address add dev $interface \
+ scope link local "$ip/16" broadcast +
+ ;;
+deconfig)
+ if [ x$ip = x ]
+ then
+ exit 1
+ fi
+ exec ip address del dev $interface local $ip
+ ;;
+esac
+exit 1
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb?rev=4464&r1=4463&r2=4464&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/base-files/squeezeos-base-files_1.0.bb
Wed Feb 25 06:53:35 2009
@@ -3,7 +3,7 @@
PRIORITY = "required"
LICENSE = "GPL"
-PR = "r25"
+PR = "r26"
SRC_URI = " \
file://85-mtd.rules \
@@ -33,6 +33,7 @@
file://squeezeplay \
file://suspend \
file://udhcpc_action \
+ file://zcip_action \
file://wlan \
file://wpa_action \
file://wpa_supplicant.conf \
@@ -106,6 +107,7 @@
install -m 0644 ${WORKDIR}/interfaces
${D}${sysconfdir}/network/interfaces
install -m 0755 ${WORKDIR}/if_mapping
${D}${sysconfdir}/network/if_mapping
install -m 0755 ${WORKDIR}/udhcpc_action
${D}${sysconfdir}/network/udhcpc_action
+ install -m 0755 ${WORKDIR}/zcip_action
${D}${sysconfdir}/network/zcip_action
install -m 0755 ${WORKDIR}/wpa_action
${D}${sysconfdir}/network/wpa_action
# wlan config
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.7.0/busybox_udhcpd_syslog.patch
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.7.0/busybox_udhcpd_syslog.patch?rev=4464&r1=4463&r2=4464&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.7.0/busybox_udhcpd_syslog.patch
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.7.0/busybox_udhcpd_syslog.patch
Wed Feb 25 06:53:35 2009
@@ -6,8 +6,8 @@
// -R was not in the file patched by Elvis. Check what it does
return execute("udhcpc -R -p /var/run/udhcpc.%iface%.pid "
-- "-b --zeroconf [[-s %script%]] "
-+ "-b --syslog --zeroconf "
+- "-b [[-s %script%]] "
++ "-b --syslog "
"-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s
%script%]]",
ifd, exec);
#else
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.7.0/busybox_zeroconf.patch
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.7.0/busybox_zeroconf.patch?rev=4464&r1=4463&r2=4464&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.7.0/busybox_zeroconf.patch
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/busybox-1.7.0/busybox_zeroconf.patch
Wed Feb 25 06:53:35 2009
@@ -19,7 +19,7 @@
+
+// -R was not in the file patched by Elvis. Check what it does
+ return execute("udhcpc -R -p /var/run/udhcpc.%iface%.pid "
-+ "-b --zeroconf [[-s %script%]] "
++ "-b [[-s %script%]] "
"-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s
%script%]]",
ifd, exec);
#else
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/files/defconfig
URL:
http://svn.slimdevices.com/jive/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/files/defconfig?rev=4464&r1=4463&r2=4464&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/files/defconfig
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/busybox/files/defconfig
Wed Feb 25 06:53:35 2009
@@ -635,7 +635,7 @@
CONFIG_FEATURE_WGET_STATUSBAR=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-# CONFIG_ZCIP is not set
+CONFIG_ZCIP=y
#
# Process Utilities
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
