commit: 78479bf6a6ccc2fac8954951cdc6e655a949d6d3 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Wed Jun 16 18:14:21 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed Jun 16 20:59:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78479bf6
app-emulation/qemu: remove unused patches Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/21269 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> app-emulation/qemu/files/65-kvm.rules-r1 | 2 - .../qemu/files/qemu-5.2.0-fix-firmware-path.patch | 16 ----- .../qemu/files/qemu-5.2.0-no-pie-ld.patch | 73 ---------------------- 3 files changed, 91 deletions(-) diff --git a/app-emulation/qemu/files/65-kvm.rules-r1 b/app-emulation/qemu/files/65-kvm.rules-r1 deleted file mode 100644 index ab3776ac29e..00000000000 --- a/app-emulation/qemu/files/65-kvm.rules-r1 +++ /dev/null @@ -1,2 +0,0 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" -KERNEL=="vhost-net", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-net" diff --git a/app-emulation/qemu/files/qemu-5.2.0-fix-firmware-path.patch b/app-emulation/qemu/files/qemu-5.2.0-fix-firmware-path.patch deleted file mode 100644 index 53969833795..00000000000 --- a/app-emulation/qemu/files/qemu-5.2.0-fix-firmware-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -Se absolute filename in files like - /usr/share/qemu/firmware/50-edk2-x86_64-secure.json - -Bug: https://bugs.gentoo.org/766743 -Patch-by: Jannik Glückert ---- a/pc-bios/descriptors/meson.build -+++ b/pc-bios/descriptors/meson.build -@@ -8,7 +8,7 @@ foreach f: [ - ] - configure_file(input: files(f), - output: f, -- configuration: {'DATADIR': qemu_datadir}, -+ configuration: {'DATADIR': get_option('prefix') / qemu_datadir}, - install: get_option('install_blobs'), - install_dir: qemu_datadir / 'firmware') - endforeach diff --git a/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch b/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch deleted file mode 100644 index f47a58790cc..00000000000 --- a/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch +++ /dev/null @@ -1,73 +0,0 @@ -From bbd2d5a8120771ec59b86a80a1f51884e0a26e53 Mon Sep 17 00:00:00 2001 -From: Christian Ehrhardt <christian.ehrha...@canonical.com> -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 /<<PKGBUILDDIR>>/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 <christian.ehrha...@canonical.com> -Message-Id: <20201214150938.1297512-1-christian.ehrha...@canonical.com> -Cc: qemu-sta...@nongnu.org -Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> ---- - configure | 3 --- - pc-bios/optionrom/Makefile | 1 - - 2 files changed, 4 deletions(-) - ---- 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 084fc10f05..30771f8d17 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 - --- -2.30.0 -
