* [PATCH] linux-firmware: use 'make install' for installation @ 2020-03-04 10:13 Alexander Kanavin 2020-03-05 16:20 ` André Draszik 0 siblings, 1 reply; 5+ messages in thread From: Alexander Kanavin @ 2020-03-04 10:13 UTC (permalink / raw) To: openembedded-core Copying the source tree over was missing important symlinks that since recent updates can only be created with make install. 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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] linux-firmware: use 'make install' for installation 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 0 siblings, 1 reply; 5+ messages in thread From: André Draszik @ 2020-03-05 16:20 UTC (permalink / raw) To: openembedded-core 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 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] linux-firmware: use 'make install' for installation 2020-03-05 16:20 ` André Draszik @ 2020-03-05 16:44 ` Alexander Kanavin 2020-03-05 16:56 ` André Draszik 0 siblings, 1 reply; 5+ messages in thread From: Alexander Kanavin @ 2020-03-05 16:44 UTC (permalink / raw) To: André Draszik; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 2364 bytes --] Right I think this should be easy to fix, we need to copy LICENSE.* manually. I'll get to it soon. 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 > > > > [-- Attachment #2: Type: text/html, Size: 3450 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] linux-firmware: use 'make install' for installation 2020-03-05 16:44 ` Alexander Kanavin @ 2020-03-05 16:56 ` André Draszik 2020-03-05 18:41 ` Alexander Kanavin 0 siblings, 1 reply; 5+ messages in thread From: André Draszik @ 2020-03-05 16:56 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OE-core 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 > > > > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] linux-firmware: use 'make install' for installation 2020-03-05 16:56 ` André Draszik @ 2020-03-05 18:41 ` Alexander Kanavin 0 siblings, 0 replies; 5+ messages in thread From: Alexander Kanavin @ 2020-03-05 18:41 UTC (permalink / raw) To: André Draszik; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 3058 bytes --] 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@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@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 > > > > > > > > > [-- Attachment #2: Type: text/html, Size: 4604 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-03-05 18:41 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 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 2020-03-05 18:41 ` Alexander Kanavin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox