tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kbuild: rpm-pkg: Fix manual debuginfo generation when using .src.rpm

Commit 62089b804895 ("kbuild: rpm-pkg: Generate debuginfo package
manually") added uses of OBJCOPY and READELF, variables from Kbuild.
These variables are defined and work properly when using the binrpm-pkg
target because rpmbuild is run within Kbuild. However, these variables
are not defined when building from a source RPM package generated with
the srcrpm-pkg target, breaking the build when generating the debug info
subpackage.

Define a default value for these variables so that these commands
respect the value from Kbuild but continue to work when built from a
source RPM package.

Cc: stable@vger.kernel.org
Fixes: 62089b804895 ("kbuild: rpm-pkg: Generate debuginfo package manually")
Reported-by: Lukas Herbolt <lukas@herbolt.com>
Closes: https://lore.kernel.org/20260212135855.147906-2-lukas@herbolt.com/
Tested-by: Lukas Herbolt <lukas@herbolt.com>
Link: https://patch.msgid.link/20260213-fix-debuginfo-srcrpm-pkg-v1-1-45cd0c0501b9@kernel.org
Signed-off-by: Nathan Chancellor <nathan@kernel.org>

Nathan Chancellor afdfb71c ffe9ac1a

+2 -2
+2 -2
scripts/package/kernel.spec
··· 148 148 while read -r mod; do 149 149 mod="${mod%.o}.ko" 150 150 dbg="%{buildroot}/usr/lib/debug/lib/modules/%{KERNELRELEASE}/kernel/${mod}" 151 - buildid=$("${READELF}" -n "${mod}" | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p') 151 + buildid=$("${READELF:-readelf}" -n "${mod}" | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p') 152 152 link="%{buildroot}/usr/lib/debug/.build-id/${buildid}.debug" 153 153 154 154 mkdir -p "${dbg%/*}" "${link%/*}" 155 - "${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}" 155 + "${OBJCOPY:-objcopy}" --only-keep-debug "${mod}" "${dbg}" 156 156 ln -sf --relative "${dbg}" "${link}" 157 157 158 158 echo "${dbg#%{buildroot}}" >> %{buildroot}/debuginfo.list