[oe-commits] [openembedded-core] 12/13: busybox.inc: handle empty DEBUG_PREFIX_MAP

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 20f1a454317ddff8a2e321c1fe55d086ff6fa286
Author: Mikko Rapeli <mikko.rapeli at bmw.de>
AuthorDate: Mon Sep 16 10:16:16 2019 +0300

    busybox.inc: handle empty DEBUG_PREFIX_MAP
    
    DEBUG_PREFIX_MAP can be empty if e.g. old clang
    toolchain doesn't support the default poky values for gcc.
    
    Fixes build failure:
    
    ERROR: Logfile of failure stored in: /home/builder/src/base/build/tmp/work/aarch64-poky-linux/busybox/1.31.0-r
    0/temp/log.do_configure.14451
    Log data follows:
    | DEBUG: Executing shell function do_configure
    | sed: -e expression #1, char 0: no previous regular expression
    | WARNING: exit code 1 from a shell command.
    | ERROR: Execution of '/home/builder/src/base/build/tmp/work/aarch64-poky-linux/busybox/1.31.0-r0/temp/run.do_configure.14451' failed with exit code 1:
    | sed: -e expression #1, char 0: no previous regular expression
    | WARNING: exit code 1 from a shell command.
    |
    
    This log entry is really useless for debugging problems so
    add "set -x" to the configure script so that details can be seen
    if something isn't working.
    
    Signed-off-by: Mikko Rapeli <mikko.rapeli at bmw.de>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/busybox/busybox.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 49165d7..956ccca 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -128,7 +128,9 @@ do_prepare_config () {
 		${S}/.config.oe-tmp > ${S}/.config
 	fi
 	sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/' ${S}/.config
-	sed -i 's|${DEBUG_PREFIX_MAP}||g' ${S}/.config
+	if [ -n "${DEBUG_PREFIX_MAP}" ]; then
+		sed -i 's|${DEBUG_PREFIX_MAP}||g' ${S}/.config
+	fi
 }
 
 # returns all the elements from the src uri that are .cfg files
@@ -142,6 +144,7 @@ def find_cfgs(d):
     return sources_list
 
 do_configure () {
+	set -x
 	do_prepare_config
 	merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
 	cml1_do_configure

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.