From 96ebaffa40656421897a9a62152cd5c42921c927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= 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 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index a2cc5c30c9d..31035a9095d 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 " @@ -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() { @@ -86,5 +88,7 @@ linux-firmware-network_package() { vmove usr/lib/firmware/ueagle-atm vmove usr/lib/firmware/ti-connectivity vmove usr/lib/firmware/dpaa2 + + # XXX: should bluetooth firmware be moved into this subpkg? } }