[arch-commits] Commit in linux-firmware/trunk (PKGBUILD)

[Jan Steffens]

    Date: Tuesday, December 3, 2019 @ 09:34:07
  Author: heftig
Revision: 370263

20191118.e8a0f4c-1

Modified:
  linux-firmware/trunk/PKGBUILD

----------+
 PKGBUILD |   38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-03 09:07:12 UTC (rev 370262)
+++ PKGBUILD	2019-12-03 09:34:07 UTC (rev 370263)
@@ -2,9 +2,9 @@
 
 pkgbase=linux-firmware
 pkgname=(linux-firmware amd-ucode)
-_commit=2b016afc348ba4b5fb2016ffcb2822f4a293da0c
-pkgver=20191022.2b016af
-pkgrel=3
+_commit=e8a0f4c9314754d8b2cbe9840357d88a861c438a  # master
+pkgver=20191118.e8a0f4c
+pkgrel=1
 pkgdesc="Firmware files for Linux"
 makedepends=('git')
 arch=('any')
@@ -11,17 +11,21 @@
 url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
 license=('GPL2' 'GPL3' 'custom')
 options=(!strip)
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#commit=${_commit}?signed"
+        0001-iwlwifi-Add-Core47-firmwares.patch.xz)
+sha256sums=('SKIP'
+            '5ccce33fa502c5c6851efdd9359744e63a90db1bb09b83b6299f9988f695d3fe')
 validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer <jwboyer at fedoraproject.org>
-source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#commit=${_commit}?signed")
 
 prepare() {
-  echo ${pkgbase}
+  cd ${pkgname}
 
-  cd "${srcdir}/${pkgname}"
+  # https://bugs.archlinux.org/task/64703
+  git apply -3 ../0001-iwlwifi-Add-Core47-firmwares.patch
 }
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
+  cd ${pkgname}
 
   # Commit date + short rev
   echo $(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD).$(git rev-parse --short HEAD)
@@ -32,7 +36,10 @@
   cat ${pkgbase}/amd-ucode/microcode_amd*.bin > kernel/x86/microcode/AuthenticAMD.bin
 
   # Reproducibility: set the timestamp on the bin file
-  [ ! -z $SOURCE_DATE_EPOCH ] && touch -d @$SOURCE_DATE_EPOCH kernel/x86/microcode/AuthenticAMD.bin
+  if [[ -n $SOURCE_DATE_EPOCH ]]; then 
+    touch -d @$SOURCE_DATE_EPOCH kernel/x86/microcode/AuthenticAMD.bin
+  fi
+
   # Reproducibility: strip the inode and device numbers from the cpio archive
   echo kernel/x86/microcode/AuthenticAMD.bin |
     bsdtar --uid 0 --gid 0 -cnf - -T - |
@@ -64,25 +71,22 @@
             'rt2x00-rt61-fw'
             'rt2x00-rt71w-fw')
 
-  cd "${srcdir}/${pkgname}"
+  cd ${pkgname}
 
   make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install
 
-  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -Dm644 LICEN* WHENCE "${pkgdir}/usr/share/licenses/linux-firmware/"
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICEN* WHENCE
 
   # Trigger a microcode reload for configurations not using early updates
-  install -d "${pkgdir}/usr/lib/tmpfiles.d"
-  echo 'w /sys/devices/system/cpu/microcode/reload - - - - 1' \
-    >"${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  echo 'w /sys/devices/system/cpu/microcode/reload - - - - 1' |
+    install -Dm644 /dev/stdin "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 }
 
 package_amd-ucode() {
   pkgdesc='Microcode update files for AMD CPUs'
 
-  install -D -m0644 amd-ucode.img "${pkgdir}"/boot/amd-ucode.img  
-  install -D -m0644 "${srcdir}/${pkgbase}/LICENSE.amd-ucode" "${pkgdir}/usr/share/licenses/amd-ucode/LICENSE"
+  install -Dt "${pkgdir}/boot" -m644 amd-ucode.img
+  install -Dm644 ${pkgbase}/LICENSE.amd-ucode "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('SKIP')