From: bruce.ashfield@gmail.com
To: richard.purdie@linuxfoundation.org
Cc: openembedded-core@lists.openembedded.org
Subject: [PATCH 6/9] kernel-yocto: Only override CONFIG_LOCALVERSION if LINUX_VERSION_EXTENSION is set
Date: Wed, 5 Feb 2020 18:12:47 -0500 [thread overview]
Message-ID: <308b2425ab2d20304fe33ada34a3089967a24af8.1580944129.git.bruce.ashfield@gmail.com> (raw)
In-Reply-To: <cover.1580944129.git.bruce.ashfield@gmail.com>
From: Paul Barker <pbarker@konsulko.com>
CONFIG_LOCALVERSION may already be set in a defconfig or config fragment
and this should not be unconditionally overridden.
Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
meta/classes/kernel-yocto.bbclass | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 9a4d2864eb..e8a9b1f18e 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -359,8 +359,10 @@ do_kernel_configme() {
bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
fi
- echo "# Global settings from linux recipe" >> ${B}/.config
- echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
+ if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then
+ echo "# Global settings from linux recipe" >> ${B}/.config
+ echo "CONFIG_LOCALVERSION="\"${LINUX_VERSION_EXTENSION}\" >> ${B}/.config
+ fi
}
addtask kernel_configme before do_configure after do_patch
--
2.19.1
next prev parent reply other threads:[~2020-02-05 23:12 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 ` bruce.ashfield [this message]
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 ` [PATCH 8/9] kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created bruce.ashfield
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=308b2425ab2d20304fe33ada34a3089967a24af8.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