From 44d1ca115810ef5e672e79b518552cd339d6b74f986f45da562692df6b08f6f3 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 2 Aug 2021 07:37:29 +0000 Subject: [PATCH] commit 6df6ad55b8b45a304b216be8e4387d3715400106 OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1544 --- dtb-aarch64.changes | 23 +++++++++++++++++++++++ dtb-aarch64.spec | 4 ++-- dtb-armv6l.changes | 23 +++++++++++++++++++++++ dtb-armv6l.spec | 4 ++-- dtb-armv7l.changes | 23 +++++++++++++++++++++++ dtb-armv7l.spec | 4 ++-- dtb-riscv64.changes | 23 +++++++++++++++++++++++ dtb-riscv64.spec | 4 ++-- dtb.spec.in.in | 2 +- kernel-64kb.changes | 23 +++++++++++++++++++++++ kernel-64kb.spec | 16 +++++++++++----- kernel-binary.spec.in | 8 +++++++- kernel-debug.changes | 23 +++++++++++++++++++++++ kernel-debug.spec | 16 +++++++++++----- kernel-default-base.spec.txt | 2 +- kernel-default.changes | 23 +++++++++++++++++++++++ kernel-default.spec | 16 +++++++++++----- kernel-docs.changes | 23 +++++++++++++++++++++++ kernel-docs.spec | 6 +++--- kernel-docs.spec.in | 2 +- kernel-kvmsmall.changes | 23 +++++++++++++++++++++++ kernel-kvmsmall.spec | 16 +++++++++++----- kernel-lpae.changes | 23 +++++++++++++++++++++++ kernel-lpae.spec | 16 +++++++++++----- kernel-obs-build.changes | 23 +++++++++++++++++++++++ kernel-obs-build.spec | 6 +++--- kernel-obs-build.spec.in | 2 +- kernel-obs-qa.changes | 23 +++++++++++++++++++++++ kernel-obs-qa.spec | 4 ++-- kernel-obs-qa.spec.in | 2 +- kernel-pae.changes | 23 +++++++++++++++++++++++ kernel-pae.spec | 16 +++++++++++----- kernel-source.changes | 23 +++++++++++++++++++++++ kernel-source.spec | 6 +++--- kernel-source.spec.in | 2 +- kernel-syms.changes | 23 +++++++++++++++++++++++ kernel-syms.spec | 6 +++--- kernel-syms.spec.in | 2 +- kernel-vanilla.changes | 23 +++++++++++++++++++++++ kernel-vanilla.spec | 16 +++++++++++----- kernel-zfcpdump.changes | 23 +++++++++++++++++++++++ kernel-zfcpdump.spec | 16 +++++++++++----- patches.suse.tar.bz2 | 4 ++-- series.conf | 1 + source-timestamp | 4 ++-- 45 files changed, 520 insertions(+), 74 deletions(-) diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes index 6922a67b..4fd5c9f5 100644 --- a/dtb-aarch64.changes +++ b/dtb-aarch64.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec index 684b9771..6efd009f 100644 --- a/dtb-aarch64.spec +++ b/dtb-aarch64.spec @@ -31,12 +31,12 @@ Name: dtb-aarch64 Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif Summary: Device Tree files for $MACHINES -License: GPL-2.0 +License: GPL-2.0-only Group: System/Boot Url: http://www.kernel.org/ ExclusiveArch: aarch64 diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes index 6922a67b..4fd5c9f5 100644 --- a/dtb-armv6l.changes +++ b/dtb-armv6l.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec index 28aaa7c8..800d15ac 100644 --- a/dtb-armv6l.spec +++ b/dtb-armv6l.spec @@ -31,12 +31,12 @@ Name: dtb-armv6l Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif Summary: Device Tree files for $MACHINES -License: GPL-2.0 +License: GPL-2.0-only Group: System/Boot Url: http://www.kernel.org/ ExclusiveArch: armv6l armv6hl diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes index 6922a67b..4fd5c9f5 100644 --- a/dtb-armv7l.changes +++ b/dtb-armv7l.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec index cc729bc6..798e7e5a 100644 --- a/dtb-armv7l.spec +++ b/dtb-armv7l.spec @@ -31,12 +31,12 @@ Name: dtb-armv7l Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif Summary: Device Tree files for $MACHINES -License: GPL-2.0 +License: GPL-2.0-only Group: System/Boot Url: http://www.kernel.org/ ExclusiveArch: armv7l armv7hl diff --git a/dtb-riscv64.changes b/dtb-riscv64.changes index 6922a67b..4fd5c9f5 100644 --- a/dtb-riscv64.changes +++ b/dtb-riscv64.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/dtb-riscv64.spec b/dtb-riscv64.spec index c6cc6add..d16a29aa 100644 --- a/dtb-riscv64.spec +++ b/dtb-riscv64.spec @@ -31,12 +31,12 @@ Name: dtb-riscv64 Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif Summary: Device Tree files for $MACHINES -License: GPL-2.0 +License: GPL-2.0-only Group: System/Boot Url: http://www.kernel.org/ ExclusiveArch: riscv64 diff --git a/dtb.spec.in.in b/dtb.spec.in.in index cddd6a83..8c697aac 100644 --- a/dtb.spec.in.in +++ b/dtb.spec.in.in @@ -36,7 +36,7 @@ Release: .g@COMMIT@ Release: @RELEASE@ %endif Summary: Device Tree files for $MACHINES -License: GPL-2.0 +License: GPL-2.0-only Group: System/Boot Url: http://www.kernel.org/ $ARCH_RESTRICTIONS diff --git a/kernel-64kb.changes b/kernel-64kb.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-64kb.changes +++ b/kernel-64kb.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-64kb.spec b/kernel-64kb.spec index 4eb7c766..7c3a6269 100644 --- a/kernel-64kb.spec +++ b/kernel-64kb.spec @@ -70,11 +70,11 @@ Name: kernel-64kb Summary: Kernel with 64kb PAGE_SIZE -License: GPL-2.0 +License: GPL-2.0-only Group: System/Kernel Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif @@ -160,6 +160,12 @@ BuildRequires: dwarfextract %ifarch %arm BuildRequires: u-boot-tools %endif +%if 0%{?usrmerged} +# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently +Conflicts: filesystem < 84 +# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge +Requires: suse-release > 20210602 +%endif Obsoletes: microcode_ctl @@ -185,10 +191,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 -Provides: kernel-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: kernel-%build_flavor-base-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 +Provides: kernel-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 # END COMMON DEPS -Provides: %name-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: %name-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 764e257b..c4d842b9 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -70,7 +70,7 @@ Name: kernel-@FLAVOR@ Summary: @SUMMARY@ -License: GPL-2.0 +License: GPL-2.0-only Group: System/Kernel Version: @RPMVERSION@ %if 0%{?is_kotd} @@ -160,6 +160,12 @@ BuildRequires: dwarfextract %ifarch %arm BuildRequires: u-boot-tools %endif +%if 0%{?usrmerged} +# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently +Conflicts: filesystem < 84 +# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge +Requires: suse-release > 20210602 +%endif Obsoletes: microcode_ctl diff --git a/kernel-debug.changes b/kernel-debug.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-debug.spec b/kernel-debug.spec index 96e5da87..2d23c35d 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -70,11 +70,11 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -License: GPL-2.0 +License: GPL-2.0-only Group: System/Kernel Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif @@ -160,6 +160,12 @@ BuildRequires: dwarfextract %ifarch %arm BuildRequires: u-boot-tools %endif +%if 0%{?usrmerged} +# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently +Conflicts: filesystem < 84 +# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge +Requires: suse-release > 20210602 +%endif Obsoletes: microcode_ctl @@ -185,10 +191,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 -Provides: kernel-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: kernel-%build_flavor-base-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 +Provides: kernel-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 # END COMMON DEPS -Provides: %name-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: %name-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 diff --git a/kernel-default-base.spec.txt b/kernel-default-base.spec.txt index c4441e4e..99e7c6c7 100644 --- a/kernel-default-base.spec.txt +++ b/kernel-default-base.spec.txt @@ -100,7 +100,7 @@ BuildRequires: kernel-subpackage-macros Summary: %summary URL: %url Group: %group -License: GPL-2.0 +License: GPL-2.0-only # Internal stuff begins %define rpm_kver %(rpm -q --qf '%%{VERSION}' %kernel_package_name) diff --git a/kernel-default.changes b/kernel-default.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-default.spec b/kernel-default.spec index 1d3ef4d1..da4cd631 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -70,11 +70,11 @@ Name: kernel-default Summary: The Standard Kernel -License: GPL-2.0 +License: GPL-2.0-only Group: System/Kernel Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif @@ -160,6 +160,12 @@ BuildRequires: dwarfextract %ifarch %arm BuildRequires: u-boot-tools %endif +%if 0%{?usrmerged} +# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently +Conflicts: filesystem < 84 +# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge +Requires: suse-release > 20210602 +%endif Obsoletes: microcode_ctl @@ -185,10 +191,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 -Provides: kernel-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: kernel-%build_flavor-base-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 +Provides: kernel-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 # END COMMON DEPS -Provides: %name-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: %name-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 diff --git a/kernel-docs.changes b/kernel-docs.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-docs.spec b/kernel-docs.spec index ca5d9252..fa1784eb 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -29,11 +29,11 @@ Name: kernel-docs Summary: Kernel Documentation -License: GPL-2.0 +License: GPL-2.0-only Group: Documentation/Man Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif @@ -64,7 +64,7 @@ BuildRequires: texlive-zapfding %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: %name-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-docs.spec.in b/kernel-docs.spec.in index 38b7254d..353aec33 100644 --- a/kernel-docs.spec.in +++ b/kernel-docs.spec.in @@ -29,7 +29,7 @@ Name: kernel-docs@VARIANT@ Summary: Kernel Documentation -License: GPL-2.0 +License: GPL-2.0-only Group: Documentation/Man Version: @RPMVERSION@ %if 0%{?is_kotd} diff --git a/kernel-kvmsmall.changes b/kernel-kvmsmall.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-kvmsmall.changes +++ b/kernel-kvmsmall.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec index f50ad279..c95ab07c 100644 --- a/kernel-kvmsmall.spec +++ b/kernel-kvmsmall.spec @@ -70,11 +70,11 @@ Name: kernel-kvmsmall Summary: The Small Developer Kernel for KVM -License: GPL-2.0 +License: GPL-2.0-only Group: System/Kernel Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif @@ -160,6 +160,12 @@ BuildRequires: dwarfextract %ifarch %arm BuildRequires: u-boot-tools %endif +%if 0%{?usrmerged} +# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently +Conflicts: filesystem < 84 +# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge +Requires: suse-release > 20210602 +%endif Obsoletes: microcode_ctl @@ -185,10 +191,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 -Provides: kernel-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: kernel-%build_flavor-base-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 +Provides: kernel-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 # END COMMON DEPS -Provides: %name-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: %name-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-lpae.changes b/kernel-lpae.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 7008bec1..546dc246 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -70,11 +70,11 @@ Name: kernel-lpae Summary: Kernel for LPAE enabled systems -License: GPL-2.0 +License: GPL-2.0-only Group: System/Kernel Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif @@ -160,6 +160,12 @@ BuildRequires: dwarfextract %ifarch %arm BuildRequires: u-boot-tools %endif +%if 0%{?usrmerged} +# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently +Conflicts: filesystem < 84 +# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge +Requires: suse-release > 20210602 +%endif Obsoletes: microcode_ctl @@ -185,10 +191,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 -Provides: kernel-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: kernel-%build_flavor-base-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 +Provides: kernel-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 # END COMMON DEPS -Provides: %name-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: %name-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index a62217d9..8aad8a52 100644 --- a/kernel-obs-build.spec +++ b/kernel-obs-build.spec @@ -45,7 +45,7 @@ BuildRequires: util-linux %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +BuildRequires: kernel%kernel_flavor-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 %if 0%{?rhel_version} BuildRequires: kernel @@ -62,11 +62,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dracut %endif Summary: package kernel and initrd for OBS VM builds -License: GPL-2.0 +License: GPL-2.0-only Group: SLES Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif diff --git a/kernel-obs-build.spec.in b/kernel-obs-build.spec.in index 2f2f2f4d..5b4df1cf 100644 --- a/kernel-obs-build.spec.in +++ b/kernel-obs-build.spec.in @@ -62,7 +62,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dracut %endif Summary: package kernel and initrd for OBS VM builds -License: GPL-2.0 +License: GPL-2.0-only Group: SLES Version: @RPMVERSION@ %if 0%{?is_kotd} diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index 120bf7cd..bafaf779 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -34,11 +34,11 @@ ExclusiveArch: aarch64 armv6hl armv7hl ppc64 ppc64le riscv64 s390x x86_64 BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif Summary: Basic QA tests for the kernel -License: GPL-2.0 +License: GPL-2.0-only Group: SLES Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif diff --git a/kernel-obs-qa.spec.in b/kernel-obs-qa.spec.in index ebcbf13d..85d05ee3 100644 --- a/kernel-obs-qa.spec.in +++ b/kernel-obs-qa.spec.in @@ -34,7 +34,7 @@ ExclusiveArch: @ARCHS@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif Summary: Basic QA tests for the kernel -License: GPL-2.0 +License: GPL-2.0-only Group: SLES Version: @RPMVERSION@ %if 0%{?is_kotd} diff --git a/kernel-pae.changes b/kernel-pae.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-pae.spec b/kernel-pae.spec index a392f935..b9f8cfe6 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -70,11 +70,11 @@ Name: kernel-pae Summary: Kernel with PAE Support -License: GPL-2.0 +License: GPL-2.0-only Group: System/Kernel Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif @@ -160,6 +160,12 @@ BuildRequires: dwarfextract %ifarch %arm BuildRequires: u-boot-tools %endif +%if 0%{?usrmerged} +# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently +Conflicts: filesystem < 84 +# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge +Requires: suse-release > 20210602 +%endif Obsoletes: microcode_ctl @@ -185,10 +191,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 -Provides: kernel-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: kernel-%build_flavor-base-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 +Provides: kernel-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 # END COMMON DEPS -Provides: %name-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: %name-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 diff --git a/kernel-source.changes b/kernel-source.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-source.spec b/kernel-source.spec index f1b38bbd..21733850 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -28,11 +28,11 @@ Name: kernel-source Summary: The Linux Kernel Sources -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Sources Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: %name-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-source.spec.in b/kernel-source.spec.in index 006543ee..1ac35823 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -28,7 +28,7 @@ Name: kernel-source@VARIANT@ Summary: The Linux Kernel Sources -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Sources Version: @RPMVERSION@ %if 0%{?is_kotd} diff --git a/kernel-syms.changes b/kernel-syms.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-syms.spec b/kernel-syms.spec index 3ed208b2..aa561ed1 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -22,12 +22,12 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Sources Version: 5.13.7 %if %using_buildservice %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif @@ -52,7 +52,7 @@ Requires: kernel-pae-devel = %version-%source_rel %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: %name-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel diff --git a/kernel-syms.spec.in b/kernel-syms.spec.in index 0e1089bd..ff4eebf0 100644 --- a/kernel-syms.spec.in +++ b/kernel-syms.spec.in @@ -22,7 +22,7 @@ Name: kernel-syms@VARIANT@ Summary: Kernel Symbol Versions (modversions) -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Sources Version: @RPMVERSION@ %if %using_buildservice diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 22143811..8b483184 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -70,11 +70,11 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -License: GPL-2.0 +License: GPL-2.0-only Group: System/Kernel Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif @@ -160,6 +160,12 @@ BuildRequires: dwarfextract %ifarch %arm BuildRequires: u-boot-tools %endif +%if 0%{?usrmerged} +# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently +Conflicts: filesystem < 84 +# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge +Requires: suse-release > 20210602 +%endif Obsoletes: microcode_ctl @@ -185,10 +191,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 -Provides: kernel-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: kernel-%build_flavor-base-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 +Provides: kernel-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 # END COMMON DEPS -Provides: %name-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: %name-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes index 6922a67b..4fd5c9f5 100644 --- a/kernel-zfcpdump.changes +++ b/kernel-zfcpdump.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 1 10:22:47 CEST 2021 - tiwai@suse.de + +- scsi: sr: Return correct event when media event code is 3 + (bsc#1188767 bsc#1188728). +- commit 5794a07 + ------------------------------------------------------------------- Sat Jul 31 13:11:10 CEST 2021 - jslaby@suse.cz @@ -413,6 +420,15 @@ Thu Jul 29 06:01:22 CEST 2021 - jslaby@suse.cz - skbuff: Fix build with SKB extensions disabled (bsc#1012628). - commit b45358d +------------------------------------------------------------------- +Wed Jul 28 17:21:54 CEST 2021 - mkubecek@suse.cz + +- use 3.0 SPDX identifier in rpm License tags + As requested by Maintenance, change rpm License tags from "GPL-2.0" + (SPDX 2.0) to "GPL-2.0-only" (SPDX 3.0) so that their scripts do not have + to adjust the tags with each maintenance update submission. +- commit f888e0b + ------------------------------------------------------------------- Wed Jul 28 11:51:15 CEST 2021 - msuchanek@suse.de @@ -1784,6 +1800,13 @@ Sun Jul 18 23:25:19 CEST 2021 - mkubecek@suse.cz - patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch - commit df2d619 +------------------------------------------------------------------- +Fri Jul 16 13:12:51 CEST 2021 - msuchanek@suse.de + +- rpm/kernel-binary.spec.in: Do not install usrmerged kernel on Leap + (boo#1184804). +- commit 5b51131 + ------------------------------------------------------------------- Thu Jul 15 18:47:58 CEST 2021 - mbrugger@suse.com diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec index c3089232..d1b75b63 100644 --- a/kernel-zfcpdump.spec +++ b/kernel-zfcpdump.spec @@ -70,11 +70,11 @@ Name: kernel-zfcpdump Summary: The IBM System Z zfcpdump Kernel -License: GPL-2.0 +License: GPL-2.0-only Group: System/Kernel Version: 5.13.7 %if 0%{?is_kotd} -Release: .gb1bb2c4 +Release: .g6df6ad5 %else Release: 0 %endif @@ -160,6 +160,12 @@ BuildRequires: dwarfextract %ifarch %arm BuildRequires: u-boot-tools %endif +%if 0%{?usrmerged} +# make sure we have post-usrmerge filesystem package - tumbleweed started to set version recently +Conflicts: filesystem < 84 +# this is the tumbleweed snapshot that introduced GCC 11 and supposedly usrmerge +Requires: suse-release > 20210602 +%endif Obsoletes: microcode_ctl @@ -185,10 +191,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 -Provides: kernel-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: kernel-%build_flavor-base-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 +Provides: kernel-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 # END COMMON DEPS -Provides: %name-srchash-b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +Provides: %name-srchash-6df6ad55b8b45a304b216be8e4387d3715400106 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index 4247ec06..bdc9c03b 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a47119be50e87533c1e3ecdae1e42fd1d26db8f9fcd4be75dd68a4faa9ec9f11 -size 60169 +oid sha256:6842579826f8cb367b6514ed10e5a0f4d18bbe098441b66ed61037c6f581ad88 +size 60773 diff --git a/series.conf b/series.conf index 42e352b8..166f2fd0 100644 --- a/series.conf +++ b/series.conf @@ -1874,6 +1874,7 @@ patches.suse/mmc-sdhci-iproc-set-sdhci_quirk_cap_clock_base_broken-on-bcm2711.patch patches.suse/pinctrl-bcm2835-accept-fewer-than-expected-irqs.patch patches.suse/arm64-dts-rockchip-Disable-CDN-DP-on-Pinebook-Pro.patch + patches.suse/scsi-sr-Return-correct-event-when-media-event-code-i.patch ######################################################## # kbuild/module infrastructure fixes diff --git a/source-timestamp b/source-timestamp index 2acdebee..79364128 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2021-07-31 11:11:20 +0000 -GIT Revision: b1bb2c49f82da7953f6d03cb74884ac9f3b115b5 +2021-08-02 06:35:59 +0000 +GIT Revision: 6df6ad55b8b45a304b216be8e4387d3715400106 GIT Branch: stable