Attachment 869417 Details for Bug 1212835

[patch] patch for stable kernel before 49c803cd919d ("kbuild: rpm-pkg: split out the body of spec file")

0001-kbuild-rpm-pkg-Fix-build-with-non-default-MODLIB.patch (text/plain), 2.58 KB, created by Michal Suchanek on 2023-09-11 08:49:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Suchanek

Created: 2023-09-11 08:49:36 UTC

Size: 2.58 KB

patch

obsolete

>From fedc9e185f5902a4ce0601126857806dbfe8de0b Mon Sep 17 00:00:00 2001
>From: Michal Suchanek <msuchanek@suse.de>
>Date: Mon, 11 Sep 2023 09:26:04 +0200
>Subject: [PATCH] kbuild: rpm-pkg: Fix build with non-default MODLIB
>
>The default MODLIB value is composed of two variables and the hardcoded
>string '/lib/modules/'.
>
>MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
>
>Defining this middle part as a variable was rejected on the basis that
>users can pass the whole MODLIB to make, such as
>
>make 'MODLIB=$(INSTALL_MOD_PATH)/usr/lib/modules/$(KERNELRELEASE)'
>
>However, this middle part of MODLIB is independently hardcoded by
>rpm-pkg, and when the user alters MODLIB this is not reflected when
>building the package.
>
>Given that $(INSTALL_MOD_PATH) is overriden during the rpm package build
>it is likely going to be empty. Then MODLIB can be passed to the rpm
>package, and used in place of the whole
>/usr/lib/modules/$(KERNELRELEASE) part.
>
>Signed-off-by: Michal Suchanek <msuchanek@suse.de>
>---
> scripts/package/mkspec | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/scripts/package/mkspec b/scripts/package/mkspec
>index 8049f0e2c110..8e26b25bc73c 100755
>--- a/scripts/package/mkspec
>+++ b/scripts/package/mkspec
>@@ -105,11 +105,11 @@ $M	$MAKE %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} modules_install
> 	$MAKE %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
> 	cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE
> 	cp .config %{buildroot}/boot/config-$KERNELRELEASE
>-$S$M	rm -f %{buildroot}/lib/modules/$KERNELRELEASE/build
>-$S$M	rm -f %{buildroot}/lib/modules/$KERNELRELEASE/source
>+$S$M	rm -f %{buildroot}$MODLIB/build
>+$S$M	rm -f %{buildroot}$MODLIB/source
> $S$M	mkdir -p %{buildroot}/usr/src/kernels/$KERNELRELEASE
> $S$M	tar cf - $EXCLUDES . | tar xf - -C %{buildroot}/usr/src/kernels/$KERNELRELEASE
>-$S$M	cd %{buildroot}/lib/modules/$KERNELRELEASE
>+$S$M	cd %{buildroot}$MODLIB
> $S$M	ln -sf /usr/src/kernels/$KERNELRELEASE build
> $S$M	ln -sf /usr/src/kernels/$KERNELRELEASE source
> 
>@@ -139,9 +139,9 @@ $S$M	ln -sf /usr/src/kernels/$KERNELRELEASE source
> 
> 	%files
> 	%defattr (-, root, root)
>-$M	/lib/modules/$KERNELRELEASE
>-$M	%exclude /lib/modules/$KERNELRELEASE/build
>-$M	%exclude /lib/modules/$KERNELRELEASE/source
>+$M	$MODLIB
>+$M	%exclude $MODLIB/build
>+$M	%exclude $MODLIB/source
> 	/boot/*
> 
> 	%files headers
>@@ -151,6 +151,6 @@ $S$M
> $S$M	%files devel
> $S$M	%defattr (-, root, root)
> $S$M	/usr/src/kernels/$KERNELRELEASE
>-$S$M	/lib/modules/$KERNELRELEASE/build
>-$S$M	/lib/modules/$KERNELRELEASE/source
>+$S$M	$MODLIB/build
>+$S$M	$MODLIB/source
> EOF
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 1212835: 869417 | 869418