Repacking kernel-mainline from kernel.org - 6.6.14 - 202401262222

.kernel-mainline.metadata

-c34de41baa29c475c0834e88a3171e255ff86cd32d83c6bffc2b797e60bfa671 SOURCES/linux-6.7.2.tar.xz
\ No newline at end of file
+fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584 SOURCES/linux-6.6.14.tar.xz
\ No newline at end of file

SPECS/kernel-mainline.spec

@@ -24,10 +24,10 @@
 %global _binary_payload w3T.xzdio
 
 # Define the version of the Linux Kernel Archive tarball.
-%global LKAver 6.7.2
+%global LKAver 6.6.14
 
 # Define the buildid, if required.
-%global buildid 202401262218
+%global buildid 202401262222
 
 # Determine the sublevel number and set pkg_version.
 %define sublevel %(echo %{LKAver} | %{__awk} -F\. '{ print $3 }')
@@ -55,6 +55,13 @@
 %global signmodules 0
 %endif
 
+### BCAT
+# Further investigation is required before these features
+# are enabled for the ELRepo Project kernels.
+%global signkernel 0
+%global signmodules 0
+### BCAT
+
 # Compress modules on all architectures that build modules.
 %ifarch x86_64 || aarch64
 %global zipmodules 1
@@ -119,9 +126,6 @@
 
 %ifarch x86_64 || aarch64
 %define with_doc 0
-### as of kernel-mainline-6.5.4, no more perf and bpftool -ay
-%define with_perf 0
-%define with_bpftool 0
 %endif
 
 %ifarch x86_64
@@ -151,7 +155,7 @@
 # Packages that need to be installed before the kernel is installed,
 # as they will be used by the %%post scripts.
 #
-%define kernel_ml_prereq  coreutils, systemd >= 203-2, /usr/bin/kernel-install
+%define kernel_lt_prereq  coreutils, systemd >= 203-2, /usr/bin/kernel-install
 %define initrd_prereq  dracut >= 027
 
 Name: kernel-mainline
@@ -240,13 +244,11 @@ Source2000: cpupower.service
 Source2001: cpupower.config
 Source2002: kvm_stat.logrotate
 
-Source3000: rocky-sigkernel.cer
-
 %if %{signkernel}
 %define secureboot_ca_0 %{_datadir}/pki/sb-certs/secureboot-ca-%{_arch}.cer
-%define secureboot_key_0 %{SOURCE3000}
+%define secureboot_key_0 %{_datadir}/pki/sb-certs/secureboot-kernel-%{_arch}.cer
 
-%define pesign_name_0 rockybootsigningsigkernelcert
+%define pesign_name_0 redhatsecureboot501
 %endif
 
 %description
@@ -254,25 +256,25 @@ The %{name} meta package.
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel-mainline package.
-#	%%kernel_ml_reqprovconf <subpackage>
-# It uses any kernel_ml_<subpackage>_conflicts and kernel_ml_<subpackage>_obsoletes
+#	%%kernel_lt_reqprovconf <subpackage>
+# It uses any kernel_lt_<subpackage>_conflicts and kernel_lt_<subpackage>_obsoletes
 # macros defined above.
 #
-%define kernel_ml_reqprovconf \
+%define kernel_lt_reqprovconf \
 Provides: %{name} = %{pkg_version}-%{pkg_release}\
 Provides: %{name}-%{_target_cpu} = %{pkg_version}-%{pkg_release}%{?1:+%{1}}\
 Provides: %{name}-drm-nouveau = 16\
 Provides: %{name}-uname-r = %{KVERREL}%{?1:+%{1}}\
-Requires(pre): %{kernel_ml_prereq}\
+Requires(pre): %{kernel_lt_prereq}\
 Requires(pre): %{initrd_prereq}\
 Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\
 Recommends: linux-firmware\
 Requires(preun): systemd >= 200\
 Conflicts: xfsprogs < 4.3.0-1\
 Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
-%{expand:%%{?kernel_ml%{?1:_%{1}}_conflicts:Conflicts: %%{%{name}%{?1:_%{1}}_conflicts}}}\
-%{expand:%%{?kernel_ml%{?1:_%{1}}_obsoletes:Obsoletes: %%{%{name}%{?1:_%{1}}_obsoletes}}}\
-%{expand:%%{?kernel_ml%{?1:_%{1}}_provides:Provides: %%{%{name}%{?1:_%{1}}_provides}}}\
+%{expand:%%{?kernel_lt%{?1:_%{1}}_conflicts:Conflicts: %%{%{name}%{?1:_%{1}}_conflicts}}}\
+%{expand:%%{?kernel_lt%{?1:_%{1}}_obsoletes:Obsoletes: %%{%{name}%{?1:_%{1}}_obsoletes}}}\
+%{expand:%%{?kernel_lt%{?1:_%{1}}_provides:Provides: %%{%{name}%{?1:_%{1}}_provides}}}\
 # We can't let RPM do the dependencies automatically because it'll then pick up\
 # a correct but undesirable perl dependency from the module headers which\
 # isn't required for the kernel proper to function.\
