Skip to content

Commit 8d1001f

Browse files
committed
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 To make it work irrespective of CONFIG_MODULES, this commit specifies the directory path, /lib/modules/%{KERNELRELEASE}, instead of individual files. However, doing so would cause new warnings: warning: File listed twice: /lib/modules/6.10.0-rc3-dirty/modules.alias warning: File listed twice: /lib/modules/6.10.0-rc3-dirty/modules.alias.bin warning: File listed twice: /lib/modules/6.10.0-rc3-dirty/modules.builtin.alias.bin warning: File listed twice: /lib/modules/6.10.0-rc3-dirty/modules.builtin.bin warning: File listed twice: /lib/modules/6.10.0-rc3-dirty/modules.dep warning: File listed twice: /lib/modules/6.10.0-rc3-dirty/modules.dep.bin warning: File listed twice: /lib/modules/6.10.0-rc3-dirty/modules.devname warning: File listed twice: /lib/modules/6.10.0-rc3-dirty/modules.softdep warning: File listed twice: /lib/modules/6.10.0-rc3-dirty/modules.symbols warning: File listed twice: /lib/modules/6.10.0-rc3-dirty/modules.symbols.bin These files exist in /lib/modules/%{KERNELRELEASE} and are also explicitly marked as %ghost. Suppress depmod because depmod-generated files are not packaged. Fixes: 615b3a3 ("kbuild: rpm-pkg: do not include depmod-generated files") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
1 parent c615665 commit 8d1001f

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

scripts/package/kernel.spec

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ patch -p1 < %{SOURCE2}
5757
%install
5858
mkdir -p %{buildroot}/lib/modules/%{KERNELRELEASE}
5959
cp $(%{make} %{makeflags} -s image_name) %{buildroot}/lib/modules/%{KERNELRELEASE}/vmlinuz
60-
%{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} modules_install
60+
# DEPMOD=true makes depmod no-op. We do not package depmod-generated files.
61+
%{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} DEPMOD=true modules_install
6162
%{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
6263
cp System.map %{buildroot}/lib/modules/%{KERNELRELEASE}
6364
cp .config %{buildroot}/lib/modules/%{KERNELRELEASE}/config
@@ -70,10 +71,7 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA
7071
%endif
7172

7273
{
73-
for x in System.map config kernel modules.builtin \
74-
modules.builtin.modinfo modules.order vmlinuz; do
75-
echo "/lib/modules/%{KERNELRELEASE}/${x}"
76-
done
74+
echo "/lib/modules/%{KERNELRELEASE}"
7775

7876
for x in alias alias.bin builtin.alias.bin builtin.bin dep dep.bin \
7977
devname softdep symbols symbols.bin; do

0 commit comments

Comments
 (0)