Merge: redhat: remove kernel-ipaclones-internal package

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6723

JIRA: https://issues.redhat.com/browse/RHEL-86518

The kernel-ipaclones-internal package added the gcc option -fdump-ipa-clones to KCFLAGS in anticipation of supporting source-based livepatch creation. This is not needed by kpatch-build or objtool-based tools, clang doesn't support it, and it interferes with Rust enablement.

Remove the build option and packaging of the generated files.

Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>

Approved-by: Jan Stancek <jstancek@redhat.com>
Approved-by: Herton R. Krzesinski <herton@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: Augusto Caringi <acaringi@redhat.com>

Author: caringi

redhat/kernel.spec.template

@@ -264,19 +264,13 @@ Summary: The Linux kernel
 # gcov support
 %define with_gcov %{?_with_gcov:1}%{?!_with_gcov:0}
 
-#
-# ipa_clone support
-%define with_ipaclones %{?_without_ipaclones: 0} %{?!_without_ipaclones: 1}
-
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
 
 %if 0%{?fedora}
 # Kernel headers are being split out into a separate package
 %define with_headers 0
 %define with_cross_headers 0
-# no ipa_clone for now
-%define with_ipaclones 0
 # no stablelist
 %define with_kernel_abi_stablelists 0
 # Fedora builds these separately
@@ -301,8 +295,6 @@ Summary: The Linux kernel
 %global clang_make_opts %{clang_make_opts} LD=ld.lld HOSTLD=ld.lld AR=llvm-ar NM=llvm-nm HOSTAR=llvm-ar HOSTNM=llvm-nm
 %endif
 %global make_opts %{make_opts} %{clang_make_opts}
-# clang does not support the -fdump-ipa-clones option
-%global with_ipaclones 0
 %endif
 
 # turn off debug kernel and kabichk for gcov builds
@@ -320,16 +312,6 @@ Summary: The Linux kernel
 %define with_kabidwchk 0
 %endif
 
-# kpatch_kcflags are extra compiler flags applied to base kernel
-# -fdump-ipa-clones is enabled only for base kernels on selected arches
-%if %{with_ipaclones}
-%ifarch x86_64 ppc64le
-%define kpatch_kcflags -fdump-ipa-clones
-%else
-%define with_ipaclones 0
-%endif
-%endif
-
 %define make_target bzImage
 %define image_install_path boot
 
@@ -380,7 +362,6 @@ Summary: The Linux kernel
 %define with_selftests 0
 %define with_cross 0
 %define with_cross_headers 0
-%define with_ipaclones 0
 %endif
 
 # if requested, only build pae kernel
@@ -401,7 +382,6 @@ Summary: The Linux kernel
 %define with_selftests 0
 %define with_cross 0
 %define with_cross_headers 0
-%define with_ipaclones 0
 %endif
 
 # if requested, only build realtime kernel
@@ -416,7 +396,6 @@ Summary: The Linux kernel
 %define with_selftests 0
 %define with_cross 0
 %define with_cross_headers 0
-%define with_ipaclones 0
 %endif
 
 # turn off kABI DUP check and DWARF-based check if kABI check is disabled
@@ -1295,18 +1274,6 @@ Requires: kernel%{?1:-%{1}}-core = %{version}-%{release}\
 This meta package is used to install matching core and devel packages for a given %{?2:%{2} }kernel.\
 %{nil}
 
-#
-# kernel-<variant>-ipaclones-internal package
-#
-%define kernel_ipaclones_package() \
-%package %{?1:%{1}-}ipaclones-internal\
-Summary: *.ipa-clones files generated by -fdump-ipa-clones for kernel%{?1:-%{1}}\
-Group: System Environment/Kernel\
-AutoReqProv: no\
-%description %{?1:%{1}-}ipaclones-internal\
-This package provides *.ipa-clones files.\
-%{nil}
-
 #
 # This macro creates a kernel-<subpackage>-modules-internal package.
 #	%%kernel_modules_internal_package <subpackage> <pretty-name>
@@ -1610,10 +1577,6 @@ Prebuilt default unified kernel image for virtual machines.
 Prebuilt default unified kernel image addons for virtual machines.
 %endif
 
-%if %{with_ipaclones}
-%kernel_ipaclones_package
-%endif
-
 %prep
 # do a few sanity-checks for --with *only builds
 %if %{with_baseonly}
@@ -1878,11 +1841,6 @@ InitBuildVars() {
     echo USING ARCH=$Arch
 
     KCFLAGS="%{?kcflags}"
-
-    # add kpatch flags for base kernel
-    if [ "$Variant" == "" ]; then
-        KCFLAGS="$KCFLAGS %{?kpatch_kcflags}"
-    fi
 }
 
 BuildKernel() {
@@ -2579,17 +2537,6 @@ BuildKernel() {
     fi
 %endif
 
-%if %{with_ipaclones}
-    MAXPROCS=$(echo %{?_smp_mflags} | sed -n 's/-j\s*\([0-9]\+\)/\1/p')
-    if [ -z "$MAXPROCS" ]; then
-        MAXPROCS=1
-    fi
-    if [ "$Variant" == "" ]; then
-        mkdir -p $RPM_BUILD_ROOT/$DevelDir-ipaclones
-        find . -name '*.ipa-clones' | xargs -i{} -r -n 1 -P $MAXPROCS install -m 644 -D "{}" "$RPM_BUILD_ROOT/$DevelDir-ipaclones/{}"
-    fi
-%endif
-
 %if %{with_gcov}
     popd
 %endif
@@ -3714,19 +3661,6 @@ fi
 %kernel_variant_files %{_use_vdso} %{with_arm64_64k} 64k
 %kernel_variant_files %{_use_vdso} %{with_realtime_arm64_64k} rt-64k
 
-%define kernel_variant_ipaclones(k:) \
-%if %{1}\
-%if %{with_ipaclones}\
-%{expand:%%files %{?2:%{2}-}ipaclones-internal}\
-%defattr(-,root,root)\
-%defverify(not mtime)\
-/usr/src/kernels/%{KVERREL}%{?2:+%{2}}-ipaclones\
-%endif\
-%endif\
-%{nil}
-
-%kernel_variant_ipaclones %{with_up}
-
 # plz don't put in a version string unless you're going to tag
 # and build.
 #