[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/7] configure: Let SLOF be initialized by ./scripts/git-submodule
From: |
Thomas Huth |
Subject: |
[PULL 7/7] configure: Let SLOF be initialized by ./scripts/git-submodule.sh |
Date: |
Tue, 16 Jun 2020 10:58:13 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
The git-submodule.sh script is called by make and initialize the
submodules listed in the GIT_SUBMODULES variable generated by
./configure.
SLOF is required for building the s390-ccw firmware on s390x, since
it is using the libnet code from SLOF for network booting.
Add it to the GIT_SUBMODULES when building the s390-ccw firmware.
Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200615074919.12552-1-f4bug@amsat.org>
[thuth: Tweaked the commit message a little bit]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.travis.yml | 1 -
configure | 5 +++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 22de1eeea1..74158f741b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -496,7 +496,6 @@ jobs:
- CONFIG="--disable-containers
--target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"
- UNRELIABLE=true
script:
- - ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF )
- BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
- |
if [ "$BUILD_RC" -eq 0 ] ; then
diff --git a/configure b/configure
index bb7fd12612..927e4a3d06 100755
--- a/configure
+++ b/configure
@@ -6533,6 +6533,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
--
2.18.1
- [PULL 0/7] fuzzing and other test-related patches, Thomas Huth, 2020/06/16
- [PULL 1/7] bios-tables-test: Fix "-tpmdev: invalid option", Thomas Huth, 2020/06/16
- [PULL 2/7] fuzz: skip QTest serialization, Thomas Huth, 2020/06/16
- [PULL 3/7] fuzz: Add support for logging QTest commands, Thomas Huth, 2020/06/16
- [PULL 4/7] fuzz: add oss-fuzz build-script, Thomas Huth, 2020/06/16
- [PULL 5/7] tests/qtest: Fix LGPL information in the file headers, Thomas Huth, 2020/06/16
- [PULL 6/7] tests/acceptance: Add boot tests for sh4 QEMU advent calendar image, Thomas Huth, 2020/06/16
- [PULL 7/7] configure: Let SLOF be initialized by ./scripts/git-submodule.sh,
Thomas Huth <=
- Re: [PULL 0/7] fuzzing and other test-related patches, Peter Maydell, 2020/06/16