From: bruce.ashfield@gmail.com
To: richard.purdie@linuxfoundation.org
Cc: openembedded-core@lists.openembedded.org
Subject: [PATCH 8/9] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created
Date: Wed, 5 Feb 2020 18:12:49 -0500 [thread overview]
Message-ID: <a7dfcd09a44a35ce8cd109c3084486347782e8aa.1580944129.git.bruce.ashfield@gmail.com> (raw)
In-Reply-To: <cover.1580944129.git.bruce.ashfield@gmail.com>
From: Martin Jansa <martin.jansa@gmail.com>
* for whatever reason, instead of silently continuing to build default kernel config
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/classes/kernel-yocto.bbclass | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index f71aa7d0a6..d961901b74 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -327,8 +327,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot"
do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot"
do_kernel_configme[dirs] += "${S} ${B}"
do_kernel_configme() {
- set +e
-
# translate the kconfig_mode into something that merge_config.sh
# understands
case ${KCONFIG_MODE} in
@@ -354,8 +352,9 @@ do_kernel_configme() {
bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)"
fi
- CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1
- if [ $? -ne 0 ]; then
+ CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs}
+
+ if [ $? -ne 0 -o ! -f ${B}/.config ]; then
bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
fi
--
2.19.1
next prev parent reply other threads:[~2020-02-05 23:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 23:12 [PATCH 0/9] kernel-yocto: consolidated pull request bruce.ashfield
2020-02-05 23:12 ` [PATCH 1/9] kern-tools: tweak symbol_why to be python safe bruce.ashfield
2020-02-05 23:12 ` [PATCH 2/9] kern-tools: integrate merge_config fix for gold linker bruce.ashfield
2020-02-05 23:12 ` [PATCH 3/9] kern-tools-native: use more common S value and oe_runmake bruce.ashfield
2020-02-05 23:12 ` [PATCH 4/9] kernel-yocto: Move defaults and tasks from linux-yocto.inc into bbclass bruce.ashfield
2020-02-05 23:12 ` [PATCH 5/9] kernel-yocto: Drop setting of unused variables in do_kernel_metadata bruce.ashfield
2020-02-05 23:12 ` [PATCH 6/9] kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set bruce.ashfield
2020-02-05 23:12 ` [PATCH 7/9] kernel-yocto.bbclass: set KERNEL_LD also for merge_config.sh bruce.ashfield
2020-02-05 23:12 ` bruce.ashfield [this message]
2020-02-05 23:12 ` [PATCH 9/9] kernel-yocto: fix defconfig detection in find_sccs() bruce.ashfield
2020-02-05 23:32 ` ✗ patchtest: failure for kernel-yocto: consolidated pull request Patchwork
2020-02-06 9:03 ` [PATCH 0/9] " Richard Purdie
2020-02-06 13:25 ` Bruce Ashfield
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a7dfcd09a44a35ce8cd109c3084486347782e8aa.1580944129.git.bruce.ashfield@gmail.com \
--to=bruce.ashfield@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox