tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1
PATCH 1/1 tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1
We do not support SDL1 in QEMU anymore. Use SDL2 instead.
--- tests/docker/dockerfiles/centos7.docker | 2 +- tests/docker/dockerfiles/centos8.docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tests/docker/dockerfiles/centos7.docker +1 -1
@@ -31,7 +31,7 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ - SDL-devel \ + SDL2-devel \ spice-glib-devel \ spice-server-devel \ tar \
tests/docker/dockerfiles/centos8.docker +1 -1
@@ -2,7 +2,7 @@ FROM centos:8.1.1911 RUN dnf -y update ENV PACKAGES \ - SDL-devel \ + SDL2-devel \ bzip2 \ bzip2-devel \ dbus-daemon \
Signature · 1 line
2.18.2
Quoted 7 lines · Thomas Huth
We do not support SDL1 in QEMU anymore. Use SDL2 instead.
Signed-off-by Thomas Huth <[email protected]>--- tests/docker/dockerfiles/centos7.docker | 2 +- tests/docker/dockerfiles/centos8.docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 26 lines · Thomas Huth
We do not support SDL1 in QEMU anymore. Use SDL2 instead.
Signed-off-by Thomas Huth <[email protected]>--- tests/docker/dockerfiles/centos7.docker | 2 +- tests/docker/dockerfiles/centos8.docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)tests/docker/dockerfiles/centos7.docker +1
-1@@ -31,7 +31,7 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ - SDL-devel \ + SDL2-devel \ spice-glib-devel \ spice-server-devel \ tar \tests/docker/dockerfiles/centos8.docker +0
-0
tests/docker/dockerfiles/centos8.docker FROM centos:8.1.1911 · line 8
Quoted 8 lines
tests/docker/dockerfiles/centos8.docker +1
-1@@ -2,7 +2,7 @@ FROM centos:8.1.1911 RUN dnf -y update ENV PACKAGES \ - SDL-devel \ + SDL2-devel \ bzip2 \ bzip2-devel \ dbus-daemon \
I wonder if we are having docker image caching issues...
build-system-centos job passed but then in check-system-centos:
FAILED: libcommon.fa.p/ui_sdl2-input.c.o ui/sdl2.h:7:10: fatal error: SDL.h: No such file or directory
#include
^~~~~~~And then in acceptance-system-centos:
./qemu-system-x86_64: error while loading shared libraries: libSDL2-2.0.so.0: cannot open shared object file: No such file or directory
Quoted 1 line · Thomas Huth
We do not support SDL1 in QEMU anymore. Use SDL2 instead.
Queued to testing/next, thanks.
Quoted 33 lines
Signed-off-by Thomas Huth <[email protected]>--- tests/docker/dockerfiles/centos7.docker | 2 +- tests/docker/dockerfiles/centos8.docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)tests/docker/dockerfiles/centos7.docker +1
-1@@ -31,7 +31,7 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ - SDL-devel \ + SDL2-devel \ spice-glib-devel \ spice-server-devel \ tar \tests/docker/dockerfiles/centos8.docker +1
-1@@ -2,7 +2,7 @@ FROM centos:8.1.1911 RUN dnf -y update ENV PACKAGES \ - SDL-devel \ + SDL2-devel \ bzip2 \ bzip2-devel \ dbus-daemon \
Signature · 1 line
Alex Bennée
Quoted 46 lines · Philippe Mathieu-Daudé
Quoted 28 lines · Thomas Huth
We do not support SDL1 in QEMU anymore. Use SDL2 instead.
Signed-off-by Thomas Huth <[email protected]>---
tests/docker/dockerfiles/centos7.docker | 2 +-
tests/docker/dockerfiles/centos8.docker | 2 +-2 files changed, 2 insertions(+), 2 deletions(-)tests/docker/dockerfiles/centos7.docker +1
-1@@ -31,7 +31,7 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ - SDL-devel \ + SDL2-devel \ spice-glib-devel \ spice-server-devel \ tar \tests/docker/dockerfiles/centos8.docker +0
-0@@ -2,7 +2,7 @@ FROM centos:8.1.1911Quoted 7 lines
RUN dnf -y update
ENV PACKAGES \
- SDL-devel \
+ SDL2-devel \
bzip2 \
bzip2-devel \
dbus-daemon \I wonder if we are having docker image caching issues...
build-system-centos job passed but then in check-system-centos:
FAILED:
libcommon.fa.p/ui_sdl2-input.c.oui/sdl2.h:7:10: fatal error:SDL.h: No such file or directory #include
^~~~~~~
Quoted 4 lines
And then in acceptance-system-centos:
./qemu-system-x86_64: error while loading shared libraries:
libSDL2-2.0.so.0: cannot open shared object file: No such file or directory
Uh, weird, now I've got that one, too ... sorry, I only waited for the build phase to complete before sending out the patch, I did not expect any trouble in the testing stage...
The check-system-xxx jobs are apparently recompiling lots of files now ... not sure yet why that happens... seems to be related to Paolo's PR from last weekend?
The previous CI run still looks okayish:
https://gitlab.com/qemu-project/qemu/-/jobs/796502985
then the one from Paolo suddenly recompiled pretty much everything:
https://gitlab.com/qemu-project/qemu/-/jobs/796767669
Does anybody got a clue what happened here?
Thomas
Quoted 31 lines · Thomas Huth
Quoted 30 lines · Philippe Mathieu-Daudé
Quoted 29 lines · Thomas Huth
We do not support SDL1 in QEMU anymore. Use SDL2 instead.
Signed-off-by Thomas Huth <[email protected]>---
tests/docker/dockerfiles/centos7.docker | 2 +-
tests/docker/dockerfiles/centos8.docker | 2 +-2 files changed, 2 insertions(+), 2 deletions(-)tests/docker/dockerfiles/centos7.docker +1
-1@@ -31,7 +31,7 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ - SDL-devel \ + SDL2-devel \ spice-glib-devel \ spice-server-devel \ tar \tests/docker/dockerfiles/centos8.docker +0
-0@@ -2,7 +2,7 @@ FROM centos:8.1.1911RUN dnf -y update
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
ENV PACKAGES \
- SDL-devel \
+ SDL2-devel \
bzip2 \
bzip2-devel \
dbus-daemon \I wonder if we are having docker image caching issues...
Looks more like something related to the artifact caching, rather than container image caching.
Quoted 13 lines
Quoted 8 lines
build-system-centos job passed but then in check-system-centos:
FAILED:
libcommon.fa.p/ui_sdl2-input.c.oui/sdl2.h:7:10: fatal error:SDL.h: No such file or directory #include
^~~~~~~Quoted 4 lines
And then in acceptance-system-centos:
./qemu-system-x86_64: error while loading shared libraries:
libSDL2-2.0.so.0: cannot open shared object file: No such file or directory
Quoted 7 lines
Uh, weird, now I've got that one, too ... sorry, I only waited for the build phase to complete before sending out the patch, I did not expect any trouble in the testing stage...
The check-system-xxx jobs are apparently recompiling lots of files now ... not sure yet why that happens... seems to be related to Paolo's PR from last weekend?
Presumably this is related to this PR removing use of make, and instead building everything directly with ninja.
Quoted 9 lines
The previous CI run still looks okayish:
https://gitlab.com/qemu-project/qemu/-/jobs/796502985
then the one from Paolo suddenly recompiled pretty much everything:
https://gitlab.com/qemu-project/qemu/-/jobs/796767669
Does anybody got a clue what happened here?
The log shows that it decided "meson" needed re-running, and as a result of re-running meson, we in turn rebuild all source.
Best guess is that somewhere in here we are not correctly preserving timestamps on something, causing ninja to consider the build out of date.
Possibly this is because the the check/acceptance jobs re-clome the git checkout again ? Coud that make ninja thing the sources have changed, or does git clone set timestamps to match the git commit date ?
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 42 lines · Philippe Mathieu-Daudé
Quoted 26 lines · Thomas Huth
We do not support SDL1 in QEMU anymore. Use SDL2 instead.
Signed-off-by Thomas Huth <[email protected]>--- tests/docker/dockerfiles/centos7.docker | 2 +- tests/docker/dockerfiles/centos8.docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)tests/docker/dockerfiles/centos7.docker +1
-1@@ -31,7 +31,7 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ - SDL-devel \ + SDL2-devel \ spice-glib-devel \ spice-server-devel \ tar \tests/docker/dockerfiles/centos8.docker +0
-0tests/docker/dockerfiles/centos8.docker FROM centos:8.1.1911 · line 8
Quoted 8 lines
tests/docker/dockerfiles/centos8.docker +1
-1@@ -2,7 +2,7 @@ FROM centos:8.1.1911 RUN dnf -y update ENV PACKAGES \ - SDL-devel \ + SDL2-devel \ bzip2 \ bzip2-devel \ dbus-daemon \I wonder if we are having docker image caching issues...
build-system-centos job passed but then in check-system-centos:
FAILED:
libcommon.fa.p/ui_sdl2-input.c.oui/sdl2.h:7:10: fatal error:SDL.h: No such file or directory
Quoted 8 lines
#include ^~~~~~~And then in acceptance-system-centos:
./qemu-system-x86_64: error while loading shared libraries:
libSDL2-2.0.so.0: cannot open shared object file: No such file or directory
Hmm weird it passes for me.
Signature · 1 line
Alex Bennée