travis.yml: Use the libfdt from the distro instead of the submodule

No need to compile-test third party submodules over and over again if
we can simply use the pre-build library from the distribution instead.

By also adding --enable-fdt=system to the configure options, we can
also avoid to check out the "dtc" submodule here.

Message-Id: <20230120075330.2076773-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2023-01-20 08:53:30 +01:00
parent ddf0944aa4
commit 769897bd0f
1 changed files with 15 additions and 7 deletions

View File

@ -128,6 +128,7 @@ jobs:
- libbrlapi-dev - libbrlapi-dev
- libcacard-dev - libcacard-dev
- libcap-ng-dev - libcap-ng-dev
- libfdt-dev
- libgcrypt20-dev - libgcrypt20-dev
- libgnutls28-dev - libgnutls28-dev
- libgtk-3-dev - libgtk-3-dev
@ -149,7 +150,8 @@ jobs:
- genisoimage - genisoimage
env: env:
- TEST_CMD="make check check-tcg V=1" - TEST_CMD="make check check-tcg V=1"
- CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS} --cxx=/bin/false" - CONFIG="--disable-containers --enable-fdt=system
--target-list=${MAIN_SOFTMMU_TARGETS} --cxx=/bin/false"
- UNRELIABLE=true - UNRELIABLE=true
- name: "[ppc64] GCC check-tcg" - name: "[ppc64] GCC check-tcg"
@ -162,6 +164,7 @@ jobs:
- libbrlapi-dev - libbrlapi-dev
- libcacard-dev - libcacard-dev
- libcap-ng-dev - libcap-ng-dev
- libfdt-dev
- libgcrypt20-dev - libgcrypt20-dev
- libgnutls28-dev - libgnutls28-dev
- libgtk-3-dev - libgtk-3-dev
@ -183,7 +186,8 @@ jobs:
- genisoimage - genisoimage
env: env:
- TEST_CMD="make check check-tcg V=1" - TEST_CMD="make check check-tcg V=1"
- CONFIG="--disable-containers --target-list=ppc64-softmmu,ppc64le-linux-user" - CONFIG="--disable-containers --enable-fdt=system
--target-list=ppc64-softmmu,ppc64le-linux-user"
- name: "[s390x] GCC check-tcg" - name: "[s390x] GCC check-tcg"
arch: s390x arch: s390x
@ -195,6 +199,7 @@ jobs:
- libbrlapi-dev - libbrlapi-dev
- libcacard-dev - libcacard-dev
- libcap-ng-dev - libcap-ng-dev
- libfdt-dev
- libgcrypt20-dev - libgcrypt20-dev
- libgnutls28-dev - libgnutls28-dev
- libgtk-3-dev - libgtk-3-dev
@ -216,7 +221,8 @@ jobs:
- genisoimage - genisoimage
env: env:
- TEST_CMD="make check check-tcg V=1" - TEST_CMD="make check check-tcg V=1"
- CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" - CONFIG="--disable-containers --enable-fdt=system
--target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"
- UNRELIABLE=true - UNRELIABLE=true
script: script:
- BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
@ -237,6 +243,7 @@ jobs:
- libattr1-dev - libattr1-dev
- libcacard-dev - libcacard-dev
- libcap-ng-dev - libcap-ng-dev
- libfdt-dev
- libgnutls28-dev - libgnutls28-dev
- libiscsi-dev - libiscsi-dev
- liblttng-ust-dev - liblttng-ust-dev
@ -255,8 +262,8 @@ jobs:
# Tests dependencies # Tests dependencies
- genisoimage - genisoimage
env: env:
- CONFIG="--disable-containers --audio-drv-list=sdl --disable-user - CONFIG="--disable-containers --enable-fdt=system --audio-drv-list=sdl
--target-list-exclude=${MAIN_SOFTMMU_TARGETS}" --disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"
- name: "[s390x] GCC (user)" - name: "[s390x] GCC (user)"
arch: s390x arch: s390x
@ -281,6 +288,7 @@ jobs:
- libbrlapi-dev - libbrlapi-dev
- libcacard-dev - libcacard-dev
- libcap-ng-dev - libcap-ng-dev
- libfdt-dev
- libgcrypt20-dev - libgcrypt20-dev
- libgnutls28-dev - libgnutls28-dev
- libgtk-3-dev - libgtk-3-dev
@ -300,6 +308,6 @@ jobs:
- ninja-build - ninja-build
env: env:
- TEST_CMD="make check-unit" - TEST_CMD="make check-unit"
- CONFIG="--disable-containers --disable-tcg --enable-kvm - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools
--disable-tools --host-cc=clang --cxx=clang++" --enable-fdt=system --host-cc=clang --cxx=clang++"
- UNRELIABLE=true - UNRELIABLE=true