Commit b537925f authored by Masahiro Yamada's avatar Masahiro Yamada

kbuild: rpm-pkg: run modules_install for non-modular kernel

For the same reason as commit 4243afdb ("kbuild: builddeb: always
make modules_install, to install modules.builtin*"), run modules_install
even when CONFIG_MODULES=n to install modules.builtin*.
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 1789fc91
...@@ -101,16 +101,13 @@ $S$M ...@@ -101,16 +101,13 @@ $S$M
%else %else
cp \$(%{make} %{makeflags} -s image_name) %{buildroot}/boot/vmlinuz-%{KERNELRELEASE} cp \$(%{make} %{makeflags} -s image_name) %{buildroot}/boot/vmlinuz-%{KERNELRELEASE}
%endif %endif
$M %{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} modules_install %{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} modules_install
%{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install %{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
cp System.map %{buildroot}/boot/System.map-%{KERNELRELEASE} cp System.map %{buildroot}/boot/System.map-%{KERNELRELEASE}
cp .config %{buildroot}/boot/config-%{KERNELRELEASE} cp .config %{buildroot}/boot/config-%{KERNELRELEASE}
$S$M rm -f %{buildroot}/lib/modules/%{KERNELRELEASE}/build ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/build
$S$M rm -f %{buildroot}/lib/modules/%{KERNELRELEASE}/source ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/source
$S$M %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='\${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}' $S$M %{make} %{makeflags} run-command KBUILD_RUN_COMMAND='\${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}'
$S$M cd %{buildroot}/lib/modules/%{KERNELRELEASE}
$S$M ln -sf /usr/src/kernels/%{KERNELRELEASE} build
$S$M ln -sf /usr/src/kernels/%{KERNELRELEASE} source
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
...@@ -138,9 +135,9 @@ $S$M ln -sf /usr/src/kernels/%{KERNELRELEASE} source ...@@ -138,9 +135,9 @@ $S$M ln -sf /usr/src/kernels/%{KERNELRELEASE} source
%files %files
%defattr (-, root, root) %defattr (-, root, root)
$M /lib/modules/%{KERNELRELEASE} /lib/modules/%{KERNELRELEASE}
$M %exclude /lib/modules/%{KERNELRELEASE}/build %exclude /lib/modules/%{KERNELRELEASE}/build
$M %exclude /lib/modules/%{KERNELRELEASE}/source %exclude /lib/modules/%{KERNELRELEASE}/source
/boot/* /boot/*
%files headers %files headers
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment