|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging] automation: provide SDL and SDL2 in opensuse images
commit 4ad75403625111bdd60571c3caaaefd3a84c574e
Author: Olaf Hering <olaf@xxxxxxxxx>
AuthorDate: Fri Jul 9 16:32:47 2021 +0200
Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Jul 9 16:06:03 2021 +0100
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@xxxxxxxxx>
Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
automation/build/suse/opensuse-leap.dockerfile | 3 ++-
automation/build/suse/opensuse-tumbleweed.dockerfile | 3 ++-
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 \
--
generated by git-patchbot for /home/xen/git/xen.git#staging
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |