diff --git a/.gitattributes b/.gitattributes index 9b03811..74249d6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,6 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text +## Specific LFS patterns +iwlwifi-4965-1.ucode filter=lfs diff=lfs merge=lfs -text +t4fw.bin filter=lfs diff=lfs merge=lfs -text diff --git a/firmware.sh b/firmware.sh index 7d33340..d0b5a9c 100644 --- a/firmware.sh +++ b/firmware.sh @@ -54,6 +54,31 @@ get_kernel_dir() usage } +cache= +if test "$1" = "--cache" ; then + cache=$2 + shift + shift +fi + +if test "$1" = "--find-supplements" -a -n "$cache" ; then + if ! test -e "$cache"; then + get_kernel_dir + echo "Using $kernel" >&2 + find "$kernel" -name '*.ko' -type f | while read ko; do + /sbin/modinfo -F firmware "$ko" | sed -e "s@\$@ $ko@" + done > $cache + fi + hits=$(while read fw ; do + sed -n -e "s@^${fw#$RPM_BUILD_ROOT/lib/firmware/} @@p" < "$cache" + done | sort) + if test -n "$hits"; then + echo "$hits" | RPMBUILD_SPECFILE=/dev/null /usr/lib/rpm/find-supplements.ksyms | \ + sed 's/^modalias(kernel-[^:]*:/modalias(/' # strip the kernel-$flavor: prefix + fi + exit 0 +fi + trap 'rm -rf "$tmp"' EXIT tmp=$(mktemp -d) @@ -72,7 +97,7 @@ case "$1" in echo "$ko" fi done | sort | \ - RPMBUILD_SPECFILE=/dev/null /usr/lib/rpm/find-supplements.ksyms | \ + RPMBUILD_SPECFILE=/dev/null /usr/lib/rpm/find-supplements.ksyms dummy-package-please-ignore | \ sed 's/^modalias(kernel-[^:]*:/modalias(/' # strip the kernel-$flavor: prefix ;; --kill-duplicates) diff --git a/iwlwifi-4965-1.ucode b/iwlwifi-4965-1.ucode new file mode 100644 index 0000000..24ee88d --- /dev/null +++ b/iwlwifi-4965-1.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:389283cf2aa7ba1c0ba86c59d342ff84b45e5ff58105dc91167d6592aabeedca +size 187608 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 6396eb2..85c1158 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Aug 25 18:04:35 CEST 2011 - mls@suse.de + +- fix supplements generation with rpm-4.9 + +------------------------------------------------------------------- +Fri Aug 12 14:57:20 CEST 2011 - dmueller@suse.de + +- add provides/obsoletes for ath3k-firmware +- Update to 20110731: + * iwlwifi-6000g2a-5.ucode: Updated to v17.168.5.3 + * ath6kl - Atheros support for AR6003 WiFi-Bluetooth combo module + * drxk - Micronas DRX-K demodulator driver + * ene-ub6250 -- ENE UB6250 SD card reader driver +- update qlogic firmware to 5.06.00 (bnc#702696) +- add iwlwifi-4965-1.ucode (was additionally in iwl4965-ucode + package before) +- Add latest firmware (1.3.10.0) for cxgb4 from Chelsio git (bnc#711432) + ------------------------------------------------------------------- Tue Aug 9 10:48:15 UTC 2011 - mmarek@suse.cz diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 9f22ff6..f81012d 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -19,7 +19,7 @@ Name: kernel-firmware BuildRequires: fdupes kernel-default -Version: 20110709 +Version: 20110731 Release: 7 Summary: Linux kernel firmware files License: Distributable in unmodified form; GPL v2 only; GPL v2 or later; X11/MIT @@ -27,7 +27,12 @@ Group: System/Kernel Url: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/ Source0: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/linux-firmware-%{version}.tar.bz2 Source1: firmware.sh +Source2: qlogic.tar.bz2 +Source3: iwlwifi-4965-1.ucode +Source4: t4fw.bin %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements +%define __ksyms_supplements bash %_sourcedir/firmware.sh --cache %{_builddir}/%{?buildsubdir}/find_supplements.cache --find-supplements +%define __ksyms_path ^/lib/firmware BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Provides: qlogic-firmware @@ -56,7 +61,8 @@ Provides: iwl6050-ucode Obsoletes: iwl6050-ucode Provides: iwl6000g2-ucode Obsoletes: iwl6000g2-ucode -AutoReq: off +Provides: ath3k-firmware +Obsoletes: ath3k-firmware %description This package contains the firmware for in-kernel drivers that was @@ -66,7 +72,9 @@ previously included in the kernel. It is shared by all kernels >= %prep -%setup -q -n linux-firmware-%version +%setup -q -n linux-firmware-%version -a 2 +cp -v %{S:3} iwlwifi-4965-1.ucode +cp -v %{S:4} cxgb4/t4fw.bin %build # nothing to do @@ -77,6 +85,7 @@ cp -avf * %{buildroot}/lib/firmware rm -f %{buildroot}/lib/firmware/WHENCE bash %_sourcedir/firmware.sh --kill-duplicates %buildroot/lib/firmware/ %fdupes %{buildroot} +rm -f find_supplements.cache %clean rm -rf %{buildroot} diff --git a/linux-firmware-20110709.tar.bz2 b/linux-firmware-20110709.tar.bz2 deleted file mode 100644 index d084b8b..0000000 --- a/linux-firmware-20110709.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1b61c5ef9b9bd34eff2296dc40a4732939e687ef80f3d0e749f58e4a1990134 -size 15267126 diff --git a/linux-firmware-20110731.tar.bz2 b/linux-firmware-20110731.tar.bz2 new file mode 100644 index 0000000..83cbcf2 --- /dev/null +++ b/linux-firmware-20110731.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7e122642b99727db63ec6cf2fb64037e7e49a2e5db59a62cdba444a273905d3 +size 15251521 diff --git a/qlogic.tar.bz2 b/qlogic.tar.bz2 new file mode 100644 index 0000000..4d6f252 --- /dev/null +++ b/qlogic.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53c628b99e43ee69384dab2bb3e60ac6b7ba41f52b22dded9ebfe6cc2b0db863 +size 416209 diff --git a/t4fw.bin b/t4fw.bin new file mode 100644 index 0000000..e912292 --- /dev/null +++ b/t4fw.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed4b49bdaea69ddd15aa996e6ad899dd12979055148f04d8667df30e2c76f565 +size 241664