Openembedded Core Discussions
 help / color / mirror / Atom feed
From: "André Draszik" <git@andred.net>
To: Alexander Kanavin <alex.kanavin@gmail.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] linux-firmware: use 'make install' for installation
Date: Thu, 05 Mar 2020 16:56:17 +0000	[thread overview]
Message-ID: <bb5bac4f73c97d4056aa89464fe97cd021c87f05.camel@andred.net> (raw)
In-Reply-To: <CANNYZj_-om40Ejv2e8TpajUW=yhsedkyjPEJWi=BaY-qMvcw-Q@mail.gmail.com>

On Thu, 2020-03-05 at 17:44 +0100, Alexander Kanavin wrote:
> Right I think this should be easy to fix, we need to copy LICENSE.* manually. I'll get to it soon.
> 

Keep in mind there's different spelling, and two more files :-)
This works for me:

+        cp -r GPL-2 LICENCE.* LICENSE.* WHENCE ${D}${nonarch_base_libdir}/firmware/


Cheers,
A.

> Alex
> 
> On Thu, 5 Mar 2020 at 17:20, André Draszik <git@andred.net> wrote:
> > On Wed, 2020-03-04 at 11:13 +0100, Alexander Kanavin wrote:
> > > Copying the source tree over was missing important symlinks
> > > that since recent updates can only be created with make install.
> > 
> > Thanks for the quick fix Alex, but unfortunately now all the -license packages
> > are non-existent and image creation fails, because their install: target
> > doesn't copy the license files.
> > 
> > Cheers,
> > Andre'
> > 
> > > 
> > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > ---
> > >  .../linux-firmware/linux-firmware_20200122.bb | 22 +------------------
> > >  1 file changed, 1 insertion(+), 21 deletions(-)
> > > 
> > > diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-
> > firmware/linux-
> > > firmware_20200122.bb
> > > index 0d1422cfca..f7198cb56a 100644
> > > --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
> > > +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
> > > @@ -208,27 +208,7 @@ do_compile() {
> > >  }
> > >  
> > >  do_install() {
> > > -     install -d  ${D}${nonarch_base_libdir}/firmware/
> > > -     cp -r * ${D}${nonarch_base_libdir}/firmware/
> > > -
> > > -     # Avoid Makefile to be deployed
> > > -     rm ${D}${nonarch_base_libdir}/firmware/Makefile
> > > -
> > > -     # Remove unbuild firmware which needs cmake and bash
> > > -     rm ${D}${nonarch_base_libdir}/firmware/carl9170fw -rf
> > > -
> > > -     # Remove pointless bash script
> > > -     rm ${D}${nonarch_base_libdir}/firmware/configure
> > > -
> > > -     # Remove python script used to check the WHENCE file
> > > -     rm ${D}${nonarch_base_libdir}/firmware/check_whence.py
> > > -
> > > -     # Libertas sd8686
> > > -     ln -sf libertas/sd8686_v9.bin ${D}${nonarch_base_libdir}/firmware/sd8686.bin
> > > -     ln -sf libertas/sd8686_v9_helper.bin ${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin
> > > -
> > > -     # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it
> > > -     ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )
> > > +        oe_runmake 'DESTDIR=${D}' install
> > >  }
> > >  
> > >  
> > > -- 
> > > 2.25.1
> > > 
> > 



  reply	other threads:[~2020-03-05 16:56 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-04 10:13 [PATCH] linux-firmware: use 'make install' for installation Alexander Kanavin
2020-03-05 16:20 ` André Draszik
2020-03-05 16:44   ` Alexander Kanavin
2020-03-05 16:56     ` André Draszik [this message]
2020-03-05 18:41       ` Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bb5bac4f73c97d4056aa89464fe97cd021c87f05.camel@andred.net \
    --to=git@andred.net \
    --cc=alex.kanavin@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox