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

[Jan Steffens]

    Date: Friday, September 4, 2015 @ 15:05:12
  Author: heftig
Revision: 245277

Revert addition of iwlwifi branch; 4.2 incompat was a config issue FS#46197

Modified:
  linux-firmware/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-04 12:56:50 UTC (rev 245276)
+++ PKGBUILD	2015-09-04 13:05:12 UTC (rev 245277)
@@ -4,8 +4,7 @@
 pkgname=linux-firmware
 # Commit date + git rev-parse --short origin/master
 _rev=6ebf5d5
-_iwl=8d08236
-pkgver=20150903.${_rev}+iwlwifi.${_iwl}
+pkgver=20150904.${_rev}
 pkgrel=1
 pkgdesc="Firmware files for Linux"
 makedepends=('git')
@@ -38,17 +37,9 @@
           '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')
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#commit=${_rev}")
+md5sums=('SKIP')
 
-prepare() {
-  cd $pkgname
-  git fetch ../iwlwifi
-  git -c user.email='foo at bar' merge --squash ${_iwl}
-}
-
 package() {
   cd "${srcdir}/${pkgname}"