Skip to content

Commit 152fdbe

Browse files
andreafioraldiandreafioraldi
committed
Fix merge
2 parents fa2b9c4 + aeb0ae9 commit 152fdbe

File tree

750 files changed

+27516
-10354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

750 files changed

+27516
-10354
lines changed

‎.gitlab-ci.d/buildtest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ check-system-alpine:
2424
artifacts: true
2525
variables:
2626
IMAGE: alpine
27-
MAKE_CHECK_ARGS: check
27+
MAKE_CHECK_ARGS: check-unit check-qtest
2828

2929
avocado-system-alpine:
3030
extends: .avocado_test_job_template
@@ -164,7 +164,7 @@ build-system-centos:
164164
variables:
165165
IMAGE: centos8
166166
CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=system
167-
--enable-modules --enable-trace-backends=dtrace
167+
--enable-modules --enable-trace-backends=dtrace --enable-docs
168168
TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu
169169
x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu
170170
MAKE_CHECK_ARGS: check-build

‎.gitlab-ci.d/cirrus.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,11 @@ x64-freebsd-12-build:
5252
NAME: freebsd-12
5353
CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
5454
CIRRUS_VM_IMAGE_SELECTOR: image_family
55-
CIRRUS_VM_IMAGE_NAME: freebsd-12-2
55+
CIRRUS_VM_IMAGE_NAME: freebsd-12-3
5656
CIRRUS_VM_CPUS: 8
5757
CIRRUS_VM_RAM: 8G
5858
UPDATE_COMMAND: pkg update
5959
INSTALL_COMMAND: pkg install -y
60-
# TODO: Enable gnutls again once FreeBSD's libtasn1 got fixed
61-
# See: https://gitlab.com/gnutls/libtasn1/-/merge_requests/71
62-
CONFIGURE_ARGS: --disable-gnutls
6360
TEST_TARGETS: check
6461

6562
x64-freebsd-13-build:

‎.gitlab-ci.d/cirrus/freebsd-12.vars

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
#
33
# $ lcitool variables freebsd-12 qemu
44
#
5-
# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1
5+
# https://gitlab.com/libvirt/libvirt-ci
66

7-
PACKAGING_COMMAND='pkg'
87
CCACHE='/usr/local/bin/ccache'
8+
CPAN_PKGS=''
9+
CROSS_PKGS=''
910
MAKE='/usr/local/bin/gmake'
1011
NINJA='/usr/local/bin/ninja'
11-
PYTHON='/usr/local/bin/python3'
12+
PACKAGING_COMMAND='pkg'
1213
PIP3='/usr/local/bin/pip-3.8'
13-
PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
14+
PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
15+
PYPI_PKGS=''
16+
PYTHON='/usr/local/bin/python3'

‎.gitlab-ci.d/cirrus/freebsd-13.vars

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
#
33
# $ lcitool variables freebsd-13 qemu
44
#
5-
# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1
5+
# https://gitlab.com/libvirt/libvirt-ci
66

7-
PACKAGING_COMMAND='pkg'
87
CCACHE='/usr/local/bin/ccache'
8+
CPAN_PKGS=''
9+
CROSS_PKGS=''
910
MAKE='/usr/local/bin/gmake'
1011
NINJA='/usr/local/bin/ninja'
11-
PYTHON='/usr/local/bin/python3'
12+
PACKAGING_COMMAND='pkg'
1213
PIP3='/usr/local/bin/pip-3.8'
13-
PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
14+
PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
15+
PYPI_PKGS=''
16+
PYTHON='/usr/local/bin/python3'

‎.gitlab-ci.d/cirrus/macos-11.vars

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
#
33
# $ lcitool variables macos-11 qemu
44
#
5-
# https://gitlab.com/libvirt/libvirt-ci/-/commit/c7e275ab27ac0dcd09da290817b9adeea1fd1eb1
5+
# https://gitlab.com/libvirt/libvirt-ci
66

7-
PACKAGING_COMMAND='brew'
87
CCACHE='/usr/local/bin/ccache'
8+
CPAN_PKGS='Test::Harness'
9+
CROSS_PKGS=''
910
MAKE='/usr/local/bin/gmake'
1011
NINJA='/usr/local/bin/ninja'
11-
PYTHON='/usr/local/bin/python3'
12+
PACKAGING_COMMAND='brew'
1213
PIP3='/usr/local/bin/pip3'
13-
PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb libxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd'
14+
PKGS='bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb libxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd'
1415
PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv'
15-
CPAN_PKGS='Test::Harness'
16+
PYTHON='/usr/local/bin/python3'

‎.gitlab-ci.d/containers.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ amd64-ubuntu2004-container:
2929
variables:
3030
NAME: ubuntu2004
3131

32-
amd64-ubuntu-container:
33-
extends: .container_job_template
34-
variables:
35-
NAME: ubuntu
36-
3732
amd64-opensuse-leap-container:
3833
extends: .container_job_template
3934
variables:

‎.gitlab-ci.d/edk2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
FROM ubuntu:16.04
55

6-
MAINTAINER Philippe Mathieu-Daudé <[email protected]>
6+
MAINTAINER Philippe Mathieu-Daudé <[email protected]>
77

88
# Install packages required to build EDK2
99
RUN apt update \

‎.gitlab-ci.d/opensbi.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ build-opensbi:
4343
artifacts:
4444
paths: # 'artifacts.zip' will contains the following files:
4545
- pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
46-
- pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
4746
- pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
48-
- pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
4947
- opensbi32-generic-stdout.log
5048
- opensbi32-generic-stderr.log
5149
- opensbi64-generic-stdout.log

‎.gitlab-ci.d/static_checks.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,6 @@ check-python-tox:
4646
QEMU_TOX_EXTRA_ARGS: --skip-missing-interpreters=false
4747
needs:
4848
job: python-container
49+
rules:
50+
- when: manual
4951
allow_failure: true

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,6 @@
6464
[submodule "roms/vbootrom"]
6565
path = roms/vbootrom
6666
url = https://gitlab.com/qemu-project/vbootrom.git
67+
[submodule "tests/lcitool/libvirt-ci"]
68+
path = tests/lcitool/libvirt-ci
69+
url = http://gitlab.com/libvirt/libvirt-ci

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Paul Burton <[email protected]> <[email protected]>
6363
Paul Burton <[email protected]> <[email protected]>
6464
Paul Burton <[email protected]> <[email protected]>
6565
Paul Burton <[email protected]> <[email protected]>
66+
Philippe Mathieu-Daudé <[email protected]> <[email protected]>
6667
Stefan Brankovic <[email protected]> <[email protected]>
6768
Yongbok Kim <[email protected]> <[email protected]>
6869

0 commit comments

Comments
 (0)