From a3b0c401cac043a132e7e2d491b3871ec94c258e Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 5 Oct 2015 12:26:11 -0700 Subject: 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 --- meta/recipes-core/busybox/busybox.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta/recipes-core/busybox/busybox.inc') 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 -- cgit 1.2.3-korg