From b8bd4cbf1a33c6c266f8b36259c69ea390327bf53169fa28ef472ae1ae884847 Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Mon, 21 Oct 2013 22:35:10 +0000 Subject: [PATCH 1/3] - Use qlogic drivers from linux-firmware instead of the separate archive (bnc#846629). OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=70 --- kernel-firmware.changes | 6 ++++++ kernel-firmware.spec | 3 +-- qlogic.tar.bz2 | 3 --- 3 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 qlogic.tar.bz2 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 2774486..2b41c06 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 21 22:32:10 UTC 2013 - jeffm@suse.com + +- Use qlogic drivers from linux-firmware instead of the separate + archive (bnc#846629). + ------------------------------------------------------------------- Mon Jul 29 14:09:07 UTC 2013 - jeffm@suse.com diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 1e80183..275e9d5 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -28,7 +28,6 @@ Url: http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.g # Created with git archive | bzip2 Source0: linux-firmware-%{version}.tar.bz2 Source1: firmware.sh -Source2: qlogic.tar.bz2 Source3: iwlwifi-4965-1.ucode Source4: carl9170-1.fw %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements @@ -81,7 +80,7 @@ Group: System/Kernel This package contains the microcode files used by AMD CPUs. %prep -%setup -q -c kernel-firmware -a 2 +%setup -q -c kernel-firmware cp -v %{S:3} iwlwifi-4965-1.ucode cp -v %{S:4} carl9170-1.fw diff --git a/qlogic.tar.bz2 b/qlogic.tar.bz2 deleted file mode 100644 index 4d6f252..0000000 --- a/qlogic.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53c628b99e43ee69384dab2bb3e60ac6b7ba41f52b22dded9ebfe6cc2b0db863 -size 416209 From d54fb5295af25475798d30247f7f7f1efcb882e5bc544c00ceace1c08d9bb144 Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Mon, 21 Oct 2013 22:38:30 +0000 Subject: [PATCH 2/3] - Use qlogic firmware from linux-firmware instead of the separate OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=71 --- kernel-firmware.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 2b41c06..e6b6b46 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Oct 21 22:32:10 UTC 2013 - jeffm@suse.com -- Use qlogic drivers from linux-firmware instead of the separate +- Use qlogic firmware from linux-firmware instead of the separate archive (bnc#846629). ------------------------------------------------------------------- From 712e136c9c87f2760ba5fe648cc2f0e880495dee51aa79fa3025c8ca5d9e3bc9 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Mon, 9 Dec 2013 14:20:28 +0000 Subject: [PATCH 3/3] - Correct AMD microcode Supplements tag in ucode-amd: bnc#847158 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=72 --- kernel-firmware.changes | 7 +++++++ kernel-firmware.spec | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/kernel-firmware.changes b/kernel-firmware.changes index e6b6b46..2306b20 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 9 14:19:50 UTC 2013 - trenn@suse.de + +- Correct Supplements string so that the package gets correctly installed + on machines with Intel CPUs + bnc#847158 + ------------------------------------------------------------------- Mon Oct 21 22:32:10 UTC 2013 - jeffm@suse.com diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 275e9d5..4d4487e 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -16,6 +16,7 @@ # + Name: kernel-firmware BuildRequires: fdupes BuildRequires: kernel-default @@ -71,12 +72,11 @@ previously included in the kernel. It is shared by all kernels >= 2.6.27-rc1. %package -n ucode-amd -Supplements: modalias(x86cpu:vendor:0002:family:*:model:*:feature:*) +Supplements: modalias(x86cpu:vendor%3A0002%3Afamily%3A*%3Amodel%3A*%3Afeature%3A*) Summary: Microcode updates for AMD CPUs Group: System/Kernel %description -n ucode-amd - This package contains the microcode files used by AMD CPUs. %prep