Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77testing.git;a=commitdiff;h=01ba8de5acc526704888c423b319e4c39057be70
commit 01ba8de5acc526704888c423b319e4c39057be70 Author: James Buren <[email protected]> Date: Thu May 15 11:13:18 2014 -0500 linux-firmware-20140316-2-x86_64 * rebuild with kernel firmware present diff --git a/source/base/linux-firmware/FrugalBuild b/source/base/linux-firmware/FrugalBuild index 4f1eb10..a1bb8bf 100644 --- a/source/base/linux-firmware/FrugalBuild +++ b/source/base/linux-firmware/FrugalBuild @@ -3,19 +3,19 @@ pkgname=linux-firmware pkgver=20140316 -pkgrel=1 -pkgdesc="Extra linux kernel firmware." +pkgrel=2 +pkgdesc="The linux kernel firmware." url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary"; Finclude kernel-version -depends=("kernel>=$_F_kernelver_ver" "kernel<$_F_kernelver_nextver") -makedepends=('alsa-firmware>=1.0.25') +depends=() groups=('base') archs=('i686' 'x86_64' 'arm') _dlurl="http://ftp.frugalware.org/pub/other/sources/$pkgname"; up2date="Flastarchive $_dlurl .tar.xz" options=('nodocs' 'nomirror') -source=($_dlurl/$pkgname-$pkgver.tar.xz) -sha1sums=('972b025d54b4a7d806695ef1f4a7b02faac4f601') +source=($_dlurl/$pkgname-$pkgver.tar.xz makefile.patch) +sha1sums=('972b025d54b4a7d806695ef1f4a7b02faac4f601' \ + '14e99da5d05d36529cc978ee1d77e2d2b3e1c9aa') # Replace the old individual packages covered by this one. replaces=('radeon-firmware' 'ralink-firmware' 'iwlwifi-1000-ucode' \ 'iwlwifi-3945-ucode' 'iwlwifi-4965-ucode' 'iwlwifi-5000-ucode' \ @@ -32,22 +32,9 @@ subarchs=('i686 x86_64 arm') build() { Fcd $pkgname - Fmkdir /lib/firmware + Fpatchall + Fmakeinstall Fdocrel LICEN{S,C}E* GPL-3 WHENCE - # Remove all text files - for i in $(find -exec file '{}' \; | grep 'text' | cut -f 1 -d ':'); do - Fexec rm -f $i - done - # Remove firmware that the kernel supplies. - for i in $(find /lib/firmware -type f | sed 's|^/lib/firmware/||'); do - Fexec rm -f $i - done - # Remove empty directories - Fexec find \( -type d -and -empty \) -delete || Fdie - # Copy firmware to destination. - for i in *; do - Fcprel $i /lib/firmware - done # Assert permissions are correct. Fdirschmod /lib/firmware 0755 Ffileschmod /lib/firmware 0644 diff --git a/source/base/linux-firmware/makefile.patch b/source/base/linux-firmware/makefile.patch new file mode 100644 index 0000000..b50c6ee --- /dev/null +++ b/source/base/linux-firmware/makefile.patch @@ -0,0 +1,15 @@ +diff -ur a/Makefile b/Makefile +--- a/Makefile 2014-03-16 13:12:54.000000000 -0500 ++++ b/Makefile 2014-05-15 11:09:01.692766209 -0500 +@@ -8,5 +8,9 @@ + install: + mkdir -p $(DESTDIR)$(FIRMWAREDIR) + cp -r * $(DESTDIR)$(FIRMWAREDIR) +- rm -f $(DESTDIR)/usbdux/*dux $(DESTDIR)/*/*.asm +- rm $(DESTDIR)$(FIRMWAREDIR)/{WHENCE,LICENSE.*,LICENCE.*} ++ rm $(DESTDIR)$(FIRMWAREDIR)/{WHENCE,LICENSE.*,LICENCE.*,GPL-3} ++ find $(DESTDIR)$(FIRMWAREDIR) \( -name '*.c' -or -name '*.h' -or -name '*.asm' -or -name 'Makefile' -or -name 'configure' -or -name '*.S' -or -name "README" -or -name '*.pl' -or -name '*.pst' -or -name '*.txt' \) -delete ++ find $(DESTDIR)$(FIRMWAREDIR) \( -type d -and -empty \) -delete ++ rm -rf $(DESTDIR)$(FIRMWAREDIR)/cis/src ++ rm -rf $(DESTDIR)$(FIRMWAREDIR)/usbdux ++ rm -rf $(DESTDIR)$(FIRMWAREDIR)/carl9170fw _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
