]> code.ossystems Code Review - openembedded-core.git/commitdiff
busybox.inc: remove redundant @DATADIR@ replacement
authorAndre McCurdy <armccurdy@gmail.com>
Mon, 5 Oct 2015 19:26:11 +0000 (12:26 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 12 Oct 2015 13:33:36 +0000 (14:33 +0100)
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>
meta/recipes-core/busybox/busybox.inc

index ed8f9fe7665bacef48d15234043cd38140aed72e..4d4709a48cbd2ff5062bbeca03636acd38e54757 100644 (file)
@@ -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