Commit 44f4119c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-6.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux 

Pull Kbuild fixes from Nicolas Schier:

 - Generate rpm-pkg debuginfo package manually, allowing signed kernel
   modules in rpm package, again

 - Fix permissions of modules.builtin.modinfo

 - Do not run kernel-doc when building external modules

* tag 'kbuild-fixes-6.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux:
  kbuild: Do not run kernel-doc when building external modules
  kbuild: Fix permissions of modules.builtin.modinfo
  kbuild: rpm-pkg: Generate debuginfo package manually
parents ad9a728a 8e249948

scripts/Makefile.build

+2 −0
Original line number Diff line number Diff line
@@ -166,11 +166,13 @@ else ifeq ($(KBUILD_CHECKSRC),2) 
        cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $<

endif



ifeq ($(KBUILD_EXTMOD),)

ifneq ($(KBUILD_EXTRA_WARN),)

  cmd_checkdoc = PYTHONDONTWRITEBYTECODE=1 $(PYTHON3) $(KERNELDOC) -none $(KDOCFLAGS) \

        $(if $(findstring 2, $(KBUILD_EXTRA_WARN)), -Wall) \

        $<

endif

endif



# Compile C sources (.c)

# ---------------------------------------------------------------------------

scripts/Makefile.vmlinux

+2 −1
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ vmlinux: vmlinux.unstripped FORCE 
# what kmod expects to parse.

quiet_cmd_modules_builtin_modinfo = GEN     $@

      cmd_modules_builtin_modinfo = $(cmd_objcopy); \

                                    sed -i 's/\x00\+$$/\x00/g' $@

                                    sed -i 's/\x00\+$$/\x00/g' $@; \

                                    chmod -x $@



OBJCOPYFLAGS_modules.builtin.modinfo := -j .modinfo -O binary

scripts/package/kernel.spec

+30 −35
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
%{!?_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
@@ -46,34 +48,12 @@ against the %{version} kernel package. 
%endif



%if %{with_debuginfo}

# 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}

%package debuginfo

Summary: Debug information package for the Linux kernel

%description debuginfo

This package provides debug information for the kernel image and modules from the

%{version} package.

%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}



# 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



%prep

%setup -q -n linux
@@ -87,7 +67,7 @@ patch -p1 < %{SOURCE2} 
mkdir -p %{buildroot}/lib/modules/%{KERNELRELEASE}

cp $(%{make} %{makeflags} -s image_name) %{buildroot}/lib/modules/%{KERNELRELEASE}/vmlinuz

# DEPMOD=true makes depmod no-op. We do not package depmod-generated files.

%{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} DEPMOD=true modules_install

%{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} INSTALL_MOD_STRIP=1 DEPMOD=true modules_install

%{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install

cp System.map %{buildroot}/lib/modules/%{KERNELRELEASE}

cp .config %{buildroot}/lib/modules/%{KERNELRELEASE}/config
@@ -118,22 +98,31 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA 
	echo "%exclude /lib/modules/%{KERNELRELEASE}/build"

} > %{buildroot}/kernel.list



# 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



%if %{with_debuginfo}

# 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}



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}"

	buildid=$("${READELF}" -n "${mod}" | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p')

	link="%{buildroot}/usr/lib/debug/.build-id/${buildid}.debug"



	mkdir -p "${dbg%/*}" "${link%/*}"

	"${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}"

	ln -sf --relative "${dbg}" "${link}"



	echo "${dbg#%{buildroot}}" >> %{buildroot}/debuginfo.list

	echo "${link#%{buildroot}}" >> %{buildroot}/debuginfo.list

done < modules.order

%endif



%clean

rm -rf %{buildroot}

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

	elfbins.list



%post

if [ -x /usr/bin/kernel-install ]; then
@@ -172,3 +161,9 @@ fi 
/usr/src/kernels/%{KERNELRELEASE}

/lib/modules/%{KERNELRELEASE}/build

%endif



%if %{with_debuginfo}

%files -f %{buildroot}/debuginfo.list debuginfo

%defattr (-, root, root)

%exclude /debuginfo.list

%endif