summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/udhcpc-fix-nfsroot.patch56
-rw-r--r--meta/recipes-core/busybox/busybox-1.19.4/udhcpscript.patch24
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.4.bb4
3 files changed, 1 insertions, 83 deletions
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/udhcpc-fix-nfsroot.patch b/meta/recipes-core/busybox/busybox-1.19.4/udhcpc-fix-nfsroot.patch
deleted file mode 100644
index d2eab8bd1b..0000000000
--- a/meta/recipes-core/busybox/busybox-1.19.4/udhcpc-fix-nfsroot.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1Upstream-Status: Pending
2
3# copy commit message from OE as the patch comment:
4# commit ec4da6df3ad5b8b03446d0dda9c50a2439ae325a
5# Author: Denys Dmytriyenko <denis@denix.org>
6# Date: Wed Feb 4 11:43:18 2009 -0500
7#
8# busybox: fix nfsroot issues with resetting IP and deleting routes
9#
10# above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
11Index: busybox-1.15.3/examples/udhcp/simple.script
12===================================================================
13--- busybox-1.15.3.orig/examples/udhcp/simple.script 2010-06-27 12:17:14.116876946 +0200
14+++ busybox-1.15.3/examples/udhcp/simple.script 2010-06-27 12:18:38.607868533 +0200
15@@ -10,10 +10,17 @@
16 BROADCAST="broadcast +"
17 [ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
18
19+# return 0 if root is mounted on a network filesystem
20+root_is_nfs() {
21+ grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts
22+}
23+
24 case "$1" in
25 deconfig)
26+ if ! root_is_nfs ; then
27 echo "Setting IP address 0.0.0.0 on $interface"
28- ifconfig $interface 0.0.0.0
29+ ifconfig $interface 0.0.0.0
30+ fi
31 ;;
32
33 renew|bound)
34@@ -21,15 +28,17 @@
35 ifconfig $interface $ip $NETMASK $BROADCAST
36
37 if [ -n "$router" ] ; then
38- echo "Deleting routers"
39- while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
40- :
41- done
42+ if ! root_is_nfs ; then
43+ echo "Deleting routers"
44+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
45+ :
46+ done
47+ fi
48
49 metric=0
50 for i in $router ; do
51 echo "Adding router $i"
52- route add default gw $i dev $interface metric $((metric++))
53+ route add default gw $i dev $interface metric $((metric++)) 2>/dev/null
54 done
55 fi
56
diff --git a/meta/recipes-core/busybox/busybox-1.19.4/udhcpscript.patch b/meta/recipes-core/busybox/busybox-1.19.4/udhcpscript.patch
deleted file mode 100644
index b82ea335ac..0000000000
--- a/meta/recipes-core/busybox/busybox-1.19.4/udhcpscript.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Upstream-Status: Pending
2
3# copy commit message from OE as the patch comment
4# commit c9bb6478a873d6de4c8a0e712435ac9a658a345d
5# Author: Holger Schurig <schurig@mn-solutions.de>
6# Date: Wed Sep 29 08:29:58 2004 +0000
7#
8# udhcpscript: fixes the "deleting routers" error message in case of no existing default routes
9#
10# Above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
11
12Index: busybox-1.15.1/examples/udhcp/simple.script
13===================================================================
14--- busybox-1.15.1.orig/examples/udhcp/simple.script 2009-09-12 17:55:36.000000000 +0200
15+++ busybox-1.15.1/examples/udhcp/simple.script 2009-09-16 22:51:06.599693412 +0200
16@@ -22,7 +22,7 @@ case "$1" in
17
18 if [ -n "$router" ] ; then
19 echo "Deleting routers"
20- while route del default gw 0.0.0.0 dev $interface ; do
21+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
22 :
23 done
24
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index 2d4e96106c..0b1e78746a 100644
--- a/meta/recipes-core/busybox/busybox_1.19.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.19.4.bb
@@ -1,9 +1,7 @@
1require busybox.inc 1require busybox.inc
2PR = "r3" 2PR = "r4"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \
6 file://udhcpc-fix-nfsroot.patch \
7 file://B921600.patch \ 5 file://B921600.patch \
8 file://get_header_tar.patch \ 6 file://get_header_tar.patch \
9 file://busybox-appletlib-dependency.patch \ 7 file://busybox-appletlib-dependency.patch \