commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d

OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=2085
This commit is contained in:
Jiri Slaby 2024-01-25 16:39:31 +00:00 committed by Git OBS Bridge
parent 6e19f3a438
commit c87d06c51e
39 changed files with 395 additions and 68 deletions

View File

@ -2,13 +2,21 @@
<!-- Default 35GB for binary packages -->
<overwrite>
<conditions>
<package>kernel-64kb</package>
<package>kernel-source:kernel-64kb</package>
<package>kernel-debug</package>
<package>kernel-source:kernel-debug</package>
<package>kernel-default</package>
<package>kernel-source:kernel-default</package>
<package>kernel-kvmsmall</package>
<package>kernel-source:kernel-kvmsmall</package>
<package>kernel-lpae</package>
<package>kernel-source:kernel-lpae</package>
<package>kernel-pae</package>
<package>kernel-source:kernel-pae</package>
<package>kernel-vanilla</package>
<package>kernel-source:kernel-vanilla</package>
<package>kernel-zfcpdump</package>
<package>kernel-source:kernel-zfcpdump</package>
</conditions>
<hardware>
@ -66,13 +74,21 @@
<conditions>
<arch>armv7l</arch>
<arch>armv6l</arch>
<package>kernel-64kb</package>
<package>kernel-source:kernel-64kb</package>
<package>kernel-debug</package>
<package>kernel-source:kernel-debug</package>
<package>kernel-default</package>
<package>kernel-source:kernel-default</package>
<package>kernel-kvmsmall</package>
<package>kernel-source:kernel-kvmsmall</package>
<package>kernel-lpae</package>
<package>kernel-source:kernel-lpae</package>
<package>kernel-pae</package>
<package>kernel-source:kernel-pae</package>
<package>kernel-vanilla</package>
<package>kernel-source:kernel-vanilla</package>
<package>kernel-zfcpdump</package>
<package>kernel-source:kernel-zfcpdump</package>
</conditions>
<hardware>
@ -86,13 +102,21 @@
<overwrite>
<conditions>
<arch>s390x</arch>
<package>kernel-64kb</package>
<package>kernel-source:kernel-64kb</package>
<package>kernel-debug</package>
<package>kernel-source:kernel-debug</package>
<package>kernel-default</package>
<package>kernel-source:kernel-default</package>
<package>kernel-kvmsmall</package>
<package>kernel-source:kernel-kvmsmall</package>
<package>kernel-lpae</package>
<package>kernel-source:kernel-lpae</package>
<package>kernel-pae</package>
<package>kernel-source:kernel-pae</package>
<package>kernel-vanilla</package>
<package>kernel-source:kernel-vanilla</package>
<package>kernel-zfcpdump</package>
<package>kernel-source:kernel-zfcpdump</package>
</conditions>
<hardware>
@ -110,13 +134,21 @@
<conditions>
<arch>i586</arch>
<arch>x86_64</arch>
<package>kernel-64kb</package>
<package>kernel-source:kernel-64kb</package>
<package>kernel-debug</package>
<package>kernel-source:kernel-debug</package>
<package>kernel-default</package>
<package>kernel-source:kernel-default</package>
<package>kernel-kvmsmall</package>
<package>kernel-source:kernel-kvmsmall</package>
<package>kernel-lpae</package>
<package>kernel-source:kernel-lpae</package>
<package>kernel-pae</package>
<package>kernel-source:kernel-pae</package>
<package>kernel-vanilla</package>
<package>kernel-source:kernel-vanilla</package>
<package>kernel-zfcpdump</package>
<package>kernel-source:kernel-zfcpdump</package>
</conditions>
<hardware>
@ -130,13 +162,21 @@
<arch>ppc</arch>
<arch>ppc64</arch>
<arch>ppc64le</arch>
<package>kernel-64kb</package>
<package>kernel-source:kernel-64kb</package>
<package>kernel-debug</package>
<package>kernel-source:kernel-debug</package>
<package>kernel-default</package>
<package>kernel-source:kernel-default</package>
<package>kernel-kvmsmall</package>
<package>kernel-source:kernel-kvmsmall</package>
<package>kernel-lpae</package>
<package>kernel-source:kernel-lpae</package>
<package>kernel-pae</package>
<package>kernel-source:kernel-pae</package>
<package>kernel-vanilla</package>
<package>kernel-source:kernel-vanilla</package>
<package>kernel-zfcpdump</package>
<package>kernel-source:kernel-zfcpdump</package>
</conditions>
<hardware>
@ -150,13 +190,21 @@
<arch>aarch64</arch>
<arch>armv6l</arch>
<arch>armv7l</arch>
<package>kernel-64kb</package>
<package>kernel-source:kernel-64kb</package>
<package>kernel-debug</package>
<package>kernel-source:kernel-debug</package>
<package>kernel-default</package>
<package>kernel-source:kernel-default</package>
<package>kernel-kvmsmall</package>
<package>kernel-source:kernel-kvmsmall</package>
<package>kernel-lpae</package>
<package>kernel-source:kernel-lpae</package>
<package>kernel-pae</package>
<package>kernel-source:kernel-pae</package>
<package>kernel-vanilla</package>
<package>kernel-source:kernel-vanilla</package>
<package>kernel-zfcpdump</package>
<package>kernel-source:kernel-zfcpdump</package>
</conditions>
<hardware>
@ -181,13 +229,21 @@
<conditions>
<arch>aarch64</arch>
<arch>x86_64</arch>
<package>kernel-64kb</package>
<package>kernel-source:kernel-64kb</package>
<package>kernel-debug</package>
<package>kernel-source:kernel-debug</package>
<package>kernel-default</package>
<package>kernel-source:kernel-default</package>
<package>kernel-kvmsmall</package>
<package>kernel-source:kernel-kvmsmall</package>
<package>kernel-lpae</package>
<package>kernel-source:kernel-lpae</package>
<package>kernel-pae</package>
<package>kernel-source:kernel-pae</package>
<package>kernel-vanilla</package>
<package>kernel-source:kernel-vanilla</package>
<package>kernel-zfcpdump</package>
<package>kernel-source:kernel-zfcpdump</package>
</conditions>
<hardware>
@ -201,13 +257,21 @@
<overwrite>
<conditions>
<arch>riscv64</arch>
<package>kernel-64kb</package>
<package>kernel-source:kernel-64kb</package>
<package>kernel-debug</package>
<package>kernel-source:kernel-debug</package>
<package>kernel-default</package>
<package>kernel-source:kernel-default</package>
<package>kernel-kvmsmall</package>
<package>kernel-source:kernel-kvmsmall</package>
<package>kernel-lpae</package>
<package>kernel-source:kernel-lpae</package>
<package>kernel-pae</package>
<package>kernel-source:kernel-pae</package>
<package>kernel-vanilla</package>
<package>kernel-source:kernel-vanilla</package>
<package>kernel-zfcpdump</package>
<package>kernel-source:kernel-zfcpdump</package>
</conditions>
<hardware>

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -27,7 +27,7 @@
Name: dtb-aarch64
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -27,7 +27,7 @@
Name: dtb-armv6l
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -27,7 +27,7 @@
Name: dtb-armv7l
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -27,7 +27,7 @@
Name: dtb-riscv64
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.7
%define patchversion 6.7.1
%define git_commit 943a3df9dd327170bde9a64da6f0f086b32cf5f9
%define git_commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -115,7 +115,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.7
%define patchversion 6.7.1
%define git_commit 943a3df9dd327170bde9a64da6f0f086b32cf5f9
%define git_commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -115,7 +115,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif
@ -299,7 +299,7 @@ NoSource: 114
NoSource: 120
NoSource: 121
%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
ExclusiveArch: aarch64 %ix86 ppc64le powerpc64le x86_64
ExclusiveArch: aarch64 %ix86 ppc64le x86_64
%else
ExclusiveArch: do_not_build
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.7
%define patchversion 6.7.1
%define git_commit 943a3df9dd327170bde9a64da6f0f086b32cf5f9
%define git_commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -115,7 +115,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif
@ -299,7 +299,7 @@ NoSource: 114
NoSource: 120
NoSource: 121
%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64le powerpc64le riscv64 s390x x86_64
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64le riscv64 s390x x86_64
%else
ExclusiveArch: do_not_build
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -18,7 +18,7 @@
%define srcversion 6.7
%define patchversion 6.7.1
%define git_commit 943a3df9dd327170bde9a64da6f0f086b32cf5f9
%define git_commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d
%define variant %{nil}
%define build_html 1
%define build_pdf 0
@ -33,7 +33,7 @@ License: GPL-2.0-only
Group: Documentation/Man
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif
@ -87,7 +87,6 @@ URL: https://www.kernel.org/
Provides: %name = %version-%source_rel
Provides: %name-srchash-%git_commit
%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
ExclusiveArch: noarch %ix86 aarch64 armv6hl armv7hl ppc64le powerpc64le riscv64 s390x x86_64
BuildArch: noarch
%else
ExclusiveArch: do_not_build

