From: Olaf Hering Date: Fri, 9 Jul 2021 14:32:47 +0000 (+0200) Subject: automation: provide SDL and SDL2 in opensuse images X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~325 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4ad75403625111bdd60571c3caaaefd3a84c574e;p=xen.git 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 Acked-by: Andrew Cooper --- 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 \