summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Dmitriyev2015-09-27 18:17:31 +0300
committerVictor Dmitriyev2015-09-27 18:17:31 +0300
commit0f45f583905252e4abef7c8fc6fef33e0d0e9fd0 (patch)
treeb8b7294fefa4c68094e319769dd9f13a8f3ebf23
parent4457943e21028114ad264ca418e91aca09f3e5ae (diff)
downloadaur-0f45f583905252e4abef7c8fc6fef33e0d0e9fd0.tar.gz
upgpkg: linux-firmware-git 20150924.f88e5c2-2
Fixed old typo.
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD16
2 files changed, 4 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7c2c60519cd1..e5ed721c9b78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-firmware-git
pkgdesc = Firmware files for Linux
pkgver = 20150924.f88e5c2
- pkgrel = 1
+ pkgrel = 2
url = http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary
arch = any
license = GPL2
@@ -9,19 +9,7 @@ pkgbase = linux-firmware-git
license = custom
makedepends = git
provides = linux-firmware=20150924.f88e5c2
- conflicts = linux-firmware-git
- conflicts = kernel26-firmware
- conflicts = ar9170-fw
- conflicts = iwlwifi-1000-ucode
- conflicts = iwlwifi-3945-ucode
- conflicts = iwlwifi-4965-ucode
- conflicts = iwlwifi-5000-ucode
- conflicts = iwlwifi-5150-ucode
- conflicts = iwlwifi-6000-ucode
- conflicts = rt2870usb-fw
- conflicts = rt2x00-rt61-fw
- conflicts = rt2x00-rt71w-fw
- conflicts = amd-ucode
+ conflicts = linux-firmware
options = !strip
source = linux-firmware-git::git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 3aadf326c584..38a288c53ede 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,25 +3,13 @@
# Contributor: xduugu
pkgname=linux-firmware-git
-pkgrel=1
+pkgrel=2
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')
+conflicts=('linux-firmware')
pkgver=20150924.f88e5c2
provides=("linux-firmware=$pkgver")
options=(!strip)