Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] qemu: correct installation dir for firmware's json
Date: Thu, 16 Jul 2020 17:18:28 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23597@inbox.vuxu.org> (raw)

[-- 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
 }

             reply	other threads:[~2020-07-16 15:18 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-16 15:18 sgn [this message]
2020-07-16 17:13 ` Hoshpak
2020-07-16 18:35 ` [PR REVIEW] " ahesford
2020-07-17  0:28 ` sgn
2020-07-17  0:29 ` sgn
2020-07-17 10:25 ` [PR PATCH] [Closed]: " sgn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23597@inbox.vuxu.org \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).