From: Yann E. MORIN Date: Tue, 13 Sep 2016 22:35:17 +0000 (+0200) Subject: infra/pkg-kconfig: Be sure to reconfigure the package on foo-reconfigure X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4b81badbcc0b25678ac6627548160702731cf393;p=buildroot.git infra/pkg-kconfig: Be sure to reconfigure the package on foo-reconfigure Currently, calling foo-reconfigure for a kconfig-based package will not re-trigger the configuration (kconfig-wise) step for the package. This can be problematic when using an override-srcdir suring development and the content of the veride-srcdir changes (e.g. on a rebase, a merge, or during a bisect). This is because the configuration (kconfig-wise) of the package is not done in the _CONFIGURE_CMDS block, but as a separate action that is not part of any step [0]. So, be sure to remove the stamp file .stamp_kconfig_fixup_done during the foo-clean-for-reconfigure rule, so that the configuration is applied again with the new source tree. We use another rule, foo-clean-kconfig-for-reconfigure, because we do not want to override the default foo-clean-for-reconfigure rule, and we have no way to add conditional commands to it. [0] The reasons it was not done are not entirely clear in my head, but IIRC that was not working at the time we tried with Thomas DS. Reported-by: Vivien Didelot Signed-off-by: "Yann E. MORIN" Cc: Vivien Didelot Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Tested-by: Vivien Didelot Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index b0f51789c3..ce9bf33299 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -118,6 +118,12 @@ $$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/.config # Before running configure, the configuration file should be present and fixed $$($(2)_TARGET_CONFIGURE): $$($(2)_DIR)/.stamp_kconfig_fixup_done +# Force olddefconfig again on -reconfigure +$(1)-clean-for-reconfigure: $(1)-clean-kconfig-for-reconfigure + +$(1)-clean-kconfig-for-reconfigure: + rm -f $$($(2)_DIR)/.stamp_kconfig_fixup_done + # Only enable the foo-*config targets when the package is actually enabled. # Note: the variable $(2)_KCONFIG_VAR is not related to the kconfig # infrastructure, but defined by pkg-generic.mk. The generic infrastructure is