author | Jan Alexander Steffens
<heftig@archlinux.org> 2015-09-04 08:17:54 UTC |
committer | Jan Alexander Steffens
<heftig@archlinux.org> 2015-09-04 08:17:54 UTC |
parent | 72e4afd43a2d05be3375b3d6a9278cf8cd8a39f5 |
PKGBUILD | +13 | -4 |
diff --git a/PKGBUILD b/PKGBUILD index 33d9b93..1017d4b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,9 @@ pkgname=linux-firmware # Commit date + git rev-parse --short origin/master -_rev=dc00519 -pkgver=20150812.${_rev} +_rev=6ebf5d5 +_iwl=8d08236 +pkgver=20150903.${_rev}+iwlwifi.${_iwl} pkgrel=1 pkgdesc="Firmware files for Linux" makedepends=('git') @@ -36,8 +37,16 @@ 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}") -md5sums=('SKIP') +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} +} package() { cd "${srcdir}/${pkgname}"