| Message ID | 1339290549-3789-2-git-send-email-afaerber@suse.de |
|---|---|
| State | New |
| Headers | show |
Am 10.06.2012 03:09, schrieb Andreas Färber: > config-devices.mak.d is included from Makefile.target, i.e. from inside > the *-softmmu/ directory. It included the directory path, so never > applied to the actual config-devices.mak. Symptoms were spurious > dependency issues with default-configs/pci.mak. > > Fix by using `basename` to strip the directory path. > > Reported-by: Gerhard Wiesinger <lists@wiesinger.com> > Signed-off-by: Andreas Färber <afaerber@suse.de> Sorry, this patch was not supposed to be in this series, it was submitted already. (That comes from dropping one patch...) /-F > --- > scripts/make_device_config.sh | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh > index 5d14885..0778fe2 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 "$1: $all_includes" > $dep > +echo "`basename $1`: $all_includes" > $dep
diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh index 5d14885..0778fe2 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 "$1: $all_includes" > $dep +echo "`basename $1`: $all_includes" > $dep
config-devices.mak.d is included from Makefile.target, i.e. from inside the *-softmmu/ directory. It included the directory path, so never applied to the actual config-devices.mak. Symptoms were spurious dependency issues with default-configs/pci.mak. Fix by using `basename` to strip the directory path. Reported-by: Gerhard Wiesinger <lists@wiesinger.com> Signed-off-by: Andreas Färber <afaerber@suse.de> --- scripts/make_device_config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)