Re: [PATCH] kbuild/mkspec: remove firmware from rpm package

Shu Wang
2017-09-20T06:39:03Z

Hi

Do you mean the patch for deb package? The patch didn't fix rpm
package. or there's another patch I didn't get on the mailing list.

https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1492398.html

Thanks

----- Original Message -----
> From: "Greg KH" <gregkh@linuxfoundation.org>
> To: shuwang@redhat.com
> Cc: "yamada masahiro" <yamada.masahiro@socionext.com>, mmarek@suse.com, linux-kbuild@vger.kernel.org,
> linux-kernel@vger.kernel.org, chuhu@redhat.com, yizhan@redhat.com
> Sent: Wednesday, September 20, 2017 2:10:12 PM
> Subject: Re: [PATCH] kbuild/mkspec: remove firmware from rpm package
>
> On Wed, Sep 20, 2017 at 10:35:29AM +0800, shuwang@redhat.com wrote:
> > From: Shu Wang <shuwang@redhat.com>
> >
> > Commit 5620a0d1aacd ("firmware: delete in-kernel firmware") deleted
> > in-kernel firmware support, including the firmware install command.
> >
> > So make binrpm-pkg will failed as no firmware_install make target.
> >
> > Signed-off-by: Shu Wang <shuwang@redhat.com>
> > ---
> > scripts/package/mkspec | 4 ----
> > 1 file changed, 4 deletions(-)
> >
> > diff --git a/scripts/package/mkspec b/scripts/package/mkspec
> > index bb43f153fd8e..8f34e31d8474 100755
> > --- a/scripts/package/mkspec
> > +++ b/scripts/package/mkspec
> > @@ -88,11 +88,8 @@ echo 'mkdir -p $RPM_BUILD_ROOT/boot/efi
> > $RPM_BUILD_ROOT/lib/modules'
> > echo "%else"
> > echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'
> > 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/"
> > @@ -154,7 +151,6 @@ echo '%defattr (-, root, root)'
> > echo "/lib/modules/$KERNELRELEASE"
> > echo "%exclude /lib/modules/$KERNELRELEASE/build"
> > echo "%exclude /lib/modules/$KERNELRELEASE/source"
> > -echo "/lib/firmware/$KERNELRELEASE"
> > echo "/boot/*"
> > echo ""
> > echo "%files headers"
>
> I think this has already been posted to the list, right?
>
> Sorry about it, it's pretty obvious that no build system tests kernel
> packages, and neither do I :)
>
> thanks,
>
> greg k-h
>