From: Andre McCurdy Date: Mon, 5 Oct 2015 19:26:11 +0000 (-0700) Subject: busybox.inc: remove redundant @DATADIR@ replacement X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~28644 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3b0c401cac043a132e7e2d491b3871ec94c258e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Ross Burton --- diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index ed8f9fe7665..4d4709a48cb 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