| Message ID | 20230110132700.833690-7-marcandre.lureau@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix win32/msys2 shader compilation & update lcitool deps | expand |
marcandre.lureau@redhat.com writes: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Fedora 35 is EOL. > > Update to upstream lcitool, that dropped f35 and added f37. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > --- > tests/docker/dockerfiles/fedora-win32-cross.docker | 4 ++-- > tests/docker/dockerfiles/fedora-win64-cross.docker | 4 ++-- > tests/docker/dockerfiles/fedora.docker | 4 ++-- > tests/lcitool/libvirt-ci | 2 +- > tests/lcitool/refresh | 6 +++--- > 5 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker > index 75383ba185..cc5d1ac4be 100644 > --- a/tests/docker/dockerfiles/fedora-win32-cross.docker > +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker > @@ -1,10 +1,10 @@ > # THIS FILE WAS AUTO-GENERATED > # > -# $ lcitool dockerfile --layers all --cross mingw32 fedora-35 qemu > +# $ lcitool dockerfile --layers all --cross mingw32 fedora-37 qemu > # > # https://gitlab.com/libvirt/libvirt-ci > > -FROM registry.fedoraproject.org/fedora:35 > +FROM registry.fedoraproject.org/fedora:37 > > RUN dnf install -y nosync && \ > echo -e '#!/bin/sh\n\ > diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker > index 98c03dc13b..cabbf4edfc 100644 > --- a/tests/docker/dockerfiles/fedora-win64-cross.docker > +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker > @@ -1,10 +1,10 @@ > # THIS FILE WAS AUTO-GENERATED > # > -# $ lcitool dockerfile --layers all --cross mingw64 fedora-35 qemu > +# $ lcitool dockerfile --layers all --cross mingw64 fedora-37 qemu > # > # https://gitlab.com/libvirt/libvirt-ci > > -FROM registry.fedoraproject.org/fedora:35 > +FROM registry.fedoraproject.org/fedora:37 > > RUN dnf install -y nosync && \ > echo -e '#!/bin/sh\n\ > diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker > index d200c7fc10..f44b005000 100644 > --- a/tests/docker/dockerfiles/fedora.docker > +++ b/tests/docker/dockerfiles/fedora.docker > @@ -1,10 +1,10 @@ > # THIS FILE WAS AUTO-GENERATED > # > -# $ lcitool dockerfile --layers all fedora-35 qemu > +# $ lcitool dockerfile --layers all fedora-37 qemu > # > # https://gitlab.com/libvirt/libvirt-ci > > -FROM registry.fedoraproject.org/fedora:35 > +FROM registry.fedoraproject.org/fedora:37 This breaks the oss fuzz build: Testing ./build-oss-fuzz/DEST_DIR/qemu-fuzz-i386-target- ... ================================================================= ==5695==ERROR: LeakSanitizer: detected memory leaks Direct leak of 8 byte(s) in 1 object(s) allocated from: #0 0x559931c2a458 in operator new(unsigned long) (/builds/stsquad/qemu/build-oss-fuzz/DEST_DIR/qemu-fuzz-i386-target-+0xcff458) (BuildId: 4656f7dd1ff6e2faf418a79279f4e92db931ba28) #1 0x7f89125205b7 (/lib64/libtcmalloc_minimal.so.4+0xe5b7) (BuildId: 8eab2cfc91caa7a82e480465400218310b7a341c) #2 0x7f8917d24cdd in call_init /usr/src/debug/glibc-2.36-9.fc37.x86_64/elf/dl-init.c:70:3 #3 0x7f8917d24cdd in call_init /usr/src/debug/glibc-2.36-9.fc37.x86_64/elf/dl-init.c:26:1 #4 0x7f8917d24dcb in _dl_init /usr/src/debug/glibc-2.36-9.fc37.x86_64/elf/dl-init.c:117:5 #5 0x7f8917d3b8df in _dl_start_user (/lib64/ld-linux-x86-64.so.2+0x1b8df) (BuildId: bb6fec54c7521fddc569a2f4e141dfb97bf3acbe) SUMMARY: AddressSanitizer: 8 byte(s) leaked in 1 allocation(s). Cleaning up project directory and file based variables The actual cause is that libglusterfs-devel pulls in gperftools-libs: [root@c0ca1c50f5cc /]# yum install libglusterfs-devel Last metadata expiration check: 0:04:40 ago on Thu 19 Jan 2023 12:24:51 PM UTC. Dependencies resolved. ============================================================================================================================================================================= Package Architecture Version Repository Size =============================================================================================================================================================================Installing: libglusterfs-devel x86_64 10.3-1.fc37 fedora 129 k Installing dependencies: gperftools-libs x86_64 2.9.1-4.fc37 fedora 307 k libgfrpc-devel x86_64 10.3-1.fc37 fedora 46 k libgfrpc0 x86_64 10.3-1.fc37 fedora 59 k libgfxdr-devel x86_64 10.3-1.fc37 fedora 9.9 k libgfxdr0 x86_64 10.3-1.fc37 fedora 31 k libglusterfs0 x86_64 10.3-1.fc37 fedora 327 k Transaction Summary =============================================================================================================================================================================Install 7 Packages Which brings in gperftools-libs an tcmalloc which then gets in the way of our build. So either we drop glusterfs on fedora builds or we need some way to avoid tcmalloc getting in the way. To try and get the rest of the PR out of the way I think we should drop this for now unless anyone has an easy solution?
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 75383ba185..cc5d1ac4be 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw32 fedora-35 qemu +# $ lcitool dockerfile --layers all --cross mingw32 fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 98c03dc13b..cabbf4edfc 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all --cross mingw64 fedora-35 qemu +# $ lcitool dockerfile --layers all --cross mingw64 fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index d200c7fc10..f44b005000 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,10 +1,10 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all fedora-35 qemu +# $ lcitool dockerfile --layers all fedora-37 qemu # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:35 +FROM registry.fedoraproject.org/fedora:37 RUN dnf install -y nosync && \ echo -e '#!/bin/sh\n\ diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index e3eb28cf2e..319a534c22 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5 +Subproject commit 319a534c220f53fc8670254cac25d6f662c82112 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index fa966e4009..a5ea0efc3b 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -111,7 +111,7 @@ try: generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("debian-amd64", "debian-11", trailer="".join(debian11_extras)) - generate_dockerfile("fedora", "fedora-35") + generate_dockerfile("fedora", "fedora-37") generate_dockerfile("opensuse-leap", "opensuse-leap-153") generate_dockerfile("ubuntu2004", "ubuntu-2004", trailer="".join(ubuntu2004_tsanhack)) @@ -161,12 +161,12 @@ try: trailer=cross_build("s390x-linux-gnu-", "s390x-softmmu,s390x-linux-user")) - generate_dockerfile("fedora-win32-cross", "fedora-35", + generate_dockerfile("fedora-win32-cross", "fedora-37", cross="mingw32", trailer=cross_build("i686-w64-mingw32-", "i386-softmmu")) - generate_dockerfile("fedora-win64-cross", "fedora-35", + generate_dockerfile("fedora-win64-cross", "fedora-37", cross="mingw64", trailer=cross_build("x86_64-w64-mingw32-", "x86_64-softmmu"))