From: Joe Lawrence <joe.lawre...@redhat.com> redhat: remove kernel-ipaclones-internal package
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.lawre...@redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -284,10 +284,6 @@ 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} @@ -301,8 +297,6 @@ Summary: The Linux kernel # 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 %define with_arm64_64k 0 @@ -328,8 +322,6 @@ Summary: The Linux kernel %global clang_make_opts %{clang_make_opts} LLVM=1 %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 @@ -347,16 +339,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 @@ -395,7 +377,6 @@ Summary: The Linux kernel %define with_tools 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_ipaclones 0 %endif # if requested, only build debug kernel @@ -407,7 +388,6 @@ Summary: The Linux kernel %define with_tools 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_ipaclones 0 %endif # if requested, only build realtime kernel @@ -423,7 +403,6 @@ Summary: The Linux kernel %define with_tools 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_ipaclones 0 %define with_headers 0 %define with_efiuki 0 %define with_zfcpdump 0 @@ -468,7 +447,6 @@ Summary: The Linux kernel %define with_kabichk 0 %define with_kernel_abi_stablelists 0 %define with_kabidw_base 0 -%define with_ipaclones 0 %endif @@ -1442,18 +1420,6 @@ Requires: %{package_name}%{?1:-%{1}}-core = %{specrpmversion}-%{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> @@ -1834,10 +1800,6 @@ Prebuilt 64k unified kernel image for virtual machines. Prebuilt 64k unified kernel image addons for virtual machines. %endif -%if %{with_ipaclones} -%kernel_ipaclones_package -%endif - %define log_msg() \ { set +x; } 2>/dev/null \ _log_msglineno=$(grep -n %{*} %{_specdir}/${RPM_PACKAGE_NAME}.spec | grep log_msg | cut -d":" -f1) \ @@ -2177,12 +2139,6 @@ InitBuildVars() { %{log_msg "InitBuildVars: USING ARCH=$Arch"} KCFLAGS="%{?kcflags}" - - # add kpatch flags for base kernel - %{log_msg "InitBuildVars: Configure KCFLAGS"} - if [ "$Variant" == "" ]; then - KCFLAGS="$KCFLAGS %{?kpatch_kcflags}" - fi } #Build bootstrap bpftool @@ -2962,18 +2918,6 @@ BuildKernel() { fi %endif -%if %{with_ipaclones} - %{log_msg "install IPA clones"} - 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 @@ -4223,19 +4167,6 @@ fi\ %kernel_variant_files %{_use_vdso} %{with_arm64_16k_base} 16k %kernel_variant_files %{_use_vdso} %{with_arm64_64k_base} 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_base} - # plz don't put in a version string unless you're going to tag # and build. # -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3824 -- _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue