[PATCH] busybox-udhcpd patches

[PATCH] busybox-udhcpd patches

[Holger Hans Peter Freyther]

[-- Attachment #1: Type: text/plain, Size: 125 bytes --]

Hi all,

first patch switches busybox to INC_PR, second creates udhcp.leases directory
so udhcpd can start up.

holger

[-- Attachment #2: 0001-busybox-Use-the-INC_PR-scheme-known-from-OE.patch --]
[-- Type: text/x-patch, Size: 1466 bytes --]

From 947d9e092ee782dd75014823ad2178be88e9b737 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Wed, 27 Jul 2011 22:03:09 +0800
Subject: [PATCH 1/3] busybox: Use the INC_PR scheme known from OE

Signed-off-by: Holger Hans Peter Freyther <holger@moiji-mobile.com>
---
 meta/recipes-core/busybox/busybox.inc       |    2 ++
 meta/recipes-core/busybox/busybox_1.18.4.bb |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 341c5c4..0867f1b 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -3,6 +3,8 @@ DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into
 HOMEPAGE = "http://www.busybox.net"
 BUGTRACKER = "https://bugs.busybox.net/"
 
+INC_PR = "r1"
+
 # bzip2 applet in busybox is based on lightly-modified bzip2 source
 # the GPL is version 2 only
 LICENSE = "GPLv2 & bzip2"
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index cf37650..c16ebcc 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
-- 
1.7.4.1


[-- Attachment #3: 0002-busybox-udhcpd-wants-to-write-to-this-directory-crea.patch --]
[-- Type: text/x-patch, Size: 2041 bytes --]

From f79816d6f4284111efd07c88dc1889299874cdc6 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Wed, 27 Jul 2011 22:03:40 +0800
Subject: [PATCH 2/3] busybox: udhcpd wants to write to this directory, create it

Create the ${D}${localstatedir}/lib/misc/udhcpd.leases directory

Signed-off-by: Holger Hans Peter Freyther <holger@moiji-mobile.com>
---
 meta/recipes-core/busybox/busybox.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 0867f1b..53f2d0d 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "BusyBox combines tiny versions of many common UNIX utilities into
 HOMEPAGE = "http://www.busybox.net"
 BUGTRACKER = "https://bugs.busybox.net/"
 
-INC_PR = "r1"
+INC_PR = "r4"
 
 # bzip2 applet in busybox is based on lightly-modified bzip2 source
 # the GPL is version 2 only
@@ -19,7 +19,7 @@ PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev"
 FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www"
 FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog.conf*"
 FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf"
-FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd"
+FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd ${localstatedir}/lib/misc/udhcpd.leases"
 FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc ${sysconfdir}/init.d/busybox-udhcpc"
 
 INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-udhcpc ${PN}-mdev"
@@ -87,6 +87,7 @@ do_install () {
 		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
 
 		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
+		install -d ${D}${localstatedir}/lib/misc/udhcpd.leases
 	fi
 	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
 		# Move hwclock back to /sbin/hwclock
-- 
1.7.4.1