diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-06-16 10:06:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-06-16 10:06:57 +0100 |
| commit | 72fc7d7f7907cbae2d3265e117ce8a21f24adc81 (patch) | |
| tree | 2b044c5712f597220c52f64b721bb521cafb4a92 /configure | |
| parent | 53550e81e2cafe7c03a39526b95cd21b5194d9b1 (diff) | |
| parent | 1ef6bfc23144e0ec7c182301d26b114b3610c8c8 (diff) | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-06-16' into staging
* Latest fuzzer patches from Alexander
* Fixes for the qtest bios-tables-test
* LGPL information cleanup in qtest code
* sh4 acceptance test
* Improved submodule handling for the s390x CI test
# gpg: Signature made Tue 16 Jun 2020 08:56:10 BST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2020-06-16:
configure: Let SLOF be initialized by ./scripts/git-submodule.sh
tests/acceptance: Add boot tests for sh4 QEMU advent calendar image
tests/qtest: Fix LGPL information in the file headers
fuzz: add oss-fuzz build-script
fuzz: Add support for logging QTest commands
fuzz: skip QTest serialization
bios-tables-test: Fix "-tpmdev: invalid option"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -6600,6 +6600,11 @@ if test "$cpu" = "s390x" ; then write_c_skeleton if compile_prog "-march=z900" ""; then roms="$roms s390-ccw" + # SLOF is required for building the s390-ccw firmware on s390x, + # since it is using the libnet code from SLOF for network booting. + if test -e "${source_path}/.git" ; then + git_submodules="${git_submodules} roms/SLOF" + fi fi fi |