commit: 1f22be3c9c3f7ad07a7e8621713758664bcc3f75 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Mon Apr 12 19:12:31 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Mon Apr 12 19:39:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f22be3c
app-emulation/qemu: drop upstreamed firmware path patch Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../qemu/files/qemu-9999-fix-firmware-path.patch | 17 ----------------- app-emulation/qemu/qemu-9999.ebuild | 1 - 2 files changed, 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 ffff31402b6..00000000000 --- 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 a304ad9fa12..9459f887f19 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="
