[arch-commits] Commit in linux-firmware/repos/testing-any (PKGBUILD PKGBUILD)

[Jan Steffens]

    Date: Friday, September 4, 2015 @ 10:22:53
  Author: heftig
Revision: 245265

archrelease: copy trunk to testing-any

Added:
  linux-firmware/repos/testing-any/PKGBUILD
    (from rev 245264, linux-firmware/trunk/PKGBUILD)
Deleted:
  linux-firmware/repos/testing-any/PKGBUILD

----------+
 PKGBUILD |  123 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 66 insertions(+), 57 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-04 08:17:54 UTC (rev 245264)
+++ PKGBUILD	2015-09-04 08:22:53 UTC (rev 245265)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Thomas Bächler <thomas at archlinux.org>
-
-pkgname=linux-firmware
-# Commit date + git rev-parse --short origin/master
-_rev=dc00519
-pkgver=20150812.${_rev}
-pkgrel=1
-pkgdesc="Firmware files for Linux"
-makedepends=('git')
-arch=('any')
-url="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
-license=('GPL2' 'GPL3' 'custom')
-conflicts=('linux-firmware-git'
-           'kernel26-firmware'
-           'ar9170-fw'
-           'iwlwifi-1000-ucode'
-           'iwlwifi-3945-ucode'
-           'iwlwifi-4965-ucode'
-           'iwlwifi-5000-ucode'
-           'iwlwifi-5150-ucode'
-           'iwlwifi-6000-ucode'
-           'rt2870usb-fw'
-           'rt2x00-rt61-fw'
-           'rt2x00-rt71w-fw'
-           'amd-ucode')
-replaces=('kernel26-firmware'
-          'ar9170-fw'
-          'iwlwifi-1000-ucode'
-          'iwlwifi-3945-ucode'
-          'iwlwifi-4965-ucode'
-          'iwlwifi-5000-ucode'
-          'iwlwifi-5150-ucode'
-          'iwlwifi-6000-ucode'
-          'rt2870usb-fw'
-          'rt2x00-rt61-fw'
-          'rt2x00-rt71w-fw'
-          'amd-ucode')
-options=(!strip)
-source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#commit=${_rev}")
-md5sums=('SKIP')
-
-package() {
-  cd "${srcdir}/${pkgname}"
-
-  make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install
-  rm "${pkgdir}/usr/lib/firmware/"{Makefile,README,configure,GPL-3}
-
-  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -Dm644 LICEN* WHENCE "${pkgdir}/usr/share/licenses/linux-firmware/"
-
-  # 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"
-}
-# vim:set ts=2 sw=2 et:

Copied: linux-firmware/repos/testing-any/PKGBUILD (from rev 245264, linux-firmware/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-09-04 08:22:53 UTC (rev 245265)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=linux-firmware
+# Commit date + git rev-parse --short origin/master
+_rev=6ebf5d5
+_iwl=8d08236
+pkgver=20150903.${_rev}+iwlwifi.${_iwl}
+pkgrel=1
+pkgdesc="Firmware files for Linux"
+makedepends=('git')
+arch=('any')
+url="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
+license=('GPL2' 'GPL3' 'custom')
+conflicts=('linux-firmware-git'
+           'kernel26-firmware'
+           'ar9170-fw'
+           'iwlwifi-1000-ucode'
+           'iwlwifi-3945-ucode'
+           'iwlwifi-4965-ucode'
+           'iwlwifi-5000-ucode'
+           'iwlwifi-5150-ucode'
+           'iwlwifi-6000-ucode'
+           'rt2870usb-fw'
+           'rt2x00-rt61-fw'
+           'rt2x00-rt71w-fw'
+           'amd-ucode')
+replaces=('kernel26-firmware'
+          'ar9170-fw'
+          'iwlwifi-1000-ucode'
+          'iwlwifi-3945-ucode'
+          'iwlwifi-4965-ucode'
+          'iwlwifi-5000-ucode'
+          'iwlwifi-5150-ucode'
+          'iwlwifi-6000-ucode'
+          'rt2870usb-fw'
+          'rt2x00-rt61-fw'
+          'rt2x00-rt71w-fw'
+          'amd-ucode')
+options=(!strip)
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#commit=${_rev}"
+        "iwlwifi::git+https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git")
+md5sums=('SKIP'
+         'SKIP')
+
+prepare() {
+  cd $pkgname
+  git fetch ../iwlwifi
+  git -c user.email='foo at bar' merge --squash ${_iwl}
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+
+  make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install
+  rm "${pkgdir}/usr/lib/firmware/"{Makefile,README,configure,GPL-3}
+
+  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm644 LICEN* WHENCE "${pkgdir}/usr/share/licenses/linux-firmware/"
+
+  # 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"
+}
+# vim:set ts=2 sw=2 et: