busybox: simplify handling of busybox-static

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/recipes/busybox/busybox-static_1.18.1.bb b/recipes/busybox/busybox-static_1.18.1.bb
index 27d4121..05cca17 100644 (file)
--- a/recipes/busybox/busybox-static_1.18.1.bb
+++ b/recipes/busybox/busybox-static_1.18.1.bb
@@ -2,9 +2,3 @@ require busybox_${PV}.bb
 
 FILESPATHPKG =. "${P}:${BPN}:busybox-${PV}:"
 S = "${WORKDIR}/busybox-${PV}"
-
-do_configure_append() {
-       sed -i -e '/CONFIG_STATIC/d' .config
-       echo "CONFIG_STATIC=y" >>.config
-}
-

diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index 13227c9..29893da 100644 (file)
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -11,7 +11,7 @@ LICENSE = "GPLv2"
 SECTION = "base"
 PRIORITY = "required"
 
-INC_PR = "r38"
+INC_PR = "r39"
 
 SRC_URI = "\
   file://busybox-cron \
@@ -97,9 +97,11 @@ python () {
                  d)
 }
 
-do_configure () {
+do_prepare_config () {
        sed -e 's#@DATADIR@#${datadir}#g' \
                < ${WORKDIR}/defconfig > ${S}/.config
+       sed -i -e '/CONFIG_STATIC/d' .config
+       echo "# CONFIG_STATIC is not set" >> .config
        for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \
                ${S}/.config
        sed -i -e '${configmangle}' ${S}/.config
@@ -112,6 +114,15 @@ do_configure () {
          {if(net==2&&$0 !~ /^#/&&$1){print("# "$1" is not set")}else{print}}' \
                  ${S}/.config.oe-tmp > ${S}/.config
        fi
+}
+
+do_prepare_config_append_pn-busybox-static() {
+       sed -i -e '/CONFIG_STATIC/d' .config
+       echo "CONFIG_STATIC=y" >>.config
+}
+
+do_configure () {
+       do_prepare_config
        cml1_do_configure
 }