summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Hieber <rhi@pengutronix.de>2021-04-26 10:28:40 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2021-04-26 10:59:35 +0200
commit55e2a6b1cf7ee69819d9f8388d2eba35fc077c2a (patch)
tree493d67512cbf13b63fd5fec2a7b80d55bf0401a4
parentf55c1918e690dccf9545173bfa16d83ff9817050 (diff)
downloadDistroKit-55e2a6b1cf7ee69819d9f8388d2eba35fc077c2a.tar.gz
DistroKit-55e2a6b1cf7ee69819d9f8388d2eba35fc077c2a.tar.xz
v7a, mips: fix barebox-common oldconfig with inherited layers
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> Link: https://lore.pengutronix.de/20210426082840.5999-1-rhi@pengutronix.de Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-rw-r--r--configs/platform-mips/rules/barebox-common.make2
-rw-r--r--configs/platform-v7a/rules/barebox-common.make2
-rw-r--r--rules/post/barebox-common.make2
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 39e8600..d0caead 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 39e8600..d0caead 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 601301b..6342521 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: \