git » linux-firmware.git » commit 50ab51b

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

author Jan Alexander Steffens
2015-09-04 13:05:12 UTC
committer Jan Alexander Steffens
2015-09-04 13:05:12 UTC
parent 1de297ba3f9c3d4df00735fd338cd658ca36a856

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

PKGBUILD +3 -12

diff --git a/PKGBUILD b/PKGBUILD
index 1017d4b..3ac96be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,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')
@@ -37,16 +36,8 @@ replaces=('kernel26-firmware'
           '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@bar' merge --squash ${_iwl}
-}
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#commit=${_rev}")
+md5sums=('SKIP')
 
 package() {
   cd "${srcdir}/${pkgname}"