* [PATCH] busybox.inc: remove redundant @DATADIR@ replacement
@ 2015-10-05 19:26 Andre McCurdy
2015-10-05 22:04 ` Christopher Larson
0 siblings, 1 reply; 2+ messages in thread
From: Andre McCurdy @ 2015-10-05 19:26 UTC (permalink / raw)
To: openembedded-core
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>
---
meta/recipes-core/busybox/busybox.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index ed8f9fe..4d4709a 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
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] busybox.inc: remove redundant @DATADIR@ replacement
2015-10-05 19:26 [PATCH] busybox.inc: remove redundant @DATADIR@ replacement Andre McCurdy
@ 2015-10-05 22:04 ` Christopher Larson
0 siblings, 0 replies; 2+ messages in thread
From: Christopher Larson @ 2015-10-05 22:04 UTC (permalink / raw)
To: Andre McCurdy; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
On Mon, Oct 5, 2015 at 12:26 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> 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>
>
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.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1060 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-05 22:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-05 19:26 [PATCH] busybox.inc: remove redundant @DATADIR@ replacement Andre McCurdy
2015-10-05 22:04 ` Christopher Larson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.