summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2021-04-12 20:12:31 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2021-04-12 20:39:31 +0100
commit1f22be3c9c3f7ad07a7e8621713758664bcc3f75 (patch)
treeb268d07b5da16cbee2927e5c98faa861704ac59b /app-emulation
parentapp-emulation/qemu: sync target list in live ebuild (diff)
downloadgentoo-1f22be3c9c3f7ad07a7e8621713758664bcc3f75.tar.gz
gentoo-1f22be3c9c3f7ad07a7e8621713758664bcc3f75.tar.bz2
gentoo-1f22be3c9c3f7ad07a7e8621713758664bcc3f75.zip
app-emulation/qemu: drop upstreamed firmware path patch
Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch17
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild1
2 files changed, 0 insertions, 18 deletions
diff --git a/app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch b/app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch
deleted file mode 100644
index ffff31402b6c..000000000000
--- a/app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Set absolute filename in files like
- /usr/share/qemu/firmware/50-edk2-x86_64-secure.json
-
-Bug: https://bugs.gentoo.org/766743
-Bug: https://bugs.launchpad.net/qemu/+bug/1913012
-Patch-by: Jannik Glückert
---- a/pc-bios/descriptors/meson.build
-+++ b/pc-bios/descriptors/meson.build
-@@ -9,7 +9,7 @@ if install_edk2_blobs
- ]
- 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/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index a304ad9fa123..9459f887f193 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -272,7 +272,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.2.0-strings.patch
"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
- "${FILESDIR}"/${PN}-9999-fix-firmware-path.patch
)
QA_PREBUILT="