linux-kbuild.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] kbuild/mkspec: remove firmware from rpm package
@ 2017-09-20  2:35 shuwang
  2017-09-20  6:10 ` Greg KH
  0 siblings, 1 reply; 5+ messages in thread
From: shuwang @ 2017-09-20  2:35 UTC (permalink / raw)
  To: yamada.masahiro, mmarek, gregkh
  Cc: linux-kbuild, linux-kernel, chuhu, yizhan, Shu Wang

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"
-- 
2.13.5


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

* Re: [PATCH] kbuild/mkspec: remove firmware from rpm package
  2017-09-20  2:35 [PATCH] kbuild/mkspec: remove firmware from rpm package shuwang
@ 2017-09-20  6:10 ` Greg KH
  2017-09-20  6:39   ` Shu Wang
  0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2017-09-20  6:10 UTC (permalink / raw)
  To: shuwang
  Cc: yamada.masahiro, mmarek, linux-kbuild, linux-kernel, chuhu, yizhan

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

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

* Re: [PATCH] kbuild/mkspec: remove firmware from rpm package
  2017-09-20  6:10 ` Greg KH
@ 2017-09-20  6:39   ` Shu Wang
  2017-09-20  6:55     ` Masahiro Yamada
  2017-09-20  7:00     ` Greg KH
  0 siblings, 2 replies; 5+ messages in thread
From: Shu Wang @ 2017-09-20  6:39 UTC (permalink / raw)
  To: Greg KH
  Cc: yamada masahiro, mmarek, linux-kbuild, linux-kernel, chuhu, yizhan

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
> 

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

* Re: [PATCH] kbuild/mkspec: remove firmware from rpm package
  2017-09-20  6:39   ` Shu Wang
@ 2017-09-20  6:55     ` Masahiro Yamada
  2017-09-20  7:00     ` Greg KH
  1 sibling, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2017-09-20  6:55 UTC (permalink / raw)
  To: Shu Wang
  Cc: Greg KH, Michal Marek, Linux Kbuild mailing list,
	Linux Kernel Mailing List, chuhu, yizhan

2017-09-20 15:39 GMT+09:00 Shu Wang <shuwang@redhat.com>:
> 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
>


I sent this:
https://patchwork.kernel.org/patch/9956143/


I will send a bug-fix pull request soon, so please wait a bit.






-- 
Best Regards
Masahiro Yamada

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

* Re: [PATCH] kbuild/mkspec: remove firmware from rpm package
  2017-09-20  6:39   ` Shu Wang
  2017-09-20  6:55     ` Masahiro Yamada
@ 2017-09-20  7:00     ` Greg KH
  1 sibling, 0 replies; 5+ messages in thread
From: Greg KH @ 2017-09-20  7:00 UTC (permalink / raw)
  To: Shu Wang
  Cc: yamada masahiro, mmarek, linux-kbuild, linux-kernel, chuhu, yizhan


A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?

A: No.
Q: Should I include quotations after my reply?

http://daringfireball.net/2007/07/on_top

On Wed, Sep 20, 2017 at 02:39:01AM -0400, Shu Wang wrote:
> 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

There's a lot of patches on the list for this issue, odds are one of
them fixed this, but maybe not.  If so, please say that in your patch so
that the developers/maintainer does not get confused.

thanks,

greg k-h

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

end of thread, other threads:[~2017-09-20  7:02 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-20  2:35 [PATCH] kbuild/mkspec: remove firmware from rpm package shuwang
2017-09-20  6:10 ` Greg KH
2017-09-20  6:39   ` Shu Wang
2017-09-20  6:55     ` Masahiro Yamada
2017-09-20  7:00     ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).