Revert EuroLinux modifications

This commit is contained in:
eabdullin 2023-12-21 13:28:44 +03:00
parent e64d00bc57
commit 410c5392a1

View File

@ -622,15 +622,6 @@ Summary: The Linux kernel
%define kernel_prereq coreutils, systemd >= 203-2, /usr/bin/kernel-install %define kernel_prereq coreutils, systemd >= 203-2, /usr/bin/kernel-install
%define initrd_prereq dracut >= 027 %define initrd_prereq dracut >= 027
# EuroLinux override
# Normaly this should be done in rpmmacros, but because the packages must be rebuildable with beast
# we have to change this here
%define with_doc 1
%global signkernel 0
%global signmodules 0
# End of EuroLinux override
Name: kernel Name: kernel
License: GPLv2 and Redistributable, no modification permitted License: GPLv2 and Redistributable, no modification permitted
@ -1254,11 +1245,11 @@ Summary: gcov graph and source files for coverage data collection.\
%{nil} %{nil}
%package -n kernel-abi-stablelists %package -n kernel-abi-stablelists
Summary: The EuroLinux kernel ABI symbol stablelists Summary: The Red Hat Enterprise Linux kernel ABI symbol stablelists
AutoReqProv: no AutoReqProv: no
%description -n kernel-abi-stablelists %description -n kernel-abi-stablelists
The kABI package contains information pertaining to the EuroLinux The kABI package contains information pertaining to the Red Hat Enterprise
kernel ABI, including lists of kernel symbols that are needed by Linux kernel ABI, including lists of kernel symbols that are needed by
external Linux kernel modules, and a yum plugin to aid enforcement. external Linux kernel modules, and a yum plugin to aid enforcement.
%if %{with_kabidw_base} %if %{with_kabidw_base}
@ -1267,8 +1258,8 @@ Summary: The baseline dataset for kABI verification using DWARF data
Group: System Environment/Kernel Group: System Environment/Kernel
AutoReqProv: no AutoReqProv: no
%description kernel-kabidw-base-internal %description kernel-kabidw-base-internal
The package contains data describing the current ABI of the EuroLinux The package contains data describing the current ABI of the Red Hat Enterprise
kernel, suitable for the kabi-dw tool. Linux kernel, suitable for the kabi-dw tool.
%endif %endif
# #
@ -1799,7 +1790,7 @@ done
# Adjust FIPS module name for RHEL # Adjust FIPS module name for RHEL
%if 0%{?rhel} %if 0%{?rhel}
for i in *.config; do for i in *.config; do
sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="EuroLinux %{rhel} - Kernel Cryptographic API"/' $i sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux %{rhel} - Kernel Cryptographic API"/' $i
done done
%endif %endif
@ -3763,8 +3754,6 @@ fi
# #
# #
%changelog %changelog
* Tue Dec 19 2023 EuroLinux Autopatch <devel@euro-linux.com>
* Fri Nov 24 2023 Jan Stancek <jstancek@redhat.com> [5.14.0-362.13.1.el9_3] * Fri Nov 24 2023 Jan Stancek <jstancek@redhat.com> [5.14.0-362.13.1.el9_3]
- cifs: Fix UAF in cifs_demultiplex_thread() (Scott Mayhew) [RHEL-15169 RHEL-15173 RHEL-15170 RHEL-15174] {CVE-2023-1192} - cifs: Fix UAF in cifs_demultiplex_thread() (Scott Mayhew) [RHEL-15169 RHEL-15173 RHEL-15170 RHEL-15174] {CVE-2023-1192}
- iommu: Optimise PCI SAC address trick (Jerry Snitselaar) [RHEL-15381 RHEL-11705] - iommu: Optimise PCI SAC address trick (Jerry Snitselaar) [RHEL-15381 RHEL-11705]