]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
qemu: Update to 7.2.0
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Feb 2023 12:50:49 +0000 (12:50 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Feb 2023 12:50:49 +0000 (12:50 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
qemu/qemu.nm

index e16afe021566cc5eb66425b97d9d7e83ff391686..29840e3807dd5bb3f957cef5775a81406fb01302 100644 (file)
@@ -4,13 +4,13 @@
 ###############################################################################
 
 name       = qemu
-version    = 3.1.0
-release    = 2
+version    = 7.2.0
+release    = 1
 
 groups     = Applications/Virtualization
-url        = http://www.qemu.org
+url        = https://www.qemu.org
 license    = GPLv2+
-summary    = QEMU is a generic and open source machine emulator and virtualizer.
+summary    = QEMU is a generic and open source machine emulator and virtualizer
 
 description
        QEMU is a processor emulator that relies on dynamic binary translation
@@ -27,6 +27,7 @@ build
                automake
                bison
                bzip2-devel
+               cairo-devel
                flex
                glib2-devel
                gnutls-devel
@@ -36,23 +37,28 @@ build
                libpng-devel
                libseccomp-devel
                libtasn1-devel
+               libudev-devel
                libusb-devel
                libuuid-devel
                lzo-devel
+               meson
+               ninja
                ncurses-devel
                nettle-devel
                pciutils-devel
                pixman-devel
+               systemd-devel
                zlib-devel
+               zstd-devel
        end
 
-       qemu_native_platform = %{DISTRO_ARCH}
-
-       if "%{DISTRO_ARCH}" == "armv7hl"
-               qemu_native_platform = arm
-       end
-
-       targets = aarch64-softmmu arm-softmmu x86_64-softmmu
+       targets = \
+               aarch64-linux-user \
+               aarch64-softmmu \
+               riscv64-linux-user \
+               riscv64-softmmu \
+               x86_64-linux-user \
+               x86_64-softmmu
 
        configure_options = \
                --prefix=%{prefix} \
@@ -73,29 +79,20 @@ build
                --enable-kvm \
                --enable-libusb \
                --enable-lzo \
+               --enable-lto \
                --enable-pie \
                --enable-vnc \
                --enable-vnc-jpeg \
-               --enable-vnc-png \
+               --enable-seccomp \
                --disable-xen \
                --disable-sdl
 
-       configure_cmds
-               sed -e "s@-Wl,-rpath,%{libdir}@@g" -i config-host.mak
-       end
-
        install_cmds
-               # Remove BIOS file which is an ELF files w/ invalid interpreter
-               rm -vf %{BUILDROOT}%{datadir}/qemu/s390-*.img
-
                # Remove ivshm stuff
                rm -vf %{BUILDROOT}%{bindir}/ivshmem* %{BUILDROOT}%{mandir}/ivshmem*
-       end
-end
 
-quality-agent
-       whitelist_execstack
-               /usr/share/qemu/openbios*
+               # Make firmware non-executable
+               find %{BUILDROOT}%{datadir}/%{name} -type f -executable | xargs chmod -v a-x
        end
 end
 
@@ -103,7 +100,7 @@ packages
        package %{name}
                # Always install the native package (for KVM)
                requires
-                       qemu-%{qemu_native_platform} = %{thisver}
+                       qemu-%{DISTRO_ARCH} = %{thisver}
                end
 
                recommends
@@ -118,7 +115,9 @@ packages
                requires = %{name} = %{thisver}
 
                files
+                       %{bindir}/qemu-%{qemu_arch}
                        %{bindir}/qemu-system-%{qemu_arch}
+                       %{mandir}/man1/qemu-%{qemu_arch}.1*
                        %{mandir}/man1/qemu-system-%{qemu_arch}.1*
                end
        end
@@ -128,9 +127,9 @@ packages
                qemu_arch = aarch64
        end
 
-       package %{name}-arm
+       package %{name}-riscv64
                template QEMUARCH
-               qemu_arch = arm
+               qemu_arch = riscv64
        end
 
        package %{name}-x86_64
@@ -153,6 +152,10 @@ packages
                end
        end
 
+       package %{name}-devel
+               template DEVEL
+       end
+
        package %{name}-debuginfo
                template DEBUGINFO
        end