From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH] v7a, mips: fix barebox-common oldconfig with inherited layers
Date: Mon, 26 Apr 2021 10:28:40 +0200 [thread overview]
Message-ID: <20210426082840.5999-1-rhi@pengutronix.de> (raw)
When using layers that inherit DistroKit, doing a 'ptxdist oldconfig
barebox-common' in the inherited layer can lead to strange errors about
unmatched MD5 sums in the config diff. This happens because
ptxd_make_world_kconfig_mode() in scripts/lib/ptxd_make_world_kconfig.sh
only updates the config files when the stage name matches "*config".
Rename the "barebox-common_oldconfig_" target to something that matches
the regex.
As a side note, we still need a separate oldconfig target for
barebox-common here because it must run before all other barebox's
oldconfig stages.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
configs/platform-mips/rules/barebox-common.make | 2 +-
configs/platform-v7a/rules/barebox-common.make | 2 +-
rules/post/barebox-common.make | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configs/platform-mips/rules/barebox-common.make b/configs/platform-mips/rules/barebox-common.make
index 39e860011500..d0caead4ac40 100644
--- a/configs/platform-mips/rules/barebox-common.make
+++ b/configs/platform-mips/rules/barebox-common.make
@@ -78,7 +78,7 @@ $(STATEDIR)/barebox-common.install:
barebox-common_menuconfig barebox-common_nconfig: $(STATEDIR)/barebox-common.extract
@$(call world/kconfig, BAREBOX_COMMON, $(subst barebox-common_,,$@))
-barebox-common_oldconfig_: $(STATEDIR)/barebox-common.extract
+barebox-common_do_oldconfig: $(STATEDIR)/barebox-common.extract
@$(call world/kconfig, BAREBOX_COMMON, oldconfig)
# vim: syntax=make
diff --git a/configs/platform-v7a/rules/barebox-common.make b/configs/platform-v7a/rules/barebox-common.make
index 39e860011500..d0caead4ac40 100644
--- a/configs/platform-v7a/rules/barebox-common.make
+++ b/configs/platform-v7a/rules/barebox-common.make
@@ -78,7 +78,7 @@ $(STATEDIR)/barebox-common.install:
barebox-common_menuconfig barebox-common_nconfig: $(STATEDIR)/barebox-common.extract
@$(call world/kconfig, BAREBOX_COMMON, $(subst barebox-common_,,$@))
-barebox-common_oldconfig_: $(STATEDIR)/barebox-common.extract
+barebox-common_do_oldconfig: $(STATEDIR)/barebox-common.extract
@$(call world/kconfig, BAREBOX_COMMON, oldconfig)
# vim: syntax=make
diff --git a/rules/post/barebox-common.make b/rules/post/barebox-common.make
index 601301b1324d..6342521abdcc 100644
--- a/rules/post/barebox-common.make
+++ b/rules/post/barebox-common.make
@@ -4,7 +4,7 @@
ifneq ($(filter barebox-common_oldconfig,$(MAKECMDGOALS)),)
$(eval $(addsuffix _oldconfig,$(filter-out barebox-common, \
- $(filter barebox-%, $(PTX_PACKAGES_SELECTED)))): barebox-common_oldconfig_$(ptx/nl))
+ $(filter barebox-%, $(PTX_PACKAGES_SELECTED)))): barebox-common_do_oldconfig$(ptx/nl))
endif
barebox-common_oldconfig: \
--
2.29.2
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next reply other threads:[~2021-04-26 8:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 8:28 Roland Hieber [this message]
2021-04-26 9:00 ` Robert Schwebel
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=20210426082840.5999-1-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=distrokit@pengutronix.de \
/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