From: Jakub Bogusz Date: Sun, 12 Jun 2022 17:10:25 +0000 (+0200) Subject: - updated to 6.0.0 X-Git-Tag: auto/th/qemu-6.0.0-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fqemu.git;a=commitdiff_plain;h=4171a99 - updated to 6.0.0 - removed obsolete binutils2.36 patch --- diff --git a/binutils-2.36.patch b/binutils-2.36.patch deleted file mode 100644 index 5b3a436..0000000 --- a/binutils-2.36.patch +++ /dev/null @@ -1,72 +0,0 @@ -From bbd2d5a8120771ec59b86a80a1f51884e0a26e53 Mon Sep 17 00:00:00 2001 -From: Christian Ehrhardt -Date: Mon, 14 Dec 2020 16:09:38 +0100 -Subject: [PATCH] build: -no-pie is no functional linker flag - -Recent binutils changes dropping unsupported options [1] caused a build -issue in regard to the optionroms. - - ld -m elf_i386 -T /<>/pc-bios/optionrom//flat.lds -no-pie \ - -s -o multiboot.img multiboot.o - ld.bfd: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?) - -This isn't really a regression in ld.bfd, filing the bug upstream -revealed that this never worked as a ld flag [2] - in fact it seems we -were by accident setting --nmagic). - -Since it never had the wanted effect this usage of LDFLAGS_NOPIE, should be -droppable without any effect. This also is the only use-case of LDFLAGS_NOPIE -in .mak, therefore we can also remove it from being added there. - -[1]: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=983d925d -[2]: https://sourceware.org/bugzilla/show_bug.cgi?id=27050#c5 - -Signed-off-by: Christian Ehrhardt -Message-Id: <20201214150938.1297512-1-christian.ehrhardt@canonical.com> -Cc: qemu-stable@nongnu.org -Signed-off-by: Paolo Bonzini ---- - configure | 3 --- - pc-bios/optionrom/Makefile | 1 - - 2 files changed, 4 deletions(-) - -diff --git a/configure b/configure -index cb21108d34c..c228f7c21e7 100755 ---- a/configure -+++ b/configure -@@ -2137,7 +2137,6 @@ EOF - # Check we support --no-pie first; we will need this for building ROMs. - if compile_prog "-Werror -fno-pie" "-no-pie"; then - CFLAGS_NOPIE="-fno-pie" -- LDFLAGS_NOPIE="-no-pie" - fi - - if test "$static" = "yes"; then -@@ -2153,7 +2152,6 @@ if test "$static" = "yes"; then - fi - elif test "$pie" = "no"; then - CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS" -- CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS" - elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then - CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" - CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS" -@@ -6714,7 +6712,6 @@ echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak - echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak - echo "GLIB_LIBS=$glib_libs" >> $config_host_mak - echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak --echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak - echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak - echo "EXESUF=$EXESUF" >> $config_host_mak - echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak -diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile -index 084fc10f054..30771f8d17c 100644 ---- a/pc-bios/optionrom/Makefile -+++ b/pc-bios/optionrom/Makefile -@@ -41,7 +41,6 @@ override CFLAGS += $(call cc-option, $(Wa)-32) - - LD_I386_EMULATION ?= elf_i386 - override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds --override LDFLAGS += $(LDFLAGS_NOPIE) - - all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin - diff --git a/qemu.spec b/qemu.spec index 9331a8b..ce6c1c2 100644 --- a/qemu.spec +++ b/qemu.spec @@ -42,12 +42,12 @@ Summary: QEMU CPU Emulator Summary(pl.UTF-8): QEMU - emulator procesora Name: qemu -Version: 5.2.0 -Release: 7 +Version: 6.0.0 +Release: 1 License: GPL v2, BSD (edk2 firmware files) Group: Applications/Emulators Source0: https://download.qemu.org/%{name}-%{version}.tar.xz -# Source0-md5: 179f86928835da857c237b42f4b2df73 +# Source0-md5: cce185dc0119546e395909e8a71a75bb # Loads kvm kernel modules at boot Source3: kvm-modules-load.conf # Creates /dev/kvm @@ -70,7 +70,6 @@ Patch1: %{name}-user-execve.patch Patch2: %{name}-xattr.patch Patch3: libjpeg-boolean.patch Patch4: x32.patch -Patch5: binutils-2.36.patch URL: https://www.qemu.org/ %{?with_opengl:BuildRequires: Mesa-libgbm-devel} %{?with_opengl:BuildRequires: OpenGL-GLX-devel} @@ -939,7 +938,6 @@ Sondy systemtap/dtrace dla QEMU. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %{__sed} -i '1s,/usr/bin/env python3,%{__python3},' scripts/qemu-trace-stap @@ -1201,7 +1199,7 @@ done %{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/edk2-licenses.txt # cleanup Sphinx files -%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/{interop,specs,system,tools,user}/{.buildinfo,objects.inv} +%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/{.buildinfo,objects.inv} %clean rm -rf $RPM_BUILD_ROOT @@ -1311,6 +1309,7 @@ fi %attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu-pci.so %attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-gpu.so %attr(755,root,root) %{_libdir}/%{name}/hw-display-virtio-vga.so +%attr(755,root,root) %{_libdir}/%{name}/hw-s390x-virtio-gpu-ccw.so %attr(755,root,root) %{_libdir}/%{name}/ui-curses.so %if %{with usbredir} %attr(755,root,root) %{_libdir}/%{name}/hw-usb-redirect.so @@ -1342,11 +1341,13 @@ fi %{_iconsdir}/hicolor/32x32/apps/qemu.bmp %{_iconsdir}/hicolor/scalable/apps/qemu.svg %{_mandir}/man1/qemu.1* +%{_mandir}/man1/qemu-storage-daemon.1* %{_mandir}/man1/virtfs-proxy-helper.1* %{_mandir}/man1/virtiofsd.1* %{_mandir}/man7/qemu-block-drivers.7* %{_mandir}/man7/qemu-cpu-models.7* %{_mandir}/man7/qemu-qmp-ref.7* +%{_mandir}/man7/qemu-storage-daemon-qmp-ref.7* %{_mandir}/man8/qemu-nbd.8* %{_mandir}/man8/qemu-pr-helper.8* %{_docdir}/qemu @@ -1365,6 +1366,7 @@ fi %attr(755,root,root) %{_bindir}/qemu-arm %attr(755,root,root) %{_bindir}/qemu-armeb %attr(755,root,root) %{_bindir}/qemu-cris +%attr(755,root,root) %{_bindir}/qemu-hexagon %attr(755,root,root) %{_bindir}/qemu-hppa %attr(755,root,root) %{_bindir}/qemu-i386 %attr(755,root,root) %{_bindir}/qemu-io @@ -1404,6 +1406,7 @@ fi %attr(755,root,root) %{_bindir}/qemu-arm-static %attr(755,root,root) %{_bindir}/qemu-armeb-static %attr(755,root,root) %{_bindir}/qemu-cris-static +%attr(755,root,root) %{_bindir}/qemu-hexagon-static %attr(755,root,root) %{_bindir}/qemu-hppa-static %attr(755,root,root) %{_bindir}/qemu-i386-static %attr(755,root,root) %{_bindir}/qemu-m68k-static