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 buildint the s390-ccw firmware,
to fix:
$ ( cd ${SRC_DIR} ; git submodule update --init roms/SLOF )
Submodule 'roms/SLOF' (https://git.qemu.org/git/SLOF.git) registered for path
'roms/SLOF'
Cloning into '/home/travis/build/user/qemu/roms/SLOF'...
fatal: unable to access 'https://git.qemu.org/git/SLOF.git/': Could not
resolve host: git.qemu.org
fatal: clone of 'https://git.qemu.org/git/SLOF.git' into submodule path
'/home/travis/build/user/qemu/roms/SLOF' failed
Failed to clone 'roms/SLOF'. Retry scheduled
Cloning into '/home/travis/build/user/qemu/roms/SLOF'...
fatal: unable to access 'https://git.qemu.org/git/SLOF.git/': Could not
resolve host: git.qemu.org
fatal: clone of 'https://git.qemu.org/git/SLOF.git' into submodule path
'/home/travis/build/user/qemu/roms/SLOF' failed
Failed to clone 'roms/SLOF' a second time, aborting
The command "( cd ${SRC_DIR} ; git submodule update --init roms/SLOF )"
exited with 1.
Reported-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
Suggested-by: Thomas Huth <th...@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
---
configure | 5 +++++
.travis.yml | 1 -
2 files changed, 5 insertions(+), 1 deletion(-)
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
diff --git a/.travis.yml b/.travis.yml
index ec6367af1f..220855c1f0 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
--
2.21.3
