[PR PATCH] qemu: correct installation dir for firmware's json

[PR PATCH] qemu: correct installation dir for firmware's json

[sgn]

[-- Attachment #1: Type: text/plain, Size: 372 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages qemu-installation-dir
https://github.com/void-linux/void-packages/pull/23597

qemu: correct installation dir for firmware's json
Close: #23495

---
@Hoshpak 

A patch file from https://github.com/void-linux/void-packages/pull/23597.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qemu-installation-dir-23597.patch --]
[-- Type: text/x-diff, Size: 1470 bytes --]

From 5ab9a3a1a9f62c73999d58dcc179bd93649f205e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 16 Jul 2020 22:13:55 +0700
Subject: [PATCH] qemu: correct installation dir for firmware's json

Close: #23495
---
 srcpkgs/qemu/template | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 5a32c5c1dd3..6da8db7aae1 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,7 +1,7 @@
 # Template file for 'qemu'
 pkgname=qemu
 version=5.0.0
-revision=2
+revision=3
 short_desc="Open Source Processor Emulator"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -81,6 +81,15 @@ do_install() {
 	make DESTDIR=${DESTDIR} install
 	# qemu-bridge-helper must be setuid for non privileged users.
 	chmod u+s ${DESTDIR}/usr/libexec/qemu-bridge-helper
+	# The firmware JSON files should be searched for in three directories
+	# * /usr/share/qemu/firmware
+	# * /etc/qemu/firmware
+	# * $XDG_CONFIG_HOME/qemu/firmware
+	# See: https://git.qemu.org/?p=qemu.git;a=blob;f=docs/interop/firmware.json;h=240f565397ae0e754e85976f2d4b5e3873ae8211;hb=HEAD#l311
+	vmkdir usr/share/qemu
+	mv ${DESTDIR}/usr/lib/qemu/firmware ${DESTDIR}/usr/share/qemu/
+	# This shouldn't be necessary, just in case.
+	ln -sf ../../share/qemu/firmware ${DESTDIR}/usr/lib/qemu/
 
 	vsv qemu-ga
 }

Re: qemu: correct installation dir for firmware's json

[Hoshpak]

[-- Attachment #1: Type: text/plain, Size: 593 bytes --]

New comment by Hoshpak on void-packages repository

https://github.com/void-linux/void-packages/pull/23597#issuecomment-659550255

Comment:
Am 16.07.20 um 17:18 schrieb Danh Doan:
> Close: #23495
> 
> ---
> @Hoshpak 

I guess it works but I don't like it much. We shouldn't apply yet
another hack just to work around that hook which creates a false
positive in this case. My preferred way to handle this would be to make
it possible to define exceptions to the hook and just install the files
in the proper directory in the first place. I will try to come up with
an alternative PR tonight.

Re: [PR REVIEW] qemu: correct installation dir for firmware's json

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23597#discussion_r455992528

Comment:
If the ultimate destination is `usr/share/qemu` cant `--datadir=/usr/lib` be removed or replaced with `--datadir=/usr/share` when calling `configure`?

Re: [PR REVIEW] qemu: correct installation dir for firmware's json

[sgn]

[-- Attachment #1: Type: text/plain, Size: 400 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/23597#discussion_r456151448

Comment:
No,
Right now, the firmware is installed into `/usr/lib/qemu`, i.e. `/usr/lib/qemu/multiboot.bin` those files are sources of warnings in pkg-lint-elf-in-usr-share.

The json files in `/usr/lib/qemu/firmware` must be moved, let's see what Hoshpak propose.

Re: qemu: correct installation dir for firmware's json

[sgn]

[-- Attachment #1: Type: text/plain, Size: 670 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/23597#issuecomment-659754069

Comment:
On 2020-07-16 10:13:38-0700, Helmut Pozimski <notifications@github.com> wrote:
> I guess it works but I don't like it much. We shouldn't apply yet
> another hack just to work around that hook which creates a false
> positive in this case. My preferred way to handle this would be to make
> it possible to define exceptions to the hook and just install the files
> in the proper directory in the first place. I will try to come up with
> an alternative PR tonight.

I don't like it either.
Just too lazy to fix the pkglint.

-- 
Danh

Re: [PR PATCH] [Closed]: qemu: correct installation dir for firmware's json

[sgn]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

There's a closed pull request on the void-packages repository

qemu: correct installation dir for firmware's json
https://github.com/void-linux/void-packages/pull/23597

Description:
Close: #23495

---
@Hoshpak