summaryrefslogtreecommitdiffstats
path: root/meta
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:36:27 +0100
commitfedff4f1af28b00040a3192e71bb24963235cfa1 (patch)
tree1af564bb74908d3ed801555382ab5a0bad7e0c6b /meta
parent78b9d2d62ffd7048427422b1590dbefbd128943f (diff)
downloadpoky-fedff4f1af28b00040a3192e71bb24963235cfa1.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. (From OE-Core rev: a3b0c401cac043a132e7e2d491b3871ec94c258e) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 () {
103} 103}
104 104
105do_prepare_config () { 105do_prepare_config () {
106 sed -e 's#@DATADIR@#${datadir}#g' \ 106 sed -e '/CONFIG_STATIC/d' \
107 < ${WORKDIR}/defconfig > ${S}/.config 107 < ${WORKDIR}/defconfig > ${S}/.config
108 sed -i -e '/CONFIG_STATIC/d' .config
109 echo "# CONFIG_STATIC is not set" >> .config 108 echo "# CONFIG_STATIC is not set" >> .config
110 for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \ 109 for i in 'CROSS' 'DISTRO FEATURES'; do echo "### $i"; done >> \
111 ${S}/.config 110 ${S}/.config