View File

@ -87,7 +87,6 @@ URL: https://www.kernel.org/
Provides: %name = %version-%source_rel
Provides: %name-srchash-%git_commit
%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
ExclusiveArch: noarch @ARCHS@
BuildArch: noarch
%else
ExclusiveArch: do_not_build

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.7
%define patchversion 6.7.1
%define git_commit 943a3df9dd327170bde9a64da6f0f086b32cf5f9
%define git_commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -115,7 +115,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif
@ -299,7 +299,7 @@ NoSource: 114
NoSource: 120
NoSource: 121
%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
ExclusiveArch: aarch64 ppc64le powerpc64le x86_64
ExclusiveArch: aarch64 ppc64le x86_64
%else
ExclusiveArch: do_not_build
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.7
%define patchversion 6.7.1
%define git_commit 943a3df9dd327170bde9a64da6f0f086b32cf5f9
%define git_commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -115,7 +115,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -44,7 +44,7 @@ BuildRequires: util-linux
%endif
%endif
%endif
BuildRequires: kernel%kernel_flavor-srchash-943a3df9dd327170bde9a64da6f0f086b32cf5f9
BuildRequires: kernel%kernel_flavor-srchash-9872dbee1f86ee3b4f45557ce7c054ff581f245d
%if 0%{?rhel_version}
BuildRequires: kernel
@ -52,7 +52,7 @@ BuildRequires: kernel
%endif
%if ! 0%{?is_kotd} || %{?is_kotd_qa}%{!?is_kotd_qa:0}
ExclusiveArch: aarch64 armv6hl armv7hl ppc64le powerpc64le riscv64 s390x x86_64
ExclusiveArch: aarch64 armv6hl armv7hl ppc64le riscv64 s390x x86_64
%else
ExclusiveArch: do_not_build
%endif
@ -62,7 +62,7 @@ License: GPL-2.0-only
Group: SLES
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -29,7 +29,7 @@ BuildRequires: kernel-default
BuildRequires: kernel-obs-build
BuildRequires: modutils
%if ! 0%{?is_kotd} || %{?is_kotd_qa}%{!?is_kotd_qa:0}
ExclusiveArch: aarch64 armv6hl armv7hl ppc64le powerpc64le riscv64 s390x x86_64
ExclusiveArch: aarch64 armv6hl armv7hl ppc64le riscv64 s390x x86_64
%else
ExclusiveArch: do_not_build
%endif
@ -38,7 +38,7 @@ License: GPL-2.0-only
Group: SLES
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.7
%define patchversion 6.7.1
%define git_commit 943a3df9dd327170bde9a64da6f0f086b32cf5f9
%define git_commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -115,7 +115,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -18,7 +18,7 @@
%define srcversion 6.7
%define patchversion 6.7.1
%define git_commit 943a3df9dd327170bde9a64da6f0f086b32cf5f9
%define git_commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@ -33,7 +33,7 @@
Name: kernel-source
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif
@ -123,7 +123,6 @@ Source114: patches.drm.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
ExclusiveArch: noarch %ix86 aarch64 armv6hl armv7hl ppc64le powerpc64le riscv64 s390x x86_64
BuildArch: noarch
%else
ExclusiveArch: do_not_build

