Skip to contentSkip to conversation

busybox.inc: remove redundant @DATADIR@ replacement

PATCH In review Andre McCurdy 2 participants 2 messages Oct 5, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/recipes-core/busybox/busybox.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-core/busybox/busybox.inc +1 -2
index ed8f9fe..4d4709a 100644
@@ -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
Signature · 1 line
1.9.1
#1 lore raw
Quoted 5 lines · Andre McCurdy

The busybox defconfig doesn't contain a @DATADIR@ marker, so the attempt to replace it in do_prepare_config is redundant.

We should really think about a new function in utils.bbclass which replaces one string with another in a path, and errors out (bbfatal) if the search string wasn't found at all.

Signature · 5 lines
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics