package/pkg-generic: fix reconfigure for kconfig packages
PATCH 1/1 package/pkg-generic: fix reconfigure for kconfig packages
Kconfig based packages are not really reconfigured if the .config file is not regenerated in the reconfigure target.
--- package/pkg-generic.mk | 2 ++ 1 file changed, 2 insertions(+)
package/pkg-generic.mk +2 -0
@@ -693,6 +693,7 @@ $(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted $(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded $(2)_TARGET_ACTUAL_SOURCE = $$($(2)_DIR)/.stamp_actual_downloaded $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned +$(2)_TARGET_DOTCONFIG = $$($(2)_DIR)/.stamp_dotconfig # default extract command $(2)_EXTRACT_CMDS ?= \
@@ -904,6 +905,7 @@ $(1)-rebuild: $(1)-clean-for-rebuild $(1) $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild rm -f $$($(2)_TARGET_CONFIGURE) + rm -f $$($(2)_TARGET_DOTCONFIG) $(1)-reconfigure: $(1)-clean-for-reconfigure $(1)
Signature · 1 line
2.17.1
PATCH 1/1 package/pkg-generic: fix reconfigure for kconfig packages
Quoted 21 lines · On Mon, 25 Nov 2019 00:10:02 +0100 Angelo Compagnucci…
Kconfigbased packages are not really reconfigured if the .config file is not regenerated in the reconfigure target.Signed-off-by Angelo Compagnucci <[email protected]>--- package/pkg-generic.mk | 2 ++ 1 file changed, 2 insertions(+)package/pkg-generic.mk +1
-0@@ -693,6 +693,7 @@ $(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted $(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded $(2)_TARGET_ACTUAL_SOURCE = $$($(2)_DIR)/.stamp_actual_downloaded $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned +$(2)_TARGET_DOTCONFIG = $$($(2)_DIR)/.stamp_dotconfig # default extract command $(2)_EXTRACT_CMDS ?= \
package/pkg-generic.mk $(1)-rebuild: $(1)-clean-for-rebuild $(1) · line 908
Quoted 4 lines
package/pkg-generic.mk +1
-0@@ -904,6 +905,7 @@ $(1)-rebuild: $(1)-clean-for-rebuild $(1) $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild rm -f $$($(2)_TARGET_CONFIGURE) + rm -f $$($(2)_TARGET_DOTCONFIG)
I think this shouldn't be done in pkg-generic.mk, and instead be kept in pkg-kconfig.mk, which already has some logic to handle reconfigure, just it doesn't do what you want. I came up with:
package/pkg-kconfig.mk +1 -1
@@ -175,7 +175,7 @@ $$($(2)_TARGET_CONFIGURE): $$($(2)_DIR)/.stamp_kconfig_fixup_done $(1)-clean-for-reconfigure: $(1)-clean-kconfig-for-reconfigure $(1)-clean-kconfig-for-reconfigure: - rm -f $$($(2)_DIR)/.stamp_kconfig_fixup_done + rm -f $$($(2)_DIR)/$$($(2)_KCONFIG_STAMP_DOTCONFIG) # Only enable the foo-*config targets when the package is actually enabled. # Note: the variable $(2)_KCONFIG_VAR is not related to the kconfig
However, there seems to be some disagreement on IRC where "foo-reconfigure" on a kconfig package implies that the configuration of the package is completely regenerated, therefore losing any local change that may have been done using "foo-menuconfig". We need to sort out this disagreement before we can merge a patch like this.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/pkg-generic: fix reconfigure for kconfig packages
Quoted 5 lines · Thomas Petazzoni
However, there seems to be some disagreement on IRC where "foo-reconfigure" on a kconfig package implies that the configuration of the package is completely regenerated, therefore losing any local change that may have been done using "foo-menuconfig". We need to sort out this disagreement before we can merge a patch like this.
The word "reconfigure" by itself could mean either option: run 'olddefconfig'
on the current .config (which is what is done now), or recreate the .config from its inputs (which is what this patch makes it do).
I think the latter is a *lot* more useful than the former. The current
situation is only useful if you're either modifying the .config directly (without foo-menuconfig), or if you're modifying the Kconfig files in an OVERRIDE_SRCDIR. Modifying the .config directly is clearly not something we need to support. Modifying Kconfig files in OVERRIDE_SRCDIR is something we should support, but even then it makes a lot of sense to reconstruct the .config from the inputs rather than trying to reuse the locally modified .config.
Bottom line: I think it's a good change (if done in pkg-kconfig like Thomas
proposed).
It'll need to be mentioned in the release notes however.
Regards,
Arnout
PATCH 1/1 package/pkg-generic: fix reconfigure for kconfig packages
Quoted 22 lines · Arnout Vandecappelle
Quoted 5 lines · Thomas Petazzoni
However, there seems to be some disagreement on IRC where "foo-reconfigure" on a kconfig package implies that the configuration of the package is completely regenerated, therefore losing any local change that may have been done using "foo-menuconfig". We need to sort out this disagreement before we can merge a patch like this.
The word "reconfigure" by itself could mean either option: run 'olddefconfig'
on the current .config (which is what is done now), or recreate the .config from its inputs (which is what this patch makes it do).I think the latter is a *lot* more useful than the former. The current
situation is only useful if you're either modifying the .config directly (without foo-menuconfig), or if you're modifying theKconfigfiles in anOVERRIDE_SRCDIR. Modifying the .config directly is clearly not something we need to support. ModifyingKconfigfiles inOVERRIDE_SRCDIRis something we should support, but even then it makes a lot of sense to reconstruct the .config from the inputs rather than trying to reuse the locally modified .config.
Quoted 2 lines
Bottom line: I think it's a good change (if done in pkg-kconfig like Thomas
proposed).
FIY: https://patchwork.ozlabs.org/patch/1201052/
The latest iteration of the patch!
Thanks!
Quoted 6 lines
It'll need to be mentioned in the release notes however.
Regards,
Arnout