Hello community, here is the log from the commit of package kernel-firmware for openSUSE:12.1 checked in at 2011-10-24 15:52:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/kernel-firmware (Old) and /work/SRC/openSUSE:12.1/.kernel-firmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-firmware", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1/kernel-firmware/kernel-firmware.changes 2011-10-24 12:57:27.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.kernel-firmware.new/kernel-firmware.changes 2011-10-24 15:52:24.000000000 +0200 @@ -1,0 +2,19 @@ +Thu Aug 25 18:04:35 CEST 2011 - [email protected] + +- fix supplements generation with rpm-4.9 + +------------------------------------------------------------------- +Fri Aug 12 14:57:20 CEST 2011 - [email protected] + +- 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) + +------------------------------------------------------------------- Old: ---- linux-firmware-20110709.tar.bz2 New: ---- iwlwifi-4965-1.ucode linux-firmware-20110731.tar.bz2 qlogic.tar.bz2 t4fw.bin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-firmware.spec ++++++ --- /var/tmp/diff_new_pack.LXzaYL/_old 2011-10-24 15:52:29.000000000 +0200 +++ /var/tmp/diff_new_pack.LXzaYL/_new 2011-10-24 15:52:29.000000000 +0200 @@ -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 @@ 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 @@ 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 @@ %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 @@ 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} ++++++ firmware.sh ++++++ --- /var/tmp/diff_new_pack.LXzaYL/_old 2011-10-24 15:52:29.000000000 +0200 +++ /var/tmp/diff_new_pack.LXzaYL/_new 2011-10-24 15:52:29.000000000 +0200 @@ -54,6 +54,31 @@ 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 @@ 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) ++++++ linux-firmware-20110709.tar.bz2 -> linux-firmware-20110731.tar.bz2 ++++++ /work/SRC/openSUSE:12.1/kernel-firmware/linux-firmware-20110709.tar.bz2 /work/SRC/openSUSE:12.1/.kernel-firmware.new/linux-firmware-20110731.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
