Skip to content

Commit 9e09007

Browse files
committed
kbuild: rpm-pkg: delete firmware_install to fix build error
Commit 5620a0d ("firmware: delete in-kernel firmware") deleted in-kernel firmware support, including "make firmware_install". Since then, "make rpm-pkg" / "make binrpm-pkg" fails to build with the error: make[2]: *** No rule to make target `firmware_install'. Stop. Commit df85b2d ("firmware: Restore support for built-in firmware") restored the build infrastructure for CONFIG_EXTRA_FIRMWARE, but this is out of the scope of "make firmware_install". So, the right thing to do is to kill the use of "make firmware_install". Fixes: 5620a0d ("firmware: delete in-kernel firmware") Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]>
1 parent 2bd6bf0 commit 9e09007

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

scripts/package/mkspec

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,8 @@ echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi $RPM_BUILD_ROOT/lib/modules'
8888
echo "%else"
8989
echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'
9090
echo "%endif"
91-
echo 'mkdir -p $RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"
9291

93-
echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= mod-fw= modules_install'
94-
echo 'INSTALL_FW_PATH=$RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"
95-
echo 'make INSTALL_FW_PATH=$INSTALL_FW_PATH' firmware_install
92+
echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install'
9693
echo "%ifarch ia64"
9794
echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
9895
echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
@@ -119,7 +116,7 @@ if ! $PREBUILT; then
119116
echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/build"
120117
echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/source"
121118
echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
122-
echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
119+
echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude .config.old --exclude .missing-syscalls.d\""
123120
echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"
124121
echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
125122
echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
@@ -154,7 +151,6 @@ echo '%defattr (-, root, root)'
154151
echo "/lib/modules/$KERNELRELEASE"
155152
echo "%exclude /lib/modules/$KERNELRELEASE/build"
156153
echo "%exclude /lib/modules/$KERNELRELEASE/source"
157-
echo "/lib/firmware/$KERNELRELEASE"
158154
echo "/boot/*"
159155
echo ""
160156
echo "%files headers"

0 commit comments

Comments
 (0)