diff --git a/kernel.spec b/kernel.spec index 43fde53d0466d397f38a49a1e314c4d29b933ceb..97d0522257ba8442c6b5f7cbe36283d2174d6da6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1,5 +1,3 @@ -%define anolis_release .0.1 - # We have to override the new %%install behavior because, well... the kernel is special. %global __spec_install_pre %{___build_pre} @@ -22,10 +20,10 @@ Summary: The Linux kernel %global distro_build 1160 %define specversion 3.10.0 -%define pkgrelease 1160.119.1.el7 +%define pkgrelease 1160.123.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1160.119.1%{anolis_release}%{?dist} +%define specrelease 1160.123.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -404,22 +402,22 @@ Source10: sign-modules Source11: x509.genkey Source12: extra_certificates %if %{?released_kernel} -Source13: centos-ca-secureboot.der -Source14: centossecureboot001.crt -Source15: centossecurebootca2.der -Source16: centossecureboot201.crt -%define pesign_name_0 centossecureboot001 -%define pesign_name_1 centossecureboot201 +Source13: redhatsecurebootca3.cer +Source14: redhatsecureboot301.cer +Source15: redhatsecurebootca5.cer +Source16: redhatsecureboot501.cer +%define pesign_name_0 redhatsecureboot301 +%define pesign_name_1 redhatsecureboot501 %else -Source13: centos-ca-secureboot.der -Source14: centossecureboot001.crt -Source15: centossecurebootca2.der -Source16: centossecureboot201.crt -%define pesign_name_0 centossecureboot001 -%define pesign_name_1 centossecureboot201 +Source13: redhatsecurebootca2.cer +Source14: redhatsecureboot003.cer +Source15: redhatsecurebootca4.cer +Source16: redhatsecureboot401.cer +%define pesign_name_0 redhatsecureboot003 +%define pesign_name_1 redhatsecureboot401 %endif -Source17: centos-ldup.x509 -Source18: centos-kpatch.x509 +Source17: rheldup3.x509 +Source18: rhelkpatch1.x509 Source19: check-kabi @@ -463,9 +461,6 @@ Source9999: lastcommit.stat # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch -Patch1000: debrand-single-cpu.patch -Patch1001: debrand-rh_taint.patch -Patch1002: debrand-rh-i686-cpu.patch BuildRoot: %{_tmppath}/kernel-%{KVRA}-root @@ -806,9 +801,6 @@ cd linux-%{KVRA} cp $RPM_SOURCE_DIR/kernel-%{version}-*.config . ApplyOptionalPatch linux-kernel-test.patch -ApplyOptionalPatch debrand-single-cpu.patch -ApplyOptionalPatch debrand-rh_taint.patch -ApplyOptionalPatch debrand-rh-i686-cpu.patch # Any further pre-build tree manipulations happen here. @@ -1582,6 +1574,29 @@ if [ `uname -i` == "x86_64" ] &&\ [ -f /etc/sysconfig/kernel ]; then\ /bin/sed -r -i -e 's/^DEFAULTKERNEL=%{-r*}$/DEFAULTKERNEL=kernel%{?-v:-%{-v*}}/' /etc/sysconfig/kernel || exit $?\ fi}\ +%{expand:\ +%{_sbindir}/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --install %{KVRA}%{?-v:.%{-v*}} || exit $?\ +: duplicate of posttrans code START - see bz1893756, bz2166233 \ +if [ -x %{_sbindir}/weak-modules ]\ +then\ + %{_sbindir}/weak-modules --add-kernel %{KVRA}%{?1:.%{1}} || exit $?\ +fi\ +%{_sbindir}/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --dracut --depmod --update %{KVRA}%{?-v:.%{-v*}} \ +rc=$?\ +if [ $rc != 0 ]; then\ + %{_sbindir}/new-kernel-pkg --remove %{KVRA}%{?1:.%{1}}\ + ERROR_MSG="ERROR: installing kernel-%{KVRA}%{?1:.%{1}}: no space left for creating initramfs. Clean up /boot partition and re-run '%{_sbindir}/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --dracut --depmod --install %{KVRA}%{?-v:.%{-v*}}'"\ + if [ -e /usr/bin/logger ]; then\ + /usr/bin/logger -p syslog.warn "\$ERROR_MSG"\ + else\ + echo "\$ERROR_MSG" > /dev/kmsg\ + fi\ + echo "\$ERROR_MSG"\ + exit $rc\ +fi\ +%{_sbindir}/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVRA}%{?1:.%{1}} || exit $?\ +: duplicate of posttrans code END \ +}\ %{nil} # @@ -1812,6 +1827,9 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog +* Tue Aug 20 2024 pangqing [3.10.0-1160.123.1.0.1.an7] +- update to kernel-3.10.0-1160.123.1 + * Wed Jun 26 2024 yangxianzhao [3.10.0-1160.119.1.0.1.an7] - modify dist diff --git a/linux-3.10.0-1160.123.1.el7.tar.xz b/linux-3.10.0-1160.123.1.el7.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..26fb1b9b52fd9404aa1218b64a2fe14a733d6ff6 Binary files /dev/null and b/linux-3.10.0-1160.123.1.el7.tar.xz differ