Makefile: Fix inclusion of the config-devices.mak.d Kconfig dependencies
PATCH 1/1 Makefile: Fix inclusion of the config-devices.mak.d Kconfig dependencies
The Makefile tries to include device Kconfig dependencies via
-include $(SUBDIR_DEVICES_MAK_DEP)
and thus expects files that match *-softmmu/config-devices.mak.d ... However, the minikconf script currently generates files a la "*-softmmu-config.devices.mak.d" instead, so the dependency files simply got ignored so far. For example, after a "touch hw/arm/Kconfig", the arm-softmmu/config-devices.mak file is currently not re-generated. Fix it by putting the dependency files in the *-softmmu folders now.
--- Makefile | 2 +- configure | 2 +- docs/devel/kconfig.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Makefile +1 -1
@@ -350,7 +350,7 @@ endif # This has to be kept in sync with Kconfig.host. MINIKCONF_ARGS = \ $(CONFIG_MINIKCONF_MODE) \ - $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ + $@ $*/config-devices.mak.d $< $(MINIKCONF_INPUTS) \ CONFIG_KVM=$(CONFIG_KVM) \ CONFIG_SPICE=$(CONFIG_SPICE) \ CONFIG_IVSHMEM=$(CONFIG_IVSHMEM) \
configure +1 -1
@@ -1832,7 +1832,7 @@ exit 0 fi # Remove old dependency files to make sure that they get properly regenerated -rm -f *-config-devices.mak.d +rm -f */config-devices.mak.d if test -z "$python" then
docs/devel/kconfig.rst +1 -1
@@ -299,7 +299,7 @@ and also listed as follows in the top-level Makefile's ``MINIKCONF_ARGS`` variable:: MINIKCONF_ARGS = \ - $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ + $@ $*/config-devices.mak.d $< $(MINIKCONF_INPUTS) \ CONFIG_KVM=$(CONFIG_KVM) \ CONFIG_SPICE=$(CONFIG_SPICE) \ CONFIG_TPM=$(CONFIG_TPM) \
Signature · 1 line
2.21.0
Paolo Bonzini
AppliedQuoted 51 lines · Thomas Huth
The
Makefiletries to include deviceKconfigdependencies via-include $(SUBDIR_DEVICES_MAK_DEP)
and thus expects files that match *-softmmu/config-devices.mak.d ... However, the minikconf script currently generates files a la "*-softmmu-config.devices.mak.d" instead, so the dependency files simply got ignored so far. For example, after a "touch hw/arm/Kconfig", the arm-softmmu/config-devices.mak file is currently not re-generated. Fix it by putting the dependency files in the *-softmmu folders now.
Reported-by Peter Maydell <[email protected]>Signed-off-by Thomas Huth <[email protected]>--- Makefile | 2 +- configure | 2 +- docs/devel/kconfig.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)Makefile +1
-1@@ -350,7 +350,7 @@ endif # This has to be kept in sync with Kconfig.host. MINIKCONF_ARGS = \ $(CONFIG_MINIKCONF_MODE) \ - $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ + $@ $*/config-devices.mak.d $< $(MINIKCONF_INPUTS) \ CONFIG_KVM=$(CONFIG_KVM) \ CONFIG_SPICE=$(CONFIG_SPICE) \ CONFIG_IVSHMEM=$(CONFIG_IVSHMEM) \configure +1
-1@@ -1832,7 +1832,7 @@ exit 0 fi # Remove old dependency files to make sure that they get properly regenerated -rm -f *-config-devices.mak.d +rm -f */config-devices.mak.d if test -z "$python" thendocs/devel/kconfig.rst +0
-0
docs/devel/kconfig.rst and also listed as follows in the top-level Makefile's ``MINIKCONF_ARGS`` · line 305
Quoted 8 lines
docs/devel/kconfig.rst +1
-1@@ -299,7 +299,7 @@ and also listed as follows in the top-level Makefile's ``MINIKCONF_ARGS`` variable:: MINIKCONF_ARGS = \ - $@ $*-config.devices.mak.d $< $(MINIKCONF_INPUTS) \ + $@ $*/config-devices.mak.d $< $(MINIKCONF_INPUTS) \ CONFIG_KVM=$(CONFIG_KVM) \ CONFIG_SPICE=$(CONFIG_SPICE) \ CONFIG_TPM=$(CONFIG_TPM) \
Queued, thanks.
Paolo