git » linux-firmware.git » commit e6c62a9

diff --git a/PKGBUILD b/PKGBUILD
index 3f05d68..019b0b0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,17 +22,6 @@ validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer <jwboyer@
 _backports=(
 )
 
-
-_pick() {
-  local p="$1" f d; shift
-  for f; do
-    d="$srcdir/$p/${f#$pkgdir/}"
-    mkdir -p "$(dirname "$d")"
-    mv "$f" "$d"
-    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
-  done
-}
-
 prepare() {
   cd ${pkgbase}
 
@@ -58,7 +47,7 @@ build() {
   cat ${pkgbase}/amd-ucode/microcode_amd*.bin > kernel/x86/microcode/AuthenticAMD.bin
 
   # Reproducibility: set the timestamp on the bin file
-  if [[ -n ${SOURCE_DATE_EPOCH} ]]; then 
+  if [[ -n ${SOURCE_DATE_EPOCH} ]]; then
     touch -d @${SOURCE_DATE_EPOCH} kernel/x86/microcode/AuthenticAMD.bin
   fi
 
@@ -68,16 +57,26 @@ build() {
     bsdtar --null -cf - --format=newc @- > amd-ucode.img
 }
 
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
 package_linux-firmware-whence() {
   pkgdesc+=" - contains the WHENCE license file which documents the vendor license details"
-  cd "$pkgbase"
-  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 WHENCE
+
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${pkgbase}/WHENCE
 }
 
 package_linux-firmware() {
   depends=('linux-firmware-whence')
-  
-  cd ${pkgname}
+
+  cd ${pkgbase}
 
   make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware installcompress
 
@@ -88,24 +87,25 @@ package_linux-firmware() {
   install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICEN*
 
   # split
-  cd "$pkgdir"
+  cd "${pkgdir}"
+
   _pick linux-firmware-nfp usr/lib/firmware/netronome
   _pick linux-firmware-nfp usr/share/licenses/${pkgname}/LICENCE.Netronome
-   
+
   _pick linux-firmware-mellanox usr/lib/firmware/mellanox
-  
+
   _pick linux-firmware-marvell usr/lib/firmware/{libertas,mwl8k,mwlwifi,mrvl}
   _pick linux-firmware-marvell usr/share/licenses/${pkgname}/LICENCE.{Marvell,NXP}
-  
+
   _pick linux-firmware-qcom usr/lib/firmware/{qcom,a300_*}
   _pick linux-firmware-qcom usr/share/licenses/${pkgname}/LICENSE.qcom
-  
+
   _pick linux-firmware-liquidio usr/lib/firmware/liquidio
   _pick linux-firmware-liquidio usr/share/licenses/${pkgname}/LICENCE.cavium_liquidio
-  
+
   _pick linux-firmware-qlogic usr/lib/firmware/{qlogic,qed,ql2???_*,c{b,t,t2}fw-*}
   _pick linux-firmware-qlogic usr/share/licenses/${pkgname}/LICENCE.{qla1280,qla2xxx}
-  
+
   _pick linux-firmware-bnx2x usr/lib/firmware/bnx2x*
 }