forked from rpms/kernel
kernel-5.11.0-0.rc7.149.el9
* Mon Feb 08 2021 Herton R. Krzesinski <herton@redhat.com> [5.11.0-0.rc7.149] - v5.11-rc7 rebase - redhat: add DUP and kpatch certificates to system trusted keys for RHEL build (Herton R. Krzesinski) - The comments in CONFIG_USB_RTL8153_ECM actually turn off CONFIG_USB_RTL8152 (Justin M. Forbes) - Update CKI pipeline project (Veronika Kabatova) Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
This commit is contained in:
parent
88165ca308
commit
8f6be103a4
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 145
|
||||
RHEL_RELEASE = 149
|
||||
|
||||
#
|
||||
# Early y+1 numbering
|
||||
|
@ -1,5 +1,5 @@
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/2f3a17ce5c1db554bdd90d0ca12f5db06ce28d45
|
||||
2f3a17ce5c1db554bdd90d0ca12f5db06ce28d45 Bluetooth: L2CAP: Try harder to accept device not knowing options
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/67dabe40324eee91aa9f135391ca7b0eb9a7e069
|
||||
67dabe40324eee91aa9f135391ca7b0eb9a7e069 Bluetooth: L2CAP: Try harder to accept device not knowing options
|
||||
|
||||
https://gitlab.com/cki-project/kernel-ark/-/commit/035ea4b6c436e53b4c9e388bc65c965f310e216c
|
||||
035ea4b6c436e53b4c9e388bc65c965f310e216c redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED
|
||||
|
42
kernel.spec
42
kernel.spec
@ -64,7 +64,7 @@ Summary: The Linux kernel
|
||||
# For a stable, released kernel, released_kernel should be 1.
|
||||
%global released_kernel 0
|
||||
|
||||
%global distro_build 0.rc6.145
|
||||
%global distro_build 0.rc7.149
|
||||
|
||||
%if 0%{?fedora}
|
||||
%define secure_boot_arch x86_64
|
||||
@ -105,13 +105,13 @@ Summary: The Linux kernel
|
||||
%endif
|
||||
|
||||
%define rpmversion 5.11.0
|
||||
%define pkgrelease 0.rc6.145
|
||||
%define pkgrelease 0.rc7.149
|
||||
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 11
|
||||
|
||||
# allow pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 0.rc6.145%{?buildid}%{?dist}
|
||||
%define specrelease 0.rc7.149%{?buildid}%{?dist}
|
||||
|
||||
%define pkg_release %{specrelease}
|
||||
|
||||
@ -601,7 +601,7 @@ BuildRequires: asciidoc
|
||||
# exact git commit you can run
|
||||
#
|
||||
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
||||
Source0: linux-5.11.0-0.rc6.145.tar.xz
|
||||
Source0: linux-5.11.0-0.rc7.149.tar.xz
|
||||
|
||||
Source1: Makefile.rhelver
|
||||
|
||||
@ -719,6 +719,9 @@ Source56: update_scripts.sh
|
||||
|
||||
Source54: mod-internal.list
|
||||
|
||||
Source100: rheldup3.x509
|
||||
Source101: rhelkpatch1.x509
|
||||
|
||||
Source200: check-kabi
|
||||
|
||||
Source201: Module.kabi_aarch64
|
||||
@ -1246,8 +1249,8 @@ ApplyOptionalPatch()
|
||||
fi
|
||||
}
|
||||
|
||||
%setup -q -n kernel-5.11.0-0.rc6.145 -c
|
||||
mv linux-5.11.0-0.rc6.145 linux-%{KVERREL}
|
||||
%setup -q -n kernel-5.11.0-0.rc7.149 -c
|
||||
mv linux-5.11.0-0.rc7.149 linux-%{KVERREL}
|
||||
|
||||
cd linux-%{KVERREL}
|
||||
cp -a %{SOURCE1} .
|
||||
@ -1323,6 +1326,18 @@ do
|
||||
done
|
||||
%endif
|
||||
|
||||
# Add DUP and kpatch certificates to system trusted keys for RHEL
|
||||
%if 0%{?rhel}
|
||||
%if %{signkernel}%{signmodules}
|
||||
openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
|
||||
openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
|
||||
cat rheldup3.pem rhelkpatch1.pem > ../certs/rhel.pem
|
||||
for i in *.config; do
|
||||
sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS=""@CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"@' $i
|
||||
done
|
||||
%endif
|
||||
%endif
|
||||
|
||||
cp %{SOURCE52} .
|
||||
OPTS=""
|
||||
%if %{with_configchecks}
|
||||
@ -2736,12 +2751,19 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Fri Feb 05 2021 Herton R. Krzesinski <herton@redhat.com> [5.11.0-0.rc6.145]
|
||||
- v5.11-rc6-139-gdd86e7fa07a3 rebase
|
||||
|
||||
* Fri Feb 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc6.20210205gitdd86e7fa07a3.145]
|
||||
* Mon Feb 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.149]
|
||||
- v5.11-rc7 rebase
|
||||
- Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera)
|
||||
|
||||
* Mon Feb 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.148]
|
||||
- redhat: add DUP and kpatch certificates to system trusted keys for RHEL build (Herton R. Krzesinski)
|
||||
|
||||
* Mon Feb 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc6.20210208git825b5991a46e.147]
|
||||
- The comments in CONFIG_USB_RTL8153_ECM actually turn off CONFIG_USB_RTL8152 (Justin M. Forbes)
|
||||
|
||||
* Sat Feb 06 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc6.20210206git17fbcdf9f163.145]
|
||||
- Update CKI pipeline project (Veronika Kabatova)
|
||||
|
||||
* Fri Feb 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc6.20210205gitdd86e7fa07a3.144]
|
||||
- Turn off additional KASAN options for Fedora (Justin M. Forbes)
|
||||
- Rename the master branch to rawhide for Fedora (Justin M. Forbes)
|
||||
|
BIN
rheldup3.x509
Normal file
BIN
rheldup3.x509
Normal file
Binary file not shown.
BIN
rhelkpatch1.x509
Normal file
BIN
rhelkpatch1.x509
Normal file
Binary file not shown.
6
sources
6
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (linux-5.11.0-0.rc6.145.tar.xz) = 37de0b214838241a33855b2aac43787ad18b0201953d3d130b06ab96c940d4755e96bbdb848f1d3bc1f4748584faa53c6c29ffa7649d67cc98c1516f4b4d60bb
|
||||
SHA512 (kernel-abi-whitelists-5.11.0-0.rc6.145.tar.bz2) = c50b82aabad4f2e49b4f998a5dc76564af4a489982f8e7e4e4a88525269cc24abb3dde568ade93176128376877b5f9daf897dc78e896cb5c7eb5b1faa30e2b2d
|
||||
SHA512 (kernel-kabi-dw-5.11.0-0.rc6.145.tar.bz2) = 1c6cd6285b506d7379f67bb4140f0589bdef5c4431c7946aade272b30c15bddd19f58dc096e8bfcb1dc20c154e78f964289f92db8b2ecbad2d3f75ab16120451
|
||||
SHA512 (linux-5.11.0-0.rc7.149.tar.xz) = a1c2b992a537888c21b43f2b74aefaccf64759f43b91ccaae1011d11c58f381df6b0750f21f0dca483ab81413132902b6e2058490ac62600540ed4e27ef648b1
|
||||
SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.149.tar.bz2) = 68f8d7a38c46f2760b277a0d73bfa5a2fd21b79eaca42f5b8df1297bd6f225e16cee6dffd07e225e2208b883609a3503f0d89ffeeb8be526ce8f8c092a7d45cb
|
||||
SHA512 (kernel-kabi-dw-5.11.0-0.rc7.149.tar.bz2) = 21c7de769e93075d14eec189e85b89df851118732663ebb4493c3350b2a8278bcc8bf2895e3871bb2562d120e27ba8177ef26d39314ff25c20cf61efec94b8f0
|
||||
|
Loading…
Reference in New Issue
Block a user