Attachment 869418 Details for Bug 1212835

[patch] patch for mainline

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

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Suchanek

Created: 2023-09-11 08:51:24 UTC

Size: 2.88 KB

patch

obsolete

>From 3df41732985d0ddf382a7e2723ba0a2ff483c83c Mon Sep 17 00:00:00 2001
>From: Michal Suchanek <msuchanek@suse.de>
>Date: Mon, 11 Sep 2023 09:16:23 +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/kernel.spec | 14 +++++++-------
> scripts/package/mkspec      |  1 +
> 2 files changed, 8 insertions(+), 7 deletions(-)
>
>diff --git a/scripts/package/kernel.spec b/scripts/package/kernel.spec
>index ac3f2ee6d7a0..1a727f636f67 100644
>--- a/scripts/package/kernel.spec
>+++ b/scripts/package/kernel.spec
>@@ -67,8 +67,8 @@ cp $(%{make} %{makeflags} -s image_name) %{buildroot}/boot/vmlinuz-%{KERNELRELEA
> %{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
> cp System.map %{buildroot}/boot/System.map-%{KERNELRELEASE}
> cp .config %{buildroot}/boot/config-%{KERNELRELEASE}
>-ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/build
>-ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/source
>+ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}%{MODLIB}/build
>+ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}%{MODLIB}/source
> %if %{with_devel}
> %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}'
> %endif
>@@ -99,9 +99,9 @@ fi
> 
> %files
> %defattr (-, root, root)
>-/lib/modules/%{KERNELRELEASE}
>-%exclude /lib/modules/%{KERNELRELEASE}/build
>-%exclude /lib/modules/%{KERNELRELEASE}/source
>+%{MODLIB}
>+%exclude %{MODLIB}/build
>+%exclude %{MODLIB}/source
> /boot/*
> 
> %files headers
>@@ -112,6 +112,6 @@ fi
> %files devel
> %defattr (-, root, root)
> /usr/src/kernels/%{KERNELRELEASE}
>-/lib/modules/%{KERNELRELEASE}/build
>-/lib/modules/%{KERNELRELEASE}/source
>+%{MODLIB}/build
>+%{MODLIB}/source
> %endif
>diff --git a/scripts/package/mkspec b/scripts/package/mkspec
>index d41608efb747..d41b2e5304ac 100755
>--- a/scripts/package/mkspec
>+++ b/scripts/package/mkspec
>@@ -18,6 +18,7 @@ fi
> cat<<EOF
> %define ARCH ${ARCH}
> %define KERNELRELEASE ${KERNELRELEASE}
>+%define MODLIB ${MODLIB}
> %define pkg_release $("${srctree}/init/build-version")
> EOF
> 
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 1212835: 869417 | 869418