linux-firmware: update to 20120227 and replace v4l-cx23885-enc.fw with correct file.

3 files changed, 13 insertions, 32 deletions

diff --git a/abs/core/linux-firmware/PKGBUILD b/abs/core/linux-firmware/PKGBUILD
index 0366c65..44bd424 100644
--- a/abs/core/linux-firmware/PKGBUILD
+++ b/abs/core/linux-firmware/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 123819 2011-05-13 15:23:26Z tpowa $
+# $Id$
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 #
 # Create a new tarball from the linux-firmware git tree with the following command:
-# git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
+# git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 # git archive --format=tar --prefix linux-firmware-$(date +%Y%m%d)/ master | xz -9 > linux-firmware-$(date +%Y%m%d).tar.xz
 #
 
 pkgname=linux-firmware
-pkgver=20110512
-pkgrel=2
+pkgver=20120227
+pkgrel=1
 pkgdesc="Firmware files for Linux"
 arch=('any')
 url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary"
@@ -39,23 +39,14 @@ replaces=('kernel26-firmware'
            'rt2x00-rt61-fw'
            'rt2x00-rt71w-fw')
 options=(!strip)
-source=(ftp://ftp.archlinux.org/other/linux-firmware/$pkgname-$pkgver.tar.xz
-        http://www.kernel.org/pub/linux/kernel/people/mcgrof/firmware/ar9170/ar9170.fw
-        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5000-ucode-8.83.5.1-1.tgz
-        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-39.31.5.1.tgz
-        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000-ucode-9.221.4.1.tgz
-        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2a-ucode-17.168.5.2.tgz
-        http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000g2b-ucode-17.168.5.2.tgz
-)
-md5sums=('af5fef154866a2e2d33d8b86b271babf'
-         '34feec4ec0eae3bb92c7c1ea2dfb4530'
-         'cec71b615f3ca6d7823c032da0be1b61'
-         '8098503cb2abcdeffffb3ddd2d8d6f60'
-         'c132a4c1946a9dbc0c36b41696e5c793'
-         '0b9579f4b8faf51c955295607a8e79a8'
-         'd87411296b4eeda0c91322228e9f8437')
+source=(v4l-cx23885-enc.fw
+        ftp://ftp.archlinux.org/other/linux-firmware/$pkgname-$pkgver.tar.xz)
+#sha256sums=('bc1cbee23ab8be8478be66e5486008d81b91fbf6de50347fd1be58b5e56bc6b7')
 
 package() {
+  #copy in correct firmware
+  install -D -m755 "${srcdir}/v4l-cx23885-enc.fw" "${srcdir}/${pkgname}-${pkgver}/"
+
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   install -d -m755 "${pkgdir}/lib/firmware"
@@ -63,18 +54,7 @@ package() {
   install -d -m755 "${pkgdir}/usr/share/licenses/linux-firmware/"
   rm -f "${pkgdir}/lib/firmware/GPL*"
   mv "${pkgdir}/lib/firmware"/{LICEN*,WHENCE} "${pkgdir}/usr/share/licenses/linux-firmware/"
-
-  # Symlinks for Broadcom firmware
-  #ln -s bcm43xx-0-610-809-0.fw "${pkgdir}/lib/firmware/brcm/bcm43xx-0.fw"
-  #ln -s bcm43xx_hdr-0-610-809-0.fw "${pkgdir}/lib/firmware/brcm/bcm43xx_hdr-0.fw"
-
-  # https://bugs.archlinux.org/task/20064
-  install -m644 "${srcdir}/ar9170.fw" "${pkgdir}/lib/firmware/"
-  # fix intel firmware files
-  install -m 644 ${srcdir}/iwlwifi-1000-ucode-39.31.5.1/iwlwifi-1000-5.ucode "${pkgdir}/lib/firmware/"
-  install -m 644 ${srcdir}/iwlwifi-5000-ucode-8.83.5.1/iwlwifi-5000-5.ucode "${pkgdir}/lib/firmware/"
-  install -m 644 ${srcdir}/iwlwifi-6000-ucode-9.221.4.1/iwlwifi-6000-4.ucode "${pkgdir}/lib/firmware/"
-  install -m 644 ${srcdir}/iwlwifi-6000g2a-ucode-17.168.5.2/iwlwifi-6000g2a-5.ucode "${pkgdir}/lib/firmware/"
-  install -m 644 ${srcdir}/iwlwifi-6000g2b-ucode-17.168.5.2/iwlwifi-6000g2b-5.ucode "${pkgdir}/lib/firmware/"
 }
+md5sums=('1cb3c48a6684126f5e503a434f2d636b'
+         '80084f057b8942421dd132a7ac78c3e8')
 # vim:set ts=2 sw=2 et:
diff --git a/abs/core/linux-firmware/__changelog b/abs/core/linux-firmware/__changelog
new file mode 100644
index 0000000..0ac04b7
--- /dev/null
+++ b/abs/core/linux-firmware/__changelog
@@ -0,0 +1 @@
+- replace v4l-cx23885-enc.fw in linux firmware because it is the wrong file.
diff --git a/abs/core/linux-firmware/v4l-cx23885-enc.fw b/abs/core/linux-firmware/v4l-cx23885-enc.fw
new file mode 100644
index 0000000..25a2915
--- /dev/null
+++ b/abs/core/linux-firmware/v4l-cx23885-enc.fw