linux-libre-firmware: move ath9k-htc-firmware to a separate package due which is necessary be build from a cross building

1 files changed, 10 insertions, 30 deletions

diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 4b886a79e..d5570f98d 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -2,15 +2,13 @@
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
 pkgname=linux-libre-firmware
-_pkgver=3.9
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
+pkgver=3.9
+pkgrel=2
 pkgdesc='Free firmware files for Linux-libre'
 arch=('any')
-url=('http://linux-libre.fsfla.org/'
-     'http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
-license=('GPL2' 'BSD')
-makedepends=('git' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc')
+url=('http://linux-libre.fsfla.org/')
+license=('GPL2')
+depends=('ath9k-htc-firmware')
 provides=('linux-firmware'
           'kernel26-firmware=2.6.34.99')
 conflicts=('linux-firmware'
@@ -38,31 +36,17 @@ replaces=('linux-firmware'
           'rt2870usb-fw'
           'rt2x00-rt61-fw'
           'rt2x00-rt71w-fw')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/linux-libre-$_pkgver-gnu.tar.xz"
-        "git://github.com/qca/open-ath9k-htc-firmware")
-md5sums=('120df29f88622dabf7015a22c7cc8e25'
-         'SKIP')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
+md5sums=('120df29f88622dabf7015a22c7cc8e25')
 
 build() {
 
-  cd $srcdir/open-ath9k-htc-firmware
-
   # create firmware folder to put the free firmware files there
   install -d -m755 $pkgdir/usr/lib/firmware
 
-  # fix path on configure file
-  sed -i 's|$PWD/../toolchain/inst|/usr|;
-         's|xtensa-elf|xtensa-unknown-elf|;
-         ' target_firmware/configure
-
-  # compile ath9k-htc-firmware
-  make -C target_firmware
-
-  mv htc_{7010,9271}.fw $pkgdir/usr/lib/firmware
-
-  cd $srcdir/linux-$_pkgver
+  cd $srcdir/linux-$pkgver
 
-  # compile free firmware files of linux-libre source code  
+  # compile free firmware files  
   make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
 
 }
@@ -72,12 +56,8 @@ package() {
   # create licenses folder to put the licenses files there
   install -d -m755 $pkgdir/usr/share/licenses/$pkgname
 
-  # move LICENSE.TXT from ath9k-htc firmware to linux-firmware license folder
-  cd $srcdir/open-ath9k-htc-firmware-1.3.2
-  mv LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENCE.atheros_firmware
-  
   # move WHENCE file to linux-firmware license folder
-  cd $srcdir/linux-$_pkgver
+  cd $srcdir/linux-$pkgver
   mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
 
 }