[DistroKit] [PATCH] v7a, mips: fix barebox-common oldconfig with inherited layers

[DistroKit] [PATCH] v7a, mips: fix barebox-common oldconfig with inherited layers

[Roland Hieber]

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

Re: [DistroKit] [PATCH] v7a, mips: fix barebox-common oldconfig with inherited layers

[Robert Schwebel]

On Mon, Apr 26, 2021 at 10:28:40AM +0200, Roland Hieber wrote:
> 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(-)

Applied to next.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de