From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 26 Apr 2021 10:28:52 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lawbs-0002s0-Fk for lore@lore.pengutronix.de; Mon, 26 Apr 2021 10:28:52 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lawbr-00067I-QD; Mon, 26 Apr 2021 10:28:51 +0200 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lawbm-000676-P1; Mon, 26 Apr 2021 10:28:46 +0200 Received: from rhi by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lawbm-0001ZY-Gm; Mon, 26 Apr 2021 10:28:46 +0200 From: Roland Hieber To: distrokit@pengutronix.de Date: Mon, 26 Apr 2021 10:28:40 +0200 Message-Id: <20210426082840.5999-1-rhi@pengutronix.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [DistroKit] [PATCH] v7a, mips: fix barebox-common oldconfig with inherited layers X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roland Hieber Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- 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