summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2021-07-09 16:32:47 +0200
committerAndrew Cooper <andrew.cooper3@citrix.com>2021-07-09 16:06:03 +0100
commit4ad75403625111bdd60571c3caaaefd3a84c574e (patch)
tree6ccbdd2539fad408368dcbd58019d20c30d00059
parent303c857a2701fe7c180744faca3507efd3edbb1d (diff)
automation: provide SDL and SDL2 in opensuse images
qemu-xen-traditional may make use of SDL, qemu-xen may make use of SDL2. Use pkgconfig() as resolvable instead of a rpm name, the latter may change. Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
-rw-r--r--automation/build/suse/opensuse-leap.dockerfile3
-rw-r--r--automation/build/suse/opensuse-tumbleweed.dockerfile3
2 files changed, 4 insertions, 2 deletions
diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile
index 03f8a7acad..2f92392d76 100644
--- a/automation/build/suse/opensuse-leap.dockerfile
+++ b/automation/build/suse/opensuse-leap.dockerfile
@@ -31,7 +31,6 @@ RUN zypper install -y --no-recommends \
glibc-devel-32bit \
gzip \
hostname \
- libSDL2-devel \
libaio-devel \
libbz2-devel \
libext2fs-devel \
@@ -56,6 +55,8 @@ RUN zypper install -y --no-recommends \
pandoc \
patch \
pkg-config \
+ 'pkgconfig(sdl)' \
+ 'pkgconfig(sdl2)' \
python \
python-devel \
python3-devel \
diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile
index be5ddb0d98..ed10cd8a22 100644
--- a/automation/build/suse/opensuse-tumbleweed.dockerfile
+++ b/automation/build/suse/opensuse-tumbleweed.dockerfile
@@ -31,7 +31,6 @@ RUN zypper install -y --no-recommends \
glibc-devel-32bit \
gzip \
hostname \
- libSDL2-devel \
libaio-devel \
libbz2-devel \
libext2fs-devel \
@@ -59,6 +58,8 @@ RUN zypper install -y --no-recommends \
pandoc \
patch \
pkg-config \
+ 'pkgconfig(sdl)' \
+ 'pkgconfig(sdl2)' \
python-devel \
python3-devel \
systemd-devel \