linux-firmware: use 'make install' for installation
PATCH 1/1 linux-firmware: use 'make install' for installation
Copying the source tree over was missing important symlinks that since recent updates can only be created with make install.
--- .../linux-firmware/linux-firmware_20200122.bb | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-)
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +1 -21
@@ -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 }
Signature · 1 line
2.25.1
Quoted 2 lines · Alexander Kanavin
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'
Quoted 43 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../linux-firmware/linux-firmware_20200122.bb | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-)meta/recipes-kernel/linux-firmware/linux- renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-0firmware_20200122.bb
index0d1422cfca..f7198cb56a100644meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +1
-21@@ -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 }Signature · 1 line
2.25.1
Right I think this should be easy to fix, we need to copy LICENSE.* manually. I'll get to it soon.
Alex
Quoted 62 lines · André Draszik
Quoted 2 lines · Alexander Kanavin
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'Review
Quoted 7 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../linux-firmware/linux-firmware_20200122.bb | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-)(quoted diff) +0
-0linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-
Quoted 15 lines
firmware_20200122.bb
index0d1422cfca..f7198cb56a100644meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-7@@ -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 bashmeta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb do_compile() { · line 227
Quoted 10 lines
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-10- 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
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb do_compile() { · line 228
Quoted 1 line
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-1- ln -sf libertas/sd8686_v9_helper.bin${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb do_compile() { · line 230
Quoted 2 lines
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-2- - # fixup wl12xx location, after 2.6.37 the kernel searches adifferent location for it
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb do_compile() { · line 231
Quoted 1 line
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-1- ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sfti-connectivity/* . )
Quoted 7 lines
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +1
-1+ oe_runmake 'DESTDIR=${D}' install } --2.25.1
Quoted 2 lines · Alexander Kanavin
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.
Quoted 59 lines
Alex
Quoted 56 lines · André Draszik
Quoted 2 lines · Alexander Kanavin
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'meta/recipes-kernel/linux-
Quoted 7 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../linux-firmware/linux-firmware_20200122.bb | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-)meta/recipes-kernel/linux- renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-0
firmware/linux-Quoted 36 lines
firmware_20200122.bb
index0d1422cfca..f7198cb56a100644meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +1
-21@@ -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 }Signature · 1 line
2.25.1
Maybe you could send a follow up patch then? I won’t get to it until tomorrow.
Alex
Quoted 84 lines · André Draszik
Quoted 1 line · Alexander Kanavin
Right I think this should be easy to fix, we need to copy LICENSE.*
manually. I'll get to it soon.
Quoted 1 line
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.Quoted 8 lines
Alex
Quoted 5 lines · André Draszik
Quoted 2 lines · Alexander Kanavin
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
Quoted 1 line
Quoted 1 line
are non-existent and image creation fails, because their install:
target
Quoted 9 lines
Quoted 9 lines
doesn't copy the license files.
Cheers,
Andre'Quoted 4 lines
Signed-off-by Alexander Kanavin <[email protected]>--- .../linux-firmware/linux-firmware_20200122.bb | 22+------------------ > > > 1 file changed, 1 insertion(+), 21 deletions(-)Quoted 2 lines
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +0
-0linux-firmware_20200122.bb b/meta/recipes-kernel/linux-
Quoted 18 lines
Quoted 18 lines
firmware/linux-Quoted 17 lines
firmware_20200122.bb
index0d1422cfca..f7198cb56a100644meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-9@@ -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 -Quoted 8 lines
Quoted 8 lines
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb do_compile() {
Quoted 8 lines
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-8- # 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
Quoted 1 line
Quoted 1 line
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb do_compile() { · line 228
Quoted 1 line
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-1- ln -sf libertas/sd8686_v9_helper.bin${D}${nonarch_base_libdir}/firmware/sd8686_helper.bin
Quoted 2 lines
Quoted 2 lines
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb do_compile() { · line 230
Quoted 2 lines
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-2- - # fixup wl12xx location, after 2.6.37 the kernel searches adifferent location for it
Quoted 1 line
Quoted 1 line
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb do_compile() { · line 231
Quoted 1 line
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0
-1- ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sfti-connectivity/* . )
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +1
-1+ oe_runmake 'DESTDIR=${D}' install } --2.25.1