[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2] configure: Let SLOF be initialized by ./scripts/git-submodule
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2] configure: Let SLOF be initialized by ./scripts/git-submodule.sh |
Date: |
Mon, 15 Jun 2020 08:57:21 +0200 |
The git-submodule.sh script is called by make and initialize the
submodules listed in the GIT_SUBMODULES variable generated by
./configure.
Add SLOF when we build the ppc64-softmmu target for the pSeries
machines (which use SLOF). This fixes:
$ ( 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-ayland@ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
CI: https://travis-ci.org/github/philmd/qemu/jobs/698406512#L1596
---
configure | 12 ++++++++++++
.travis.yml | 1 -
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 7c2adf36e5..f297a4b68f 100755
--- a/configure
+++ b/configure
@@ -2248,6 +2248,18 @@ if test "$edk2_blobs" = "yes" && ! has bzip2; then
error_exit "The bzip2 program is required for building QEMU"
fi
+###################################
+# SLOF is mandatory for the pSeries
+for target in $target_list; do
+ case $target in
+ ppc64-softmmu)
+ if test -e "${source_path}/.git" ; then
+ git_submodules="${git_submodules} roms/SLOF"
+ fi
+ ;;
+ esac
+done
+
feature_not_found() {
feature=$1
remedy=$2
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
- [PATCH v2] configure: Let SLOF be initialized by ./scripts/git-submodule.sh,
Philippe Mathieu-Daudé <=