1 |
commit: 78479bf6a6ccc2fac8954951cdc6e655a949d6d3 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Wed Jun 16 18:14:21 2021 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 16 20:59:13 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78479bf6 |
7 |
|
8 |
app-emulation/qemu: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/21269 |
13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
14 |
|
15 |
app-emulation/qemu/files/65-kvm.rules-r1 | 2 - |
16 |
.../qemu/files/qemu-5.2.0-fix-firmware-path.patch | 16 ----- |
17 |
.../qemu/files/qemu-5.2.0-no-pie-ld.patch | 73 ---------------------- |
18 |
3 files changed, 91 deletions(-) |
19 |
|
20 |
diff --git a/app-emulation/qemu/files/65-kvm.rules-r1 b/app-emulation/qemu/files/65-kvm.rules-r1 |
21 |
deleted file mode 100644 |
22 |
index ab3776ac29e..00000000000 |
23 |
--- a/app-emulation/qemu/files/65-kvm.rules-r1 |
24 |
+++ /dev/null |
25 |
@@ -1,2 +0,0 @@ |
26 |
-KERNEL=="kvm", GROUP="kvm", MODE="0660" |
27 |
-KERNEL=="vhost-net", GROUP="kvm", MODE="0660", OPTIONS+="static_node=vhost-net" |
28 |
|
29 |
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 |
30 |
deleted file mode 100644 |
31 |
index 53969833795..00000000000 |
32 |
--- a/app-emulation/qemu/files/qemu-5.2.0-fix-firmware-path.patch |
33 |
+++ /dev/null |
34 |
@@ -1,16 +0,0 @@ |
35 |
-Se absolute filename in files like |
36 |
- /usr/share/qemu/firmware/50-edk2-x86_64-secure.json |
37 |
- |
38 |
-Bug: https://bugs.gentoo.org/766743 |
39 |
-Patch-by: Jannik Glückert |
40 |
---- a/pc-bios/descriptors/meson.build |
41 |
-+++ b/pc-bios/descriptors/meson.build |
42 |
-@@ -8,7 +8,7 @@ foreach f: [ |
43 |
- ] |
44 |
- configure_file(input: files(f), |
45 |
- output: f, |
46 |
-- configuration: {'DATADIR': qemu_datadir}, |
47 |
-+ configuration: {'DATADIR': get_option('prefix') / qemu_datadir}, |
48 |
- install: get_option('install_blobs'), |
49 |
- install_dir: qemu_datadir / 'firmware') |
50 |
- endforeach |
51 |
|
52 |
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 |
53 |
deleted file mode 100644 |
54 |
index f47a58790cc..00000000000 |
55 |
--- a/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch |
56 |
+++ /dev/null |
57 |
@@ -1,73 +0,0 @@ |
58 |
-From bbd2d5a8120771ec59b86a80a1f51884e0a26e53 Mon Sep 17 00:00:00 2001 |
59 |
-From: Christian Ehrhardt <christian.ehrhardt@×××××××××.com> |
60 |
-Date: Mon, 14 Dec 2020 16:09:38 +0100 |
61 |
-Subject: [PATCH] build: -no-pie is no functional linker flag |
62 |
- |
63 |
-Recent binutils changes dropping unsupported options [1] caused a build |
64 |
-issue in regard to the optionroms. |
65 |
- |
66 |
- ld -m elf_i386 -T /<<PKGBUILDDIR>>/pc-bios/optionrom//flat.lds -no-pie \ |
67 |
- -s -o multiboot.img multiboot.o |
68 |
- ld.bfd: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?) |
69 |
- |
70 |
-This isn't really a regression in ld.bfd, filing the bug upstream |
71 |
-revealed that this never worked as a ld flag [2] - in fact it seems we |
72 |
-were by accident setting --nmagic). |
73 |
- |
74 |
-Since it never had the wanted effect this usage of LDFLAGS_NOPIE, should be |
75 |
-droppable without any effect. This also is the only use-case of LDFLAGS_NOPIE |
76 |
-in .mak, therefore we can also remove it from being added there. |
77 |
- |
78 |
-[1]: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=983d925d |
79 |
-[2]: https://sourceware.org/bugzilla/show_bug.cgi?id=27050#c5 |
80 |
- |
81 |
-Signed-off-by: Christian Ehrhardt <christian.ehrhardt@×××××××××.com> |
82 |
-Message-Id: <20201214150938.1297512-1-christian.ehrhardt@×××××××××.com> |
83 |
-Cc: qemu-stable@××××××.org |
84 |
-Signed-off-by: Paolo Bonzini <pbonzini@××××××.com> |
85 |
---- |
86 |
- configure | 3 --- |
87 |
- pc-bios/optionrom/Makefile | 1 - |
88 |
- 2 files changed, 4 deletions(-) |
89 |
- |
90 |
---- a/configure |
91 |
-+++ b/configure |
92 |
-@@ -2137,7 +2137,6 @@ EOF |
93 |
- # Check we support --no-pie first; we will need this for building ROMs. |
94 |
- if compile_prog "-Werror -fno-pie" "-no-pie"; then |
95 |
- CFLAGS_NOPIE="-fno-pie" |
96 |
-- LDFLAGS_NOPIE="-no-pie" |
97 |
- fi |
98 |
- |
99 |
- if test "$static" = "yes"; then |
100 |
-@@ -2153,7 +2152,6 @@ if test "$static" = "yes"; then |
101 |
- fi |
102 |
- elif test "$pie" = "no"; then |
103 |
- CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS" |
104 |
-- CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS" |
105 |
- elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then |
106 |
- CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" |
107 |
- CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS" |
108 |
-@@ -6714,7 +6712,6 @@ echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak |
109 |
- echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak |
110 |
- echo "GLIB_LIBS=$glib_libs" >> $config_host_mak |
111 |
- echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak |
112 |
--echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak |
113 |
- echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak |
114 |
- echo "EXESUF=$EXESUF" >> $config_host_mak |
115 |
- echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak |
116 |
-diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile |
117 |
-index 084fc10f05..30771f8d17 100644 |
118 |
---- a/pc-bios/optionrom/Makefile |
119 |
-+++ b/pc-bios/optionrom/Makefile |
120 |
-@@ -41,7 +41,6 @@ override CFLAGS += $(call cc-option, $(Wa)-32) |
121 |
- |
122 |
- LD_I386_EMULATION ?= elf_i386 |
123 |
- override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds |
124 |
--override LDFLAGS += $(LDFLAGS_NOPIE) |
125 |
- |
126 |
- all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin |
127 |
- |
128 |
--- |
129 |
-2.30.0 |
130 |
- |