Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3b7c930a8bb4b6f58f8096662b9f41ce7e2ffe8b
commit 3b7c930a8bb4b6f58f8096662b9f41ce7e2ffe8b Author: Miklos Vajna <[email protected]> Date: Tue May 3 09:40:49 2011 +0200 linux-firmware-20110502-4-i686 - resolve conflict with alsa-firmware - fix for t/pacman-g1 diff --git a/source/base/linux-firmware/FrugalBuild b/source/base/linux-firmware/FrugalBuild index bf55b06..ee3a4b6 100644 --- a/source/base/linux-firmware/FrugalBuild +++ b/source/base/linux-firmware/FrugalBuild @@ -3,11 +3,12 @@ pkgname=linux-firmware pkgver=20110502 -pkgrel=3 +pkgrel=4 pkgdesc="Extra 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-$_F_kernelver_rel") +depends=("kernel>=$_F_kernelver_ver") +makedepends=('alsa-firmware') groups=('base') archs=('i686' 'x86_64' 'ppc' 'arm') _dlurl="http://ftp.frugalware.org/pub/other/sources/$pkgname" @@ -33,7 +34,7 @@ build() Fexec rm -f $i done # Remove firmware that the kernel supplies. - for i in $(pacman -Ql kernel | sed -n 's|.*/lib/firmware/\(.*\)|\1|p'); do + for i in $(pacman-g2 -Ql kernel alsa-firmware | sed -n 's|.*/lib/firmware/\(.*\)|\1|p'); do [ -d "$i" ] && continue Fexec rm -f $i done _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
