commit 72aabc280320ed44ba5be658a4e67057167ed825
OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1531
This commit is contained in:
Git OBS Bridge
parent
d7c263a103
commit
c6aceb84fc
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:01f5dcd28e37c832bf3cbb2961eab78ad1b2e47a6d9d30cda0cffb4032ea41f2
|
||||
size 292968
|
||||
oid sha256:67aa7316112603489dc5e0012c9874e92fc0f9a8ecfd40ef9e471992337051f6
|
||||
size 293172
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
Name: dtb-aarch64
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
Name: dtb-armv6l
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
Name: dtb-armv7l
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
Name: dtb-riscv64
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
130
kernel-64kb.spec
130
kernel-64kb.spec
@ -68,27 +68,13 @@
|
||||
%define install_vdso 0
|
||||
%endif
|
||||
|
||||
# TW is usrmerged
|
||||
%if %{undefined usrmerged} && 0%{?suse_version} >= 1550
|
||||
%define usrmerged 1
|
||||
%endif
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
%define modules_dir /usr/lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap %{modules_dir}/System.map
|
||||
%else
|
||||
%define modules_dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap /boot/System.map-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
|
||||
Name: kernel-64kb
|
||||
Summary: Kernel with 64kb PAGE_SIZE
|
||||
License: GPL-2.0
|
||||
Group: System/Kernel
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -199,10 +185,10 @@ Conflicts: hyper-v < 4
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-%build_flavor-base-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
Provides: kernel-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: %name-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
%obsolete_rebuilds %name
|
||||
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
|
||||
Source2: source-post.sh
|
||||
@ -624,14 +610,6 @@ done
|
||||
|
||||
%install
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
# add symlink for usrmerge so install scripts will just follow the
|
||||
# link and end up placing files in /usr/lib. The link will be
|
||||
# removed later and is not packaged here.
|
||||
mkdir -p %{buildroot}/usr/lib
|
||||
ln -s usr/lib %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
# get rid of /usr/lib/rpm/brp-strip-debug
|
||||
# strip removes too much from the vmlinux ELF binary
|
||||
export NO_BRP_STRIP_DEBUG=true
|
||||
@ -704,6 +682,9 @@ add_vmlinux()
|
||||
mkdir -p %buildroot/usr/share/man/man9
|
||||
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
|
||||
objcopy -R .rodata.compressed arch/s390/boot/compressed/vmlinux %buildroot/boot/zdebug-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
%endif
|
||||
%ifarch %arm
|
||||
add_vmlinux --compressed
|
||||
@ -724,19 +705,11 @@ add_vmlinux()
|
||||
# sign the modules, firmware and possibly the kernel in the buildservice
|
||||
BRP_PESIGN_FILES=""
|
||||
%if "%CONFIG_EFI_STUB" == "y"
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%ifarch s390x ppc64 ppc64le
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%if "%CONFIG_MODULE_SIG" == "y"
|
||||
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
|
||||
%endif
|
||||
@ -798,13 +771,6 @@ for sub in '' '-extra' \
|
||||
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
|
||||
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
|
||||
-e "s:@SRCVARIANT@:%variant:g" \
|
||||
-e "s:@MODULESDIR@:%modules_dir:g" \
|
||||
-e "s:@SYSTEMMAP@:%systemmap:g" \
|
||||
%if 0%{?usrmerged}
|
||||
-e "s:^@USRMERGE@::" \
|
||||
%else
|
||||
-e "/^@USRMERGE@/d" \
|
||||
%endif
|
||||
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
|
||||
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
|
||||
case "$script" in
|
||||
@ -1000,9 +966,7 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
|
||||
# Recreate the generated Makefile with correct path
|
||||
#
|
||||
# Linux 5.13 no longer has mkmakefile and the generated makefile only depends on
|
||||
# relative location of source and binary directories which is preserved.
|
||||
# No need to recreate.
|
||||
# Linux 5.13 no longer has mkmakefile
|
||||
if [ -f ../scripts/mkmakefile ] ; then
|
||||
sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \
|
||||
%rpm_install_dir/%cpu_arch_flavor \
|
||||
@ -1013,10 +977,6 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
fi
|
||||
|
||||
rm -rf %{buildroot}/lib/firmware
|
||||
%if 0%{?usrmerged}
|
||||
# remove usrmerge aid
|
||||
rm %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
add_dirs_to_filelist() {
|
||||
sed -rn '
|
||||
@ -1029,7 +989,7 @@ add_dirs_to_filelist() {
|
||||
# print all parents
|
||||
:a
|
||||
# skip directories owned by other packages
|
||||
s:^%%dir (/boot|/etc|(/usr)?/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:/[^/]+$::p
|
||||
ta
|
||||
' "$@" | sort -u
|
||||
@ -1040,25 +1000,16 @@ if [ -f %my_builddir/livepatch-files.no_dir ] ; then
|
||||
cat %my_builddir/livepatch-files.no_dir | add_dirs_to_filelist > %my_builddir/livepatch-files
|
||||
fi
|
||||
|
||||
# does not exist for non-modularized kernels
|
||||
%if 0%{?usrmerged}
|
||||
mkdir -p %{buildroot}%modules_dir
|
||||
%endif
|
||||
shopt -s nullglob dotglob
|
||||
> %my_builddir/kernel-devel.files
|
||||
{
|
||||
echo "%modules_dir/build"
|
||||
echo "%modules_dir/source"
|
||||
cd %buildroot
|
||||
for file in boot/symtypes*; do
|
||||
%if 0%{?usrmerged}
|
||||
l="${file##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
mv "$file" "%{buildroot}$l"
|
||||
ln -s "..$l" $file
|
||||
echo "$l"
|
||||
echo "%%ghost /$file"
|
||||
%else
|
||||
echo "/$file"
|
||||
%endif
|
||||
done
|
||||
} | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||
f=${file##%buildroot}
|
||||
echo "$f"
|
||||
done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
( cd %buildroot ; find .%obj_install_dir/%cpu_arch_flavor -type f ; ) | \
|
||||
sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \
|
||||
add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
@ -1067,8 +1018,6 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
echo %ghost /boot/initrd$suffix
|
||||
cd %buildroot
|
||||
for f in boot/*; do
|
||||
l="${f##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
if test -L "$f"; then
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
@ -1084,46 +1033,24 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
;;
|
||||
boot/vmlinux-*)
|
||||
if $ghost_vmlinux; then
|
||||
# fall through to mark next echo as %ghost
|
||||
echo -n "%%ghost "
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
%if 0%{?usrmerged}
|
||||
boot/vmlinuz-*)
|
||||
echo -n "%%attr(0644, root, root) "
|
||||
;;
|
||||
%endif
|
||||
boot/symtypes*)
|
||||
%if 0%{?usrmerged}
|
||||
echo "%exclude $l"
|
||||
%endif
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
%if 0%{?usrmerged}
|
||||
mv "$f" "./$l"
|
||||
ln -s "..$l" $f
|
||||
# the find in the CONFIG_MODULES condition below also finds the files
|
||||
# but there's sort -u later, so this is ok
|
||||
echo "$l" # note: must be first after case statement above
|
||||
echo "%%ghost /$f"
|
||||
%else
|
||||
echo "%%attr(0644, root, root) /$f"
|
||||
%endif
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
find %{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor \
|
||||
find lib/modules/%kernelrelease-%build_flavor \
|
||||
-type d -o \
|
||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||
! -path '*/modules.builtin' \
|
||||
! -path '*/modules.builtin.modinfo' \) -printf '%%%%ghost /%%p\n' \
|
||||
-o -name '*.ko' -prune \
|
||||
%if 0%{?usrmerged}
|
||||
-o \( -type f ! -path '*/symtypes*' ! -path '*/vmlinu*' \) -printf '/%%p\n'
|
||||
%else
|
||||
-o -type f -printf '/%%p\n'
|
||||
%endif
|
||||
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
|
||||
cat %my_builddir/base-modules
|
||||
fi
|
||||
if test %CONFIG_MODULE_SIG = "y" -a -d etc/uefi/certs; then
|
||||
@ -1139,7 +1066,10 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||
|
||||
{
|
||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
|
||||
add_dirs_to_filelist %my_builddir/kernel-base.files
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
add_dirs_to_filelist %my_builddir/main-modules
|
||||
fi
|
||||
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
|
||||
echo "/lib/firmware/%kernelrelease-%build_flavor"
|
||||
fi
|
||||
@ -1181,15 +1111,15 @@ for f in %my_builddir/*-kmp-modules; do
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}%modules_dir/modules.fips
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-main.files
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files
|
||||
fi
|
||||
|
||||
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
|
||||
# much, but it keeps rpmlint from breaking the package build. Note that we skip
|
||||
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
|
||||
%fdupes %buildroot%modules_dir
|
||||
%fdupes $RPM_BUILD_ROOT/lib
|
||||
|
||||
%preun -f preun.sh
|
||||
|
||||
@ -1372,7 +1302,7 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
|
||||
%files %{livepatch}
|
||||
# rpmlint complains about empty packages, so lets own something
|
||||
%defattr(-, root, root)
|
||||
%dir %modules_dir
|
||||
%dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
%if 0%{?klp_symbols} && "%livepatch" != ""
|
||||
|
||||
@ -68,20 +68,6 @@
|
||||
%define install_vdso 0
|
||||
%endif
|
||||
|
||||
# TW is usrmerged
|
||||
%if %{undefined usrmerged} && 0%{?suse_version} >= 1550
|
||||
%define usrmerged 1
|
||||
%endif
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
%define modules_dir /usr/lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap %{modules_dir}/System.map
|
||||
%else
|
||||
%define modules_dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap /boot/System.map-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
|
||||
Name: kernel-@FLAVOR@
|
||||
Summary: @SUMMARY@
|
||||
License: GPL-2.0
|
||||
@ -479,14 +465,6 @@ done
|
||||
|
||||
%install
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
# add symlink for usrmerge so install scripts will just follow the
|
||||
# link and end up placing files in /usr/lib. The link will be
|
||||
# removed later and is not packaged here.
|
||||
mkdir -p %{buildroot}/usr/lib
|
||||
ln -s usr/lib %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
# get rid of /usr/lib/rpm/brp-strip-debug
|
||||
# strip removes too much from the vmlinux ELF binary
|
||||
export NO_BRP_STRIP_DEBUG=true
|
||||
@ -559,6 +537,9 @@ add_vmlinux()
|
||||
mkdir -p %buildroot/usr/share/man/man9
|
||||
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
|
||||
objcopy -R .rodata.compressed arch/s390/boot/compressed/vmlinux %buildroot/boot/zdebug-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
%endif
|
||||
%ifarch %arm
|
||||
add_vmlinux --compressed
|
||||
@ -579,19 +560,11 @@ add_vmlinux()
|
||||
# sign the modules, firmware and possibly the kernel in the buildservice
|
||||
BRP_PESIGN_FILES=""
|
||||
%if "%CONFIG_EFI_STUB" == "y"
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%ifarch s390x ppc64 ppc64le
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%if "%CONFIG_MODULE_SIG" == "y"
|
||||
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
|
||||
%endif
|
||||
@ -653,13 +626,6 @@ for sub in '' '-extra' \
|
||||
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
|
||||
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
|
||||
-e "s:@SRCVARIANT@:%variant:g" \
|
||||
-e "s:@MODULESDIR@:%modules_dir:g" \
|
||||
-e "s:@SYSTEMMAP@:%systemmap:g" \
|
||||
%if 0%{?usrmerged}
|
||||
-e "s:^@USRMERGE@::" \
|
||||
%else
|
||||
-e "/^@USRMERGE@/d" \
|
||||
%endif
|
||||
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
|
||||
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
|
||||
case "$script" in
|
||||
@ -855,9 +821,7 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
|
||||
# Recreate the generated Makefile with correct path
|
||||
#
|
||||
# Linux 5.13 no longer has mkmakefile and the generated makefile only depends on
|
||||
# relative location of source and binary directories which is preserved.
|
||||
# No need to recreate.
|
||||
# Linux 5.13 no longer has mkmakefile
|
||||
if [ -f ../scripts/mkmakefile ] ; then
|
||||
sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \
|
||||
%rpm_install_dir/%cpu_arch_flavor \
|
||||
@ -868,10 +832,6 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
fi
|
||||
|
||||
rm -rf %{buildroot}/lib/firmware
|
||||
%if 0%{?usrmerged}
|
||||
# remove usrmerge aid
|
||||
rm %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
add_dirs_to_filelist() {
|
||||
sed -rn '
|
||||
@ -884,7 +844,7 @@ add_dirs_to_filelist() {
|
||||
# print all parents
|
||||
:a
|
||||
# skip directories owned by other packages
|
||||
s:^%%dir (/boot|/etc|(/usr)?/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:/[^/]+$::p
|
||||
ta
|
||||
' "$@" | sort -u
|
||||
@ -895,25 +855,16 @@ if [ -f %my_builddir/livepatch-files.no_dir ] ; then
|
||||
cat %my_builddir/livepatch-files.no_dir | add_dirs_to_filelist > %my_builddir/livepatch-files
|
||||
fi
|
||||
|
||||
# does not exist for non-modularized kernels
|
||||
%if 0%{?usrmerged}
|
||||
mkdir -p %{buildroot}%modules_dir
|
||||
%endif
|
||||
shopt -s nullglob dotglob
|
||||
> %my_builddir/kernel-devel.files
|
||||
{
|
||||
echo "%modules_dir/build"
|
||||
echo "%modules_dir/source"
|
||||
cd %buildroot
|
||||
for file in boot/symtypes*; do
|
||||
%if 0%{?usrmerged}
|
||||
l="${file##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
mv "$file" "%{buildroot}$l"
|
||||
ln -s "..$l" $file
|
||||
echo "$l"
|
||||
echo "%%ghost /$file"
|
||||
%else
|
||||
echo "/$file"
|
||||
%endif
|
||||
done
|
||||
} | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||
f=${file##%buildroot}
|
||||
echo "$f"
|
||||
done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
( cd %buildroot ; find .%obj_install_dir/%cpu_arch_flavor -type f ; ) | \
|
||||
sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \
|
||||
add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
@ -922,8 +873,6 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
echo %ghost /boot/initrd$suffix
|
||||
cd %buildroot
|
||||
for f in boot/*; do
|
||||
l="${f##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
if test -L "$f"; then
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
@ -939,46 +888,24 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
;;
|
||||
boot/vmlinux-*)
|
||||
if $ghost_vmlinux; then
|
||||
# fall through to mark next echo as %ghost
|
||||
echo -n "%%ghost "
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
%if 0%{?usrmerged}
|
||||
boot/vmlinuz-*)
|
||||
echo -n "%%attr(0644, root, root) "
|
||||
;;
|
||||
%endif
|
||||
boot/symtypes*)
|
||||
%if 0%{?usrmerged}
|
||||
echo "%exclude $l"
|
||||
%endif
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
%if 0%{?usrmerged}
|
||||
mv "$f" "./$l"
|
||||
ln -s "..$l" $f
|
||||
# the find in the CONFIG_MODULES condition below also finds the files
|
||||
# but there's sort -u later, so this is ok
|
||||
echo "$l" # note: must be first after case statement above
|
||||
echo "%%ghost /$f"
|
||||
%else
|
||||
echo "%%attr(0644, root, root) /$f"
|
||||
%endif
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
find %{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor \
|
||||
find lib/modules/%kernelrelease-%build_flavor \
|
||||
-type d -o \
|
||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||
! -path '*/modules.builtin' \
|
||||
! -path '*/modules.builtin.modinfo' \) -printf '%%%%ghost /%%p\n' \
|
||||
-o -name '*.ko' -prune \
|
||||
%if 0%{?usrmerged}
|
||||
-o \( -type f ! -path '*/symtypes*' ! -path '*/vmlinu*' \) -printf '/%%p\n'
|
||||
%else
|
||||
-o -type f -printf '/%%p\n'
|
||||
%endif
|
||||
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
|
||||
cat %my_builddir/base-modules
|
||||
fi
|
||||
if test %CONFIG_MODULE_SIG = "y" -a -d etc/uefi/certs; then
|
||||
@ -994,7 +921,10 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||
|
||||
{
|
||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
|
||||
add_dirs_to_filelist %my_builddir/kernel-base.files
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
add_dirs_to_filelist %my_builddir/main-modules
|
||||
fi
|
||||
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
|
||||
echo "/lib/firmware/%kernelrelease-%build_flavor"
|
||||
fi
|
||||
@ -1036,15 +966,15 @@ for f in %my_builddir/*-kmp-modules; do
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}%modules_dir/modules.fips
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-main.files
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files
|
||||
fi
|
||||
|
||||
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
|
||||
# much, but it keeps rpmlint from breaking the package build. Note that we skip
|
||||
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
|
||||
%fdupes %buildroot%modules_dir
|
||||
%fdupes $RPM_BUILD_ROOT/lib
|
||||
|
||||
%preun -f preun.sh
|
||||
|
||||
@ -1224,7 +1154,7 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
|
||||
%files %{livepatch}
|
||||
# rpmlint complains about empty packages, so lets own something
|
||||
%defattr(-, root, root)
|
||||
%dir %modules_dir
|
||||
%dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
%if 0%{?klp_symbols} && "%livepatch" != ""
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -68,27 +68,13 @@
|
||||
%define install_vdso 0
|
||||
%endif
|
||||
|
||||
# TW is usrmerged
|
||||
%if %{undefined usrmerged} && 0%{?suse_version} >= 1550
|
||||
%define usrmerged 1
|
||||
%endif
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
%define modules_dir /usr/lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap %{modules_dir}/System.map
|
||||
%else
|
||||
%define modules_dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap /boot/System.map-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
|
||||
Name: kernel-debug
|
||||
Summary: A Debug Version of the Kernel
|
||||
License: GPL-2.0
|
||||
Group: System/Kernel
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -199,10 +185,10 @@ Conflicts: hyper-v < 4
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-%build_flavor-base-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
Provides: kernel-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: %name-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
%ifarch ppc64
|
||||
Provides: kernel-kdump = 2.6.28
|
||||
Obsoletes: kernel-kdump <= 2.6.28
|
||||
@ -630,14 +616,6 @@ done
|
||||
|
||||
%install
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
# add symlink for usrmerge so install scripts will just follow the
|
||||
# link and end up placing files in /usr/lib. The link will be
|
||||
# removed later and is not packaged here.
|
||||
mkdir -p %{buildroot}/usr/lib
|
||||
ln -s usr/lib %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
# get rid of /usr/lib/rpm/brp-strip-debug
|
||||
# strip removes too much from the vmlinux ELF binary
|
||||
export NO_BRP_STRIP_DEBUG=true
|
||||
@ -710,6 +688,9 @@ add_vmlinux()
|
||||
mkdir -p %buildroot/usr/share/man/man9
|
||||
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
|
||||
objcopy -R .rodata.compressed arch/s390/boot/compressed/vmlinux %buildroot/boot/zdebug-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
%endif
|
||||
%ifarch %arm
|
||||
add_vmlinux --compressed
|
||||
@ -730,19 +711,11 @@ add_vmlinux()
|
||||
# sign the modules, firmware and possibly the kernel in the buildservice
|
||||
BRP_PESIGN_FILES=""
|
||||
%if "%CONFIG_EFI_STUB" == "y"
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%ifarch s390x ppc64 ppc64le
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%if "%CONFIG_MODULE_SIG" == "y"
|
||||
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
|
||||
%endif
|
||||
@ -804,13 +777,6 @@ for sub in '' '-extra' \
|
||||
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
|
||||
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
|
||||
-e "s:@SRCVARIANT@:%variant:g" \
|
||||
-e "s:@MODULESDIR@:%modules_dir:g" \
|
||||
-e "s:@SYSTEMMAP@:%systemmap:g" \
|
||||
%if 0%{?usrmerged}
|
||||
-e "s:^@USRMERGE@::" \
|
||||
%else
|
||||
-e "/^@USRMERGE@/d" \
|
||||
%endif
|
||||
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
|
||||
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
|
||||
case "$script" in
|
||||
@ -1006,9 +972,7 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
|
||||
# Recreate the generated Makefile with correct path
|
||||
#
|
||||
# Linux 5.13 no longer has mkmakefile and the generated makefile only depends on
|
||||
# relative location of source and binary directories which is preserved.
|
||||
# No need to recreate.
|
||||
# Linux 5.13 no longer has mkmakefile
|
||||
if [ -f ../scripts/mkmakefile ] ; then
|
||||
sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \
|
||||
%rpm_install_dir/%cpu_arch_flavor \
|
||||
@ -1019,10 +983,6 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
fi
|
||||
|
||||
rm -rf %{buildroot}/lib/firmware
|
||||
%if 0%{?usrmerged}
|
||||
# remove usrmerge aid
|
||||
rm %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
add_dirs_to_filelist() {
|
||||
sed -rn '
|
||||
@ -1035,7 +995,7 @@ add_dirs_to_filelist() {
|
||||
# print all parents
|
||||
:a
|
||||
# skip directories owned by other packages
|
||||
s:^%%dir (/boot|/etc|(/usr)?/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:/[^/]+$::p
|
||||
ta
|
||||
' "$@" | sort -u
|
||||
@ -1046,25 +1006,16 @@ if [ -f %my_builddir/livepatch-files.no_dir ] ; then
|
||||
cat %my_builddir/livepatch-files.no_dir | add_dirs_to_filelist > %my_builddir/livepatch-files
|
||||
fi
|
||||
|
||||
# does not exist for non-modularized kernels
|
||||
%if 0%{?usrmerged}
|
||||
mkdir -p %{buildroot}%modules_dir
|
||||
%endif
|
||||
shopt -s nullglob dotglob
|
||||
> %my_builddir/kernel-devel.files
|
||||
{
|
||||
echo "%modules_dir/build"
|
||||
echo "%modules_dir/source"
|
||||
cd %buildroot
|
||||
for file in boot/symtypes*; do
|
||||
%if 0%{?usrmerged}
|
||||
l="${file##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
mv "$file" "%{buildroot}$l"
|
||||
ln -s "..$l" $file
|
||||
echo "$l"
|
||||
echo "%%ghost /$file"
|
||||
%else
|
||||
echo "/$file"
|
||||
%endif
|
||||
done
|
||||
} | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||
f=${file##%buildroot}
|
||||
echo "$f"
|
||||
done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
( cd %buildroot ; find .%obj_install_dir/%cpu_arch_flavor -type f ; ) | \
|
||||
sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \
|
||||
add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
@ -1073,8 +1024,6 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
echo %ghost /boot/initrd$suffix
|
||||
cd %buildroot
|
||||
for f in boot/*; do
|
||||
l="${f##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
if test -L "$f"; then
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
@ -1090,46 +1039,24 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
;;
|
||||
boot/vmlinux-*)
|
||||
if $ghost_vmlinux; then
|
||||
# fall through to mark next echo as %ghost
|
||||
echo -n "%%ghost "
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
%if 0%{?usrmerged}
|
||||
boot/vmlinuz-*)
|
||||
echo -n "%%attr(0644, root, root) "
|
||||
;;
|
||||
%endif
|
||||
boot/symtypes*)
|
||||
%if 0%{?usrmerged}
|
||||
echo "%exclude $l"
|
||||
%endif
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
%if 0%{?usrmerged}
|
||||
mv "$f" "./$l"
|
||||
ln -s "..$l" $f
|
||||
# the find in the CONFIG_MODULES condition below also finds the files
|
||||
# but there's sort -u later, so this is ok
|
||||
echo "$l" # note: must be first after case statement above
|
||||
echo "%%ghost /$f"
|
||||
%else
|
||||
echo "%%attr(0644, root, root) /$f"
|
||||
%endif
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
find %{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor \
|
||||
find lib/modules/%kernelrelease-%build_flavor \
|
||||
-type d -o \
|
||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||
! -path '*/modules.builtin' \
|
||||
! -path '*/modules.builtin.modinfo' \) -printf '%%%%ghost /%%p\n' \
|
||||
-o -name '*.ko' -prune \
|
||||
%if 0%{?usrmerged}
|
||||
-o \( -type f ! -path '*/symtypes*' ! -path '*/vmlinu*' \) -printf '/%%p\n'
|
||||
%else
|
||||
-o -type f -printf '/%%p\n'
|
||||
%endif
|
||||
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
|
||||
cat %my_builddir/base-modules
|
||||
fi
|
||||
if test %CONFIG_MODULE_SIG = "y" -a -d etc/uefi/certs; then
|
||||
@ -1145,7 +1072,10 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||
|
||||
{
|
||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
|
||||
add_dirs_to_filelist %my_builddir/kernel-base.files
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
add_dirs_to_filelist %my_builddir/main-modules
|
||||
fi
|
||||
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
|
||||
echo "/lib/firmware/%kernelrelease-%build_flavor"
|
||||
fi
|
||||
@ -1187,15 +1117,15 @@ for f in %my_builddir/*-kmp-modules; do
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}%modules_dir/modules.fips
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-main.files
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files
|
||||
fi
|
||||
|
||||
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
|
||||
# much, but it keeps rpmlint from breaking the package build. Note that we skip
|
||||
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
|
||||
%fdupes %buildroot%modules_dir
|
||||
%fdupes $RPM_BUILD_ROOT/lib
|
||||
|
||||
%preun -f preun.sh
|
||||
|
||||
@ -1386,7 +1316,7 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
|
||||
%files %{livepatch}
|
||||
# rpmlint complains about empty packages, so lets own something
|
||||
%defattr(-, root, root)
|
||||
%dir %modules_dir
|
||||
%dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
%if 0%{?klp_symbols} && "%livepatch" != ""
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -68,27 +68,13 @@
|
||||
%define install_vdso 0
|
||||
%endif
|
||||
|
||||
# TW is usrmerged
|
||||
%if %{undefined usrmerged} && 0%{?suse_version} >= 1550
|
||||
%define usrmerged 1
|
||||
%endif
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
%define modules_dir /usr/lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap %{modules_dir}/System.map
|
||||
%else
|
||||
%define modules_dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap /boot/System.map-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
|
||||
Name: kernel-default
|
||||
Summary: The Standard Kernel
|
||||
License: GPL-2.0
|
||||
Group: System/Kernel
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -199,10 +185,10 @@ Conflicts: hyper-v < 4
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-%build_flavor-base-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
Provides: kernel-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: %name-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
%ifarch %ix86
|
||||
Provides: kernel-smp = 2.6.17
|
||||
Obsoletes: kernel-smp <= 2.6.17
|
||||
@ -673,14 +659,6 @@ done
|
||||
|
||||
%install
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
# add symlink for usrmerge so install scripts will just follow the
|
||||
# link and end up placing files in /usr/lib. The link will be
|
||||
# removed later and is not packaged here.
|
||||
mkdir -p %{buildroot}/usr/lib
|
||||
ln -s usr/lib %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
# get rid of /usr/lib/rpm/brp-strip-debug
|
||||
# strip removes too much from the vmlinux ELF binary
|
||||
export NO_BRP_STRIP_DEBUG=true
|
||||
@ -753,6 +731,9 @@ add_vmlinux()
|
||||
mkdir -p %buildroot/usr/share/man/man9
|
||||
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
|
||||
objcopy -R .rodata.compressed arch/s390/boot/compressed/vmlinux %buildroot/boot/zdebug-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
%endif
|
||||
%ifarch %arm
|
||||
add_vmlinux --compressed
|
||||
@ -773,19 +754,11 @@ add_vmlinux()
|
||||
# sign the modules, firmware and possibly the kernel in the buildservice
|
||||
BRP_PESIGN_FILES=""
|
||||
%if "%CONFIG_EFI_STUB" == "y"
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%ifarch s390x ppc64 ppc64le
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%if "%CONFIG_MODULE_SIG" == "y"
|
||||
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
|
||||
%endif
|
||||
@ -847,13 +820,6 @@ for sub in '' '-extra' \
|
||||
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
|
||||
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
|
||||
-e "s:@SRCVARIANT@:%variant:g" \
|
||||
-e "s:@MODULESDIR@:%modules_dir:g" \
|
||||
-e "s:@SYSTEMMAP@:%systemmap:g" \
|
||||
%if 0%{?usrmerged}
|
||||
-e "s:^@USRMERGE@::" \
|
||||
%else
|
||||
-e "/^@USRMERGE@/d" \
|
||||
%endif
|
||||
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
|
||||
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
|
||||
case "$script" in
|
||||
@ -1049,9 +1015,7 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
|
||||
# Recreate the generated Makefile with correct path
|
||||
#
|
||||
# Linux 5.13 no longer has mkmakefile and the generated makefile only depends on
|
||||
# relative location of source and binary directories which is preserved.
|
||||
# No need to recreate.
|
||||
# Linux 5.13 no longer has mkmakefile
|
||||
if [ -f ../scripts/mkmakefile ] ; then
|
||||
sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \
|
||||
%rpm_install_dir/%cpu_arch_flavor \
|
||||
@ -1062,10 +1026,6 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
fi
|
||||
|
||||
rm -rf %{buildroot}/lib/firmware
|
||||
%if 0%{?usrmerged}
|
||||
# remove usrmerge aid
|
||||
rm %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
add_dirs_to_filelist() {
|
||||
sed -rn '
|
||||
@ -1078,7 +1038,7 @@ add_dirs_to_filelist() {
|
||||
# print all parents
|
||||
:a
|
||||
# skip directories owned by other packages
|
||||
s:^%%dir (/boot|/etc|(/usr)?/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:/[^/]+$::p
|
||||
ta
|
||||
' "$@" | sort -u
|
||||
@ -1089,25 +1049,16 @@ if [ -f %my_builddir/livepatch-files.no_dir ] ; then
|
||||
cat %my_builddir/livepatch-files.no_dir | add_dirs_to_filelist > %my_builddir/livepatch-files
|
||||
fi
|
||||
|
||||
# does not exist for non-modularized kernels
|
||||
%if 0%{?usrmerged}
|
||||
mkdir -p %{buildroot}%modules_dir
|
||||
%endif
|
||||
shopt -s nullglob dotglob
|
||||
> %my_builddir/kernel-devel.files
|
||||
{
|
||||
echo "%modules_dir/build"
|
||||
echo "%modules_dir/source"
|
||||
cd %buildroot
|
||||
for file in boot/symtypes*; do
|
||||
%if 0%{?usrmerged}
|
||||
l="${file##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
mv "$file" "%{buildroot}$l"
|
||||
ln -s "..$l" $file
|
||||
echo "$l"
|
||||
echo "%%ghost /$file"
|
||||
%else
|
||||
echo "/$file"
|
||||
%endif
|
||||
done
|
||||
} | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||
f=${file##%buildroot}
|
||||
echo "$f"
|
||||
done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
( cd %buildroot ; find .%obj_install_dir/%cpu_arch_flavor -type f ; ) | \
|
||||
sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \
|
||||
add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
@ -1116,8 +1067,6 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
echo %ghost /boot/initrd$suffix
|
||||
cd %buildroot
|
||||
for f in boot/*; do
|
||||
l="${f##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
if test -L "$f"; then
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
@ -1133,46 +1082,24 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
;;
|
||||
boot/vmlinux-*)
|
||||
if $ghost_vmlinux; then
|
||||
# fall through to mark next echo as %ghost
|
||||
echo -n "%%ghost "
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
%if 0%{?usrmerged}
|
||||
boot/vmlinuz-*)
|
||||
echo -n "%%attr(0644, root, root) "
|
||||
;;
|
||||
%endif
|
||||
boot/symtypes*)
|
||||
%if 0%{?usrmerged}
|
||||
echo "%exclude $l"
|
||||
%endif
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
%if 0%{?usrmerged}
|
||||
mv "$f" "./$l"
|
||||
ln -s "..$l" $f
|
||||
# the find in the CONFIG_MODULES condition below also finds the files
|
||||
# but there's sort -u later, so this is ok
|
||||
echo "$l" # note: must be first after case statement above
|
||||
echo "%%ghost /$f"
|
||||
%else
|
||||
echo "%%attr(0644, root, root) /$f"
|
||||
%endif
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
find %{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor \
|
||||
find lib/modules/%kernelrelease-%build_flavor \
|
||||
-type d -o \
|
||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||
! -path '*/modules.builtin' \
|
||||
! -path '*/modules.builtin.modinfo' \) -printf '%%%%ghost /%%p\n' \
|
||||
-o -name '*.ko' -prune \
|
||||
%if 0%{?usrmerged}
|
||||
-o \( -type f ! -path '*/symtypes*' ! -path '*/vmlinu*' \) -printf '/%%p\n'
|
||||
%else
|
||||
-o -type f -printf '/%%p\n'
|
||||
%endif
|
||||
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
|
||||
cat %my_builddir/base-modules
|
||||
fi
|
||||
if test %CONFIG_MODULE_SIG = "y" -a -d etc/uefi/certs; then
|
||||
@ -1188,7 +1115,10 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||
|
||||
{
|
||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
|
||||
add_dirs_to_filelist %my_builddir/kernel-base.files
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
add_dirs_to_filelist %my_builddir/main-modules
|
||||
fi
|
||||
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
|
||||
echo "/lib/firmware/%kernelrelease-%build_flavor"
|
||||
fi
|
||||
@ -1230,15 +1160,15 @@ for f in %my_builddir/*-kmp-modules; do
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}%modules_dir/modules.fips
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-main.files
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files
|
||||
fi
|
||||
|
||||
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
|
||||
# much, but it keeps rpmlint from breaking the package build. Note that we skip
|
||||
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
|
||||
%fdupes %buildroot%modules_dir
|
||||
%fdupes $RPM_BUILD_ROOT/lib
|
||||
|
||||
%preun -f preun.sh
|
||||
|
||||
@ -1487,7 +1417,7 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
|
||||
%files %{livepatch}
|
||||
# rpmlint complains about empty packages, so lets own something
|
||||
%defattr(-, root, root)
|
||||
%dir %modules_dir
|
||||
%dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
%if 0%{?klp_symbols} && "%livepatch" != ""
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ License: GPL-2.0
|
||||
Group: Documentation/Man
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%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-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: %name-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -68,27 +68,13 @@
|
||||
%define install_vdso 0
|
||||
%endif
|
||||
|
||||
# TW is usrmerged
|
||||
%if %{undefined usrmerged} && 0%{?suse_version} >= 1550
|
||||
%define usrmerged 1
|
||||
%endif
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
%define modules_dir /usr/lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap %{modules_dir}/System.map
|
||||
%else
|
||||
%define modules_dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap /boot/System.map-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
|
||||
Name: kernel-kvmsmall
|
||||
Summary: The Small Developer Kernel for KVM
|
||||
License: GPL-2.0
|
||||
Group: System/Kernel
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -199,10 +185,10 @@ Conflicts: hyper-v < 4
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-%build_flavor-base-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
Provides: kernel-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: %name-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
%obsolete_rebuilds %name
|
||||
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
|
||||
Source2: source-post.sh
|
||||
@ -628,14 +614,6 @@ done
|
||||
|
||||
%install
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
# add symlink for usrmerge so install scripts will just follow the
|
||||
# link and end up placing files in /usr/lib. The link will be
|
||||
# removed later and is not packaged here.
|
||||
mkdir -p %{buildroot}/usr/lib
|
||||
ln -s usr/lib %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
# get rid of /usr/lib/rpm/brp-strip-debug
|
||||
# strip removes too much from the vmlinux ELF binary
|
||||
export NO_BRP_STRIP_DEBUG=true
|
||||
@ -708,6 +686,9 @@ add_vmlinux()
|
||||
mkdir -p %buildroot/usr/share/man/man9
|
||||
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
|
||||
objcopy -R .rodata.compressed arch/s390/boot/compressed/vmlinux %buildroot/boot/zdebug-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
%endif
|
||||
%ifarch %arm
|
||||
add_vmlinux --compressed
|
||||
@ -728,19 +709,11 @@ add_vmlinux()
|
||||
# sign the modules, firmware and possibly the kernel in the buildservice
|
||||
BRP_PESIGN_FILES=""
|
||||
%if "%CONFIG_EFI_STUB" == "y"
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%ifarch s390x ppc64 ppc64le
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%if "%CONFIG_MODULE_SIG" == "y"
|
||||
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
|
||||
%endif
|
||||
@ -802,13 +775,6 @@ for sub in '' '-extra' \
|
||||
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
|
||||
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
|
||||
-e "s:@SRCVARIANT@:%variant:g" \
|
||||
-e "s:@MODULESDIR@:%modules_dir:g" \
|
||||
-e "s:@SYSTEMMAP@:%systemmap:g" \
|
||||
%if 0%{?usrmerged}
|
||||
-e "s:^@USRMERGE@::" \
|
||||
%else
|
||||
-e "/^@USRMERGE@/d" \
|
||||
%endif
|
||||
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
|
||||
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
|
||||
case "$script" in
|
||||
@ -1004,9 +970,7 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
|
||||
# Recreate the generated Makefile with correct path
|
||||
#
|
||||
# Linux 5.13 no longer has mkmakefile and the generated makefile only depends on
|
||||
# relative location of source and binary directories which is preserved.
|
||||
# No need to recreate.
|
||||
# Linux 5.13 no longer has mkmakefile
|
||||
if [ -f ../scripts/mkmakefile ] ; then
|
||||
sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \
|
||||
%rpm_install_dir/%cpu_arch_flavor \
|
||||
@ -1017,10 +981,6 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
fi
|
||||
|
||||
rm -rf %{buildroot}/lib/firmware
|
||||
%if 0%{?usrmerged}
|
||||
# remove usrmerge aid
|
||||
rm %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
add_dirs_to_filelist() {
|
||||
sed -rn '
|
||||
@ -1033,7 +993,7 @@ add_dirs_to_filelist() {
|
||||
# print all parents
|
||||
:a
|
||||
# skip directories owned by other packages
|
||||
s:^%%dir (/boot|/etc|(/usr)?/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:/[^/]+$::p
|
||||
ta
|
||||
' "$@" | sort -u
|
||||
@ -1044,25 +1004,16 @@ if [ -f %my_builddir/livepatch-files.no_dir ] ; then
|
||||
cat %my_builddir/livepatch-files.no_dir | add_dirs_to_filelist > %my_builddir/livepatch-files
|
||||
fi
|
||||
|
||||
# does not exist for non-modularized kernels
|
||||
%if 0%{?usrmerged}
|
||||
mkdir -p %{buildroot}%modules_dir
|
||||
%endif
|
||||
shopt -s nullglob dotglob
|
||||
> %my_builddir/kernel-devel.files
|
||||
{
|
||||
echo "%modules_dir/build"
|
||||
echo "%modules_dir/source"
|
||||
cd %buildroot
|
||||
for file in boot/symtypes*; do
|
||||
%if 0%{?usrmerged}
|
||||
l="${file##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
mv "$file" "%{buildroot}$l"
|
||||
ln -s "..$l" $file
|
||||
echo "$l"
|
||||
echo "%%ghost /$file"
|
||||
%else
|
||||
echo "/$file"
|
||||
%endif
|
||||
done
|
||||
} | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||
f=${file##%buildroot}
|
||||
echo "$f"
|
||||
done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
( cd %buildroot ; find .%obj_install_dir/%cpu_arch_flavor -type f ; ) | \
|
||||
sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \
|
||||
add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
@ -1071,8 +1022,6 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
echo %ghost /boot/initrd$suffix
|
||||
cd %buildroot
|
||||
for f in boot/*; do
|
||||
l="${f##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
if test -L "$f"; then
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
@ -1088,46 +1037,24 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
;;
|
||||
boot/vmlinux-*)
|
||||
if $ghost_vmlinux; then
|
||||
# fall through to mark next echo as %ghost
|
||||
echo -n "%%ghost "
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
%if 0%{?usrmerged}
|
||||
boot/vmlinuz-*)
|
||||
echo -n "%%attr(0644, root, root) "
|
||||
;;
|
||||
%endif
|
||||
boot/symtypes*)
|
||||
%if 0%{?usrmerged}
|
||||
echo "%exclude $l"
|
||||
%endif
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
%if 0%{?usrmerged}
|
||||
mv "$f" "./$l"
|
||||
ln -s "..$l" $f
|
||||
# the find in the CONFIG_MODULES condition below also finds the files
|
||||
# but there's sort -u later, so this is ok
|
||||
echo "$l" # note: must be first after case statement above
|
||||
echo "%%ghost /$f"
|
||||
%else
|
||||
echo "%%attr(0644, root, root) /$f"
|
||||
%endif
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
find %{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor \
|
||||
find lib/modules/%kernelrelease-%build_flavor \
|
||||
-type d -o \
|
||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||
! -path '*/modules.builtin' \
|
||||
! -path '*/modules.builtin.modinfo' \) -printf '%%%%ghost /%%p\n' \
|
||||
-o -name '*.ko' -prune \
|
||||
%if 0%{?usrmerged}
|
||||
-o \( -type f ! -path '*/symtypes*' ! -path '*/vmlinu*' \) -printf '/%%p\n'
|
||||
%else
|
||||
-o -type f -printf '/%%p\n'
|
||||
%endif
|
||||
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
|
||||
cat %my_builddir/base-modules
|
||||
fi
|
||||
if test %CONFIG_MODULE_SIG = "y" -a -d etc/uefi/certs; then
|
||||
@ -1143,7 +1070,10 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||
|
||||
{
|
||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
|
||||
add_dirs_to_filelist %my_builddir/kernel-base.files
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
add_dirs_to_filelist %my_builddir/main-modules
|
||||
fi
|
||||
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
|
||||
echo "/lib/firmware/%kernelrelease-%build_flavor"
|
||||
fi
|
||||
@ -1185,15 +1115,15 @@ for f in %my_builddir/*-kmp-modules; do
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}%modules_dir/modules.fips
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-main.files
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files
|
||||
fi
|
||||
|
||||
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
|
||||
# much, but it keeps rpmlint from breaking the package build. Note that we skip
|
||||
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
|
||||
%fdupes %buildroot%modules_dir
|
||||
%fdupes $RPM_BUILD_ROOT/lib
|
||||
|
||||
%preun -f preun.sh
|
||||
|
||||
@ -1384,7 +1314,7 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
|
||||
%files %{livepatch}
|
||||
# rpmlint complains about empty packages, so lets own something
|
||||
%defattr(-, root, root)
|
||||
%dir %modules_dir
|
||||
%dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
%if 0%{?klp_symbols} && "%livepatch" != ""
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
130
kernel-lpae.spec
130
kernel-lpae.spec
@ -68,27 +68,13 @@
|
||||
%define install_vdso 0
|
||||
%endif
|
||||
|
||||
# TW is usrmerged
|
||||
%if %{undefined usrmerged} && 0%{?suse_version} >= 1550
|
||||
%define usrmerged 1
|
||||
%endif
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
%define modules_dir /usr/lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap %{modules_dir}/System.map
|
||||
%else
|
||||
%define modules_dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap /boot/System.map-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
|
||||
Name: kernel-lpae
|
||||
Summary: Kernel for LPAE enabled systems
|
||||
License: GPL-2.0
|
||||
Group: System/Kernel
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -199,10 +185,10 @@ Conflicts: hyper-v < 4
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-%build_flavor-base-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
Provides: kernel-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: %name-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
%obsolete_rebuilds %name
|
||||
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
|
||||
Source2: source-post.sh
|
||||
@ -622,14 +608,6 @@ done
|
||||
|
||||
%install
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
# add symlink for usrmerge so install scripts will just follow the
|
||||
# link and end up placing files in /usr/lib. The link will be
|
||||
# removed later and is not packaged here.
|
||||
mkdir -p %{buildroot}/usr/lib
|
||||
ln -s usr/lib %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
# get rid of /usr/lib/rpm/brp-strip-debug
|
||||
# strip removes too much from the vmlinux ELF binary
|
||||
export NO_BRP_STRIP_DEBUG=true
|
||||
@ -702,6 +680,9 @@ add_vmlinux()
|
||||
mkdir -p %buildroot/usr/share/man/man9
|
||||
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
|
||||
objcopy -R .rodata.compressed arch/s390/boot/compressed/vmlinux %buildroot/boot/zdebug-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
%endif
|
||||
%ifarch %arm
|
||||
add_vmlinux --compressed
|
||||
@ -722,19 +703,11 @@ add_vmlinux()
|
||||
# sign the modules, firmware and possibly the kernel in the buildservice
|
||||
BRP_PESIGN_FILES=""
|
||||
%if "%CONFIG_EFI_STUB" == "y"
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%ifarch s390x ppc64 ppc64le
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%if "%CONFIG_MODULE_SIG" == "y"
|
||||
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
|
||||
%endif
|
||||
@ -796,13 +769,6 @@ for sub in '' '-extra' \
|
||||
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
|
||||
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
|
||||
-e "s:@SRCVARIANT@:%variant:g" \
|
||||
-e "s:@MODULESDIR@:%modules_dir:g" \
|
||||
-e "s:@SYSTEMMAP@:%systemmap:g" \
|
||||
%if 0%{?usrmerged}
|
||||
-e "s:^@USRMERGE@::" \
|
||||
%else
|
||||
-e "/^@USRMERGE@/d" \
|
||||
%endif
|
||||
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
|
||||
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
|
||||
case "$script" in
|
||||
@ -998,9 +964,7 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
|
||||
# Recreate the generated Makefile with correct path
|
||||
#
|
||||
# Linux 5.13 no longer has mkmakefile and the generated makefile only depends on
|
||||
# relative location of source and binary directories which is preserved.
|
||||
# No need to recreate.
|
||||
# Linux 5.13 no longer has mkmakefile
|
||||
if [ -f ../scripts/mkmakefile ] ; then
|
||||
sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \
|
||||
%rpm_install_dir/%cpu_arch_flavor \
|
||||
@ -1011,10 +975,6 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
fi
|
||||
|
||||
rm -rf %{buildroot}/lib/firmware
|
||||
%if 0%{?usrmerged}
|
||||
# remove usrmerge aid
|
||||
rm %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
add_dirs_to_filelist() {
|
||||
sed -rn '
|
||||
@ -1027,7 +987,7 @@ add_dirs_to_filelist() {
|
||||
# print all parents
|
||||
:a
|
||||
# skip directories owned by other packages
|
||||
s:^%%dir (/boot|/etc|(/usr)?/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:/[^/]+$::p
|
||||
ta
|
||||
' "$@" | sort -u
|
||||
@ -1038,25 +998,16 @@ if [ -f %my_builddir/livepatch-files.no_dir ] ; then
|
||||
cat %my_builddir/livepatch-files.no_dir | add_dirs_to_filelist > %my_builddir/livepatch-files
|
||||
fi
|
||||
|
||||
# does not exist for non-modularized kernels
|
||||
%if 0%{?usrmerged}
|
||||
mkdir -p %{buildroot}%modules_dir
|
||||
%endif
|
||||
shopt -s nullglob dotglob
|
||||
> %my_builddir/kernel-devel.files
|
||||
{
|
||||
echo "%modules_dir/build"
|
||||
echo "%modules_dir/source"
|
||||
cd %buildroot
|
||||
for file in boot/symtypes*; do
|
||||
%if 0%{?usrmerged}
|
||||
l="${file##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
mv "$file" "%{buildroot}$l"
|
||||
ln -s "..$l" $file
|
||||
echo "$l"
|
||||
echo "%%ghost /$file"
|
||||
%else
|
||||
echo "/$file"
|
||||
%endif
|
||||
done
|
||||
} | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||
f=${file##%buildroot}
|
||||
echo "$f"
|
||||
done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
( cd %buildroot ; find .%obj_install_dir/%cpu_arch_flavor -type f ; ) | \
|
||||
sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \
|
||||
add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
@ -1065,8 +1016,6 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
echo %ghost /boot/initrd$suffix
|
||||
cd %buildroot
|
||||
for f in boot/*; do
|
||||
l="${f##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
if test -L "$f"; then
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
@ -1082,46 +1031,24 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
;;
|
||||
boot/vmlinux-*)
|
||||
if $ghost_vmlinux; then
|
||||
# fall through to mark next echo as %ghost
|
||||
echo -n "%%ghost "
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
%if 0%{?usrmerged}
|
||||
boot/vmlinuz-*)
|
||||
echo -n "%%attr(0644, root, root) "
|
||||
;;
|
||||
%endif
|
||||
boot/symtypes*)
|
||||
%if 0%{?usrmerged}
|
||||
echo "%exclude $l"
|
||||
%endif
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
%if 0%{?usrmerged}
|
||||
mv "$f" "./$l"
|
||||
ln -s "..$l" $f
|
||||
# the find in the CONFIG_MODULES condition below also finds the files
|
||||
# but there's sort -u later, so this is ok
|
||||
echo "$l" # note: must be first after case statement above
|
||||
echo "%%ghost /$f"
|
||||
%else
|
||||
echo "%%attr(0644, root, root) /$f"
|
||||
%endif
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
find %{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor \
|
||||
find lib/modules/%kernelrelease-%build_flavor \
|
||||
-type d -o \
|
||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||
! -path '*/modules.builtin' \
|
||||
! -path '*/modules.builtin.modinfo' \) -printf '%%%%ghost /%%p\n' \
|
||||
-o -name '*.ko' -prune \
|
||||
%if 0%{?usrmerged}
|
||||
-o \( -type f ! -path '*/symtypes*' ! -path '*/vmlinu*' \) -printf '/%%p\n'
|
||||
%else
|
||||
-o -type f -printf '/%%p\n'
|
||||
%endif
|
||||
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
|
||||
cat %my_builddir/base-modules
|
||||
fi
|
||||
if test %CONFIG_MODULE_SIG = "y" -a -d etc/uefi/certs; then
|
||||
@ -1137,7 +1064,10 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||
|
||||
{
|
||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
|
||||
add_dirs_to_filelist %my_builddir/kernel-base.files
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
add_dirs_to_filelist %my_builddir/main-modules
|
||||
fi
|
||||
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
|
||||
echo "/lib/firmware/%kernelrelease-%build_flavor"
|
||||
fi
|
||||
@ -1179,15 +1109,15 @@ for f in %my_builddir/*-kmp-modules; do
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}%modules_dir/modules.fips
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-main.files
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files
|
||||
fi
|
||||
|
||||
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
|
||||
# much, but it keeps rpmlint from breaking the package build. Note that we skip
|
||||
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
|
||||
%fdupes %buildroot%modules_dir
|
||||
%fdupes $RPM_BUILD_ROOT/lib
|
||||
|
||||
%preun -f preun.sh
|
||||
|
||||
@ -1366,7 +1296,7 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
|
||||
%files %{livepatch}
|
||||
# rpmlint complains about empty packages, so lets own something
|
||||
%defattr(-, root, root)
|
||||
%dir %modules_dir
|
||||
%dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
%if 0%{?klp_symbols} && "%livepatch" != ""
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -45,7 +45,7 @@ BuildRequires: util-linux
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: kernel%kernel_flavor-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
BuildRequires: kernel%kernel_flavor-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
|
||||
%if 0%{?rhel_version}
|
||||
BuildRequires: kernel
|
||||
@ -66,7 +66,7 @@ License: GPL-2.0
|
||||
Group: SLES
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ License: GPL-2.0
|
||||
Group: SLES
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -60,7 +60,7 @@ projects and runs basic tests.
|
||||
# and called here.
|
||||
|
||||
krel=$(uname -r)
|
||||
if test ! -d "/lib/modules/$krel/kernel" && test ! -d "/usr/lib/modules/$krel/kernel"; then
|
||||
if test ! -d "/lib/modules/$krel/kernel"; then
|
||||
echo "Kernel package for $krel not installed; exiting"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@ -60,7 +60,7 @@ projects and runs basic tests.
|
||||
# and called here.
|
||||
|
||||
krel=$(uname -r)
|
||||
if test ! -d "/lib/modules/$krel/kernel" && test ! -d "/usr/lib/modules/$krel/kernel"; then
|
||||
if test ! -d "/lib/modules/$krel/kernel"; then
|
||||
echo "Kernel package for $krel not installed; exiting"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
130
kernel-pae.spec
130
kernel-pae.spec
@ -68,27 +68,13 @@
|
||||
%define install_vdso 0
|
||||
%endif
|
||||
|
||||
# TW is usrmerged
|
||||
%if %{undefined usrmerged} && 0%{?suse_version} >= 1550
|
||||
%define usrmerged 1
|
||||
%endif
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
%define modules_dir /usr/lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap %{modules_dir}/System.map
|
||||
%else
|
||||
%define modules_dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap /boot/System.map-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
|
||||
Name: kernel-pae
|
||||
Summary: Kernel with PAE Support
|
||||
License: GPL-2.0
|
||||
Group: System/Kernel
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -199,10 +185,10 @@ Conflicts: hyper-v < 4
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-%build_flavor-base-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
Provides: kernel-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: %name-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
%ifarch %ix86
|
||||
Provides: kernel-bigsmp = 2.6.17
|
||||
Obsoletes: kernel-bigsmp <= 2.6.17
|
||||
@ -650,14 +636,6 @@ done
|
||||
|
||||
%install
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
# add symlink for usrmerge so install scripts will just follow the
|
||||
# link and end up placing files in /usr/lib. The link will be
|
||||
# removed later and is not packaged here.
|
||||
mkdir -p %{buildroot}/usr/lib
|
||||
ln -s usr/lib %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
# get rid of /usr/lib/rpm/brp-strip-debug
|
||||
# strip removes too much from the vmlinux ELF binary
|
||||
export NO_BRP_STRIP_DEBUG=true
|
||||
@ -730,6 +708,9 @@ add_vmlinux()
|
||||
mkdir -p %buildroot/usr/share/man/man9
|
||||
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
|
||||
objcopy -R .rodata.compressed arch/s390/boot/compressed/vmlinux %buildroot/boot/zdebug-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
%endif
|
||||
%ifarch %arm
|
||||
add_vmlinux --compressed
|
||||
@ -750,19 +731,11 @@ add_vmlinux()
|
||||
# sign the modules, firmware and possibly the kernel in the buildservice
|
||||
BRP_PESIGN_FILES=""
|
||||
%if "%CONFIG_EFI_STUB" == "y"
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%ifarch s390x ppc64 ppc64le
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%if "%CONFIG_MODULE_SIG" == "y"
|
||||
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
|
||||
%endif
|
||||
@ -824,13 +797,6 @@ for sub in '' '-extra' \
|
||||
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
|
||||
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
|
||||
-e "s:@SRCVARIANT@:%variant:g" \
|
||||
-e "s:@MODULESDIR@:%modules_dir:g" \
|
||||
-e "s:@SYSTEMMAP@:%systemmap:g" \
|
||||
%if 0%{?usrmerged}
|
||||
-e "s:^@USRMERGE@::" \
|
||||
%else
|
||||
-e "/^@USRMERGE@/d" \
|
||||
%endif
|
||||
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
|
||||
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
|
||||
case "$script" in
|
||||
@ -1026,9 +992,7 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
|
||||
# Recreate the generated Makefile with correct path
|
||||
#
|
||||
# Linux 5.13 no longer has mkmakefile and the generated makefile only depends on
|
||||
# relative location of source and binary directories which is preserved.
|
||||
# No need to recreate.
|
||||
# Linux 5.13 no longer has mkmakefile
|
||||
if [ -f ../scripts/mkmakefile ] ; then
|
||||
sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \
|
||||
%rpm_install_dir/%cpu_arch_flavor \
|
||||
@ -1039,10 +1003,6 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
fi
|
||||
|
||||
rm -rf %{buildroot}/lib/firmware
|
||||
%if 0%{?usrmerged}
|
||||
# remove usrmerge aid
|
||||
rm %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
add_dirs_to_filelist() {
|
||||
sed -rn '
|
||||
@ -1055,7 +1015,7 @@ add_dirs_to_filelist() {
|
||||
# print all parents
|
||||
:a
|
||||
# skip directories owned by other packages
|
||||
s:^%%dir (/boot|/etc|(/usr)?/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:/[^/]+$::p
|
||||
ta
|
||||
' "$@" | sort -u
|
||||
@ -1066,25 +1026,16 @@ if [ -f %my_builddir/livepatch-files.no_dir ] ; then
|
||||
cat %my_builddir/livepatch-files.no_dir | add_dirs_to_filelist > %my_builddir/livepatch-files
|
||||
fi
|
||||
|
||||
# does not exist for non-modularized kernels
|
||||
%if 0%{?usrmerged}
|
||||
mkdir -p %{buildroot}%modules_dir
|
||||
%endif
|
||||
shopt -s nullglob dotglob
|
||||
> %my_builddir/kernel-devel.files
|
||||
{
|
||||
echo "%modules_dir/build"
|
||||
echo "%modules_dir/source"
|
||||
cd %buildroot
|
||||
for file in boot/symtypes*; do
|
||||
%if 0%{?usrmerged}
|
||||
l="${file##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
mv "$file" "%{buildroot}$l"
|
||||
ln -s "..$l" $file
|
||||
echo "$l"
|
||||
echo "%%ghost /$file"
|
||||
%else
|
||||
echo "/$file"
|
||||
%endif
|
||||
done
|
||||
} | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||
f=${file##%buildroot}
|
||||
echo "$f"
|
||||
done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
( cd %buildroot ; find .%obj_install_dir/%cpu_arch_flavor -type f ; ) | \
|
||||
sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \
|
||||
add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
@ -1093,8 +1044,6 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
echo %ghost /boot/initrd$suffix
|
||||
cd %buildroot
|
||||
for f in boot/*; do
|
||||
l="${f##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
if test -L "$f"; then
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
@ -1110,46 +1059,24 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
;;
|
||||
boot/vmlinux-*)
|
||||
if $ghost_vmlinux; then
|
||||
# fall through to mark next echo as %ghost
|
||||
echo -n "%%ghost "
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
%if 0%{?usrmerged}
|
||||
boot/vmlinuz-*)
|
||||
echo -n "%%attr(0644, root, root) "
|
||||
;;
|
||||
%endif
|
||||
boot/symtypes*)
|
||||
%if 0%{?usrmerged}
|
||||
echo "%exclude $l"
|
||||
%endif
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
%if 0%{?usrmerged}
|
||||
mv "$f" "./$l"
|
||||
ln -s "..$l" $f
|
||||
# the find in the CONFIG_MODULES condition below also finds the files
|
||||
# but there's sort -u later, so this is ok
|
||||
echo "$l" # note: must be first after case statement above
|
||||
echo "%%ghost /$f"
|
||||
%else
|
||||
echo "%%attr(0644, root, root) /$f"
|
||||
%endif
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
find %{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor \
|
||||
find lib/modules/%kernelrelease-%build_flavor \
|
||||
-type d -o \
|
||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||
! -path '*/modules.builtin' \
|
||||
! -path '*/modules.builtin.modinfo' \) -printf '%%%%ghost /%%p\n' \
|
||||
-o -name '*.ko' -prune \
|
||||
%if 0%{?usrmerged}
|
||||
-o \( -type f ! -path '*/symtypes*' ! -path '*/vmlinu*' \) -printf '/%%p\n'
|
||||
%else
|
||||
-o -type f -printf '/%%p\n'
|
||||
%endif
|
||||
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
|
||||
cat %my_builddir/base-modules
|
||||
fi
|
||||
if test %CONFIG_MODULE_SIG = "y" -a -d etc/uefi/certs; then
|
||||
@ -1165,7 +1092,10 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||
|
||||
{
|
||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
|
||||
add_dirs_to_filelist %my_builddir/kernel-base.files
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
add_dirs_to_filelist %my_builddir/main-modules
|
||||
fi
|
||||
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
|
||||
echo "/lib/firmware/%kernelrelease-%build_flavor"
|
||||
fi
|
||||
@ -1207,15 +1137,15 @@ for f in %my_builddir/*-kmp-modules; do
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}%modules_dir/modules.fips
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-main.files
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files
|
||||
fi
|
||||
|
||||
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
|
||||
# much, but it keeps rpmlint from breaking the package build. Note that we skip
|
||||
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
|
||||
%fdupes %buildroot%modules_dir
|
||||
%fdupes $RPM_BUILD_ROOT/lib
|
||||
|
||||
%preun -f preun.sh
|
||||
|
||||
@ -1436,7 +1366,7 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
|
||||
%files %{livepatch}
|
||||
# rpmlint complains about empty packages, so lets own something
|
||||
%defattr(-, root, root)
|
||||
%dir %modules_dir
|
||||
%dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
%if 0%{?klp_symbols} && "%livepatch" != ""
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# These zero-length files are correct:
|
||||
addFilter("zero-length /usr/src/linux-.*-obj/.*/include/config.*h")
|
||||
# vdsos are special
|
||||
addFilter("shared-lib-without-dependency-information .*/lib/modules/[1-9].*/vdso/.*")
|
||||
addFilter("missing-PT_GNU_STACK-section .*/lib/modules/[1-9].*/vdso/.*")
|
||||
addFilter("shared-lib-without-dependency-information /lib/modules/[1-9].*/vdso/.*")
|
||||
addFilter("missing-PT_GNU_STACK-section /lib/modules/[1-9].*/vdso/.*")
|
||||
# This is a stale symlink until the kernel-source package is installed:
|
||||
addFilter("dangling-symlink .*/lib/modules/[1-9].*/source")
|
||||
addFilter("dangling-symlink /lib/modules/[1-9].*/source")
|
||||
# These hidden files are fine:
|
||||
addFilter("hidden-file-or-dir /usr/src/linux-.*-obj/.*/.config")
|
||||
addFilter("hidden-file-or-dir /usr/src/linux-.*-obj/.*/.kernel-binary.spec.buildenv")
|
||||
|
||||
@ -32,7 +32,7 @@ License: GPL-2.0
|
||||
Group: Development/Sources
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -43,7 +43,7 @@ BuildRequires: fdupes
|
||||
BuildRequires: sed
|
||||
Requires(post): coreutils sed
|
||||
Provides: %name = %version-%source_rel
|
||||
Provides: %name-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: %name-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
Provides: linux
|
||||
Provides: multiversion(kernel)
|
||||
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
|
||||
|
||||
@ -11,7 +11,7 @@ set -o pipefail
|
||||
install -d -m 0755 $RPM_BUILD_ROOT/boot
|
||||
|
||||
$scriptdir/splitflist $kernel_package_name kernel.flist kernel-ghost.flist
|
||||
echo Ghost files:
|
||||
echo Missing files:
|
||||
cat kernel-ghost.flist
|
||||
|
||||
rpm -q --qf '%{PREIN}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_nvr/g" > prein.sh
|
||||
@ -21,8 +21,7 @@ rpm -q --qf '%{POSTUN}' $kernel_package_name | sed -e "s/$kernel_nvrq/$package_n
|
||||
|
||||
[ -z "$(rpm -q --triggers $kernel_package_name)" ] # not handled
|
||||
|
||||
KREL=$(sed -rne '/^(\/usr)?\/lib\/modules\/([^/]+)$/{s,.*/,,;p;q}' < kernel.flist)
|
||||
grep -q /usr/lib/modules/ kernel.flist && USR=/usr
|
||||
KREL=$(cat kernel.flist | grep ^/lib/modules | { sort -r ||: ;} | head -n 1 | sed -e s,^/lib/modules/,, -e 's,/.*,,')
|
||||
|
||||
$scriptdir/mergedep $KREL > modules.dep
|
||||
|
||||
@ -30,13 +29,13 @@ $scriptdir/mergedep $KREL > modules.dep
|
||||
$scriptdir/moddep modules.dep request-modules modules
|
||||
|
||||
$scriptdir/modflist kernel.flist modules modules.flist /lib/modules/$KREL/modules.builtin
|
||||
grep -v "^$USR/lib/modules/$KREL\\(\$\\|/kernel\\)" < kernel.flist >> modules.flist || :
|
||||
cat kernel.flist | grep -v ^/lib/modules >> modules.flist
|
||||
[ -d /lib/modules/$KREL/vdso ] && echo /lib/modules/$KREL/vdso >> modules.flist ||:
|
||||
echo /lib/modules/$KREL/modules.* | tr ' ' '\n' >> modules.flist
|
||||
|
||||
tar -C / -cf- -T modules.flist | tar -C $RPM_BUILD_ROOT -xvf-
|
||||
|
||||
[ -z "$USR" ] || ln -s usr/lib $RPM_BUILD_ROOT/lib
|
||||
moderr="$(/usr/sbin/depmod -b $RPM_BUILD_ROOT -e -F /boot/System.map-$KREL $KREL 2>&1 > /dev/null)"
|
||||
[ -z "$USR" ] || rm $RPM_BUILD_ROOT/lib
|
||||
|
||||
if [ "$moderr" ] ; then
|
||||
echo Picked modules have errors:
|
||||
@ -45,27 +44,35 @@ exit 1
|
||||
fi
|
||||
|
||||
echo "%defattr(-,root,root)" > subpackage.flist
|
||||
echo "%dir $USR/lib/modules/$KREL" >> subpackage.flist
|
||||
grep -v "^$USR/lib/modules/$KREL\\(\$\\|/kernel\\)" < kernel.flist >> subpackage.flist || :
|
||||
echo $USR/lib/modules/$KREL/kernel >> subpackage.flist
|
||||
while read name rest; do
|
||||
echo "%ghost $name"
|
||||
done < kernel-ghost.flist >> subpackage.flist
|
||||
cat kernel.flist | grep -v ^/lib/modules >> subpackage.flist
|
||||
echo /lib/modules/$KREL >> subpackage.flist
|
||||
cat kernel-ghost.flist | sed -e 's/^/%ghost /' >> subpackage.flist
|
||||
|
||||
cat kernel-ghost.flist | while read ghost ; do
|
||||
case $ghost in
|
||||
/boot/image-%build_flavor | /boot/vmlinux-%build_flavor | /boot/vmlinuz-%build_flavor | \
|
||||
/boot/Image-%build_flavor | /boot/initrd-%build_flavor)
|
||||
;;
|
||||
/boot/vmlinux | /boot/vmlinuz | /boot/zImage | /boot/Image | /boot/image | /boot/initrd)
|
||||
;;
|
||||
/boot/vmlinux-$KREL)
|
||||
[ -f /boot/vmlinux-$KREL.gz ] && touch vmlinux-$KREL
|
||||
;;
|
||||
/boot/initrd-$KREL | /boot/initrd-$KREL-kdump)
|
||||
# Create a dummy initrd with roughly the size the real one will have.
|
||||
# That way, YaST will know that this package requires some additional
|
||||
# space in /boot.
|
||||
dd if=/dev/zero of=$RPM_BUILD_ROOT$ghost \
|
||||
bs=1024 seek=2047 count=1
|
||||
chmod 0600 $RPM_BUILD_ROOT$ghost
|
||||
;;
|
||||
/lib/modules/$KREL/modules.*)
|
||||
[ -f $RPM_BUILD_ROOT$ghost ]
|
||||
;;
|
||||
*)
|
||||
echo Missing file "$ghost" not handled.
|
||||
exit 1;
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
# recreate ghost files in build root
|
||||
while read name mode size mtime link; do
|
||||
t=$(( mode&0170000 ))
|
||||
p="${mode:0-4:4}"
|
||||
(( p != 0 )) || p=''
|
||||
if (( t == 0100000 )); then
|
||||
install -D -m "${p:-0644}" /dev/null "$RPM_BUILD_ROOT$name"
|
||||
dd if=/dev/null bs=1 count=0 status=none seek="$size" of="$RPM_BUILD_ROOT$name"
|
||||
touch -h --date="@$mtime" "$RPM_BUILD_ROOT$name"
|
||||
elif (( t == 0040000 )); then
|
||||
install -d -m "${p:-0755}" "$RPM_BUILD_ROOT$name"
|
||||
touch -h -date="@$mtime" "$RPM_BUILD_ROOT$name"
|
||||
elif (( t == 0120000 )); then
|
||||
ln -s "$link" "$RPM_BUILD_ROOT$name"
|
||||
touch -h --date="@$mtime" "$RPM_BUILD_ROOT$name"
|
||||
fi
|
||||
done < kernel-ghost.flist
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ Group: Development/Sources
|
||||
Version: 5.13.1
|
||||
%if %using_buildservice
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%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-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: %name-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
Provides: multiversion(kernel)
|
||||
Source: README.KSYMS
|
||||
Requires: kernel-devel%variant = %version-%source_rel
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -68,27 +68,13 @@
|
||||
%define install_vdso 0
|
||||
%endif
|
||||
|
||||
# TW is usrmerged
|
||||
%if %{undefined usrmerged} && 0%{?suse_version} >= 1550
|
||||
%define usrmerged 1
|
||||
%endif
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
%define modules_dir /usr/lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap %{modules_dir}/System.map
|
||||
%else
|
||||
%define modules_dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap /boot/System.map-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
|
||||
Name: kernel-vanilla
|
||||
Summary: The Standard Kernel - without any SUSE patches
|
||||
License: GPL-2.0
|
||||
Group: System/Kernel
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -199,10 +185,10 @@ Conflicts: hyper-v < 4
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-%build_flavor-base-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
Provides: kernel-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: %name-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
%obsolete_rebuilds %name
|
||||
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
|
||||
Source2: source-post.sh
|
||||
@ -621,14 +607,6 @@ done
|
||||
|
||||
%install
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
# add symlink for usrmerge so install scripts will just follow the
|
||||
# link and end up placing files in /usr/lib. The link will be
|
||||
# removed later and is not packaged here.
|
||||
mkdir -p %{buildroot}/usr/lib
|
||||
ln -s usr/lib %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
# get rid of /usr/lib/rpm/brp-strip-debug
|
||||
# strip removes too much from the vmlinux ELF binary
|
||||
export NO_BRP_STRIP_DEBUG=true
|
||||
@ -701,6 +679,9 @@ add_vmlinux()
|
||||
mkdir -p %buildroot/usr/share/man/man9
|
||||
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
|
||||
objcopy -R .rodata.compressed arch/s390/boot/compressed/vmlinux %buildroot/boot/zdebug-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
%endif
|
||||
%ifarch %arm
|
||||
add_vmlinux --compressed
|
||||
@ -721,19 +702,11 @@ add_vmlinux()
|
||||
# sign the modules, firmware and possibly the kernel in the buildservice
|
||||
BRP_PESIGN_FILES=""
|
||||
%if "%CONFIG_EFI_STUB" == "y"
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%ifarch s390x ppc64 ppc64le
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%if "%CONFIG_MODULE_SIG" == "y"
|
||||
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
|
||||
%endif
|
||||
@ -795,13 +768,6 @@ for sub in '' '-extra' \
|
||||
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
|
||||
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
|
||||
-e "s:@SRCVARIANT@:%variant:g" \
|
||||
-e "s:@MODULESDIR@:%modules_dir:g" \
|
||||
-e "s:@SYSTEMMAP@:%systemmap:g" \
|
||||
%if 0%{?usrmerged}
|
||||
-e "s:^@USRMERGE@::" \
|
||||
%else
|
||||
-e "/^@USRMERGE@/d" \
|
||||
%endif
|
||||
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
|
||||
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
|
||||
case "$script" in
|
||||
@ -997,9 +963,7 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
|
||||
# Recreate the generated Makefile with correct path
|
||||
#
|
||||
# Linux 5.13 no longer has mkmakefile and the generated makefile only depends on
|
||||
# relative location of source and binary directories which is preserved.
|
||||
# No need to recreate.
|
||||
# Linux 5.13 no longer has mkmakefile
|
||||
if [ -f ../scripts/mkmakefile ] ; then
|
||||
sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \
|
||||
%rpm_install_dir/%cpu_arch_flavor \
|
||||
@ -1010,10 +974,6 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
fi
|
||||
|
||||
rm -rf %{buildroot}/lib/firmware
|
||||
%if 0%{?usrmerged}
|
||||
# remove usrmerge aid
|
||||
rm %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
add_dirs_to_filelist() {
|
||||
sed -rn '
|
||||
@ -1026,7 +986,7 @@ add_dirs_to_filelist() {
|
||||
# print all parents
|
||||
:a
|
||||
# skip directories owned by other packages
|
||||
s:^%%dir (/boot|/etc|(/usr)?/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:/[^/]+$::p
|
||||
ta
|
||||
' "$@" | sort -u
|
||||
@ -1037,25 +997,16 @@ if [ -f %my_builddir/livepatch-files.no_dir ] ; then
|
||||
cat %my_builddir/livepatch-files.no_dir | add_dirs_to_filelist > %my_builddir/livepatch-files
|
||||
fi
|
||||
|
||||
# does not exist for non-modularized kernels
|
||||
%if 0%{?usrmerged}
|
||||
mkdir -p %{buildroot}%modules_dir
|
||||
%endif
|
||||
shopt -s nullglob dotglob
|
||||
> %my_builddir/kernel-devel.files
|
||||
{
|
||||
echo "%modules_dir/build"
|
||||
echo "%modules_dir/source"
|
||||
cd %buildroot
|
||||
for file in boot/symtypes*; do
|
||||
%if 0%{?usrmerged}
|
||||
l="${file##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
mv "$file" "%{buildroot}$l"
|
||||
ln -s "..$l" $file
|
||||
echo "$l"
|
||||
echo "%%ghost /$file"
|
||||
%else
|
||||
echo "/$file"
|
||||
%endif
|
||||
done
|
||||
} | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||
f=${file##%buildroot}
|
||||
echo "$f"
|
||||
done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
( cd %buildroot ; find .%obj_install_dir/%cpu_arch_flavor -type f ; ) | \
|
||||
sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \
|
||||
add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
@ -1064,8 +1015,6 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
echo %ghost /boot/initrd$suffix
|
||||
cd %buildroot
|
||||
for f in boot/*; do
|
||||
l="${f##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
if test -L "$f"; then
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
@ -1081,46 +1030,24 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
;;
|
||||
boot/vmlinux-*)
|
||||
if $ghost_vmlinux; then
|
||||
# fall through to mark next echo as %ghost
|
||||
echo -n "%%ghost "
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
%if 0%{?usrmerged}
|
||||
boot/vmlinuz-*)
|
||||
echo -n "%%attr(0644, root, root) "
|
||||
;;
|
||||
%endif
|
||||
boot/symtypes*)
|
||||
%if 0%{?usrmerged}
|
||||
echo "%exclude $l"
|
||||
%endif
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
%if 0%{?usrmerged}
|
||||
mv "$f" "./$l"
|
||||
ln -s "..$l" $f
|
||||
# the find in the CONFIG_MODULES condition below also finds the files
|
||||
# but there's sort -u later, so this is ok
|
||||
echo "$l" # note: must be first after case statement above
|
||||
echo "%%ghost /$f"
|
||||
%else
|
||||
echo "%%attr(0644, root, root) /$f"
|
||||
%endif
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
find %{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor \
|
||||
find lib/modules/%kernelrelease-%build_flavor \
|
||||
-type d -o \
|
||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||
! -path '*/modules.builtin' \
|
||||
! -path '*/modules.builtin.modinfo' \) -printf '%%%%ghost /%%p\n' \
|
||||
-o -name '*.ko' -prune \
|
||||
%if 0%{?usrmerged}
|
||||
-o \( -type f ! -path '*/symtypes*' ! -path '*/vmlinu*' \) -printf '/%%p\n'
|
||||
%else
|
||||
-o -type f -printf '/%%p\n'
|
||||
%endif
|
||||
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
|
||||
cat %my_builddir/base-modules
|
||||
fi
|
||||
if test %CONFIG_MODULE_SIG = "y" -a -d etc/uefi/certs; then
|
||||
@ -1136,7 +1063,10 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||
|
||||
{
|
||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
|
||||
add_dirs_to_filelist %my_builddir/kernel-base.files
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
add_dirs_to_filelist %my_builddir/main-modules
|
||||
fi
|
||||
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
|
||||
echo "/lib/firmware/%kernelrelease-%build_flavor"
|
||||
fi
|
||||
@ -1178,15 +1108,15 @@ for f in %my_builddir/*-kmp-modules; do
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}%modules_dir/modules.fips
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-main.files
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files
|
||||
fi
|
||||
|
||||
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
|
||||
# much, but it keeps rpmlint from breaking the package build. Note that we skip
|
||||
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
|
||||
%fdupes %buildroot%modules_dir
|
||||
%fdupes $RPM_BUILD_ROOT/lib
|
||||
|
||||
%preun -f preun.sh
|
||||
|
||||
@ -1363,7 +1293,7 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
|
||||
%files %{livepatch}
|
||||
# rpmlint complains about empty packages, so lets own something
|
||||
%defattr(-, root, root)
|
||||
%dir %modules_dir
|
||||
%dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
%if 0%{?klp_symbols} && "%livepatch" != ""
|
||||
|
||||
@ -1,3 +1,53 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 12 08:10:50 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
- Revert "UsrMerge the kernel (boo#1184804)"
|
||||
This reverts commit 6f5ed044f52ae3de78db9492d404f9c88d29b938 as it:
|
||||
1) breaks installation in Leap/SLE -- no initrd is generated.
|
||||
2) breaks installation-images -- expecting kernel in /boot and modules
|
||||
in /lib.
|
||||
- commit b6ab3de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:12:30 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable DRM_I2C_NXP_TDA998X
|
||||
This also selects SND_SOC_HDMI_CODEC, SND_PCM_ELD, SND_PCM_IEC958.
|
||||
- commit d56d022
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 11 18:08:39 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_TPS65086
|
||||
Also enable the related drivers GPIO_TPS65086 and REGULATOR_TPS65086.
|
||||
- commit ce26f32
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 9 13:07:01 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- rpm/kernel-binary.spec.in: Remove zdebug define used only once.
|
||||
- commit 85a9fc2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:28:04 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- Update config files (boo#1187824).
|
||||
CRYPTO_FIPS=y
|
||||
CRYPTO_MANAGER_DISABLE_TESTS=n
|
||||
- commit c81d16b
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 20:04:55 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Exctract s390 decompression code (jsc#SLE-17042).
|
||||
- commit 7f97df2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 11:17:05 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Fix up usrmerge for non-modular kernels.
|
||||
- commit d718cd9
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
|
||||
@ -6,6 +56,14 @@ Thu Jul 8 07:02:35 CEST 2021 - jslaby@suse.cz
|
||||
(bsc#1012628).
|
||||
- commit bfd7864
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:35:52 CEST 2021 - schwab@suse.de
|
||||
|
||||
- config: riscv64: enable MFD_DA9063
|
||||
Also enable the related drivers DA9063_WATCHDOG, REGULATOR_DA9063,
|
||||
RTC_DRV_DA9063.
|
||||
- commit 40fb687
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -15,6 +73,13 @@ Mon Jul 5 18:08:41 CEST 2021 - mkubecek@suse.cz
|
||||
- patches.suse/proc-Avoid-mixing-integer-types-in-mem_rw.patch
|
||||
- commit 9510801
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 21:12:15 CEST 2021 - msuchanek@suse.de
|
||||
|
||||
- kernel-binary.spec: Remove obsolete and wrong comment
|
||||
mkmakefile is repleced by echo on newer kernel
|
||||
- commit d9209e7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 1 18:44:34 CEST 2021 - mkubecek@suse.cz
|
||||
|
||||
@ -22425,6 +22490,13 @@ Fri Aug 14 09:17:24 CEST 2020 - jslaby@suse.cz
|
||||
- r8169: rename RTL8125 to RTL8125A (bsc#1174875).
|
||||
- commit d6761b2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 10:07:31 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add ecdh_generic (boo#1173813)
|
||||
- commit 42f38df
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 12 09:46:06 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -26269,6 +26341,14 @@ Wed Jun 17 18:44:23 CEST 2020 - jslaby@suse.cz
|
||||
spinlock (bnc#1012628).
|
||||
- commit af36e48
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 17 15:48:09 CEST 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips:
|
||||
* add aes-ce-ccm and des3_ede-x86_64 (boo#173030)
|
||||
* add aes_ti and aes_neon_bs (boo#1172956)
|
||||
- commit 08a1655
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 16 09:25:57 CEST 2020 - jslaby@suse.cz
|
||||
|
||||
@ -33339,6 +33419,12 @@ Wed Feb 5 07:21:12 CET 2020 - jslaby@suse.cz
|
||||
cgroup (bnc#1012628).
|
||||
- commit c2619d7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 12:07:31 CET 2020 - duwe@suse.de
|
||||
|
||||
- rpm/modules.fips: add keywrap (bsc#1160561)
|
||||
- commit 719d9e1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 4 07:41:15 CET 2020 - jslaby@suse.cz
|
||||
|
||||
@ -37700,6 +37786,13 @@ Sun Nov 24 21:41:27 CET 2019 - mkubecek@suse.cz
|
||||
change which only affected some architectures anyway.
|
||||
- commit 5c1d459
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:46:18 CET 2019 - lpechacek@suse.com
|
||||
|
||||
- Add crypto modules required by tcrypt (FIPS)
|
||||
References: bsc#1153192
|
||||
- commit 0bc5cd1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 08:21:20 CET 2019 - jslaby@suse.cz
|
||||
|
||||
|
||||
@ -68,27 +68,13 @@
|
||||
%define install_vdso 0
|
||||
%endif
|
||||
|
||||
# TW is usrmerged
|
||||
%if %{undefined usrmerged} && 0%{?suse_version} >= 1550
|
||||
%define usrmerged 1
|
||||
%endif
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
%define modules_dir /usr/lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap %{modules_dir}/System.map
|
||||
%else
|
||||
%define modules_dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%define systemmap /boot/System.map-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
|
||||
Name: kernel-zfcpdump
|
||||
Summary: The IBM System Z zfcpdump Kernel
|
||||
License: GPL-2.0
|
||||
Group: System/Kernel
|
||||
Version: 5.13.1
|
||||
%if 0%{?is_kotd}
|
||||
Release: <RELEASE>.gbebf622
|
||||
Release: <RELEASE>.g72aabc2
|
||||
%else
|
||||
Release: 0
|
||||
%endif
|
||||
@ -199,10 +185,10 @@ Conflicts: hyper-v < 4
|
||||
Conflicts: libc.so.6()(64bit)
|
||||
%endif
|
||||
Provides: kernel = %version-%source_rel
|
||||
Provides: kernel-%build_flavor-base-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: kernel-%build_flavor-base-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
Provides: kernel-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
# END COMMON DEPS
|
||||
Provides: %name-srchash-bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
Provides: %name-srchash-72aabc280320ed44ba5be658a4e67057167ed825
|
||||
%obsolete_rebuilds %name
|
||||
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
|
||||
Source2: source-post.sh
|
||||
@ -624,14 +610,6 @@ done
|
||||
|
||||
%install
|
||||
|
||||
%if 0%{?usrmerged}
|
||||
# add symlink for usrmerge so install scripts will just follow the
|
||||
# link and end up placing files in /usr/lib. The link will be
|
||||
# removed later and is not packaged here.
|
||||
mkdir -p %{buildroot}/usr/lib
|
||||
ln -s usr/lib %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
# get rid of /usr/lib/rpm/brp-strip-debug
|
||||
# strip removes too much from the vmlinux ELF binary
|
||||
export NO_BRP_STRIP_DEBUG=true
|
||||
@ -704,6 +682,9 @@ add_vmlinux()
|
||||
mkdir -p %buildroot/usr/share/man/man9
|
||||
find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';'
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300
|
||||
objcopy -R .rodata.compressed arch/s390/boot/compressed/vmlinux %buildroot/boot/zdebug-%kernelrelease-%build_flavor
|
||||
%endif
|
||||
%endif
|
||||
%ifarch %arm
|
||||
add_vmlinux --compressed
|
||||
@ -724,19 +705,11 @@ add_vmlinux()
|
||||
# sign the modules, firmware and possibly the kernel in the buildservice
|
||||
BRP_PESIGN_FILES=""
|
||||
%if "%CONFIG_EFI_STUB" == "y"
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%ifarch s390x ppc64 ppc64le
|
||||
%if 0%{?usrmerged}
|
||||
BRP_PESIGN_FILES="%modules_dir/$image"
|
||||
%else
|
||||
BRP_PESIGN_FILES="/boot/$image-%kernelrelease-%build_flavor"
|
||||
%endif
|
||||
%endif
|
||||
%if "%CONFIG_MODULE_SIG" == "y"
|
||||
BRP_PESIGN_FILES="$BRP_PESIGN_FILES *.ko"
|
||||
%endif
|
||||
@ -798,13 +771,6 @@ for sub in '' '-extra' \
|
||||
-e "s:@RPM_TARGET_CPU@:%_target_cpu:g" \
|
||||
-e "s:@CPU_ARCH_FLAVOR@:%cpu_arch_flavor:g" \
|
||||
-e "s:@SRCVARIANT@:%variant:g" \
|
||||
-e "s:@MODULESDIR@:%modules_dir:g" \
|
||||
-e "s:@SYSTEMMAP@:%systemmap:g" \
|
||||
%if 0%{?usrmerged}
|
||||
-e "s:^@USRMERGE@::" \
|
||||
%else
|
||||
-e "/^@USRMERGE@/d" \
|
||||
%endif
|
||||
%_sourcedir/$script.sh > %my_builddir/$script$sub.sh
|
||||
if test "$base_package" -eq 1 -a "${#certs[@]}" -gt 0; then
|
||||
case "$script" in
|
||||
@ -1000,9 +966,7 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
|
||||
# Recreate the generated Makefile with correct path
|
||||
#
|
||||
# Linux 5.13 no longer has mkmakefile and the generated makefile only depends on
|
||||
# relative location of source and binary directories which is preserved.
|
||||
# No need to recreate.
|
||||
# Linux 5.13 no longer has mkmakefile
|
||||
if [ -f ../scripts/mkmakefile ] ; then
|
||||
sh ../scripts/mkmakefile ../../../%{basename:%src_install_dir} \
|
||||
%rpm_install_dir/%cpu_arch_flavor \
|
||||
@ -1013,10 +977,6 @@ if [ %CONFIG_MODULES = y ]; then
|
||||
fi
|
||||
|
||||
rm -rf %{buildroot}/lib/firmware
|
||||
%if 0%{?usrmerged}
|
||||
# remove usrmerge aid
|
||||
rm %{buildroot}/lib
|
||||
%endif
|
||||
|
||||
add_dirs_to_filelist() {
|
||||
sed -rn '
|
||||
@ -1029,7 +989,7 @@ add_dirs_to_filelist() {
|
||||
# print all parents
|
||||
:a
|
||||
# skip directories owned by other packages
|
||||
s:^%%dir (/boot|/etc|(/usr)?/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$::
|
||||
s:/[^/]+$::p
|
||||
ta
|
||||
' "$@" | sort -u
|
||||
@ -1040,25 +1000,16 @@ if [ -f %my_builddir/livepatch-files.no_dir ] ; then
|
||||
cat %my_builddir/livepatch-files.no_dir | add_dirs_to_filelist > %my_builddir/livepatch-files
|
||||
fi
|
||||
|
||||
# does not exist for non-modularized kernels
|
||||
%if 0%{?usrmerged}
|
||||
mkdir -p %{buildroot}%modules_dir
|
||||
%endif
|
||||
shopt -s nullglob dotglob
|
||||
> %my_builddir/kernel-devel.files
|
||||
{
|
||||
echo "%modules_dir/build"
|
||||
echo "%modules_dir/source"
|
||||
cd %buildroot
|
||||
for file in boot/symtypes*; do
|
||||
%if 0%{?usrmerged}
|
||||
l="${file##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
mv "$file" "%{buildroot}$l"
|
||||
ln -s "..$l" $file
|
||||
echo "$l"
|
||||
echo "%%ghost /$file"
|
||||
%else
|
||||
echo "/$file"
|
||||
%endif
|
||||
done
|
||||
} | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
for file in %buildroot/boot/symtypes* %buildroot/lib/modules/*/{build,source}; do
|
||||
f=${file##%buildroot}
|
||||
echo "$f"
|
||||
done | add_dirs_to_filelist >%my_builddir/kernel-devel.files
|
||||
( cd %buildroot ; find .%obj_install_dir/%cpu_arch_flavor -type f ; ) | \
|
||||
sed -e 's/^[.]//' | grep -v -e '[.]ipa-clones$' -e '/Symbols[.]list$' -e '/ipa-clones[.]list$'| \
|
||||
add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
@ -1067,8 +1018,6 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
echo %ghost /boot/initrd$suffix
|
||||
cd %buildroot
|
||||
for f in boot/*; do
|
||||
l="${f##*/}"
|
||||
l="%modules_dir/${l//-%kernelrelease-%build_flavor}"
|
||||
if test -L "$f"; then
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
@ -1084,46 +1033,24 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
;;
|
||||
boot/vmlinux-*)
|
||||
if $ghost_vmlinux; then
|
||||
# fall through to mark next echo as %ghost
|
||||
echo -n "%%ghost "
|
||||
echo "%%ghost /$f"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
%if 0%{?usrmerged}
|
||||
boot/vmlinuz-*)
|
||||
echo -n "%%attr(0644, root, root) "
|
||||
;;
|
||||
%endif
|
||||
boot/symtypes*)
|
||||
%if 0%{?usrmerged}
|
||||
echo "%exclude $l"
|
||||
%endif
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
%if 0%{?usrmerged}
|
||||
mv "$f" "./$l"
|
||||
ln -s "..$l" $f
|
||||
# the find in the CONFIG_MODULES condition below also finds the files
|
||||
# but there's sort -u later, so this is ok
|
||||
echo "$l" # note: must be first after case statement above
|
||||
echo "%%ghost /$f"
|
||||
%else
|
||||
echo "%%attr(0644, root, root) /$f"
|
||||
%endif
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
find %{?usrmerged:usr/}lib/modules/%kernelrelease-%build_flavor \
|
||||
find lib/modules/%kernelrelease-%build_flavor \
|
||||
-type d -o \
|
||||
\( -path '*/modules.*' ! -path '*/modules.order' \
|
||||
! -path '*/modules.builtin' \
|
||||
! -path '*/modules.builtin.modinfo' \) -printf '%%%%ghost /%%p\n' \
|
||||
-o -name '*.ko' -prune \
|
||||
%if 0%{?usrmerged}
|
||||
-o \( -type f ! -path '*/symtypes*' ! -path '*/vmlinu*' \) -printf '/%%p\n'
|
||||
%else
|
||||
-o -type f -printf '/%%p\n'
|
||||
%endif
|
||||
-o -name '*.ko' -prune -o -type f -printf '/%%p\n'
|
||||
cat %my_builddir/base-modules
|
||||
fi
|
||||
if test %CONFIG_MODULE_SIG = "y" -a -d etc/uefi/certs; then
|
||||
@ -1139,7 +1066,10 @@ add_dirs_to_filelist >> %my_builddir/kernel-devel.files
|
||||
} | sort -u | add_dirs_to_filelist >%my_builddir/kernel-base.files
|
||||
|
||||
{
|
||||
add_dirs_to_filelist %my_builddir/{kernel-base.files,main-modules}
|
||||
add_dirs_to_filelist %my_builddir/kernel-base.files
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
add_dirs_to_filelist %my_builddir/main-modules
|
||||
fi
|
||||
if test -d %buildroot/lib/firmware/%kernelrelease-%build_flavor; then
|
||||
echo "/lib/firmware/%kernelrelease-%build_flavor"
|
||||
fi
|
||||
@ -1181,15 +1111,15 @@ for f in %my_builddir/*-kmp-modules; do
|
||||
done
|
||||
|
||||
if [ %CONFIG_MODULES = y ]; then
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}%modules_dir/modules.fips
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo %modules_dir/modules.fips >> %my_builddir/kernel-main.files
|
||||
install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files
|
||||
echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files
|
||||
fi
|
||||
|
||||
# Hardlink duplicate files automatically (from package fdupes): It doesn't save
|
||||
# much, but it keeps rpmlint from breaking the package build. Note that we skip
|
||||
# /usr/src/linux-obj intentionally, to not accidentally break timestamps there
|
||||
%fdupes %buildroot%modules_dir
|
||||
%fdupes $RPM_BUILD_ROOT/lib
|
||||
|
||||
%preun -f preun.sh
|
||||
|
||||
@ -1372,7 +1302,7 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
|
||||
%files %{livepatch}
|
||||
# rpmlint complains about empty packages, so lets own something
|
||||
%defattr(-, root, root)
|
||||
%dir %modules_dir
|
||||
%dir /lib/modules/%kernelrelease-%build_flavor
|
||||
%endif
|
||||
|
||||
%if 0%{?klp_symbols} && "%livepatch" != ""
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
ablk_helper
|
||||
aes-ce-ccm
|
||||
aes-neon-bs
|
||||
aes_s390
|
||||
aes_ti
|
||||
af_alg
|
||||
algif_hash
|
||||
ansi_cprng
|
||||
@ -16,16 +19,19 @@ cast6_generic
|
||||
cast_common
|
||||
cbc
|
||||
ccm
|
||||
cfb
|
||||
cmac
|
||||
cryptd
|
||||
crypto_user
|
||||
ctr
|
||||
cts
|
||||
deflate
|
||||
des3_ede-x86_64
|
||||
des_generic
|
||||
des_s390
|
||||
drbg
|
||||
ecb
|
||||
ecdh_generic
|
||||
fcrypt
|
||||
gcm
|
||||
gf128mul
|
||||
@ -33,9 +39,11 @@ ghash_generic
|
||||
ghash_s390
|
||||
glue_helper
|
||||
khazad
|
||||
keywrap
|
||||
lrw
|
||||
md4
|
||||
michael_mic
|
||||
ofb
|
||||
pcbc
|
||||
rmd128
|
||||
rmd160
|
||||
|
||||
19
post.sh
19
post.sh
@ -10,23 +10,6 @@ for x in /boot/@IMAGE@ /boot/initrd; do
|
||||
rm -f $x$suffix
|
||||
ln -s ${x##*/}-@KERNELRELEASE@-@FLAVOR@ $x$suffix
|
||||
done
|
||||
@USRMERGE@# compat stuff for /boot.
|
||||
@USRMERGE@# if /boot is not a speparate partition we can just link the kernel
|
||||
@USRMERGE@# there to save space. Otherwise copy.
|
||||
@USRMERGE@if mountpoint -q /boot; then
|
||||
@USRMERGE@ copy_or_link="cp -a"
|
||||
@USRMERGE@else
|
||||
@USRMERGE@ copy_or_link="ln -sf"
|
||||
@USRMERGE@fi
|
||||
@USRMERGE@# XXX: need to fix suse-module-tools for sysctl.conf and System.map
|
||||
@USRMERGE@for x in @IMAGE@ sysctl.conf System.map; do
|
||||
@USRMERGE@ if [ ! -e /boot/$x-@KERNELRELEASE@-@FLAVOR@ ]; then
|
||||
@USRMERGE@ $copy_or_link ..@MODULESDIR@/$x /boot/$x-@KERNELRELEASE@-@FLAVOR@
|
||||
@USRMERGE@ if [ -e @MODULESDIR@/.$x.hmac ]; then
|
||||
@USRMERGE@ $copy_or_link ..@MODULESDIR@/.$x.hmac /boot/.$x-@KERNELRELEASE@-@FLAVOR@.hmac
|
||||
@USRMERGE@ fi
|
||||
@USRMERGE@ fi
|
||||
@USRMERGE@done
|
||||
|
||||
# Add symlinks of compatible modules to /lib/modules/$krel/weak-updates/,
|
||||
# run depmod and mkinitrd
|
||||
@ -73,7 +56,7 @@ if [ -f /etc/fstab -a ! -e /.buildenv ] ; then
|
||||
if [ @FLAVOR@ = rt ]; then
|
||||
default=force-default
|
||||
fi
|
||||
if [ -e /boot/$initrd -o ! -e @MODULESDIR@ ] && \
|
||||
if [ -e /boot/$initrd -o ! -e /lib/modules/@KERNELRELEASE@-@FLAVOR@ ] && \
|
||||
run_bootloader ; then
|
||||
[ -e /boot/$initrd ] || initrd=
|
||||
if [ -x /usr/lib/bootloader/bootloader_entry ]; then
|
||||
|
||||
@ -6,7 +6,7 @@ rm -f /boot/do_purge_kernels
|
||||
wm2=/usr/lib/module-init-tools/weak-modules2
|
||||
nvr=@SUBPACKAGE@-@RPM_VERSION_RELEASE@
|
||||
|
||||
if [ -e @SYSTEMMAP@ ]; then
|
||||
if [ -e /boot/System.map-@KERNELRELEASE@-@FLAVOR@ ]; then
|
||||
# the same package was reinstalled or just rebuilt, otherwise the files
|
||||
# would have been deleted by now
|
||||
# do not remove anything in this case (bnc#533766)
|
||||
@ -21,7 +21,7 @@ if [ @BASE_PACKAGE@ = 0 ]; then
|
||||
rm -f /var/run/rpm-$nvr-modules
|
||||
exit 0
|
||||
fi
|
||||
# Remove symlinks from @MODULESDIR@/weak-updates/.
|
||||
# Remove symlinks from /lib/modules/$krel/weak-updates/.
|
||||
if [ -x $wm2 ]; then
|
||||
/bin/bash -${-/e/} $wm2 --remove-kernel @KERNELRELEASE@-@FLAVOR@
|
||||
fi
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
2021-07-08 05:02:50 +0000
|
||||
GIT Revision: bebf622aff1cb3cc04057e235652056aa3e2cff5
|
||||
2021-07-12 06:35:58 +0000
|
||||
GIT Revision: 72aabc280320ed44ba5be658a4e67057167ed825
|
||||
GIT Branch: stable
|
||||
|
||||
@ -77,7 +77,7 @@ while read mod path; do
|
||||
no)
|
||||
;;
|
||||
"")
|
||||
echo "warning: $mod not listed in supported.conf" >&2
|
||||
echo "warning: ${path#/lib/modules/*/kernel/} not listed in supported.conf" >&2
|
||||
;;
|
||||
*)
|
||||
echo "error: invalid support flag for $mod: $support" >&2
|
||||
@ -119,13 +119,11 @@ join -j 1 -o 2.2 "$tmp/base" "$tmp/all" >"$opt_out/base-modules"
|
||||
|
||||
# base firmware
|
||||
kver=$(make $MAKE_ARGS -s -C "$opt_builddir" kernelrelease)
|
||||
fw_dir=/lib/firmware/$kver
|
||||
test -d $opt_dir/usr$fw_dir && fw_dir=/usr$fw_dir
|
||||
if test -d "$opt_dir$fw_dir"; then
|
||||
if test -d "$opt_dir/lib/firmware/$kver"; then
|
||||
join <(/sbin/modinfo -F firmware \
|
||||
$(sed "s:^:$opt_dir:" "$opt_out/base-modules") | sort) \
|
||||
<(find "$opt_dir$fw_dir" -type f -printf '%P\n' | sort)
|
||||
fi | sed "s:^:$fw_dir:" >"$opt_out/base-firmware"
|
||||
<(find "$opt_dir/lib/firmware/$kver" -type f -printf '%P\n' | sort)
|
||||
fi | sed "s:^:/lib/firmware/$kver/:" >"$opt_out/base-firmware"
|
||||
|
||||
# kmps
|
||||
for f in "$opt_builddir"/Module.*-kmp; do
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#!/bin/bash -e
|
||||
#!/bin/sh -e
|
||||
|
||||
package="$1"
|
||||
present="$2"
|
||||
@ -10,7 +10,6 @@ rpm -ql --noghost "$package" | while read x ; do
|
||||
[ -e "$x" -o -L "$x" ] && echo "$x" >> "$present" || echo Missing file "$x"
|
||||
done
|
||||
|
||||
rpm -q --qf '[%{FILEFLAGS} %{FILENAMES} 0%{FILEMODES:octal} %{FILESIZES} %{FILEMTIMES} %{FILELINKTOS}\n]' $package | while read -a line; do
|
||||
[ $[line[0]&64] = 64 ] || continue
|
||||
echo "${line[@]:1}"
|
||||
done > "$ghost"
|
||||
rpm -ql "$package" | while read x ; do
|
||||
grep "^$x\$" $present >/dev/null || echo "$x" >> $ghost
|
||||
done
|
||||
|
||||
@ -165,7 +165,7 @@
|
||||
crypto/cast_common
|
||||
crypto/cbc
|
||||
crypto/ccm
|
||||
- crypto/cfb
|
||||
crypto/cfb # required by tcrypt, bsc#1153192
|
||||
crypto/chacha20poly1305
|
||||
- crypto/chacha_generic
|
||||
crypto/cmac
|
||||
@ -213,7 +213,7 @@
|
||||
- crypto/morus1280
|
||||
- crypto/morus640
|
||||
- crypto/nhpoly1305
|
||||
- crypto/ofb
|
||||
crypto/ofb # required by tcrypt, bsc#1153192
|
||||
crypto/pcbc
|
||||
crypto/pcrypt
|
||||
crypto/poly1305_generic
|
||||
|
||||
Loading…
Reference in New Issue
Block a user