From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 1/2] MAKEALL: support direct options for KCONFIG_ADD
Date: Thu, 13 Mar 2025 12:36:03 +0100 [thread overview]
Message-ID: <20250313113604.915474-1-a.fatoum@pengutronix.de> (raw)
KCONFIG_ADD currently expects a list of files to be merged.
As MAKEALL is a bash script, let's make use of process substitution
to create temporary files out of -k CONFIG_foo=bar options.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
MAKEALL | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/MAKEALL b/MAKEALL
index 1966eedb4673..b0967b8ae340 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -56,7 +56,7 @@ usage() {
echo "BUILDDIR -O build dir"
echo "LOGDIR -l log dir"
echo "REGEX -e regex"
- echo "KCONFIG_ADD -k kconfig fragment"
+ echo "KCONFIG_ADD -k kconfig fragment or option"
echo "TARGET -t Makefile target"
echo "V -v verbosity"
echo "INCREMENTAL -i"
@@ -116,6 +116,11 @@ report() {
fi
}
+merge_config() {
+ with_logs_collected ./scripts/kconfig/merge_config.sh -m -O \
+ ${BUILDDIR} "$@"
+}
+
do_build_defconfig() {
local arch=$1
local defconfig=$2
@@ -156,8 +161,11 @@ do_build_defconfig() {
MAKE="${MAKE} $silent_flag CROSS_COMPILE=${cross_compile}"
with_logs_collected ${MAKE} ${defconfig}
for i in ${KCONFIG_ADD}; do
- with_logs_collected ./scripts/kconfig/merge_config.sh -m -O \
- ${BUILDDIR} ${BUILDDIR}/.config $i
+ if [[ $i =~ ^CONFIG_* ]]; then
+ merge_config ${BUILDDIR}/.config <(echo $i)
+ else
+ merge_config ${BUILDDIR}/.config $i
+ fi
done
with_logs_collected ${MAKE} $silent_flag olddefconfig
--
2.39.5
next reply other threads:[~2025-03-13 11:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-13 11:36 Ahmad Fatoum [this message]
2025-03-13 11:36 ` [PATCH 2/2] MAKEALL: parse kconfig_add out of YAML files Ahmad Fatoum
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=20250313113604.915474-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.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