forked from rpms/kernel
kernel-5.14.0-265.el9
* Thu Feb 09 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-265.el9] - CI: Add pipelines for kernel-64k variant for RHEL (Veronika Kabatova) - CI: Enable pipelines for 64k variant (Veronika Kabatova) - arm64-64k: Add new kernel variant to RHEL9/CS9 for 64K page-size'd ARM64 (Donald Dutile) [2153073] Resolves: rhbz#2153073 Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
This commit is contained in:
parent
d59d834594
commit
5e5e1efbe9
@ -12,7 +12,7 @@ RHEL_MINOR = 2
|
|||||||
#
|
#
|
||||||
# Use this spot to avoid future merge conflicts.
|
# Use this spot to avoid future merge conflicts.
|
||||||
# Do not trim this comment.
|
# Do not trim this comment.
|
||||||
RHEL_RELEASE = 264
|
RHEL_RELEASE = 265
|
||||||
|
|
||||||
#
|
#
|
||||||
# ZSTREAM
|
# ZSTREAM
|
||||||
|
6892
kernel-aarch64-64k-debug-rhel.config
Normal file
6892
kernel-aarch64-64k-debug-rhel.config
Normal file
File diff suppressed because it is too large
Load Diff
6868
kernel-aarch64-64k-rhel.config
Normal file
6868
kernel-aarch64-64k-rhel.config
Normal file
File diff suppressed because it is too large
Load Diff
167
kernel.spec
167
kernel.spec
@ -48,6 +48,30 @@
|
|||||||
# will not see them.
|
# will not see them.
|
||||||
%global __spec_install_pre %{___build_pre}
|
%global __spec_install_pre %{___build_pre}
|
||||||
|
|
||||||
|
# Replace '-' with '_' where needed so that variants can use '-' in
|
||||||
|
# their name.
|
||||||
|
%define uname_suffix %{lua:
|
||||||
|
local flavour = rpm.expand('%{?1:+%{1}}')
|
||||||
|
flavour = flavour:gsub('-', '_')
|
||||||
|
if flavour ~= '' then
|
||||||
|
print(flavour)
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
|
# This returns the main kernel tied to a debug variant. For example,
|
||||||
|
# kernel-debug is the debug version of kernel, so we return an empty
|
||||||
|
# string. However, kernel-64k-debug is the debug version of kernel-64k,
|
||||||
|
# in this case we need to return "64k", and so on. This is used in
|
||||||
|
# macros below where we need this for some uname based requires.
|
||||||
|
%define uname_variant %{lua:
|
||||||
|
local flavour = rpm.expand('%{?1:%{1}}')
|
||||||
|
_, _, main, sub = flavour:find("(%w+)-(.*)")
|
||||||
|
if main then
|
||||||
|
print("+" .. main)
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
# At the time of this writing (2019-03), RHEL8 packages use w2.xzdio
|
# At the time of this writing (2019-03), RHEL8 packages use w2.xzdio
|
||||||
# compression for rpms (xz, level 2).
|
# compression for rpms (xz, level 2).
|
||||||
# Kernel has several large (hundreds of mbytes) rpms, they take ~5 mins
|
# Kernel has several large (hundreds of mbytes) rpms, they take ~5 mins
|
||||||
@ -119,15 +143,15 @@ Summary: The Linux kernel
|
|||||||
# define buildid .local
|
# define buildid .local
|
||||||
%define specversion 5.14.0
|
%define specversion 5.14.0
|
||||||
%define patchversion 5.14
|
%define patchversion 5.14
|
||||||
%define pkgrelease 264
|
%define pkgrelease 265
|
||||||
%define kversion 5
|
%define kversion 5
|
||||||
%define tarfile_release 5.14.0-264.el9
|
%define tarfile_release 5.14.0-265.el9
|
||||||
# This is needed to do merge window version magic
|
# This is needed to do merge window version magic
|
||||||
%define patchlevel 14
|
%define patchlevel 14
|
||||||
# This allows pkg_release to have configurable %%{?dist} tag
|
# This allows pkg_release to have configurable %%{?dist} tag
|
||||||
%define specrelease 264%{?buildid}%{?dist}
|
%define specrelease 265%{?buildid}%{?dist}
|
||||||
# This defines the kabi tarball version
|
# This defines the kabi tarball version
|
||||||
%define kabiversion 5.14.0-264.el9
|
%define kabiversion 5.14.0-265.el9
|
||||||
|
|
||||||
#
|
#
|
||||||
# End of genspec.sh variables
|
# End of genspec.sh variables
|
||||||
@ -151,6 +175,8 @@ Summary: The Linux kernel
|
|||||||
%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1}
|
%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1}
|
||||||
# kernel-zfcpdump (s390 specific kernel for zfcpdump)
|
# kernel-zfcpdump (s390 specific kernel for zfcpdump)
|
||||||
%define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1}
|
%define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1}
|
||||||
|
# kernel-64k (aarch64 kernel with 64K page_size)
|
||||||
|
%define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1}
|
||||||
# kernel-doc
|
# kernel-doc
|
||||||
%define with_doc %{?_without_doc: 0} %{?!_without_doc: 1}
|
%define with_doc %{?_without_doc: 0} %{?!_without_doc: 1}
|
||||||
# kernel-headers
|
# kernel-headers
|
||||||
@ -406,6 +432,11 @@ Summary: The Linux kernel
|
|||||||
%define with_zfcpdump 0
|
%define with_zfcpdump 0
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# 64k variant only for aarch64
|
||||||
|
%ifnarch aarch64
|
||||||
|
%define with_arm64_64k 0
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
# This is not for Fedora
|
# This is not for Fedora
|
||||||
%define with_zfcpdump 0
|
%define with_zfcpdump 0
|
||||||
@ -496,6 +527,7 @@ Summary: The Linux kernel
|
|||||||
%define with_debug 0
|
%define with_debug 0
|
||||||
%define with_pae 0
|
%define with_pae 0
|
||||||
%define with_zfcpdump 0
|
%define with_zfcpdump 0
|
||||||
|
%define with_arm64_64k 0
|
||||||
|
|
||||||
%define with_debuginfo 0
|
%define with_debuginfo 0
|
||||||
%define with_perf 0
|
%define with_perf 0
|
||||||
@ -759,6 +791,9 @@ Source39: filter-s390x.sh.rhel
|
|||||||
Source40: filter-modules.sh.rhel
|
Source40: filter-modules.sh.rhel
|
||||||
|
|
||||||
Source41: x509.genkey.centos
|
Source41: x509.genkey.centos
|
||||||
|
# ARM64 64K page-size kernel config
|
||||||
|
Source42: kernel-aarch64-64k-rhel.config
|
||||||
|
Source43: kernel-aarch64-64k-debug-rhel.config
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?include_fedora}
|
%if 0%{?include_fedora}
|
||||||
@ -855,8 +890,8 @@ The kernel meta package
|
|||||||
%if %{-o:0}%{!-o:1}\
|
%if %{-o:0}%{!-o:1}\
|
||||||
Provides: kernel = %{specversion}-%{pkg_release}\
|
Provides: kernel = %{specversion}-%{pkg_release}\
|
||||||
%endif\
|
%endif\
|
||||||
Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
|
Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{uname_suffix %{?1:%{1}}}\
|
||||||
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
|
Provides: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
|
||||||
Requires(pre): %{kernel_prereq}\
|
Requires(pre): %{kernel_prereq}\
|
||||||
Requires(pre): %{initrd_prereq}\
|
Requires(pre): %{initrd_prereq}\
|
||||||
Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\
|
Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\
|
||||||
@ -1129,8 +1164,8 @@ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
|
|||||||
%package %{?1:%{1}-}devel\
|
%package %{?1:%{1}-}devel\
|
||||||
Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
|
Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
|
||||||
Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\
|
Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\
|
||||||
Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
|
Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{uname_suffix %{?1:%{1}}}\
|
||||||
Provides: kernel-devel-uname-r = %{KVERREL}%{?1:+%{1}}\
|
Provides: kernel-devel-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
|
||||||
Provides: installonlypkg(kernel)\
|
Provides: installonlypkg(kernel)\
|
||||||
AutoReqProv: no\
|
AutoReqProv: no\
|
||||||
Requires(pre): findutils\
|
Requires(pre): findutils\
|
||||||
@ -1143,7 +1178,7 @@ Requires: flex\
|
|||||||
Requires: make\
|
Requires: make\
|
||||||
Requires: gcc\
|
Requires: gcc\
|
||||||
%if %{-m:1}%{!-m:0}\
|
%if %{-m:1}%{!-m:0}\
|
||||||
Requires: kernel-devel-uname-r = %{KVERREL}\
|
Requires: kernel-devel-uname-r = %{KVERREL}%{uname_variant %{?1:%{1}}}\
|
||||||
%endif\
|
%endif\
|
||||||
%description %{?1:%{1}-}devel\
|
%description %{?1:%{1}-}devel\
|
||||||
This package provides kernel headers and makefiles sufficient to build modules\
|
This package provides kernel headers and makefiles sufficient to build modules\
|
||||||
@ -1185,12 +1220,12 @@ This package provides *.ipa-clones files.\
|
|||||||
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
|
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
|
||||||
Group: System Environment/Kernel\
|
Group: System Environment/Kernel\
|
||||||
Provides: kernel%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{version}-%{release}\
|
Provides: kernel%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{version}-%{release}\
|
||||||
Provides: kernel%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
|
Provides: kernel%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{version}-%{release}%{uname_suffix %{?1:%{1}}}\
|
||||||
Provides: kernel%{?1:-%{1}}-modules-internal = %{version}-%{release}%{?1:+%{1}}\
|
Provides: kernel%{?1:-%{1}}-modules-internal = %{version}-%{release}%{uname_suffix %{?1:%{1}}}\
|
||||||
Provides: installonlypkg(kernel-module)\
|
Provides: installonlypkg(kernel-module)\
|
||||||
Provides: kernel%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{?1:+%{1}}\
|
Provides: kernel%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
|
||||||
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
|
Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
|
||||||
Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
|
Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
|
||||||
AutoReq: no\
|
AutoReq: no\
|
||||||
AutoProv: yes\
|
AutoProv: yes\
|
||||||
%description %{?1:%{1}-}modules-internal\
|
%description %{?1:%{1}-}modules-internal\
|
||||||
@ -1205,14 +1240,14 @@ This package provides kernel modules for the %{?2:%{2} }kernel package for Red H
|
|||||||
%package %{?1:%{1}-}modules-extra\
|
%package %{?1:%{1}-}modules-extra\
|
||||||
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
|
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
|
||||||
Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}\
|
Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}\
|
||||||
Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
|
Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{uname_suffix %{?1:%{1}}}\
|
||||||
Provides: kernel%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\
|
Provides: kernel%{?1:-%{1}}-modules-extra = %{version}-%{release}%{uname_suffix %{?1:%{1}}}\
|
||||||
Provides: installonlypkg(kernel-module)\
|
Provides: installonlypkg(kernel-module)\
|
||||||
Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\
|
Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
|
||||||
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
|
Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
|
||||||
Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
|
Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
|
||||||
%if %{-m:1}%{!-m:0}\
|
%if %{-m:1}%{!-m:0}\
|
||||||
Requires: kernel-modules-extra-uname-r = %{KVERREL}\
|
Requires: kernel-modules-extra-uname-r = %{KVERREL}%{uname_variant %{?1:%{1}}}\
|
||||||
%endif\
|
%endif\
|
||||||
AutoReq: no\
|
AutoReq: no\
|
||||||
AutoProv: yes\
|
AutoProv: yes\
|
||||||
@ -1228,13 +1263,13 @@ This package provides less commonly used kernel modules for the %{?2:%{2} }kerne
|
|||||||
%package %{?1:%{1}-}modules\
|
%package %{?1:%{1}-}modules\
|
||||||
Summary: kernel modules to match the %{?2:%{2}-}core kernel\
|
Summary: kernel modules to match the %{?2:%{2}-}core kernel\
|
||||||
Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\
|
Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\
|
||||||
Provides: kernel-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
|
Provides: kernel-modules-%{_target_cpu} = %{version}-%{release}%{uname_suffix %{?1:%{1}}}\
|
||||||
Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\
|
Provides: kernel-modules = %{version}-%{release}%{uname_suffix %{?1:%{1}}}\
|
||||||
Provides: installonlypkg(kernel-module)\
|
Provides: installonlypkg(kernel-module)\
|
||||||
Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
|
Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
|
||||||
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
|
Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
|
||||||
%if %{-m:1}%{!-m:0}\
|
%if %{-m:1}%{!-m:0}\
|
||||||
Requires: kernel-modules-uname-r = %{KVERREL}\
|
Requires: kernel-modules-uname-r = %{KVERREL}%{uname_variant %{?1:%{1}}}\
|
||||||
%endif\
|
%endif\
|
||||||
AutoReq: no\
|
AutoReq: no\
|
||||||
AutoProv: yes\
|
AutoProv: yes\
|
||||||
@ -1249,8 +1284,8 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne
|
|||||||
%define kernel_meta_package() \
|
%define kernel_meta_package() \
|
||||||
%package %{1}\
|
%package %{1}\
|
||||||
summary: kernel meta-package for the %{1} kernel\
|
summary: kernel meta-package for the %{1} kernel\
|
||||||
Requires: kernel-%{1}-core-uname-r = %{KVERREL}+%{1}\
|
Requires: kernel-%{1}-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\
|
||||||
Requires: kernel-%{1}-modules-uname-r = %{KVERREL}+%{1}\
|
Requires: kernel-%{1}-modules-uname-r = %{KVERREL}%{uname_suffix %{1}}\
|
||||||
Provides: installonlypkg(kernel)\
|
Provides: installonlypkg(kernel)\
|
||||||
%description %{1}\
|
%description %{1}\
|
||||||
The meta-package for the %{1} kernel\
|
The meta-package for the %{1} kernel\
|
||||||
@ -1264,10 +1299,10 @@ The meta-package for the %{1} kernel\
|
|||||||
%define kernel_variant_package(n:mo) \
|
%define kernel_variant_package(n:mo) \
|
||||||
%package %{?1:%{1}-}core\
|
%package %{?1:%{1}-}core\
|
||||||
Summary: %{variant_summary}\
|
Summary: %{variant_summary}\
|
||||||
Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
|
Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
|
||||||
Provides: installonlypkg(kernel)\
|
Provides: installonlypkg(kernel)\
|
||||||
%if %{-m:1}%{!-m:0}\
|
%if %{-m:1}%{!-m:0}\
|
||||||
Requires: kernel-core-uname-r = %{KVERREL}\
|
Requires: kernel-core-uname-r = %{KVERREL}%{uname_variant %{?1:%{1}}}\
|
||||||
%endif\
|
%endif\
|
||||||
%{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\
|
%{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\
|
||||||
%if %{?1:1} %{!?1:0} \
|
%if %{?1:1} %{!?1:0} \
|
||||||
@ -1302,7 +1337,29 @@ zfcpdump infrastructure.
|
|||||||
# with_zfcpdump
|
# with_zfcpdump
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with_arm64_64k}
|
||||||
|
%define variant_summary The Linux kernel compiled for 64k pagesize usage
|
||||||
|
%kernel_variant_package 64k
|
||||||
|
%description 64k-core
|
||||||
|
The kernel package contains a variant of the ARM64 Linux kernel using
|
||||||
|
a 64K page size.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with_arm64_64k} && %{with_debug}
|
||||||
%define variant_summary The Linux kernel compiled with extra debugging enabled
|
%define variant_summary The Linux kernel compiled with extra debugging enabled
|
||||||
|
%if !%{debugbuildsenabled}
|
||||||
|
%kernel_variant_package -m 64k-debug
|
||||||
|
%else
|
||||||
|
%kernel_variant_package 64k-debug
|
||||||
|
%endif
|
||||||
|
%description 64k-debug-core
|
||||||
|
The debug kernel package contains a variant of the ARM64 Linux kernel using
|
||||||
|
a 64K page size.
|
||||||
|
This variant of the kernel has numerous debugging options enabled.
|
||||||
|
It should only be installed when trying to gather additional information
|
||||||
|
on kernel bugs, as some of these options impact performance noticably.
|
||||||
|
%endif
|
||||||
|
|
||||||
%if !%{debugbuildsenabled}
|
%if !%{debugbuildsenabled}
|
||||||
%kernel_variant_package -m debug
|
%kernel_variant_package -m debug
|
||||||
%else
|
%else
|
||||||
@ -2209,12 +2266,19 @@ cd linux-%{KVERREL}
|
|||||||
|
|
||||||
%if %{with_debug}
|
%if %{with_debug}
|
||||||
BuildKernel %make_target %kernel_image %{_use_vdso} debug
|
BuildKernel %make_target %kernel_image %{_use_vdso} debug
|
||||||
|
%if %{with_arm64_64k}
|
||||||
|
BuildKernel %make_target %kernel_image %{_use_vdso} 64k-debug
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_zfcpdump}
|
%if %{with_zfcpdump}
|
||||||
BuildKernel %make_target %kernel_image %{_use_vdso} zfcpdump
|
BuildKernel %make_target %kernel_image %{_use_vdso} zfcpdump
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with_arm64_64k}
|
||||||
|
BuildKernel %make_target %kernel_image %{_use_vdso} 64k
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{with_pae}
|
%if %{with_pae}
|
||||||
BuildKernel %make_target %kernel_image %{use_vdso} lpae
|
BuildKernel %make_target %kernel_image %{use_vdso} lpae
|
||||||
%endif
|
%endif
|
||||||
@ -2224,7 +2288,7 @@ BuildKernel %make_target %kernel_image %{_use_vdso}
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifnarch noarch i686
|
%ifnarch noarch i686
|
||||||
%if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} && !%{with_up}
|
%if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} && !%{with_up} && !%{with_arm64_64k}
|
||||||
# If only building the user space tools, then initialize the build environment
|
# If only building the user space tools, then initialize the build environment
|
||||||
# and some variables so that the various userspace tools can be built.
|
# and some variables so that the various userspace tools can be built.
|
||||||
InitBuildVars
|
InitBuildVars
|
||||||
@ -2374,6 +2438,12 @@ find Documentation -type d | xargs chmod u+w
|
|||||||
if [ "%{with_debug}" -ne "0" ]; then \
|
if [ "%{with_debug}" -ne "0" ]; then \
|
||||||
%{modsign_cmd} certs/signing_key.pem.sign+debug certs/signing_key.x509.sign+debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \
|
%{modsign_cmd} certs/signing_key.pem.sign+debug certs/signing_key.x509.sign+debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \
|
||||||
fi \
|
fi \
|
||||||
|
if [ "%{with_arm64_64k}" -ne "0" ]; then \
|
||||||
|
%{modsign_cmd} certs/signing_key.pem.sign+64k certs/signing_key.x509.sign+64k $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k/ \
|
||||||
|
fi \
|
||||||
|
if [ "%{with_arm64_64k}" -ne "0" ] && [ "%{with_debug}" -ne "0"]; then \
|
||||||
|
%{modsign_cmd} certs/signing_key.pem.sign+64k-debug certs/signing_key.x509.sign+64k-debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+64k-debug/ \
|
||||||
|
fi \
|
||||||
if [ "%{with_up}" -ne "0" ]; then \
|
if [ "%{with_up}" -ne "0" ]; then \
|
||||||
%{modsign_cmd} certs/signing_key.pem.sign certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
|
%{modsign_cmd} certs/signing_key.pem.sign certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
|
||||||
fi \
|
fi \
|
||||||
@ -2840,16 +2910,26 @@ fi\
|
|||||||
%kernel_variant_post -v lpae -r (kernel|kernel-smp)
|
%kernel_variant_post -v lpae -r (kernel|kernel-smp)
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_debug}
|
|
||||||
%kernel_variant_preun debug
|
|
||||||
%kernel_variant_post -v debug
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with_zfcpdump}
|
%if %{with_zfcpdump}
|
||||||
%kernel_variant_preun zfcpdump
|
%kernel_variant_preun zfcpdump
|
||||||
%kernel_variant_post -v zfcpdump
|
%kernel_variant_post -v zfcpdump
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with_arm64_64k}
|
||||||
|
%kernel_variant_preun 64k
|
||||||
|
%kernel_variant_post -v 64k
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with_debug} && %{with_arm64_64k}
|
||||||
|
%kernel_variant_preun 64k-debug
|
||||||
|
%kernel_variant_post -v 64k-debug
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with_debug}
|
||||||
|
%kernel_variant_preun debug
|
||||||
|
%kernel_variant_post -v debug
|
||||||
|
%endif
|
||||||
|
|
||||||
if [ -x /sbin/ldconfig ]
|
if [ -x /sbin/ldconfig ]
|
||||||
then
|
then
|
||||||
/sbin/ldconfig -X || exit $?
|
/sbin/ldconfig -X || exit $?
|
||||||
@ -3087,6 +3167,9 @@ fi
|
|||||||
|
|
||||||
%kernel_variant_files %{_use_vdso} %{with_up}
|
%kernel_variant_files %{_use_vdso} %{with_up}
|
||||||
%kernel_variant_files %{_use_vdso} %{with_debug} debug
|
%kernel_variant_files %{_use_vdso} %{with_debug} debug
|
||||||
|
%if %{with_arm64_64k}
|
||||||
|
%kernel_variant_files %{_use_vdso} %{with_debug} 64k-debug
|
||||||
|
%endif
|
||||||
%if %{with_debug_meta}
|
%if %{with_debug_meta}
|
||||||
%files debug
|
%files debug
|
||||||
%files debug-core
|
%files debug-core
|
||||||
@ -3094,9 +3177,18 @@ fi
|
|||||||
%files debug-devel-matched
|
%files debug-devel-matched
|
||||||
%files debug-modules
|
%files debug-modules
|
||||||
%files debug-modules-extra
|
%files debug-modules-extra
|
||||||
|
%if %{with_arm64_64k}
|
||||||
|
%files 64k-debug
|
||||||
|
%files 64k-debug-core
|
||||||
|
%files 64k-debug-devel
|
||||||
|
%files 64k-debug-devel-matched
|
||||||
|
%files 64k-debug-modules
|
||||||
|
%files 64k-debug-modules-extra
|
||||||
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%kernel_variant_files %{use_vdso} %{with_pae} lpae
|
%kernel_variant_files %{use_vdso} %{with_pae} lpae
|
||||||
%kernel_variant_files %{_use_vdso} %{with_zfcpdump} zfcpdump
|
%kernel_variant_files %{_use_vdso} %{with_zfcpdump} zfcpdump
|
||||||
|
%kernel_variant_files %{_use_vdso} %{with_arm64_64k} 64k
|
||||||
|
|
||||||
%define kernel_variant_ipaclones(k:) \
|
%define kernel_variant_ipaclones(k:) \
|
||||||
%if %{1}\
|
%if %{1}\
|
||||||
@ -3116,6 +3208,11 @@ fi
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 09 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-265.el9]
|
||||||
|
- CI: Add pipelines for kernel-64k variant for RHEL (Veronika Kabatova)
|
||||||
|
- CI: Enable pipelines for 64k variant (Veronika Kabatova)
|
||||||
|
- arm64-64k: Add new kernel variant to RHEL9/CS9 for 64K page-size'd ARM64 (Donald Dutile) [2153073]
|
||||||
|
|
||||||
* Wed Feb 08 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-264.el9]
|
* Wed Feb 08 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-264.el9]
|
||||||
- uapi: add missing ip/ipv6 header dependencies for linux/stddef.h (Herton R. Krzesinski) [2166738]
|
- uapi: add missing ip/ipv6 header dependencies for linux/stddef.h (Herton R. Krzesinski) [2166738]
|
||||||
- redhat: make selftests build install headers under tools/testing/selftests/usr/include (Herton R. Krzesinski) [2166738]
|
- redhat: make selftests build install headers under tools/testing/selftests/usr/include (Herton R. Krzesinski) [2166738]
|
||||||
|
6
sources
6
sources
@ -1,3 +1,3 @@
|
|||||||
SHA512 (linux-5.14.0-264.el9.tar.xz) = 033374bf8174f197379c8f5c6d51964661d63cd2c9d128b25f37a3e2b9c491807dbd3dd4cc2631d4f77c09512d392cecaddf8764fa6919e981fda6c7ac49eb4e
|
SHA512 (linux-5.14.0-265.el9.tar.xz) = 88c76cabb2019dae2f68e7fa8118e6c3178a524824b102d355998ea6dce5008f24ef155c61d6a7a78979ae467c0ec658415fc2267832232fa79431721f1018b5
|
||||||
SHA512 (kernel-abi-stablelists-5.14.0-264.el9.tar.bz2) = 24c462c4e64c309a1416eb2887dc85969ba275ad136d6df80c8cc4d85e5be70700ecf1eea8d62d966ec7f73d23879a41af6a9a7f9888a80e29e1d6793cc72c47
|
SHA512 (kernel-abi-stablelists-5.14.0-265.el9.tar.bz2) = 37ddfebb0a986fa9f9481a9772c82b2c421633f9484497a9834f888dac729b7646bf2d09caa2b9a154416a1d934bf58543c1685ffd74e3b47dd29d65f57f8e1d
|
||||||
SHA512 (kernel-kabi-dw-5.14.0-264.el9.tar.bz2) = 1c3178e46a21160e737185183cfd8dab7cb52c976b9b4f64fbd00a946a639d8046bc0747147717a86ea74f4a0a3efdad21258738146892092cef514566f97182
|
SHA512 (kernel-kabi-dw-5.14.0-265.el9.tar.bz2) = dcb15da3de01f8c5232eef12e1f0c609aaa16090c809ec596f33a1d86c9fead295098bd6973814d8a025a93303a05174698c0ab2e642e70a309c3793429e5d9e
|
||||||
|
Loading…
Reference in New Issue
Block a user