diff options
author | Enric Balletbo i Serra <eballetbo@gmail.com> | 2010-06-27 12:29:31 +0200 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-29 12:38:02 +0100 |
commit | 132122e31375117bf8b5ab68369cb8fafa03058d (patch) | |
tree | 5bec7821f4d16bd55e79771ded4719002d890cc9 | |
parent | 0f806dfec85639d9e8875554500b6da8dfb3f59c (diff) | |
download | openembedded-core-132122e31375117bf8b5ab68369cb8fafa03058d.tar.gz openembedded-core-132122e31375117bf8b5ab68369cb8fafa03058d.tar.bz2 openembedded-core-132122e31375117bf8b5ab68369cb8fafa03058d.zip |
busybox: fix unexpected "done" in /etc/udhcpc.d/50default script.
Run udhcpc results in
udhcpc (v1.15.3) started
/etc/udhcpc.d/50default: line 37: syntax error: unexpected "done" (expecting "fi")
run-parts: /etc/udhcpc.d/50default exited with code 2
Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch | 13 | ||||
-rw-r--r-- | meta/packages/busybox/busybox_1.15.3.bb | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch b/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch index 3b975b63f9..edea898b10 100644 --- a/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch +++ b/meta/packages/busybox/busybox-1.15.3/udhcpc-fix-nfsroot.patch @@ -1,8 +1,8 @@ -Index: busybox-1.15.1/examples/udhcp/simple.script +Index: busybox-1.15.3/examples/udhcp/simple.script =================================================================== ---- busybox-1.15.1.orig/examples/udhcp/simple.script 2009-09-16 22:52:09.000000000 +0200 -+++ busybox-1.15.1/examples/udhcp/simple.script 2009-09-16 22:57:11.424608476 +0200 -@@ -10,10 +10,17 @@ NETMASK="" +--- busybox-1.15.3.orig/examples/udhcp/simple.script 2010-06-27 12:17:14.116876946 +0200 ++++ busybox-1.15.3/examples/udhcp/simple.script 2010-06-27 12:18:38.607868533 +0200 +@@ -10,10 +10,17 @@ BROADCAST="broadcast +" [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" @@ -21,7 +21,7 @@ Index: busybox-1.15.1/examples/udhcp/simple.script ;; renew|bound) -@@ -21,15 +28,18 @@ case "$1" in +@@ -21,15 +28,17 @@ ifconfig $interface $ip $NETMASK $BROADCAST if [ -n "$router" ] ; then @@ -34,8 +34,7 @@ Index: busybox-1.15.1/examples/udhcp/simple.script + while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do + : + done -+ : -+ done ++ fi metric=0 for i in $router ; do diff --git a/meta/packages/busybox/busybox_1.15.3.bb b/meta/packages/busybox/busybox_1.15.3.bb index d6373758eb..9be4abdb17 100644 --- a/meta/packages/busybox/busybox_1.15.3.bb +++ b/meta/packages/busybox/busybox_1.15.3.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "4" +PR = "r5" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |