Skip to content

Commit 2c0658c

Browse files
committed
uek-rpm: remove obsolete CTF-related find-debuginfo hack
The find-debuginfo.diff hack is meant to stop CTF information being stripped out of the kernel modules. However, after the CTF decoupling work in bug 27124490, this hack serves no purpose: CTF is normally found in a separate archive file, is only built into modules when the modules are out-of-tree, and the in-kernel-tree kernel-uek.spec is not used by out-of-tree modules in any case. So the patch can simply be removed, with all its potential for occasional failure. (Out-of-tree module authors will still have to do something similar to ensure their CTF is not lost, if they contribute types that they would like DTrace to be able to see: but this was true before this patch was removed and will still be true afterwards.) Orabug: 29043023 Signed-off-by: Nick Alcock <[email protected]> Reviewed-by: Victor Erminpour <[email protected]>
1 parent 3cd07db commit 2c0658c

File tree

2 files changed

+7
-53
lines changed

2 files changed

+7
-53
lines changed

uek-rpm/ol7/debuginfo-g1.diff

Lines changed: 0 additions & 44 deletions
This file was deleted.

uek-rpm/ol7/kernel-uek.spec

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,7 @@ Source26: Module.kabi_x86_64
604604
Source200: kabi_whitelist_x86_64debug
605605
Source201: kabi_whitelist_x86_64
606606

607-
Source300: debuginfo-g1.diff
608-
Source301: find-debuginfo.sh.ol7.diff
607+
Source300: find-debuginfo.sh.ol7.diff
609608

610609
# Sources for kernel-tools
611610
Source2000: cpupower.service
@@ -1120,12 +1119,11 @@ ApplyPatch %{stable_patch_00}
11201119
ApplyPatch %{stable_patch_01}
11211120
%endif
11221121

1123-
# Copy the RPM find-debuginfo.sh into the buildroot and patch it
1124-
# to support -g1. (This is a patch of *RPM*, not of the kernel,
1125-
# so it is not governed by nopatches.)
1126-
cp %{_rpmconfigdir}/find-debuginfo.sh %{_builddir}
1127-
patch %{_builddir}/find-debuginfo.sh %{SOURCE300} && \
1128-
patch %{_builddir}/find-debuginfo.sh %{SOURCE301}
1122+
# Copy the RPM find-debuginfo.sh into the buildroot and patch it.
1123+
# (This is a patch of *RPM*, not of the kernel, so it is not governed
1124+
# by nopatches.)
1125+
cp %{_rpmconfigdir}/find-debuginfo.sh %{_builddir} && \
1126+
patch %{_builddir}/find-debuginfo.sh %{SOURCE300}
11291127
chmod +x %{_builddir}/find-debuginfo.sh
11301128

11311129
# only deal with configs if we are going to build for the arch
@@ -1639,7 +1637,7 @@ make -j1 htmldocs || %{doc_build_fail}
16391637
%if %{with_debuginfo}
16401638

16411639
%define __debug_install_post \
1642-
%{_builddir}/find-debuginfo.sh %{debuginfo_args} -g1 %{_builddir}/%{?buildsubdir}\
1640+
%{_builddir}/find-debuginfo.sh %{debuginfo_args} %{_builddir}/%{?buildsubdir}\
16431641
%{nil}
16441642

16451643
%ifnarch noarch

0 commit comments

Comments
 (0)