All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] kbuild: do not try to include firmware in the kernel rpm
@ 2017-09-18 12:11 Paolo Abeni
  2017-09-18 13:54 ` Greg Kroah-Hartman
  0 siblings, 1 reply; 2+ messages in thread
From: Paolo Abeni @ 2017-09-18 12:11 UTC (permalink / raw)
  To: linux-kbuild; +Cc: Masahiro Yamada, Michal Marek, Greg Kroah-Hartman

Since the commit 5620a0d1aacd ("firmware: delete in-kernel firmware")
the make target 'firmware_install' is no more available, but the
current kernel rpm specfile uses it, so that binary rpm generation
always fails.

Fix it by dropping firmware inclusion in the generated rpm, too.
The firmware directory - now empty - is still included into the rpm.

Fixes: 5620a0d1aacd ("firmware: delete in-kernel firmware")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
 scripts/package/mkspec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index bb43f153fd8e..8c687463f872 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -91,8 +91,6 @@ echo "%endif"
 echo 'mkdir -p $RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"
 
 echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= mod-fw= modules_install'
-echo 'INSTALL_FW_PATH=$RPM_BUILD_ROOT'"/lib/firmware/$KERNELRELEASE"
-echo 'make INSTALL_FW_PATH=$INSTALL_FW_PATH' firmware_install
 echo "%ifarch ia64"
 echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
 echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
-- 
2.13.5


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-09-18 13:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-18 12:11 [PATCH] kbuild: do not try to include firmware in the kernel rpm Paolo Abeni
2017-09-18 13:54 ` Greg Kroah-Hartman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.