summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMikko Rapeli <mikko.rapeli@bmw.de>2019-09-16 07:16:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-16 22:02:45 (GMT)
commit224355418b514ca16334ae261ff8404a14987ad3 (patch)
tree7b61434398dc6aa3299cd724b6c905a4997ee183 /meta/recipes-core
parent2c6b9b918cd0baecfbf3fd1844a82fa017a9b844 (diff)
downloadpoky-224355418b514ca16334ae261ff8404a14987ad3.tar.gz
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. (From OE-Core rev: 20f1a454317ddff8a2e321c1fe55d086ff6fa286) Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox.inc5
1 files changed, 4 insertions, 1 deletions
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 () {
128 ${S}/.config.oe-tmp > ${S}/.config 128 ${S}/.config.oe-tmp > ${S}/.config
129 fi 129 fi
130 sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/' ${S}/.config 130 sed -i 's/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"/CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -b"/' ${S}/.config
131 sed -i 's|${DEBUG_PREFIX_MAP}||g' ${S}/.config 131 if [ -n "${DEBUG_PREFIX_MAP}" ]; then
132 sed -i 's|${DEBUG_PREFIX_MAP}||g' ${S}/.config
133 fi
132} 134}
133 135
134# returns all the elements from the src uri that are .cfg files 136# returns all the elements from the src uri that are .cfg files
@@ -142,6 +144,7 @@ def find_cfgs(d):
142 return sources_list 144 return sources_list
143 145
144do_configure () { 146do_configure () {
147 set -x
145 do_prepare_config 148 do_prepare_config
146 merge_config.sh -m .config ${@" ".join(find_cfgs(d))} 149 merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
147 cml1_do_configure 150 cml1_do_configure