busybox 1.2.0 fix packaging due to changed CONFIG_ options

WARNING: Need to review ALL defconfigs before setting this version as default

7 files changed, 12 insertions, 13 deletions

diff --git a/packages/busybox/busybox-1.2.0/defconfig b/packages/busybox/busybox-1.2.0/defconfig
index 017e9d274c..dfd594f747 100644
--- a/packages/busybox/busybox-1.2.0/defconfig
+++ b/packages/busybox/busybox-1.2.0/defconfig
@@ -454,8 +454,8 @@ CONFIG_FEATURE_WGET_IP6_LITERAL=y
 #
 # udhcp Server/Client
 #
-CONFIG_UDHCPD=y
-CONFIG_UDHCPC=y
+CONFIG_APP_UDHCPD=y
+CONFIG_APP_UDHCPC=y
 # CONFIG_DUMPLEASES is not set
 CONFIG_FEATURE_UDHCP_SYSLOG=y
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
diff --git a/packages/busybox/busybox-1.2.0/nylon/defconfig b/packages/busybox/busybox-1.2.0/nylon/defconfig
index 599051bafb..866b8ec94d 100644
--- a/packages/busybox/busybox-1.2.0/nylon/defconfig
+++ b/packages/busybox/busybox-1.2.0/nylon/defconfig
@@ -366,8 +366,8 @@ CONFIG_FEATURE_WGET_IP6_LITERAL=y
 #
 # udhcp Server/Client
 #
-CONFIG_UDHCPD=y
-CONFIG_UDHCPC=y
+CONFIG_APP_UDHCPD=y
+CONFIG_APP_UDHCPC=y
 CONFIG_DUMPLEASES=y
 CONFIG_FEATURE_UDHCP_SYSLOG=y
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
diff --git a/packages/busybox/busybox-1.2.0/openmn/defconfig b/packages/busybox/busybox-1.2.0/openmn/defconfig
index f98af91853..007f3a69b1 100644
--- a/packages/busybox/busybox-1.2.0/openmn/defconfig
+++ b/packages/busybox/busybox-1.2.0/openmn/defconfig
@@ -359,8 +359,8 @@ CONFIG_FEATURE_WGET_AUTHENTICATION=y
 #
 # udhcp Server/Client
 #
-# CONFIG_UDHCPD is not set
-CONFIG_UDHCPC=y
+# CONFIG_APP_UDHCPD is not set
+CONFIG_APP_UDHCPC=y
 CONFIG_FEATURE_UDHCP_SYSLOG=y
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
 
diff --git a/packages/busybox/busybox-1.2.0/openslug/defconfig b/packages/busybox/busybox-1.2.0/openslug/defconfig
index 7debaeced2..011e5c896f 100644
--- a/packages/busybox/busybox-1.2.0/openslug/defconfig
+++ b/packages/busybox/busybox-1.2.0/openslug/defconfig
@@ -340,7 +340,7 @@ CONFIG_FEATURE_WGET_IP6_LITERAL=y
 # udhcp Server/Client
 #
 # CONFIG_UDHCPD is not set
-CONFIG_UDHCPC=y
+CONFIG_APP_UDHCPC=y
 CONFIG_FEATURE_UDHCP_SYSLOG=y
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
 
diff --git a/packages/busybox/busybox-1.2.0/sparc/defconfig b/packages/busybox/busybox-1.2.0/sparc/defconfig
index 8b8cbfc839..329c7796fd 100644
--- a/packages/busybox/busybox-1.2.0/sparc/defconfig
+++ b/packages/busybox/busybox-1.2.0/sparc/defconfig
@@ -345,7 +345,7 @@ CONFIG_FEATURE_WGET_IP6_LITERAL=y
 # udhcp Server/Client
 #
 # CONFIG_UDHCPD is not set
-CONFIG_UDHCPC=y
+CONFIG_APP_UDHCPC=y
 CONFIG_FEATURE_UDHCP_SYSLOG=y
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
 
diff --git a/packages/busybox/busybox-1.2.0/wrt54/defconfig b/packages/busybox/busybox-1.2.0/wrt54/defconfig
index 7f1aef4ef9..60a8883069 100644
--- a/packages/busybox/busybox-1.2.0/wrt54/defconfig
+++ b/packages/busybox/busybox-1.2.0/wrt54/defconfig
@@ -365,7 +365,7 @@ CONFIG_FEATURE_WGET_IP6_LITERAL=y
 # udhcp Server/Client
 #
 # CONFIG_UDHCPD is not set
-CONFIG_UDHCPC=y
+CONFIG_APP_UDHCPC=y
 # CONFIG_FEATURE_UDHCP_SYSLOG is not set
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
 
diff --git a/packages/busybox/busybox_1.2.0.bb b/packages/busybox/busybox_1.2.0.bb
index 798998c8e1..f386304d90 100644
--- a/packages/busybox/busybox_1.2.0.bb
+++ b/packages/busybox/busybox_1.2.0.bb
@@ -35,8 +35,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://syslog.conf \
 	   file://mount.busybox \
 	   file://umount.busybox"
-
-#S = "${WORKDIR}/busybox-1.1.0-pre1"
+S = "${WORKDIR}/busybox-1.2.0"
 
 export EXTRA_CFLAGS = "${CFLAGS}"
 EXTRA_OEMAKE_append = " CROSS=${HOST_PREFIX}"
@@ -101,7 +100,7 @@ do_install () {
 		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
 		install -d ${D}/srv/www
 	fi
-	if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then 
 		# Move udhcpd back to /usr/sbin/udhcpd
 		install -d ${D}${sbindir}
 		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
@@ -115,7 +114,7 @@ do_install () {
 					
 		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then 
+	if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then 
 		# Move dhcpc back to /usr/sbin/udhcpc
 		install -d ${D}${base_sbindir}
 		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/