riscv/qemu - qemu - Gitea: Git with a cup of tea

Commit Graph

Author	SHA1	Message	Date
Paolo Bonzini	15564d85af	build: pass .d file name to scripts/make_device_config.sh, fix makefile target The .d file name must match exactly what is used in the SUBDIR_DEVICES_MAK_DEP variable. Instead of making assumptions in the make_device_config.sh script, just pass it in. Similarly, the makefile target may not match the output file name, because Makefile uses a temporary file. Instead of making assumptions on what the Makefile does, emit the config-devices.mak file to stdout, and use the passed-in destination as the makefile target Reported-by: Peter Maydell <peter.maydell@linaro.org> Cc: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>	11 years ago
Michael S. Tsirkin	12ccfec968	Makefile: don't silence mak file test with V=1 V=1 should show what's going on, it's not nice to silence things unconditionally. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Message-Id: <1424332114-13440-1-git-send-email-mst@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>	11 years ago
Andreas Färber	8807080133	make_device_config.sh: Emit dependency file to directory where included Placing the config-devices.mak.d file alongside the config-devices.mak file in -softmmu/ lead to it getting included into through -softmmu/Makefile in addition to ./Makefile, leading to confusion. Instead, emit it to ./%-config-devices.mak.d, where it is included. Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>	13 years ago
Andreas Färber	1b3048170a	Revert "make_device_config.sh: Fix target path in generated dependency file" This reverts commit `23bf49b5ec`. 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> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>	13 years ago
Gerd Hoffmann	f4ece40463	fix scripts/make_device_config.sh Make it handle multiple include statements in a file: (1) The printf needs a space so the include files will be separated. (2) Also $f can contain multiple failes, so redirection will not work and we have to use cat to process all files. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>	13 years ago
Andreas Färber	23bf49b5ec	make_device_config.sh: Fix target path in generated dependency file 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 build failures due to missing dependency on default-configs/pci.mak. Fix this by using `basename` to strip the directory path. Reported-by: Gerhard Wiesinger <lists@wiesinger.com> Cc: qemu-stable@nongnu.org Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>	13 years ago
Blue Swirl	4c3b5a4891	Add scripts directory Move build and user scripts into scripts directory. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>	15 years ago
Stefan Weil	0601740a5d	make_device_config: Fix non-fatal error message with dash and other shells ORS=" " adds a blank to the name of the include file. Some shells (e.g. dash) don't accept input redirection (tr -d '\r' < $f) when $f ends with a blank, so they print an error message instead of reading pci.mak. This is a non-fatal error because pci.mak does not contain an include line. It was introduced by commit `5d6b423c5c`. Using printf avoids adding a blank and is also supported by older awk versions (this solution was suggested by Paolo Bonzini, thank you). Cc: Blue Swirl <blauwirbel@gmail.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Tested-by: Andreas Färber <andreas.faerber@web.de>	16 years ago
Stefan Weil	5d6b423c5c	win32: Fix CRLF problem in make_device_config.sh QEMU source code with CRLF line endings which is quite common on windows hosts fails with current make_device_config.sh. The awk script gets the name of the included file with \r, so instead of pci.mak it will search for pci.mak\r which of course does not work. Fix this by removing any \r. v2: Avoid using sub() and \r with awk because they are unsupported on some platforms. Use tr to remove \r. This new solution improves portability and was suggested by Paolo Bonzini. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Acked-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>	16 years ago
Paul Brook	cf66924f81	Detect missing config includes Terminate make_device_config.sh if the awk command fails. Typically this means a missing file. Signed-off-by: Paul Brook <paul@codesourcery.com>	16 years ago
Paul Brook	bd9141bb2e	Include directives in default configs Allow default configs to be split into several files. Signed-off-by: Paul Brook <paul@codesourcery.com>	16 years ago

7 Commits (b82fc321bf02aaceea0beb4dfabb4ca86a9a5ff6)