[oe-commits] Marcin Juszkiewicz : ifupdown: update to 0.6.10 and do not ship /etc/ network/interfaces

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 920132b42db5454b553b8f360a0be325849692a7
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=920132b42db5454b553b8f360a0be325849692a7

Author: Marcin Juszkiewicz <marcin at buglabs.net>
Date:   Wed Mar 31 15:43:29 2010 +0200

ifupdown: update to 0.6.10 and do not ship /etc/network/interfaces

Init script was renamed to ifup like it is in ifupdown-ubuntu

Signed-off-by: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl>

---

 .../busybox.patch                                  |    0 
 .../head-tail.patch                                |    0 
 .../{ifupdown-0.6.8 => ifupdown-0.6.10}/init       |    0 
 .../zeroconf.patch                                 |    0 
 recipes/ifupdown/ifupdown-0.6.8/interfaces         |    2 -
 recipes/ifupdown/ifupdown-0.6.8/udhcpc.patch       |   28 --------------------
 .../{ifupdown_0.6.8.bb => ifupdown_0.6.10.bb}      |   14 +++++----
 7 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/recipes/ifupdown/ifupdown-0.6.8/busybox.patch b/recipes/ifupdown/ifupdown-0.6.10/busybox.patch
similarity index 100%
rename from recipes/ifupdown/ifupdown-0.6.8/busybox.patch
rename to recipes/ifupdown/ifupdown-0.6.10/busybox.patch
diff --git a/recipes/ifupdown/ifupdown-0.6.8/head-tail.patch b/recipes/ifupdown/ifupdown-0.6.10/head-tail.patch
similarity index 100%
rename from recipes/ifupdown/ifupdown-0.6.8/head-tail.patch
rename to recipes/ifupdown/ifupdown-0.6.10/head-tail.patch
diff --git a/recipes/ifupdown/ifupdown-0.6.8/init b/recipes/ifupdown/ifupdown-0.6.10/init
similarity index 100%
rename from recipes/ifupdown/ifupdown-0.6.8/init
rename to recipes/ifupdown/ifupdown-0.6.10/init
diff --git a/recipes/ifupdown/ifupdown-0.6.8/zeroconf.patch b/recipes/ifupdown/ifupdown-0.6.10/zeroconf.patch
similarity index 100%
rename from recipes/ifupdown/ifupdown-0.6.8/zeroconf.patch
rename to recipes/ifupdown/ifupdown-0.6.10/zeroconf.patch
diff --git a/recipes/ifupdown/ifupdown-0.6.8/interfaces b/recipes/ifupdown/ifupdown-0.6.8/interfaces
deleted file mode 100644
index f1bd92e..0000000
--- a/recipes/ifupdown/ifupdown-0.6.8/interfaces
+++ /dev/null
@@ -1,2 +0,0 @@
-auto lo
-iface lo inet loopback
diff --git a/recipes/ifupdown/ifupdown-0.6.8/udhcpc.patch b/recipes/ifupdown/ifupdown-0.6.8/udhcpc.patch
deleted file mode 100644
index 5b662e7..0000000
--- a/recipes/ifupdown/ifupdown-0.6.8/udhcpc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: ifupdown-0.6.8/inet.defn
-===================================================================
---- ifupdown-0.6.8.orig/inet.defn	2007-01-04 09:11:43.000000000 +0100
-+++ ifupdown-0.6.8/inet.defn	2007-01-04 09:12:51.000000000 +0100
-@@ -81,8 +81,7 @@
-         elsif (execable("/sbin/dhclient"))
-     pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
-         elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100))
--    udhcpc -n -p /var/run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
--           [[-c %client%]] \
-+    udhcpc -b -p /var/run/udhcpc.%iface%.pid -i %iface% -H `cat /etc/hostname` \
-         elsif (execable("/sbin/udhcpc") && mylinuxver() >= mylinux(2,2,0))
-     dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
-            [[-l %leasetime%]] %iface% \
-@@ -91,11 +90,11 @@
-   down
-     dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \
-         if (execable("/sbin/dhclient3"))
--    cat /var/run/dhclient.%iface%.pid | xargs -i kill -TERM {} \
-+    kill -TERM `cat /var/run/dhclient.%iface%.pid` \
-         elsif (execable("/sbin/dhclient"))
-     pump -i %iface% -r \
-         elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100))
--    cat /var/run/udhcpc.%iface%.pid | xargs -i kill -TERM {} \
-+    kill -TERM `cat /var/run/udhcpc.%iface%.pid` \
-         elsif (execable("/sbin/udhcpc"))
-     dhcpcd -k %iface% \
-         elsif (execable("/sbin/dhcpcd"))
diff --git a/recipes/ifupdown/ifupdown_0.6.8.bb b/recipes/ifupdown/ifupdown_0.6.10.bb
similarity index 77%
rename from recipes/ifupdown/ifupdown_0.6.8.bb
rename to recipes/ifupdown/ifupdown_0.6.10.bb
index 53ccb5f..6bc4f47 100644
--- a/recipes/ifupdown/ifupdown_0.6.8.bb
+++ b/recipes/ifupdown/ifupdown_0.6.10.bb
@@ -8,13 +8,13 @@ SECTION = "base"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.tar.gz \
            file://busybox.patch;patch=1 \
-           file://udhcpc.patch;patch=1 \
            file://zeroconf.patch;patch=1 \
-           file://init \
-           file://interfaces"
+           file://init "
 
 EXTRA_OEMAKE = ""
 
+inherit update-rc.d
+
 do_compile () {
 	chmod a+rx *.pl *.sh
 	oe_runmake 'CC=${CC}' "CFLAGS=${CFLAGS} -Wall -W -D'IFUPDOWN_VERSION=\"${PV}\"'"
@@ -22,15 +22,17 @@ do_compile () {
 
 do_install () {
 	install -d ${D}${sysconfdir}/init.d \
-		   ${D}${sysconfdir}/network \
+		   ${D}${sysconfdir}/network/run/
 		   ${D}${mandir}/man8 \
 		   ${D}${mandir}/man5 \
 		   ${D}${base_sbindir}
 	install -m 0755 ifup ${D}${base_sbindir}/
 	ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown
-	install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking
-	install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
+	install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ifup
 	install -m 0644 ifup.8 ${D}${mandir}/man8
 	install -m 0644 interfaces.5 ${D}${mandir}/man5
 	cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8
 }
+
+INITSCRIPT_NAME = "ifup"
+INITSCRIPT_PARAMS = "start 39 S . stop 39 0 6 1 ."