View File

@ -123,7 +123,6 @@ Source114: patches.drm.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
ExclusiveArch: noarch @ARCHS@
BuildArch: noarch
%else
ExclusiveArch: do_not_build

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -16,7 +16,7 @@
#
%define git_commit 943a3df9dd327170bde9a64da6f0f086b32cf5f9
%define git_commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@ -28,7 +28,7 @@ Group: Development/Sources
Version: 6.7.1
%if %using_buildservice
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif
@ -42,7 +42,7 @@ BuildRequires: coreutils
%ifarch aarch64
Requires: kernel-64kb-devel = %version-%source_rel
%endif
%ifarch aarch64 armv6hl armv7hl %ix86 ppc64le powerpc64le riscv64 s390x x86_64
%ifarch aarch64 armv6hl armv7hl %ix86 ppc64le riscv64 s390x x86_64
Requires: kernel-default-devel = %version-%source_rel
%endif
%ifarch armv7hl
@ -58,7 +58,7 @@ Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel
%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ppc64le powerpc64le riscv64 s390x x86_64
ExclusiveArch: %ix86 aarch64 armv6hl armv7hl ppc64le riscv64 s390x x86_64
%else
ExclusiveArch: do_not_build
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.7
%define patchversion 6.7.1
%define git_commit 943a3df9dd327170bde9a64da6f0f086b32cf5f9
%define git_commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -115,7 +115,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif
@ -299,7 +299,7 @@ NoSource: 114
NoSource: 120
NoSource: 121
%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64le powerpc64le riscv64 s390x x86_64
ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64le riscv64 s390x x86_64
%else
ExclusiveArch: do_not_build
%endif

