Unverified Commit ffe9ac1a authored by Nathan Chancellor's avatar Nathan Chancellor
Browse files

kernel: rpm-pkg: Restore find-debuginfo.sh approach to -debuginfo package 



Commit 62089b80 ("kbuild: rpm-pkg: Generate debuginfo package
manually") effectively reverted commit a7c699d0 ("kbuild: rpm-pkg:
build a debuginfo RPM") but the approach it took is not safe for older
RPM releases. Restore commit a7c699d0 ("kbuild: rpm-pkg: build a
debuginfo RPM") for the !CONFIG_MODULE_SIG case to allow more
environments and configurations to take advantage of the separate debug
information package process.

Cc: stable@vger.kernel.org
Fixes: 62089b80 ("kbuild: rpm-pkg: Generate debuginfo package manually")
Tested-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Tested-by: default avatarSteve French <stfrench@microsoft.com>
Tested-by: default avatarJuergen Gross <jgross@suse.com>
Acked-by: default avatarNicolas Schier <nsc@kernel.org>
Link: https://patch.msgid.link/20260210-kbuild-fix-debuginfo-rpm-v1-2-0730b92b14bc@kernel.org


Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
parent 6d6b8b0e

scripts/package/kernel.spec

+46 −4
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
%{!?_arch: %define _arch dummy}

%{!?make: %define make make}

%define makeflags %{?_smp_mflags} ARCH=%{ARCH}

%define __spec_install_post /usr/lib/rpm/brp-compress || :

%define debug_package %{nil}



Name: kernel

Summary: The Linux Kernel
@@ -56,6 +54,38 @@ This package provides debug information for the kernel image and modules from th 
%define install_mod_strip 1

%endif



%if %{with_debuginfo_rpm}

# list of debuginfo-related options taken from distribution kernel.spec

# files

%undefine _include_minidebuginfo

%undefine _find_debuginfo_dwz_opts

%undefine _unique_build_ids

%undefine _unique_debug_names

%undefine _unique_debug_srcs

%undefine _debugsource_packages

%undefine _debuginfo_subpackages

%global _find_debuginfo_opts -r

%global _missing_build_ids_terminate_build 1

%global _no_recompute_build_ids 1

%{debug_package}



# later, we make all modules executable so that find-debuginfo.sh strips

# them up. but they don't actually need to be executable, so remove the

# executable bit, taking care to do it _after_ find-debuginfo.sh has run

%define __spec_install_post \

	%{?__debug_package:%{__debug_install_post}} \

	%{__arch_install_post} \

	%{__os_install_post} \

	find %{buildroot}/lib/modules/%{KERNELRELEASE} -name "*.ko" -type f \\\

		| xargs --no-run-if-empty chmod u-x

%else

%define __spec_install_post /usr/lib/rpm/brp-compress || :

%endif

# some (but not all) versions of rpmbuild emit %%debug_package with

# %%install. since we've already emitted it manually, that would cause

# a package redefinition error. ensure that doesn't happen

%define debug_package %{nil}



%prep

%setup -q -n linux

cp %{SOURCE1} .config
@@ -99,14 +129,22 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA 
	echo "%exclude /lib/modules/%{KERNELRELEASE}/build"

} > %{buildroot}/kernel.list



%if %{with_debuginfo_manual}

%if 0%{with_debuginfo_manual}%{with_debuginfo_rpm} > 0

# copying vmlinux directly to the debug directory means it will not get

# stripped (but its source paths will still be collected + fixed up)

mkdir -p %{buildroot}/usr/lib/debug/lib/modules/%{KERNELRELEASE}

cp vmlinux %{buildroot}/usr/lib/debug/lib/modules/%{KERNELRELEASE}

%endif



echo /usr/lib/debug/lib/modules/%{KERNELRELEASE}/vmlinux > %{buildroot}/debuginfo.list

%if %{with_debuginfo_rpm}

# make modules executable so that find-debuginfo.sh strips them. this

# will be undone later in %%__spec_install_post

find %{buildroot}/lib/modules/%{KERNELRELEASE} -name "*.ko" -type f \

	| xargs --no-run-if-empty chmod u+x

%endif



%if %{with_debuginfo_manual}

echo /usr/lib/debug/lib/modules/%{KERNELRELEASE}/vmlinux > %{buildroot}/debuginfo.list

while read -r mod; do

	mod="${mod%.o}.ko"

	dbg="%{buildroot}/usr/lib/debug/lib/modules/%{KERNELRELEASE}/kernel/${mod}"
@@ -124,6 +162,10 @@ done < modules.order 


%clean

rm -rf %{buildroot}

%if %{with_debuginfo_rpm}

rm -f debugfiles.list debuglinks.list debugsourcefiles.list debugsources.list \

	elfbins.list

%endif



%post

if [ -x /usr/bin/kernel-install ]; then

scripts/package/mkspec

+5 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ else 
echo '%define with_devel 0'

fi



# use %{debug_package} machinery to generate -debuginfo

with_debuginfo_rpm=0

# manually generate -debuginfo package

with_debuginfo_manual=0

# debuginfo package generation uses find-debuginfo.sh under the hood,
@@ -56,9 +58,12 @@ if grep -q CONFIG_DEBUG_INFO=y include/config/auto.conf && 
				with_debuginfo_manual='%{?_without_debuginfo:0}%{?!_without_debuginfo:1}'

			fi

		fi

	else

		with_debuginfo_rpm='%{?_without_debuginfo:0}%{?!_without_debuginfo:1}'

	fi

fi

echo "%define with_debuginfo_manual $with_debuginfo_manual"

echo "%define with_debuginfo_rpm $with_debuginfo_rpm"



cat<<EOF

%define ARCH ${ARCH}