@@ -373,9 +375,9 @@ and simple manipulation of eBPF programs and maps.
 
 #
 # This macro creates a kernel-mainline-<subpackage>-devel package.
-#	%%kernel_ml_devel_package [-m] <subpackage> <pretty-name>
+#	%%kernel_lt_devel_package [-m] <subpackage> <pretty-name>
 #
-%define kernel_ml_devel_package(m) \
+%define kernel_lt_devel_package(m) \
 %package %{?1:%{1}-}devel\
 Summary: Development package for building %{name} modules to match the %{?2:%{2} }%{name}.\
 Provides: %{name}%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\
@@ -404,9 +406,9 @@ against the %{?2:%{2} }%{name} package.\
 #
 # This macro creates an empty kernel-mainline-<subpackage>-devel-matched package that
 # requires both the core and devel packages locked on the same version.
-#	%%kernel_ml_devel_matched_package [-m] <subpackage> <pretty-name>
+#	%%kernel_lt_devel_matched_package [-m] <subpackage> <pretty-name>
 #
-%define kernel_ml_devel_matched_package(m) \
+%define kernel_lt_devel_matched_package(m) \
 %package %{?1:%{1}-}devel-matched\
 Summary: Meta package to install matching core and devel packages for a given %{?2:%{2} }%{name}.\
 Requires: %{name}%{?1:-%{1}}-devel = %{version}-%{release}\
@@ -417,9 +419,9 @@ This meta package is used to install matching core and devel packages for a give
 
 #
 # This macro creates a kernel-mainline-<subpackage>-modules-extra package.
-#	%%kernel_ml_modules_extra_package [-m] <subpackage> <pretty-name>
+#	%%kernel_lt_modules_extra_package [-m] <subpackage> <pretty-name>
 #
-%define kernel_ml_modules_extra_package(m) \
+%define kernel_lt_modules_extra_package(m) \
 %package %{?1:%{1}-}modules-extra\
 Summary: Extra %{name} modules to match the %{?2:%{2} }%{name}.\
 Provides: %{name}%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}\
