diff options
author | Kevin Tian <kevin.tian@intel.com> | 2010-07-06 15:33:31 +0800 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-07-07 17:12:11 +0100 |
commit | b56df3f573bdd5b5aebb5bdf565e8d9be1aa098d (patch) | |
tree | e3ad39ad14f6eb1f941445d35e7650113808e1bc /meta/packages/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch | |
parent | 330e32da127715341f49780b1f88120a31411739 (diff) | |
download | openembedded-core-b56df3f573bdd5b5aebb5bdf565e8d9be1aa098d.tar.gz openembedded-core-b56df3f573bdd5b5aebb5bdf565e8d9be1aa098d.tar.bz2 openembedded-core-b56df3f573bdd5b5aebb5bdf565e8d9be1aa098d.tar.xz openembedded-core-b56df3f573bdd5b5aebb5bdf565e8d9be1aa098d.zip |
busybox: upgrade to 1.16.2
[Patches] (add comments for kept patches)
REMOVE _0000-wget-no-check-certificate.patch_: in 1.16.2 now
KEEP _B921600.patch_: add 921600 speed serial line
REMOVE _ash_fix_redirection_of_fd_0.patch_: in 1.16.2
REMOVE _fdisk_lineedit_segfault.patch_: not used even in 1.15.3
REMOVE _fix_: not used even in 1.15.3
KEEP _get_header_tar.patch_: fix tar problem with exact 100 bytes filename
REMOVE _r24785.patch_: not used even in 1.15.3
KEEP _run-parts.in.usr-bin.patch_: solve confliction with debianutils. Though
the later is not in poky, keep it for safety
KEEP _udhcpscript.patch_: fix warning message
REMOVE _xargs-double-size.patch_: not used even in 1.15.3
KEEP _busybox-appletlib-dependency.patch_: solve paralle make issue. Move away
from files/.
KEEP _udhcpc-fix-nfsroot.patch_: support nfsroot
[Files]
UPDATE _defconfig_: adapt to new 1.16.2 config options
[Recipe]
- adapt to new 1.16.2 config option
- remove old OEMAKE_apend on "CROSS" which has been replaced by "CROSS_COMPILE"
since 2006
Signed-off-by Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch')
-rw-r--r-- | meta/packages/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/packages/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch b/meta/packages/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch new file mode 100644 index 000000000..89eeb425a --- /dev/null +++ b/meta/packages/busybox/busybox-1.16.2/udhcpc-fix-nfsroot.patch @@ -0,0 +1,54 @@ +# copy commit message from OE as the patch comment: +# commit ec4da6df3ad5b8b03446d0dda9c50a2439ae325a +# Author: Denys Dmytriyenko <denis@denix.org> +# Date: Wed Feb 4 11:43:18 2009 -0500 +# +# busybox: fix nfsroot issues with resetting IP and deleting routes +# +# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06 +Index: busybox-1.15.3/examples/udhcp/simple.script +=================================================================== +--- 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" + ++# return 0 if root is mounted on a network filesystem ++root_is_nfs() { ++ grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts ++} ++ + case "$1" in + deconfig) ++ if ! root_is_nfs ; then + echo "Setting IP address 0.0.0.0 on $interface" +- ifconfig $interface 0.0.0.0 ++ ifconfig $interface 0.0.0.0 ++ fi + ;; + + renew|bound) +@@ -21,15 +28,17 @@ + ifconfig $interface $ip $NETMASK $BROADCAST + + if [ -n "$router" ] ; then +- echo "Deleting routers" +- while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do +- : +- done ++ if ! root_is_nfs ; then ++ echo "Deleting routers" ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do ++ : ++ done ++ fi + + metric=0 + for i in $router ; do + echo "Adding router $i" +- route add default gw $i dev $interface metric $((metric++)) ++ route add default gw $i dev $interface metric $((metric++)) 2>/dev/null + done + fi + |