busybox 1.16.2: Fix udhcpd and udhcpc in config

Starting with version 1.16.x busybox changed CONFIG_APP_UDHCPxxx into CONFIG_UDHCPCxxx.
- Change defconfigs
- Fix do_install_append to install the scritps if these options are set

diff --git a/recipes/busybox/busybox-1.16.2/angstrom/defconfig b/recipes/busybox/busybox-1.16.2/angstrom/defconfig
index 8934890..0ecb0f2 100644 (file)
--- a/recipes/busybox/busybox-1.16.2/angstrom/defconfig
+++ b/recipes/busybox/busybox-1.16.2/angstrom/defconfig
@@ -710,12 +710,12 @@ CONFIG_TRACEROUTE=y
 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
 CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
 CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
-CONFIG_APP_UDHCPD=y
-CONFIG_APP_DHCPRELAY=y
-CONFIG_APP_DUMPLEASES=y
+CONFIG_UDHCPD=y
+CONFIG_DHCPRELAY=y
+CONFIG_DUMPLEASES=y
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
 CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
-CONFIG_APP_UDHCPC=y
+CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 # CONFIG_FEATURE_UDHCP_PORT is not set
 # CONFIG_UDHCP_DEBUG is not set

diff --git a/recipes/busybox/busybox-1.16.2/defconfig b/recipes/busybox/busybox-1.16.2/defconfig
index ddbaa08..5a6870c 100644 (file)
--- a/recipes/busybox/busybox-1.16.2/defconfig
+++ b/recipes/busybox/busybox-1.16.2/defconfig
@@ -710,12 +710,12 @@ CONFIG_TRACEROUTE=y
 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
 CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
 CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
-CONFIG_APP_UDHCPD=y
-CONFIG_APP_DHCPRELAY=y
-CONFIG_APP_DUMPLEASES=y
+CONFIG_UDHCPD=y
+CONFIG_DHCPRELAY=y
+CONFIG_DUMPLEASES=y
 # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
 CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
-CONFIG_APP_UDHCPC=y
+CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 # CONFIG_FEATURE_UDHCP_PORT is not set
 # CONFIG_UDHCP_DEBUG is not set

diff --git a/recipes/busybox/busybox_1.16.2.bb b/recipes/busybox/busybox_1.16.2.bb
index 25f69f3..2502c52 100644 (file)
--- a/recipes/busybox/busybox_1.16.2.bb
+++ b/recipes/busybox/busybox_1.16.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -46,4 +46,15 @@ do_install_append() {
     install -d ${D}${sysconfdir}/mdev
     install -m 0755 ${WORKDIR}/find-touchscreen.sh ${D}${sysconfdir}/mdev/
     install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/
+
+    if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
+          install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
+    fi
+
+    if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
+          install -d ${D}${sysconfdir}/udhcpc.d
+          install -d ${D}${datadir}/udhcpc
+          install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default
+          install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
+    fi
 }