From 62ed130960d0af4f82c7c4997ef0ec6e05b42760 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sun, 10 Dec 2023 00:34:13 +0300 Subject: [PATCH] Support building qemu 8.1 from bookworm-backports --- debian/patched-qemu.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/patched-qemu.Dockerfile b/debian/patched-qemu.Dockerfile index 0a5864c3..46bf931d 100644 --- a/debian/patched-qemu.Dockerfile +++ b/debian/patched-qemu.Dockerfile @@ -7,7 +7,7 @@ ARG REL= WORKDIR /root -RUN if [ "$REL" = "buster" -o "$REL" = "bullseye" ]; then \ +RUN if [ "$REL" = "buster" -o "$REL" = "bullseye" -o "$REL" = "bookworm" ]; then \ echo "deb http://deb.debian.org/debian $REL-backports main" >> /etc/apt/sources.list; \ echo >> /etc/apt/preferences; \ echo 'Package: *' >> /etc/apt/preferences; \ @@ -45,7 +45,7 @@ RUN set -e; \ rm -rf /root/packages/qemu-$REL/*; \ cd /root/packages/qemu-$REL; \ dpkg-source -x /root/qemu*.dsc; \ - QEMU_VER=$(ls -d qemu*/ | perl -pe 's!^.*(\d+\.\d+).*!$1!'); \ + QEMU_VER=$(ls -d qemu*/ | perl -pe 's!^.*?(\d+\.\d+).*!$1!'); \ D=$(ls -d qemu*/); \ cp /root/vitastor/patches/qemu-$QEMU_VER-vitastor.patch ./qemu-*/debian/patches; \ echo qemu-$QEMU_VER-vitastor.patch >> $D/debian/patches/series; \