Skip to contentSkip to conversation

kbuild: rpm-pkg: fix build error with CONFIG_MODULES=n

PATCH Superseded Masahiro Yamada 1 participant 1 message Jun 16, 2024 Kbuild

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: rpm-pkg: fix build error with CONFIG_MODULES=n

When CONFIG_MODULES is disabled, 'make (bin)rpm-pkg' fails.

  $ make allnoconfig binrpm-pkg
    [ snip ]
  error: File not found: .../linux/rpmbuild/BUILDROOT/kernel-6.10.0_rc3-1.i386/lib/modules/6.10.0-rc3/kernel
  error: File not found: .../linux/rpmbuild/BUILDROOT/kernel-6.10.0_rc3-1.i386/lib/modules/6.10.0-rc3/modules.order
Fixes 615b3a3d2d41 ("kbuild: rpm-pkg: do not include depmod-generated files")

---

 scripts/package/kernel.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
scripts/package/kernel.spec +2 -4
index 19e458341f45..f1c7a5ea338f 100644
@@ -70,13 +70,11 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA
 %endif
 
 {
-	for x in System.map config kernel modules.builtin \
-			modules.builtin.modinfo modules.order vmlinuz; do
-		echo "/lib/modules/%{KERNELRELEASE}/${x}"
-	done
+	echo "/lib/modules/%{KERNELRELEASE}"
 
 	for x in alias alias.bin builtin.alias.bin builtin.bin dep dep.bin \
 					devname softdep symbols symbols.bin; do
+		rm -f "%{buildroot}/lib/modules/%{KERNELRELEASE}/modules.${x}"
 		echo "%ghost /lib/modules/%{KERNELRELEASE}/modules.${x}"
 	done
 
Signature · 1 line
2.43.0