From: Laurent Vivier <lvivier@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
qemu-devel@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>
Cc: Aleksandar Markovic <aleksandar.markovic@rt-rk.com>,
Thomas Huth <thuth@redhat.com>,
"Daniel P . Berrange" <berrange@redhat.com>
Subject: Re: [PATCH v2] Makefile: Fix config-devices.mak not regenerated when Kconfig updated
Date: Tue, 5 Nov 2019 16:18:44 +0100 [thread overview]
Message-ID: <7cf9fa58-542b-d6af-4cb4-c807c780a0a6@redhat.com> (raw)
In-Reply-To: <20191105151209.1814-1-philmd@redhat.com>
On 05/11/2019 16:12, Philippe Mathieu-Daudé wrote:
> When hw/$DIR/Kconfig is changed, the corresponding generated
> hw/$DIR/config-devices.mak is not being updated.
> Fix this by including all the hw/*/Kconfig files to the prerequisite
> names of the rule generating the config-devices.mak files.
>
> Fixes: e0e312f3525a (build: switch to Kconfig)
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> v2:
> Simplify using the wildcard() function instead of calling `sed` (danpb)
>
> You can see this tread where Peter reported the failure:
> https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg00125.html
>
> How to reproduce:
>
> $ git checkout branch_modifying_kconfig
> $ make i386-softmmu/all
> $ make clean
> $ git checkout prev_branch
> $ make clean
> $ make i386-softmmu/all
> # error
>
> If OK, I plan to include this fix in the "hw/i386/pc: Split PIIX3
> southbridge from i440FX northbridge" pull request.
> ---
> Makefile | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 0e994a275d..f4fca08cd7 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -384,7 +384,8 @@ MINIKCONF_ARGS = \
> CONFIG_LINUX=$(CONFIG_LINUX) \
> CONFIG_PVRDMA=$(CONFIG_PVRDMA)
>
> -MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig
> +MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig \
> + $(wildcard $(SRC_PATH)/hw/*/Kconfig)
> MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \
>
> $(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_INPUTS) $(BUILD_DIR)/config-host.mak
>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
next prev parent reply other threads:[~2019-11-05 15:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 15:12 [PATCH v2] Makefile: Fix config-devices.mak not regenerated when Kconfig updated Philippe Mathieu-Daudé
2019-11-05 15:18 ` Laurent Vivier [this message]
2019-11-05 16:05 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7cf9fa58-542b-d6af-4cb4-c807c780a0a6@redhat.com \
--to=lvivier@redhat.com \
--cc=aleksandar.markovic@rt-rk.com \
--cc=berrange@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).