View File

@ -1,9 +1,25 @@
-------------------------------------------------------------------
Thu Jan 25 12:41:57 CET 2024 - msuchanek@suse.de
- Revert "Limit kernel-source build to architectures for which the kernel binary"
This reverts commit 08a9e44c00758b5f3f3b641830ab6affff041132.
The fix for bsc#1108281 directly causes bsc#1218768, revert.
- commit 2943b8a
-------------------------------------------------------------------
Thu Jan 25 12:39:11 CET 2024 - msuchanek@suse.de
- mkspec: Include constraints for both multibuild and plain package always
There is no need to check for multibuild flag, the constraints can be
always generated for both cases.
- commit 308ea09
-------------------------------------------------------------------
Thu Jan 25 11:53:37 CET 2024 - jslaby@suse.cz
- rpm/mkspec: use kernel-source: prefix for constraints on multibuild
Otherwise the constraints are not applied with multibuild enabled.
- commit 943a3df
- commit 841012b
-------------------------------------------------------------------
Wed Jan 24 14:40:23 CET 2024 - jslaby@suse.cz

View File

@ -19,7 +19,7 @@
%define srcversion 6.7
%define patchversion 6.7.1
%define git_commit 943a3df9dd327170bde9a64da6f0f086b32cf5f9
%define git_commit 9872dbee1f86ee3b4f45557ce7c054ff581f245d
%define variant %{nil}
%define compress_modules zstd
%define compress_vmlinux xz
@ -115,7 +115,7 @@ License: GPL-2.0-only
Group: System/Kernel
Version: 6.7.1
%if 0%{?is_kotd}
Release: <RELEASE>.g943a3df
Release: <RELEASE>.g9872dbe
%else
Release: 0
%endif

11
mkspec
View File

@ -196,13 +196,11 @@ for my $flavor (sort keys(%flavor_archs)) {
);
}
# kernel-source.spec
do_spec('source', "kernel-source$variant.spec", %macros,
ARCHS => $all_archs);
do_spec('source', "kernel-source$variant.spec", %macros);
if ($variant eq "") {
# kernel-docs.spec
do_spec('docs', "kernel-docs$variant.spec", %macros,
ARCHS => $all_archs);
do_spec('docs', "kernel-docs$variant.spec", %macros);
}
# kernel-syms.spec
@ -262,8 +260,7 @@ copy_changes();
# _constraints
{
my $prefix = $multibuild ? "kernel-source:" : "";
my @packages = map { "<package>${prefix}kernel-$_</package>" } sort keys(%flavor_archs);
my @packages = map { "<package>kernel-$_</package>\n<package>kernel-source:kernel-$_</package>" } sort keys(%flavor_archs);
my $packages = join("\n", @packages);
do_spec('constraints', "_constraints",
BINARY_PACKAGES_XML => $packages);
@ -474,8 +471,6 @@ sub _arch2rpm {
my $arch = shift;
return "\%ix86" if $arch eq "i386";
return "aarch64" if $arch eq "arm64";
# ppc64le src rpms are built as powerpc64le
return "ppc64le powerpc64le" if $arch eq "ppc64le";
return $arch;
}

View File

@ -1,3 +1,3 @@
2024-01-25 10:53:37 +0000
GIT Revision: 943a3df9dd327170bde9a64da6f0f086b32cf5f9
2024-01-25 15:01:09 +0000
GIT Revision: 9872dbee1f86ee3b4f45557ce7c054ff581f245d
GIT Branch: stable