Skip to content

Commit d720643

Browse files
committed
redhat: remove kernel-ipaclones-internal package
JIRA: https://issues.redhat.com/browse/RHEL-86518 Upstream Status: RHEL only (kernel-ark) commit a6b01e3b10b8679875bb02160cd94bf6616e1394 Author: Joe Lawrence <joe.lawrence@redhat.com> Date: Tue Apr 8 10:46:15 2025 -0400 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.lawrence@redhat.com> Conflicts: - redhat/kernel.spec.template: diff context Assisted-by: Patchpal AI Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
1 parent 1f46989 commit d720643

File tree

1 file changed

+0
-66
lines changed

1 file changed

+0
-66
lines changed

redhat/kernel.spec.template

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -264,19 +264,13 @@ Summary: The Linux kernel
264264
# gcov support
265265
%define with_gcov %{?_with_gcov:1}%{?!_with_gcov:0}
266266

267-
#
268-
# ipa_clone support
269-
%define with_ipaclones %{?_without_ipaclones: 0} %{?!_without_ipaclones: 1}
270-
271267
# Want to build a vanilla kernel build without any non-upstream patches?
272268
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
273269

274270
%if 0%{?fedora}
275271
# Kernel headers are being split out into a separate package
276272
%define with_headers 0
277273
%define with_cross_headers 0
278-
# no ipa_clone for now
279-
%define with_ipaclones 0
280274
# no stablelist
281275
%define with_kernel_abi_stablelists 0
282276
# Fedora builds these separately
@@ -301,8 +295,6 @@ Summary: The Linux kernel
301295
%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
302296
%endif
303297
%global make_opts %{make_opts} %{clang_make_opts}
304-
# clang does not support the -fdump-ipa-clones option
305-
%global with_ipaclones 0
306298
%endif
307299

308300
# turn off debug kernel and kabichk for gcov builds
@@ -320,16 +312,6 @@ Summary: The Linux kernel
320312
%define with_kabidwchk 0
321313
%endif
322314

323-
# kpatch_kcflags are extra compiler flags applied to base kernel
324-
# -fdump-ipa-clones is enabled only for base kernels on selected arches
325-
%if %{with_ipaclones}
326-
%ifarch x86_64 ppc64le
327-
%define kpatch_kcflags -fdump-ipa-clones
328-
%else
329-
%define with_ipaclones 0
330-
%endif
331-
%endif
332-
333315
%define make_target bzImage
334316
%define image_install_path boot
335317

@@ -380,7 +362,6 @@ Summary: The Linux kernel
380362
%define with_selftests 0
381363
%define with_cross 0
382364
%define with_cross_headers 0
383-
%define with_ipaclones 0
384365
%endif
385366

386367
# if requested, only build pae kernel
@@ -401,7 +382,6 @@ Summary: The Linux kernel
401382
%define with_selftests 0
402383
%define with_cross 0
403384
%define with_cross_headers 0
404-
%define with_ipaclones 0
405385
%endif
406386

407387
# if requested, only build realtime kernel
@@ -416,7 +396,6 @@ Summary: The Linux kernel
416396
%define with_selftests 0
417397
%define with_cross 0
418398
%define with_cross_headers 0
419-
%define with_ipaclones 0
420399
%endif
421400

422401
# turn off kABI DUP check and DWARF-based check if kABI check is disabled
@@ -1292,18 +1271,6 @@ Requires: kernel%{?1:-%{1}}-core = %{version}-%{release}\
12921271
This meta package is used to install matching core and devel packages for a given %{?2:%{2} }kernel.\
12931272
%{nil}
12941273

1295-
#
1296-
# kernel-<variant>-ipaclones-internal package
1297-
#
1298-
%define kernel_ipaclones_package() \
1299-
%package %{?1:%{1}-}ipaclones-internal\
1300-
Summary: *.ipa-clones files generated by -fdump-ipa-clones for kernel%{?1:-%{1}}\
1301-
Group: System Environment/Kernel\
1302-
AutoReqProv: no\
1303-
%description %{?1:%{1}-}ipaclones-internal\
1304-
This package provides *.ipa-clones files.\
1305-
%{nil}
1306-
13071274
#
13081275
# This macro creates a kernel-<subpackage>-modules-internal package.
13091276
# %%kernel_modules_internal_package <subpackage> <pretty-name>
@@ -1628,10 +1595,6 @@ Prebuilt default unified kernel image for virtual machines.
16281595
Prebuilt default unified kernel image addons for virtual machines.
16291596
%endif
16301597

1631-
%if %{with_ipaclones}
1632-
%kernel_ipaclones_package
1633-
%endif
1634-
16351598
%prep
16361599
# do a few sanity-checks for --with *only builds
16371600
%if %{with_baseonly}
@@ -1896,11 +1859,6 @@ InitBuildVars() {
18961859
echo USING ARCH=$Arch
18971860

18981861
KCFLAGS="%{?kcflags}"
1899-
1900-
# add kpatch flags for base kernel
1901-
if [ "$Variant" == "" ]; then
1902-
KCFLAGS="$KCFLAGS %{?kpatch_kcflags}"
1903-
fi
19041862
}
19051863

19061864
BuildKernel() {
@@ -2608,17 +2566,6 @@ BuildKernel() {
26082566
fi
26092567
%endif
26102568

2611-
%if %{with_ipaclones}
2612-
MAXPROCS=$(echo %{?_smp_mflags} | sed -n 's/-j\s*\([0-9]\+\)/\1/p')
2613-
if [ -z "$MAXPROCS" ]; then
2614-
MAXPROCS=1
2615-
fi
2616-
if [ "$Variant" == "" ]; then
2617-
mkdir -p $RPM_BUILD_ROOT/$DevelDir-ipaclones
2618-
find . -name '*.ipa-clones' | xargs -i{} -r -n 1 -P $MAXPROCS install -m 644 -D "{}" "$RPM_BUILD_ROOT/$DevelDir-ipaclones/{}"
2619-
fi
2620-
%endif
2621-
26222569
%if %{with_gcov}
26232570
popd
26242571
%endif
@@ -3765,19 +3712,6 @@ fi
37653712
%kernel_variant_files %{_use_vdso} %{with_arm64_64k} 64k
37663713
%kernel_variant_files %{_use_vdso} %{with_realtime_arm64_64k} rt-64k
37673714

3768-
%define kernel_variant_ipaclones(k:) \
3769-
%if %{1}\
3770-
%if %{with_ipaclones}\
3771-
%{expand:%%files %{?2:%{2}-}ipaclones-internal}\
3772-
%defattr(-,root,root)\
3773-
%defverify(not mtime)\
3774-
/usr/src/kernels/%{KVERREL}%{?2:+%{2}}-ipaclones\
3775-
%endif\
3776-
%endif\
3777-
%{nil}
3778-
3779-
%kernel_variant_ipaclones %{with_up}
3780-
37813715
# plz don't put in a version string unless you're going to tag
37823716
# and build.
37833717
#

0 commit comments

Comments
 (0)