| Message ID | 649fc773623d3f3a445cbfb8abca51c04c7919f4.1505730087.git.pabeni@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Sep 18, 2017 at 02:11:15PM +0200, Paolo Abeni wrote: > 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(-) I think someone else sent this right before you did, but if not: Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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/"
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(-)