| Message ID | 1361460407-8493-2-git-send-email-afaerber@suse.de |
|---|---|
| State | New |
| Headers | show |
On 21 February 2013 15:26, Andreas Färber <afaerber@suse.de> wrote: > This reverts commit 23bf49b5eca716aaad073f2b47613434e1515cb5. > > While *-softmmu/config-devices.mak.d is included through *.d pattern via > Makefile.target, the make_devices_config.sh call these dependencies are > for is in ./Makefile. Therefore revert to original behavior. This commit message is wrong, isn't it? *-softmmu/config-devices.mak.d is included from Makefile, not Makefile.target: SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS)) # and then later: -include $(SUBDIR_DEVICES_MAK_DEP) -- PMM
Am 21.02.2013 16:30, schrieb Peter Maydell: > On 21 February 2013 15:26, Andreas Färber <afaerber@suse.de> wrote: >> This reverts commit 23bf49b5eca716aaad073f2b47613434e1515cb5. >> >> While *-softmmu/config-devices.mak.d is included through *.d pattern via >> Makefile.target, the make_devices_config.sh call these dependencies are >> for is in ./Makefile. Therefore revert to original behavior. > > This commit message is wrong, isn't it? *-softmmu/config-devices.mak.d > is included from Makefile, not Makefile.target: > > SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS)) > # and then later: > -include $(SUBDIR_DEVICES_MAK_DEP) That's exactly what I have just been discussing with Paolo: It is in fact included from both, both back then and today! -> 2/3 I can surely reword the commit message though to make that more clear. Point is my reverted commit message was not wrong, just half-wrong. :) Andreas
diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh index 0778fe2..5d14885 100644 --- a/scripts/make_device_config.sh +++ b/scripts/make_device_config.sh @@ -25,4 +25,4 @@ done process_includes $src > $dest cat $src $all_includes | grep -v '^include' > $dest -echo "`basename $1`: $all_includes" > $dep +echo "$1: $all_includes" > $dep
This reverts commit 23bf49b5eca716aaad073f2b47613434e1515cb5. While *-softmmu/config-devices.mak.d is included through *.d pattern via Makefile.target, the make_devices_config.sh call these dependencies are for is in ./Makefile. Therefore revert to original behavior. This should unbreak pci.mak dependencies not propagating. Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andreas Färber <afaerber@suse.de> --- scripts/make_device_config.sh | 2 +- 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)