busybox: remove unused patches for simple.script (udhcpc)

* OE-Core provides its own copy of simple.script.

(From OE-Core rev: 3a36efc17c8504b00a7a277a67a7b10caa4d1cdc)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andreas Oberritter 2012-05-03 21:35:01 +02:00 committed by Richard Purdie
parent 97911d3931
commit 84eb62d8b2
3 changed files with 1 additions and 83 deletions

View File

@ -1,56 +0,0 @@
Upstream-Status: Pending
# 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

View File

@ -1,24 +0,0 @@
Upstream-Status: Pending
# copy commit message from OE as the patch comment
# commit c9bb6478a873d6de4c8a0e712435ac9a658a345d
# Author: Holger Schurig <schurig@mn-solutions.de>
# Date: Wed Sep 29 08:29:58 2004 +0000
#
# udhcpscript: fixes the "deleting routers" error message in case of no existing default routes
#
# Above comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-06
Index: busybox-1.15.1/examples/udhcp/simple.script
===================================================================
--- busybox-1.15.1.orig/examples/udhcp/simple.script 2009-09-12 17:55:36.000000000 +0200
+++ busybox-1.15.1/examples/udhcp/simple.script 2009-09-16 22:51:06.599693412 +0200
@@ -22,7 +22,7 @@ case "$1" in
if [ -n "$router" ] ; then
echo "Deleting routers"
- while route del default gw 0.0.0.0 dev $interface ; do
+ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
:
done

View File

@ -1,9 +1,7 @@
require busybox.inc
PR = "r3"
PR = "r4"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://udhcpscript.patch \
file://udhcpc-fix-nfsroot.patch \
file://B921600.patch \
file://get_header_tar.patch \
file://busybox-appletlib-dependency.patch \