linux-raspberrypi: Adjust for libexecdir changes
PATCH 1/1 linux-raspberrypi: Adjust for libexecdir changes
libexecdir has changed its location in latest OE core, it used to be pointing to /usr/lib which was essentially same as libdir and when hardcoded in do_rpiboot_mkimage it worked.
Fixes kernel build failures e.g.
DEBUG: Executing shell function do_rpiboot_mkimage /a/builder/mnt/build-oe/tmp-musl/work/raspberrypi2-oe-linux-musleabi/linux-raspberrypi/1_4.1.10+gitAUTOINC+b74df9228c-r0/temp/run.do_rpiboot_mkimage.5543:
line 111:
/a/builder/mnt/build-oe/tmp-musl/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg: No such file or directory
--- recipes-kernel/linux/linux-raspberrypi.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-kernel/linux/linux-raspberrypi.inc +1 -1
@@ -60,7 +60,7 @@ do_rpiboot_mkimage() { if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then if test -n "${KERNEL_DEVICETREE}"; then # Add RPi bootloader trailer to kernel image to enable DeviceTree support - ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT} + ${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT} fi fi }
Signature · 1 line
2.7.0
Ping?
We can't build on master branch without this fix...
Cheers,
Anders
Quoted 29 lines · Khem Raj
libexecdir has changed its location in latest OE core, it used to be pointing to
/usr/libwhich was essentially same as libdir and when hardcoded indo_rpiboot_mkimageit worked.Fixes kernel build failures e.g.
DEBUG: Executing shell function
do_rpiboot_mkimage/a/builder/mnt/build-oe/tmp-musl/work/raspberrypi2-oe-linux-musleabi/linux-raspberrypi/1_4.1.10+gitAUTOINC+b74df9228c-r0/temp/run.do_rpiboot_mkimage.5543:
line 111:
/a/builder/mnt/build-oe/tmp-musl/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg: No such file or directorySigned-off-by Khem Raj <[email protected]>--- recipes-kernel/linux/linux-raspberrypi.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)recipes-kernel/linux/linux-raspberrypi.inc +1
-1@@ -60,7 +60,7 @@ do_rpiboot_mkimage() { if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then if test -n "${KERNEL_DEVICETREE}"; then # Add RPi bootloader trailer to kernel image to enable DeviceTree support - ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT} + ${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT} fi fi }
Signature · 2 lines
Anders Darander, Senior System Architect ChargeStorm AB / eStorm AB
Quoted 34 lines · Anders Darander
Ping?
We can't build on master branch without this fix...
Cheers,
AndersQuoted 25 lines · Khem Raj
libexecdir has changed its location in latest OE core, it used to be pointing to
/usr/libwhich was essentially same as libdir and when hardcoded indo_rpiboot_mkimageit worked.Fixes kernel build failures e.g.
DEBUG: Executing shell function
do_rpiboot_mkimage/a/builder/mnt/build-oe/tmp-musl/work/raspberrypi2-oe-linux-musleabi/linux-raspberrypi/1_4.1.10+gitAUTOINC+b74df9228c-r0/temp/run.do_rpiboot_mkimage.5543:
line 111:
/a/builder/mnt/build-oe/tmp-musl/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg: No such file or directorySigned-off-by Khem Raj <[email protected]>--- recipes-kernel/linux/linux-raspberrypi.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)recipes-kernel/linux/linux-raspberrypi.inc +0
-1@@ -60,7 +60,7 @@ do_rpiboot_mkimage() { if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then if test -n "${KERNEL_DEVICETREE}"; then # Add RPi bootloader trailer to kernel image to enable DeviceTree support - ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
Quoted 8 lines
recipes-kernel/linux/linux-raspberrypi.inc do_rpiboot_mkimage() { · line 66
Quoted 4 lines
recipes-kernel/linux/linux-raspberrypi.inc +1
-0+ ${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT} fi fi }--
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB
--
This patch is mandatory but there was a serial with additional fixes send by Maciej Borzecki on Feb 2nd. I think this is worth taken into account.
Andreas
Quoted 46 lines · Andreas Müller
Quoted 34 lines · Anders Darander
Ping?
We can't build on master branch without this fix...
Cheers,
AndersQuoted 25 lines · Khem Raj
libexecdir has changed its location in latest OE core, it used to be pointing to
/usr/libwhich was essentially same as libdir and when hardcoded indo_rpiboot_mkimageit worked.Fixes kernel build failures e.g.
DEBUG: Executing shell function
do_rpiboot_mkimage/a/builder/mnt/build-oe/tmp-musl/work/raspberrypi2-oe-linux-musleabi/linux-raspberrypi/1_4.1.10+gitAUTOINC+b74df9228c-r0/temp/run.do_rpiboot_mkimage.5543:
line 111:
/a/builder/mnt/build-oe/tmp-musl/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg: No such file or directorySigned-off-by Khem Raj <[email protected]>---
recipes-kernel/linux/linux-raspberrypi.inc | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)recipes-kernel/linux/linux-raspberrypi.inc +0
-1@@ -60,7 +60,7 @@ do_rpiboot_mkimage() { if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then if test -n "${KERNEL_DEVICETREE}"; then # Add RPi bootloader trailer to kernel image to enable DeviceTree support - ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}Quoted 8 lines
recipes-kernel/linux/linux-raspberrypi.inc do_rpiboot_mkimage() { · line 66
Quoted 4 lines
recipes-kernel/linux/linux-raspberrypi.inc +1
-0+ ${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT} fi fi }--
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB
--
Quoted 3 lines
This patch is mandatory but there was a serial with additional fixes send by Maciej Borzecki on Feb 2nd. I think this is worth taken into account.
You can try to use github.com/kraj/meta-raspberrypi kraj/master I plan to test out more and more pending submissions on that branch
Quoted 7 lines
Andreas
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Quoted 2 lines · Khem Raj
You can try to use github.com/kraj/meta-raspberrypi kraj/master I plan to test out more and more pending submissions on that branch
Thanks, and done.
It's too bad meta-raspberrypi didn't have a master-next branch :-)
Quoted 19 lines · Andreas Müller
Quoted 15 lines · Khem Raj
Quoted 6 lines
recipes-kernel/linux/linux-raspberrypi.inc +0
-0recipes-kernel/linux/linux-raspberrypi.inc do_rpiboot_mkimage() { · line 66
Quoted 8 lines
recipes-kernel/linux/linux-raspberrypi.inc +1
-1@@ -60,7 +60,7 @@ do_rpiboot_mkimage() { if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then if test -n "${KERNEL_DEVICETREE}"; then # Add RPi bootloader trailer to kernel image to enable DeviceTree support - ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT} + ${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT} fi fi }This patch is mandatory but there was a serial with additional fixes send by Maciej Borzecki on Feb 2nd. I think this is worth taken into account.
Yes, that's right.
If the rest of the patches in that series is non-controversial, could we have them applied? Otherwise, could we have Khem's patch applied, and the other series rebased upon that?
We've had the master branch non-building for quite a while now...
I'm just keen to get either of those patches applied to meta-raspberrypi. I'd like to avoid having to use a local fork as much as possible...
Cheers,
Anders
Signature · 2 lines
Anders Darander, Senior System Architect ChargeStorm AB / eStorm AB
Quoted 5 lines · Anders Darander
Quoted 3 lines · Andreas Müller
Quoted 3 lines · Khem Raj
Review
Quoted 2 lines
(quoted diff) +0
-0
b/recipes-kernel/linux/linux-raspberrypi.inc
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
recipes-kernel/linux/linux-raspberrypi.inc do_rpiboot_mkimage() { · line 62
Quoted 7 lines
index 70e8bfe..0798788 100644
recipes-kernel/linux/linux-raspberrypi.inc +0
-0@@ -60,7 +60,7 @@ do_rpiboot_mkimage() { if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then if test -n "${KERNEL_DEVICETREE}"; then # Add RPi bootloader trailer to kernel image to enable
DeviceTree support
Quoted 1 line
Quoted 1 line
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc do_rpiboot_mkimage() { · line 63
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc +0
-1- ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg
--dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
Quoted 1 line
Quoted 1 line
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc do_rpiboot_mkimage() { · line 63
Quoted 1 line
recipes-kernel/linux/linux-raspberrypi.inc +1
-0+ ${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok
${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
recipes-kernel/linux/linux-raspberrypi.inc do_rpiboot_mkimage() { · line 66
Quoted 3 lines
recipes-kernel/linux/linux-raspberrypi.inc +0
-0fi fi }This patch is mandatory but there was a serial with additional fixes send by Maciej Borzecki on Feb 2nd. I think this is worth taken into account.
Quoted 6 lines
Yes, that's right.
If the rest of the patches in that series is non-controversial, could we have them applied? Otherwise, could we have Khem's patch applied, and the other series rebased upon that?
This will also make layer incompatible with jethro and older releases. So before applying this patch jethro has to branch out
Quoted 17 lines
We've had the master branch non-building for quite a while now...
I'm just keen to get either of those patches applied to meta-raspberrypi. I'd like to avoid having to use a local fork as much as possible...
Cheers,
Anders--
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Hi Khem,
I just posted another patch which does basically the same thing but uses ${STAGING_LIBEXECDIR_NATIVE}.
I checked the expansion of ${STAGING_LIBEXECDIR_NATIVE} on daisy branch and master.
daisy:
[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg which matches the previous hardcoded path before the patch
master:
[...]/sysroots/x86_64-linux/usr/libexec/mkknlimg
So it looks like my patch should work on older branches too...
Regards,
Jonathan
Quoted 63 lines · Khem Raj
Quoted 26 lines · Anders Darander
Quoted 14 lines · Andreas Müller
Quoted 14 lines · Khem Raj
Quoted 13 lines
recipes-kernel/linux/linux-raspberrypi.inc +0
-0@@ -60,7 +60,7 @@ do_rpiboot_mkimage() { if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then if test -n "${KERNEL_DEVICETREE}"; then # Add RPi bootloader trailer to kernel image to enableDeviceTree support
- ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg
--dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}Quoted 9 lines
Quoted 5 lines
Quoted 5 lines
+ ${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok
${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
fi
fi
}This patch is mandatory but there was a serial with additional fixes send by Maciej Borzecki on Feb 2nd. I think this is worth taken into account.
Quoted 6 lines
Yes, that's right.
If the rest of the patches in that series is non-controversial, could we have them applied? Otherwise, could we have Khem's patch applied, and the other series rebased upon that?
This will also make layer incompatible with jethro and older releases. So before applying this patch jethro has to branch out
Quoted 9 lines
We've had the master branch non-building for quite a while now...
I'm just keen to get either of those patches applied to meta-raspberrypi. I'd like to avoid having to use a local fork as much as possible...
Cheers,
AndersQuoted 8 lines
--
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Quoted 7 lines · Jonathan Liu
Hi Khem,
I just posted another patch which does basically the same thing but uses ${STAGING_LIBEXECDIR_NATIVE}.
I checked the expansion of ${STAGING_LIBEXECDIR_NATIVE} on daisy branch and master.
Quoted 9 lines
daisy:
[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg which matches the previous hardcoded path before the patchmaster:
[...]/sysroots/x86_64-linux/usr/libexec/mkknlimgSo it looks like my patch should work on older branches too...
yes this approach is better. Therefore I have picked it into kraj/master, I will test it out and push is shortly.
Quoted 67 lines
Regards,
JonathanQuoted 63 lines · Khem Raj
Quoted 26 lines · Anders Darander
Quoted 14 lines · Andreas Müller
Quoted 14 lines · Khem Raj
Quoted 13 lines
recipes-kernel/linux/linux-raspberrypi.inc +0
-0@@ -60,7 +60,7 @@ do_rpiboot_mkimage() { if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then if test -n "${KERNEL_DEVICETREE}"; then # Add RPi bootloader trailer to kernel image to enableDeviceTree support
- ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/mkknlimg
--dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}Quoted 9 lines
Quoted 5 lines
Quoted 5 lines
+ ${STAGING_DIR_NATIVE}${libexecdir}/mkknlimg --dtok
${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
fi
fi
}This patch is mandatory but there was a serial with additional fixes send by Maciej Borzecki on Feb 2nd. I think this is worth taken into account.
Quoted 6 lines
Yes, that's right.
If the rest of the patches in that series is non-controversial, could we have them applied? Otherwise, could we have Khem's patch applied, and the other series rebased upon that?
This will also make layer incompatible with jethro and older releases. So before applying this patch jethro has to branch out
Quoted 9 lines
We've had the master branch non-building for quite a while now...
I'm just keen to get either of those patches applied to meta-raspberrypi. I'd like to avoid having to use a local fork as much as possible...
Cheers,
AndersQuoted 8 lines
--
Anders Darander, Senior System Architect
ChargeStorm AB / eStorm AB
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Quoted 9 lines · Anders Darander
If the rest of the patches in that series is non-controversial, could we have them applied? Otherwise, could we have Khem's patch applied, and the other series rebased upon that?
We've had the master branch non-building for quite a while now...
I'm just keen to get either of those patches applied to meta-raspberrypi. I'd like to avoid having to use a local fork as much as possible...
+1