[oe-commits] Bernhard Reutner-Fischer : busybox: simplify handling of busybox-static

[git version control]

Module: openembedded.git
Branch: shr/testing2011.1
Commit: 59b2e10f88a2a4e8c18b7515bba38150e87c2005
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=59b2e10f88a2a4e8c18b7515bba38150e87c2005

Author: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
Date:   Mon Jan  3 20:02:01 2011 +0000

busybox: simplify handling of busybox-static

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

---

 recipes/busybox/busybox.inc |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index ceca8d7..8d2a88c 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -100,9 +100,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
@@ -115,6 +117,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
 }