Github messages for voidlinux
 help / color / mirror / Atom feed
From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] linux-firmware: use included Makefile.
Date: Mon, 11 Jan 2021 03:50:53 +0100	[thread overview]
Message-ID: <20210111025053.Ck0slYoOwxqsXF5Ey6rEaPHXf0lhw5JESutJGCIsFTo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27817@inbox.vuxu.org>

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

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages firm
https://github.com/void-linux/void-packages/pull/27817

linux-firmware: use included Makefile.
Manually copying the files is error prone, leading to a lot of missing
symlinks (defined in the WHENCE file) as well as unnecessary content,
such as source code and some helper scripts. This commit fixes that.

Fixes #27682

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firm-27817.patch --]
[-- Type: text/x-diff, Size: 1697 bytes --]

From 61c5800c666b4640d5f92b1d81daeb63ece9a94b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 10 Jan 2021 23:43:07 -0300
Subject: [PATCH] linux-firmware: use included Makefile.

Manually copying the files is error prone, leading to a lot of missing
symlinks (defined in the WHENCE file) as well as unnecessary content,
such as source code and some helper scripts. This commit fixes that.

Fixes #27682
---
 srcpkgs/linux-firmware/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index a2cc5c30c9d..bb1fbf54ecc 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version=20201218
-revision=1
+revision=2
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,12 +16,14 @@ subpackages="linux-firmware-amd linux-firmware-broadcom
  linux-firmware-intel linux-firmware-nvidia linux-firmware-network"
 
 do_install() {
-	vmkdir usr/lib/firmware
-	vmkdir usr/share/licenses/${pkgname}
-	vcopy "*" usr/lib/firmware
-	rm -f ${DESTDIR}/usr/lib/firmware/{README*,configure,GPL*}
-	mv ${DESTDIR}/usr/lib/firmware/{LICEN*,WHENCE} \
-		${DESTDIR}/usr/share/licenses/${pkgname}
+	make install FIRMWAREDIR=/usr/lib/firmware DESTDIR=$DESTDIR
+
+	for _l in LICEN* WHENCE
+	do
+		vlicense "$_l"
+	done
+
+	# XXX: should some firmwares, like carl9170, be pruned?
 }
 
 linux-firmware-amd_package() {

  reply	other threads:[~2021-01-11  2:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-11  2:45 [PR PATCH] " ericonr
2021-01-11  2:50 ` ericonr [this message]
2021-01-11  2:52 ` [PR PATCH] [Merged]: " ericonr

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=20210111025053.Ck0slYoOwxqsXF5Ey6rEaPHXf0lhw5JESutJGCIsFTo@z \
    --to=ericonr@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).