From addf0caba72d862bf5b9f7f02cb2c1663c6ae7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 3 Jul 2013 20:25:38 -0300 Subject: linux-libre-firmware: fix pkgver due that it is from 2 source codes --- libre/linux-libre-firmware/PKGBUILD | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'libre/linux-libre-firmware') diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 4b46592d0..2f87714aa 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -2,14 +2,15 @@ # Contributor: Márcio Silva pkgname=linux-libre-firmware -pkgver=3.9 -pkgrel=2 +_pkgver=3.9 +pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgrel=1 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' 'wget') +makedepends=('git' 'xtensa-unknown-elf-gcc') provides=('linux-firmware' 'kernel26-firmware=2.6.34.99') conflicts=('linux-firmware' @@ -42,23 +43,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux md5sums=('120df29f88622dabf7015a22c7cc8e25' 'SKIP') -prepare() { - - cd $srcdir/open-ath9k-htc-firmware - - # disable build error - sed -i 's|GMP,|GMP,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|MPFR,|MPFR,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|MPC,|MPC,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|BINUTILS,|BINUTILS,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|GCC,|GCC,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - ' Makefile - - # prepare toolchain to compile ath9k-htc firmware - make toolchain - -} - build() { cd $srcdir/open-ath9k-htc-firmware -- cgit v1.2.3-2-g168b From 269ee85110ca3b1f5693d2d3a0c4711ab76de088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 3 Jul 2013 22:31:58 -0300 Subject: linux-libre-firmware: fix issues on PKGBUILD --- libre/linux-libre-firmware/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libre/linux-libre-firmware') diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 2f87714aa..eb82af49b 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -38,7 +38,7 @@ 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" +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') @@ -48,14 +48,14 @@ build() { cd $srcdir/open-ath9k-htc-firmware # create firmware folder to put the free firmware files there - mkdir -p $pkgdir/usr/lib/firmware + install -d -m755 $pkgdir/usr/lib/firmware # 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 make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install @@ -64,6 +64,7 @@ build() { 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 @@ -71,7 +72,7 @@ package() { 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 } -- cgit v1.2.3-2-g168b From e9e0c4f1e57f199bbf8f596cd5cf6c78cd6233d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 4 Jul 2013 02:45:51 -0300 Subject: linux-libre-firmware: add sed commands to fix configure file --- libre/linux-libre-firmware/PKGBUILD | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libre/linux-libre-firmware') diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index eb82af49b..45b5ff001 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -50,6 +50,12 @@ build() { # 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 -- cgit v1.2.3-2-g168b From ce0c19f9013603b00ca760b821fb7d97d911347e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 4 Jul 2013 02:48:15 -0300 Subject: linux-libre-firmware: remove blank space on PKGBUILD --- libre/linux-libre-firmware/PKGBUILD | 1 - 1 file changed, 1 deletion(-) (limited to 'libre/linux-libre-firmware') diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 45b5ff001..4983604a4 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -51,7 +51,6 @@ build() { 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 -- cgit v1.2.3-2-g168b