From a53aaa3c1a57990b434c4dbc6c1e6ab88e5895baffcf611e5333bd12e1ebf65a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 11 Aug 2011 13:56:11 +0000 Subject: [PATCH 1/5] Updating link to change in openSUSE:Factory/kernel-firmware revision 23.0 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=79a34e835b51c836ce416efd3bf98146 --- kernel-firmware.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 13cb4f1..9f22ff6 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -20,7 +20,7 @@ Name: kernel-firmware BuildRequires: fdupes kernel-default Version: 20110709 -Release: 2 +Release: 7 Summary: Linux kernel firmware files License: Distributable in unmodified form; GPL v2 only; GPL v2 or later; X11/MIT Group: System/Kernel From 8ab1fef1ca789ff549c6db4fc640cd7aa09c324a4cd9d8927dd22e09e8d45715 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 12 Aug 2011 23:11:16 +0000 Subject: [PATCH 2/5] Accepting request 78676 from home:dirkmueller:branches:Kernel:HEAD - 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) OBS-URL: https://build.opensuse.org/request/show/78676 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=38 --- .gitattributes | 3 +++ iwlwifi-4965-1.ucode | 3 +++ kernel-firmware.changes | 14 ++++++++++++++ kernel-firmware.spec | 11 +++++++++-- linux-firmware-20110709.tar.bz2 | 3 --- linux-firmware-20110731.tar.bz2 | 3 +++ qlogic.tar.bz2 | 3 +++ t4fw.bin | 3 +++ 8 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 iwlwifi-4965-1.ucode delete mode 100644 linux-firmware-20110709.tar.bz2 create mode 100644 linux-firmware-20110731.tar.bz2 create mode 100644 qlogic.tar.bz2 create mode 100644 t4fw.bin 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/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..c5529a2 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +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..dbd1f0e 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,6 +27,9 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -56,6 +59,8 @@ Provides: iwl6050-ucode Obsoletes: iwl6050-ucode Provides: iwl6000g2-ucode Obsoletes: iwl6000g2-ucode +Provides: ath3k-firmware +Obsoletes: ath3k-firmware AutoReq: off %description @@ -66,7 +71,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 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 From 6d8d26ec137f7c54585c63645badf8fada0ca75a64e7365feafdb7ef2d62bc2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Thu, 25 Aug 2011 16:04:51 +0000 Subject: [PATCH 3/5] - fix supplements generation with rpm-4.9 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=39 --- firmware.sh | 23 +++++++++++++++++++++++ kernel-firmware.changes | 5 +++++ kernel-firmware.spec | 4 +++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/firmware.sh b/firmware.sh index 7d33340..1ccae17 100644 --- a/firmware.sh +++ b/firmware.sh @@ -54,6 +54,29 @@ 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 + while read fw ; do + sed -n -e "s@^${fw#$RPM_BUILD_ROOT/lib/firmware/} @@p" < "$cache" + done | sort | \ + RPMBUILD_SPECFILE=/dev/null /usr/lib/rpm/find-supplements.ksyms | \ + sed 's/^modalias(kernel-[^:]*:/modalias(/' # strip the kernel-$flavor: prefix + exit 0 +fi + trap 'rm -rf "$tmp"' EXIT tmp=$(mktemp -d) diff --git a/kernel-firmware.changes b/kernel-firmware.changes index c5529a2..85c1158 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/kernel-firmware.spec b/kernel-firmware.spec index dbd1f0e..f81012d 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -31,6 +31,8 @@ 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 @@ -61,7 +63,6 @@ Provides: iwl6000g2-ucode Obsoletes: iwl6000g2-ucode Provides: ath3k-firmware Obsoletes: ath3k-firmware -AutoReq: off %description This package contains the firmware for in-kernel drivers that was @@ -84,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} From 6c98fcd652c3a9d8c80df12c577ca592d544b83ca0ba52e01ec5992e011fedbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Thu, 25 Aug 2011 16:15:02 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=40 --- firmware.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/firmware.sh b/firmware.sh index 1ccae17..4cf4b8d 100644 --- a/firmware.sh +++ b/firmware.sh @@ -69,11 +69,13 @@ if test "$1" = "--find-supplements" -a -n "$cache" ; then /sbin/modinfo -F firmware "$ko" | sed -e "s@\$@ $ko@" done > $cache fi - while read fw ; do + hits=$(while read fw ; do sed -n -e "s@^${fw#$RPM_BUILD_ROOT/lib/firmware/} @@p" < "$cache" - done | sort | \ - RPMBUILD_SPECFILE=/dev/null /usr/lib/rpm/find-supplements.ksyms | \ - sed 's/^modalias(kernel-[^:]*:/modalias(/' # strip the kernel-$flavor: prefix + 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 From 12aaefbbdb3640b0f09796f17a0f90dbe6c972925ce8e102a4023e4bc7a27d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Thu, 25 Aug 2011 16:25:20 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=41 --- firmware.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware.sh b/firmware.sh index 4cf4b8d..d0b5a9c 100644 --- a/firmware.sh +++ b/firmware.sh @@ -97,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)