[oe] [PATCH 07/12] busybox: simplify handling of busybox-static
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Mon Jan 3 20:02:01 UTC 2011
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
recipes/busybox/busybox-static_1.17.4.bb | 8 +-------
recipes/busybox/busybox-static_1.18.1.bb | 6 ------
recipes/busybox/busybox.inc | 15 +++++++++++++--
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/recipes/busybox/busybox-static_1.17.4.bb b/recipes/busybox/busybox-static_1.17.4.bb
index 325752a..252fd66 100644
--- a/recipes/busybox/busybox-static_1.17.4.bb
+++ b/recipes/busybox/busybox-static_1.17.4.bb
@@ -1,11 +1,5 @@
require busybox_${PV}.bb
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
FILESPATHPKG =. "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-static_1.18.1.bb b/recipes/busybox/busybox-static_1.18.1.bb
index 58aca93..eeb3040 100644
--- 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 =. "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 a9d1e6e..eda5f95 100644
--- 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
}
--
1.7.2.3
More information about the Openembedded-devel
mailing list