summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/linux-libre-firmware/PKGBUILD31
-rw-r--r--libre/linux-libre-firmware/parabola-LICENSE.patch13
2 files changed, 13 insertions, 31 deletions
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 2fc80bd81..dd43819fe 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -1,14 +1,13 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-# Contributor: 謝致邦 <Yeking@Red54.com>
+# Contributor: Márcio Silva <coadde@lavabit.com>
-# We're getting this from Debian Sid
pkgname=linux-libre-firmware
-pkgver=3.1
+pkgver=3.6
pkgrel=1
pkgdesc='Free Firmware files for Linux-libre'
arch=('any')
-url='http://svn.debian.org/wsvn/kernel/dists/trunk/firmware-free/'
-license=('GPL2' 'GPL3' 'MPL')
+url='http://linux-libre.fsfla.org/'
+license=('GPL2')
provides=('linux-firmware=20120625'
'kernel26-firmware=2.6.34.99')
conflicts=('linux-firmware'
@@ -36,19 +35,15 @@ replaces=('linux-firmware'
'rt2870usb-fw'
'rt2x00-rt61-fw'
'rt2x00-rt71w-fw')
-source=("http://ftp.debian.org/debian/pool/main/f/firmware-free/firmware-free_$pkgver.tar.gz"
- 'parabola-LICENSE.patch')
-md5sums=('8f111229d121f447a4b6ea58cb897e00'
- '3aaa2d5530c3c9518ae02978204a83ff')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
+md5sums=('a2312edd0265b5b07bd4b50afae2b380')
package() {
- cd "$srcdir/firmware-free"
- patch -Np1 -i "$srcdir/parabola-LICENSE.patch"
- rm -r "$srcdir/firmware-free/"{debian,defines}
- cd "$srcdir/firmware-free/linux-free"
- rm defines
- install -d -m755 "$pkgdir/usr/lib/firmware"
- cp -a * "$pkgdir/usr/lib/firmware"
- install -d -m755 "$pkgdir/usr/share/licenses/$pkgname"
- mv "${pkgdir}/usr/lib/firmware/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/WHENCE"
+ cd $srcdir/linux-$pkgver
+
+ make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
+
+ # move WHENCE file to linux-libre-firmware license folder
+ install -d -m755 $pkgdir/usr/share/licenses/$pkgname
+ mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
}
diff --git a/libre/linux-libre-firmware/parabola-LICENSE.patch b/libre/linux-libre-firmware/parabola-LICENSE.patch
deleted file mode 100644
index 6d0a4f6f3..000000000
--- a/libre/linux-libre-firmware/parabola-LICENSE.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur firmware-free.orig/linux-free/LICENSE firmware-free/linux-free/LICENSE
---- firmware-free.orig/linux-free/LICENSE 2012-06-17 00:06:50.000000000 -0300
-+++ firmware-free/linux-free/LICENSE 2012-10-09 14:45:23.836344258 -0200
-@@ -149,6 +149,6 @@
-
- --------------------------------------------------------------------------
-
--On Debian systems the text of the GPL version 2 can be found in
--/usr/share/common-licenses/GPL-2, and the text of the GPL version 3
--can be found in /usr/share/common-licenses/GPL-3.
-+On Parabola GNU/Linux-libre the text of the GPL version 2 can be found in
-+/usr/share/licenses/common/GPL2, and the text of the GPL version 3
-+can be found in /usr/share/licenses/common/GPL3.