@@ -441,9 +443,9 @@ This package provides less commonly used %{name} modules for the %{?2:%{2} }%{na
 
 #
 # This macro creates a kernel-mainline-<subpackage>-modules package.
-#	%%kernel_ml_modules_package [-m] <subpackage> <pretty-name>
+#	%%kernel_lt_modules_package [-m] <subpackage> <pretty-name>
 #
-%define kernel_ml_modules_package(m) \
+%define kernel_lt_modules_package(m) \
 %package %{?1:%{1}-}modules\
 Summary: %{name} modules to match the %{?2:%{2}-}core %{name}.\
 Provides: %{name}%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\
@@ -464,9 +466,9 @@ This package provides commonly used %{name} modules for the %{?2:%{2}-}core %{na
 
 #
 # this macro creates a kernel-mainline-<subpackage> meta package.
-#	%%kernel_ml_meta_package <subpackage>
+#	%%kernel_lt_meta_package <subpackage>
 #
-%define kernel_ml_meta_package() \
+%define kernel_lt_meta_package() \
 %package %{1}\
 Summary: %{name} meta-package for the %{1} ${name}.\
 Requires: %{name}-%{1}-core-uname-r = %{KVERREL}+%{1}\
@@ -480,9 +482,9 @@ The meta-package for the %{1} %{name}.\
 #
 # This macro creates a kernel-mainline-<subpackage> and its -devel.
 #	%%define variant_summary The Linux kernel-mainline compiled for <configuration>
-#	%%kernel_ml_variant_package [-n <pretty-name>] [-m] <subpackage>
+#	%%kernel_lt_variant_package [-n <pretty-name>] [-m] <subpackage>
 #
-%define kernel_ml_variant_package(n:m) \
+%define kernel_lt_variant_package(n:m) \
 %package %{?1:%{1}-}core\
 Summary: %{variant_summary}.\
 Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
@@ -491,20 +493,20 @@ Provides: installonlypkg(kernel-mainline)\
 %if %{-m:1}%{!-m:0}\
 Requires: %{name}-core-uname-r = %{KVERREL}\
 %endif\
-%{expand:%%kernel_ml_reqprovconf}\
+%{expand:%%kernel_lt_reqprovconf}\
 %if %{?1:1} %{!?1:0} \
-%{expand:%%kernel_ml_meta_package %{?1:%{1}}}\
+%{expand:%%kernel_lt_meta_package %{?1:%{1}}}\
 %endif\
-%{expand:%%kernel_ml_devel_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
-%{expand:%%kernel_ml_devel_matched_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
-%{expand:%%kernel_ml_modules_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
-%{expand:%%kernel_ml_modules_extra_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
+%{expand:%%kernel_lt_devel_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
+%{expand:%%kernel_lt_devel_matched_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
+%{expand:%%kernel_lt_modules_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
+%{expand:%%kernel_lt_modules_extra_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
 %{nil}
 
 # And, finally, the main -core package.
 
 %define variant_summary The Linux kernel.
-%kernel_ml_variant_package
+%kernel_lt_variant_package
 %description core
 The %{name} package contains the Linux kernel (vmlinuz), the core of any
 Linux kernel based operating system. The %{name} package handles the basic
@@ -567,13 +569,12 @@ sed -i "s@^EXTRAVERSION.*@EXTRAVERSION = -%{release}.%{_target_cpu}@" Makefile
 
 %ifarch x86_64 || aarch64
 cp config-%{_target_cpu} .config
-%{__make} -s ARCH=%{bldarch} listnewconfig | grep -E '^CONFIG_' > newoptions-%{_target_cpu}.txt || true
-if [ -s newoptions-%{_target_cpu}.txt ]; then
-  # We're just automatically adding new options, think of it as rolling.
-  # If something breaks we can disable it explicitly.
-  cat newoptions-%{_target_cpu}.txt >> .config
+%{__make} -s ARCH=%{bldarch} listnewconfig | grep -E '^CONFIG_' > newoptions%{_target_cpu}.txt || true
+if [ -s newoptions%{_target_cpu}.txt ]; then
+	cat newoptions%{_target_cpu}.txt
+	exit 1
 fi
-rm -f newoptions-%{_target_cpu}.txt
+rm -f newoptions%{_target_cpu}.txt
 %endif
 
 # Add DUP and kpatch certificates to system trusted keys for Rocky.
@@ -679,14 +680,10 @@ pushd tools/gpio > /dev/null
 %{__make} -s %{?_smp_mflags}
 popd > /dev/null
 
-### BCAT
-%if 0
 pushd tools/vm > /dev/null
 %{__make} -s %{?_smp_mflags} slabinfo page_owner_sort
 popd > /dev/null
 %endif
-### BCAT
-%endif
 
 %if %{with_bpftool}
 %global bpftool_make \
@@ -702,7 +699,6 @@ popd > /dev/null
 
 %install
 %define __modsign_install_post \
-pushd linux-%{KVERREL} > /dev/null \
 if [ "%{signmodules}" -eq "1" ]; then \
 	if [ "%{with_std}" -ne "0" ]; then \
 		%{SOURCE21} certs/signing_key.pem.sign certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
@@ -1184,15 +1180,11 @@ pushd tools/kvm/kvm_stat > /dev/null
 install -m644 -D kvm_stat.service $RPM_BUILD_ROOT%{_unitdir}/kvm_stat.service
 popd > /dev/null
 
-### BCAT
-%if 0
 pushd tools/vm > /dev/null
 install -m755 slabinfo $RPM_BUILD_ROOT%{_bindir}/slabinfo
 install -m755 page_owner_sort $RPM_BUILD_ROOT%{_bindir}/page_owner_sort
 popd > /dev/null
 %endif
-### BCAT
-%endif
 
 %if %{with_bpftool}
 pushd tools/bpf/bpftool > /dev/null
@@ -1232,12 +1224,12 @@ popd > /dev/null
 
 #
 # This macro defines a %%post script for a kernel-mainline*-devel package.
-#	%%kernel_ml_devel_post [<subpackage>]
+#	%%kernel_lt_devel_post [<subpackage>]
 # Note we don't run hardlink if ostree is in use, as ostree is
 # a far more sophisticated hardlink implementation.
 # https://github.com/projectatomic/rpm-ostree/commit/58a79056a889be8814aa51f507b2c7a4dccee526
 #
-%define kernel_ml_devel_post() \
+%define kernel_lt_devel_post() \
 %{expand:%%post %{?1:%{1}-}devel}\
 if [ -f /etc/sysconfig/kernel ]\
 then\
@@ -1255,9 +1247,9 @@ fi\
 #
 # This macro defines a %%post script for a kernel-mainline*-modules-extra package.
 # It also defines a %%postun script that does the same thing.
-#	%%kernel_ml_modules_extra_post [<subpackage>]
+#	%%kernel_lt_modules_extra_post [<subpackage>]
 #
-%define kernel_ml_modules_extra_post() \
+%define kernel_lt_modules_extra_post() \
 %{expand:%%post %{?1:%{1}-}modules-extra}\
 /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
 %{nil}\
@@ -1268,9 +1260,9 @@ fi\
 #
 # This macro defines a %%post script for a kernel-mainline*-modules package.
 # It also defines a %%postun script that does the same thing.
-#	%%kernel_ml_modules_post [<subpackage>]
+#	%%kernel_lt_modules_post [<subpackage>]
 #
-%define kernel_ml_modules_post() \
+%define kernel_lt_modules_post() \
 %{expand:%%post %{?1:%{1}-}modules}\
 /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
 %{nil}\
@@ -1279,10 +1271,10 @@ fi\
 %{nil}
 
 # This macro defines a %%posttrans script for a kernel-mainline package.
-#	%%kernel_ml_variant_posttrans [<subpackage>]
+#	%%kernel_lt_variant_posttrans [<subpackage>]
 # More text can follow to go at the end of this variant's %%post.
 #
-%define kernel_ml_variant_posttrans() \
+%define kernel_lt_variant_posttrans() \
 %{expand:%%posttrans %{?1:%{1}-}core}\
 if [ -x %{_sbindir}/weak-modules ]\
 then\
@@ -1293,14 +1285,14 @@ fi\
 
 #
 # This macro defines a %%post script for a kernel-mainline package and its devel package.
-#	%%kernel_ml_variant_post [-v <subpackage>] [-r <replace>]
+#	%%kernel_lt_variant_post [-v <subpackage>] [-r <replace>]
 # More text can follow to go at the end of this variant's %%post.
 #
-%define kernel_ml_variant_post(v:r:) \
-%{expand:%%kernel_ml_devel_post %{?-v*}}\
-%{expand:%%kernel_ml_modules_post %{?-v*}}\
-%{expand:%%kernel_ml_modules_extra_post %{?-v*}}\
-%{expand:%%kernel_ml_variant_posttrans %{?-v*}}\
+%define kernel_lt_variant_post(v:r:) \
+%{expand:%%kernel_lt_devel_post %{?-v*}}\
+%{expand:%%kernel_lt_modules_post %{?-v*}}\
+%{expand:%%kernel_lt_modules_extra_post %{?-v*}}\
+%{expand:%%kernel_lt_variant_posttrans %{?-v*}}\
 %{expand:%%post %{?-v*:%{-v*}-}core}\
 %{-r:\
 if [ `uname -i` == "x86_64" ] &&\
@@ -1311,9 +1303,9 @@ fi}\
 
 #
 # This macro defines a %%preun script for a kernel-mainline package.
-#	%%kernel_ml_variant_preun <subpackage>
+#	%%kernel_lt_variant_preun <subpackage>
 #
-%define kernel_ml_variant_preun() \
+%define kernel_lt_variant_preun() \
 %{expand:%%preun %{?1:%{1}-}core}\
 /bin/kernel-install remove %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\
 if [ -x %{_sbindir}/weak-modules ]\
@@ -1322,8 +1314,8 @@ then\
 fi\
 %{nil}
 
-%kernel_ml_variant_preun
-%kernel_ml_variant_post -r kernel-smp
+%kernel_lt_variant_preun
+%kernel_lt_variant_post -r kernel-smp
 
 if [ -x /sbin/ldconfig ]
 then
@@ -1392,15 +1384,11 @@ fi
 %{_bindir}/kvm_stat
 %{_unitdir}/kvm_stat.service
 %config(noreplace) %{_sysconfdir}/logrotate.d/kvm_stat
-### BCAT
-%if 0
 %{_bindir}/page_owner_sort
 %{_bindir}/slabinfo
-%endif
-### BCAT
 
 %files -n %{name}-tools-libs
-%{_libdir}/libcpupower.so.1
+%{_libdir}/libcpupower.so.0
 %{_libdir}/libcpupower.so.0.0.1
 
 %files -n %{name}-tools-libs-devel
@@ -1433,9 +1421,9 @@ fi
 #
 # This macro defines the %%files sections for a kernel-mainline package
 # and its devel package.
-#	%%kernel_ml_variant_files [-k vmlinux] <use_vdso> <condition> <subpackage>
+#	%%kernel_lt_variant_files [-k vmlinux] <use_vdso> <condition> <subpackage>
 #
-%define kernel_ml_variant_files(k:) \
+%define kernel_lt_variant_files(k:) \
 %if %{2}\
 %{expand:%%files -f %{name}-%{?3:%{3}-}core.list %{?1:-f %{name}-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\
 %{!?_licensedir:%global license %%doc}\
@@ -1481,10 +1469,10 @@ fi
 %endif\
 %{nil}
 
-%kernel_ml_variant_files %{_use_vdso} %{with_std}
+%kernel_lt_variant_files %{_use_vdso} %{with_std}
 
 %changelog
 
-* Fri Jan 26 2024 Mustafa Gezen - 6.7.2-202401262218
-- Rebase to 6.7.2
+* Fri Jan 26 2024 Mustafa Gezen - 6.6.14-202401262222
+- Rebase to 6.6.14