diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2021-01-31 14:29:29 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2021-01-31 14:29:29 +0000 |
commit | 5bdcc2f808d183c45bf1ba630bd70637a0546d9f (patch) | |
tree | c41cf39a51a10bcf4ec8d33082c3b99833f92e5d /app-emulation | |
parent | app-emulation/qemu: apply werror and keymap patches to live ebuild (diff) | |
download | gentoo-5bdcc2f808d183c45bf1ba630bd70637a0546d9f.tar.gz gentoo-5bdcc2f808d183c45bf1ba630bd70637a0546d9f.tar.bz2 gentoo-5bdcc2f808d183c45bf1ba630bd70637a0546d9f.zip |
app-emulation/qemu: port fimrware path to live ebuild
Package-Manager: Portage-3.0.14, Repoman-3.0.2
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.patch | 17 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 3 |
2 files changed, 18 insertions, 2 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 new file mode 100644 index 000000000000..ffff31402b6c --- /dev/null +++ b/app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch @@ -0,0 +1,17 @@ +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 411002ffdfea..1e9063a884a2 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -228,8 +228,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-strings.patch "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch - #needs a whitespace tweak - #"${FILESDIR}"/${PN}-5.2.0-fix-firmware-path.patch + "${FILESDIR}"/${PN}-9999-fix-firmware-path.patch ) QA_PREBUILT=" |