| 1 |
commit: 5bdcc2f808d183c45bf1ba630bd70637a0546d9f |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 31 14:29:29 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 31 14:29:29 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdcc2f8 |
| 7 |
|
| 8 |
app-emulation/qemu: port fimrware path to live ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 12 |
|
| 13 |
.../qemu/files/qemu-9999-fix-firmware-path.patch | 17 +++++++++++++++++ |
| 14 |
app-emulation/qemu/qemu-9999.ebuild | 3 +-- |
| 15 |
2 files changed, 18 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch b/app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..ffff31402b6 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch |
| 22 |
@@ -0,0 +1,17 @@ |
| 23 |
+Set absolute filename in files like |
| 24 |
+ /usr/share/qemu/firmware/50-edk2-x86_64-secure.json |
| 25 |
+ |
| 26 |
+Bug: https://bugs.gentoo.org/766743 |
| 27 |
+Bug: https://bugs.launchpad.net/qemu/+bug/1913012 |
| 28 |
+Patch-by: Jannik Glückert |
| 29 |
+--- a/pc-bios/descriptors/meson.build |
| 30 |
++++ b/pc-bios/descriptors/meson.build |
| 31 |
+@@ -9,7 +9,7 @@ if install_edk2_blobs |
| 32 |
+ ] |
| 33 |
+ configure_file(input: files(f), |
| 34 |
+ output: f, |
| 35 |
+- configuration: {'DATADIR': qemu_datadir}, |
| 36 |
++ configuration: {'DATADIR': get_option('prefix') / qemu_datadir}, |
| 37 |
+ install: get_option('install_blobs'), |
| 38 |
+ install_dir: qemu_datadir / 'firmware') |
| 39 |
+ endforeach |
| 40 |
|
| 41 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
| 42 |
index 411002ffdfe..1e9063a884a 100644 |
| 43 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
| 44 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
| 45 |
@@ -228,8 +228,7 @@ PATCHES=( |
| 46 |
"${FILESDIR}"/${PN}-5.2.0-strings.patch |
| 47 |
"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch |
| 48 |
"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch |
| 49 |
- #needs a whitespace tweak |
| 50 |
- #"${FILESDIR}"/${PN}-5.2.0-fix-firmware-path.patch |
| 51 |
+ "${FILESDIR}"/${PN}-9999-fix-firmware-path.patch |
| 52 |
) |
| 53 |
|
| 54 |
QA_PREBUILT=" |
Archives