aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-10-05 12:26:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-12 14:33:36 +0100
commita3b0c401cac043a132e7e2d491b3871ec94c258e (patch)
treea550b0ab59a2c65c1672fe9774e3d05b71118beb
parentfd0c6de410856ec42e20762163575f0efde44541 (diff)
downloadopenembedded-core-contrib-a3b0c401cac043a132e7e2d491b3871ec94c258e.tar.gz
busybox.inc: remove redundant @DATADIR@ replacement
The busybox defconfig doesn't contain a @DATADIR@ marker, so the attempt to replace it in do_prepare_config is redundant. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/busybox/busybox.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index ed8f9fe766..4d4709a48c 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -103,9 +103,8 @@ python () {
}
do_prepare_config () {
- sed -e 's#@DATADIR@#${datadir}#g' \
+ sed -e '/CONFIG_STATIC/d' \
< ${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