[OE-core] [PATCH] linux-firmware: use 'make install' for installation

[Alexander Kanavin]

Maybe you could send a follow up patch then? I won’t get to it until
tomorrow.

Alex

On Thu 5. Mar 2020 at 17.56, André Draszik <git at andred.net> wrote:

> 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 at 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 at 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
> > > >
> > >
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20200305/2a8a9bf9/attachment-0001.html>