linux-raspberrypi: fix path to mkknlimg

PATCH Superseded Jonathan Liu 3 participants 11 messages Feb 26, 2016 – Feb 28, 2016 Broadcom BCM2711/BCM2835 Arm architecture

lore

Share & tools

lore

Jonathan Liu

author

2016-02-26 09:27 UTC #0 lore raw

PATCH 1/1 linux-raspberrypi: fix path to mkknlimg

The path had libexecdir hardcoded so it was no longer correct when libexecdir was changed in meta/conf/bitbake.conf from ${libdir}/${BPN} to ${prefix_native}/libexec for nativesdk recipes.

Fixes "No such file or directory" error when executing do_rpiboot_mkimage.

Signed-off-by Jonathan Liu <[email protected]>

---
 recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

recipes-kernel/linux/linux-raspberrypi.inc +1 -1

index 70e8bfe..8c7c46c 100644
@@ -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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
         fi
     fi
 }

Signature · 1 line

2.7.1

Andrei Gherzan

2016-02-26 17:15 UTC #1 lore raw

Quoted 27 lines · Jonathan Liu

The path had libexecdir hardcoded so it was no longer correct when libexecdir was changed in meta/conf/bitbake.conf from ${libdir}/${BPN} to ${prefix_native}/libexec for nativesdk recipes.
Fixes "No such file or directory" error when executing do_rpiboot_mkimage.
Signed-off-by Jonathan Liu <[email protected]>
---
 recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-kernel/linux/linux-raspberrypi.inc +1 -1
index 70e8bfe..8c7c46c 100644
@@ -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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
         fi
     fi
 }
Signature · 1 line
2.7.1

Back alive. testing this.

Signature · 1 line

Andrei Gherzan

Petter Mabäcker

2016-02-26 17:49 UTC #2 lore raw

2016-02-26 18:14 skrev Andrei Gherzan:

Quoted 1 line

On Fri, Feb 26, 2016 at

Quoted 2 lines · Jonathan Liu

Quoted 2 lines
The path had libexecdir

hardcoded so it was no longer correct when libexecdir was changed in meta/conf/bitbake.conf from ${libdir}/${BPN} to ${prefix_native}/libexec for nativesdk recipes. Fixes "No such file or directory" error when executing do_rpiboot_mkimage. Signed-off-by: Jonathan Liu <[email protected]> --- recipes-kernel/linux/linux-raspberrypi.inc | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-) diff --git

a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index 70e8bfe..8c7c46c 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc @@ -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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT} fi fi } -- 2.7.1

Quoted 6 lines

Back alive. testing this.
--
Andrei Gherzan

Hi,

I think we should use the older patchset from
_Maciej Borzecki _ (that solves this and some other minor stuffs) instead. It also keeps the rpi-mkimage
structure:

https://lists.yoctoproject.org/pipermail/yocto/2016-February/028271.html

BR
Petter

Andrei Gherzan

2016-02-26 18:05 UTC #3 lore raw

--
Andrei Gherzan

Quoted 28 lines · Petter Mabäcker

2016-02-26 18:14 skrev Andrei Gherzan:
On Fri, Feb 26, 2016 at 08:26:57PM +1100, Jonathan Liu wrote:
The path had libexecdir hardcoded so it was no longer correct when libexecdir was changed in meta/conf/bitbake.conf from ${libdir}/${BPN} to ${prefix_native}/libexec for nativesdk recipes. Fixes "No such file or directory" error when executing do_rpiboot_mkimage. Signed-off-by: Jonathan Liu <[email protected]> --- recipes-kernel/linux/linux-raspberrypi.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index 70e8bfe..8c7c46c 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc @@ -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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT} fi fi } -- 2.7.1
Back alive. testing this.
--
Andrei Gherzan
Hi,

Quoted 9 lines

I think we should use the older patchset from *Maciej Borzecki * (that solves this and some other minor stuffs) instead. It also keeps the rpi-mkimage structure:
https://lists.yoctoproject.org/pipermail/yocto/2016-February/028271.html
BR Petter

Very good catch Petter. I'll test that PR.

Andrei Gherzan

2016-02-26 19:55 UTC #4 lore raw

Quoted 42 lines · Andrei Gherzan

   --
   Andrei Gherzan
   On Fri, Feb 26, 2016 at 6:48 PM, Petter Mabäcker
   <[1][email protected]> wrote:

   2016-02-26 18:14 skrev Andrei Gherzan:

On Fri, Feb 26, 2016 at 08:26:57PM +1100, Jonathan Liu wrote:

     The path had libexecdir hardcoded so it was no longer correct when
     libexecdir was changed in meta/conf/bitbake.conf from
     ${libdir}/${BPN} to ${prefix_native}/libexec for nativesdk recipes.
     Fixes "No such file or directory" error when executing
     do_rpiboot_mkimage. Signed-off-by: Jonathan Liu
     <[2][email protected]> --- recipes-kernel/linux/linux-raspberrypi.inc
     | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git
     a/recipes-kernel/linux/linux-raspberrypi.inc
     b/recipes-kernel/linux/linux-raspberrypi.inc index 70e8bfe..8c7c46c
     100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++
     b/recipes-kernel/linux/linux-raspberrypi.inc @@ -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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT}
     ${KERNEL_OUTPUT} fi fi } -- 2.7.1

Back alive. testing this.

--
Andrei Gherzan

Hi,
I think we should use the older patchset from Maciej Borzecki (that solves this and some other minor stuffs) instead. It also keeps the rpi-mkimage structure:
[3]https://lists.yoctoproject.org/pipermail/yocto/2016-February/028271. html
BR Petter

Quoted 1 line

Very good catch Petter. I'll test that PR.

Merged the patch set sent by Maciej. Which covers this patch too. Thanks,

--
Andrei Gherzan

Jonathan Liu

author

2016-02-26 21:03 UTC #5 lore raw

Quoted 43 lines · Andrei Gherzan

Quoted 42 lines · Andrei Gherzan

   --
   Andrei Gherzan
   On Fri, Feb 26, 2016 at 6:48 PM, Petter Mabäcker
   <[1][email protected]> wrote:

   2016-02-26 18:14 skrev Andrei Gherzan:

On Fri, Feb 26, 2016 at 08:26:57PM +1100, Jonathan Liu wrote:

     The path had libexecdir hardcoded so it was no longer correct when
     libexecdir was changed in meta/conf/bitbake.conf from
     ${libdir}/${BPN} to ${prefix_native}/libexec for nativesdk recipes.
     Fixes "No such file or directory" error when executing
     do_rpiboot_mkimage. Signed-off-by: Jonathan Liu
     <[2][email protected]> --- recipes-kernel/linux/linux-raspberrypi.inc
     | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git
     a/recipes-kernel/linux/linux-raspberrypi.inc
     b/recipes-kernel/linux/linux-raspberrypi.inc index 70e8bfe..8c7c46c
     100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++
     b/recipes-kernel/linux/linux-raspberrypi.inc @@ -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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT}
     ${KERNEL_OUTPUT} fi fi } -- 2.7.1

Back alive. testing this.

--
Andrei Gherzan

Hi,
I think we should use the older patchset from Maciej Borzecki (that solves this and some other minor stuffs) instead. It also keeps the rpi-mkimage structure:

   [3]https://lists.yoctoproject.org/pipermail/yocto/2016-February/028271.
   html
   BR Petter

Quoted 7 lines

Quoted 1 line
Very good catch Petter. I'll test that PR.
Merged the patch set sent by Maciej. Which covers this patch too. Thanks,
--
Andrei Gherzan

Note that Maciej's patch doesn't really preserve the path on older branches like you expect.

On master branch:
${libexecdir}/rpi-mkimage expands to /usr/libexec/rpi-mkimage

On daisy branch:
${libexecdir}/rpi-mkimage expands to /usr/lib/rpi-mkimage/rpi-mkimage

Regards,
Jonathan

Andrei Gherzan

2016-02-27 12:22 UTC #6 lore raw

Quoted 52 lines · Jonathan Liu

Quoted 43 lines · Andrei Gherzan

Quoted 42 lines · Andrei Gherzan

   --
   Andrei Gherzan
   On Fri, Feb 26, 2016 at 6:48 PM, Petter Mabäcker
   <[1][email protected]> wrote:

   2016-02-26 18:14 skrev Andrei Gherzan:

On Fri, Feb 26, 2016 at 08:26:57PM +1100, Jonathan Liu wrote:

     The path had libexecdir hardcoded so it was no longer correct when
     libexecdir was changed in meta/conf/bitbake.conf from
     ${libdir}/${BPN} to ${prefix_native}/libexec for nativesdk recipes.
     Fixes "No such file or directory" error when executing
     do_rpiboot_mkimage. Signed-off-by: Jonathan Liu
     <[2][email protected]> --- recipes-kernel/linux/linux-raspberrypi.inc
     | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git
     a/recipes-kernel/linux/linux-raspberrypi.inc
     b/recipes-kernel/linux/linux-raspberrypi.inc index 70e8bfe..8c7c46c
     100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++
     b/recipes-kernel/linux/linux-raspberrypi.inc @@ -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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT}
     ${KERNEL_OUTPUT} fi fi } -- 2.7.1

Back alive. testing this.

--
Andrei Gherzan

Hi,
I think we should use the older patchset from Maciej Borzecki (that solves this and some other minor stuffs) instead. It also keeps the rpi-mkimage structure:

   [3]https://lists.yoctoproject.org/pipermail/yocto/2016-February/028271.
   html
   BR Petter

Quoted 7 lines

Quoted 1 line
Very good catch Petter. I'll test that PR.
Merged the patch set sent by Maciej. Which covers this patch too. Thanks,
--
Andrei Gherzan

Quoted 8 lines

Note that Maciej's patch doesn't really preserve the path on older branches like you expect.
On master branch:
${libexecdir}/rpi-mkimage expands to /usr/libexec/rpi-mkimage
On daisy branch:
${libexecdir}/rpi-mkimage expands to /usr/lib/rpi-mkimage/rpi-mkimage

This is a very good catch. But for now this patch is not in daisy it is only in master which is supposed to work with poky master. I do understand your concern. And I think it is the same thing on jethro too. So you propose relying on STAGING_LIBEXECDIR_NATIVE and let it append or not BPN?

--
Andrei Gherzan

Jonathan Liu

author

2016-02-27 12:25 UTC #7 lore raw

Quoted 62 lines · Andrei Gherzan

Quoted 52 lines · Jonathan Liu
Quoted 43 lines · Andrei Gherzan
Quoted 42 lines · Andrei Gherzan
   --
   Andrei Gherzan
   On Fri, Feb 26, 2016 at 6:48 PM, Petter Mabäcker
   <[1][email protected]> wrote:

   2016-02-26 18:14 skrev Andrei Gherzan:
On Fri, Feb 26, 2016 at 08:26:57PM +1100, Jonathan Liu wrote:
     The path had libexecdir hardcoded so it was no longer correct when
     libexecdir was changed in meta/conf/bitbake.conf from
     ${libdir}/${BPN} to ${prefix_native}/libexec for nativesdk recipes.
     Fixes "No such file or directory" error when executing
     do_rpiboot_mkimage. Signed-off-by: Jonathan Liu
     <[2][email protected]> --- recipes-kernel/linux/linux-raspberrypi.inc
     | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git
     a/recipes-kernel/linux/linux-raspberrypi.inc
     b/recipes-kernel/linux/linux-raspberrypi.inc index 70e8bfe..8c7c46c
     100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++
     b/recipes-kernel/linux/linux-raspberrypi.inc @@ -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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT}
     ${KERNEL_OUTPUT} fi fi } -- 2.7.1
Back alive. testing this.
--
Andrei Gherzan
Hi,
I think we should use the older patchset from Maciej Borzecki (that solves this and some other minor stuffs) instead. It also keeps the rpi-mkimage structure:
   [3]https://lists.yoctoproject.org/pipermail/yocto/2016-February/028271.
   html
   BR Petter
Quoted 7 lines
Quoted 1 line
Very good catch Petter. I'll test that PR.
Merged the patch set sent by Maciej. Which covers this patch too. Thanks,
--
Andrei Gherzan
Quoted 8 lines
Note that Maciej's patch doesn't really preserve the path on older branches like you expect.
On master branch:
${libexecdir}/rpi-mkimage expands to /usr/libexec/rpi-mkimage
On daisy branch:
${libexecdir}/rpi-mkimage expands to /usr/lib/rpi-mkimage/rpi-mkimage

Quoted 7 lines

This is a very good catch. But for now this patch is not in daisy it is only in master which is supposed to work with poky master. I do understand your concern. And I think it is the same thing on jethro too. So you propose relying on STAGING_LIBEXECDIR_NATIVE and let it append or not BPN?
--
Andrei Gherzan

I propose my patch instead which has the following behavior and goes along with the libexecdir change rather than trying to go against it.

My patch has the following paths for mkknlimg.

daisy:
[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg which matches the previous hardcoded path before the patch so the path doesn't change with the patch for older branches

master:
[...]/sysroots/x86_64-linux/usr/libexec/mkknlimg

You can then do something similar for U-Boot.

Regards,
Jonathan

Andrei Gherzan

2016-02-27 13:05 UTC #8 lore raw

Quoted 81 lines · Jonathan Liu

Quoted 62 lines · Andrei Gherzan
Quoted 52 lines · Jonathan Liu
Quoted 43 lines · Andrei Gherzan
Quoted 42 lines · Andrei Gherzan
   --
   Andrei Gherzan
   On Fri, Feb 26, 2016 at 6:48 PM, Petter Mabäcker
   <[1][email protected]> wrote:

   2016-02-26 18:14 skrev Andrei Gherzan:
On Fri, Feb 26, 2016 at 08:26:57PM +1100, Jonathan Liu wrote:
     The path had libexecdir hardcoded so it was no longer correct when
     libexecdir was changed in meta/conf/bitbake.conf from
     ${libdir}/${BPN} to ${prefix_native}/libexec for nativesdk recipes.
     Fixes "No such file or directory" error when executing
     do_rpiboot_mkimage. Signed-off-by: Jonathan Liu
     <[2][email protected]> --- recipes-kernel/linux/linux-raspberrypi.inc
     | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git
     a/recipes-kernel/linux/linux-raspberrypi.inc
     b/recipes-kernel/linux/linux-raspberrypi.inc index 70e8bfe..8c7c46c
     100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++
     b/recipes-kernel/linux/linux-raspberrypi.inc @@ -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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT}
     ${KERNEL_OUTPUT} fi fi } -- 2.7.1
Back alive. testing this.
--
Andrei Gherzan
Hi,
I think we should use the older patchset from Maciej Borzecki (that solves this and some other minor stuffs) instead. It also keeps the rpi-mkimage structure:
   [3]https://lists.yoctoproject.org/pipermail/yocto/2016-February/028271.
   html
   BR Petter
Quoted 7 lines
Quoted 1 line
Very good catch Petter. I'll test that PR.
Merged the patch set sent by Maciej. Which covers this patch too. Thanks,
--
Andrei Gherzan
Quoted 8 lines
Note that Maciej's patch doesn't really preserve the path on older branches like you expect.
On master branch:
${libexecdir}/rpi-mkimage expands to /usr/libexec/rpi-mkimage
On daisy branch:
${libexecdir}/rpi-mkimage expands to /usr/lib/rpi-mkimage/rpi-mkimage
Quoted 7 lines
This is a very good catch. But for now this patch is not in daisy it is only in master which is supposed to work with poky master. I do understand your concern. And I think it is the same thing on jethro too. So you propose relying on STAGING_LIBEXECDIR_NATIVE and let it append or not BPN?
--
Andrei Gherzan
I propose my patch instead which has the following behavior and goes along with the libexecdir change rather than trying to go against it.
My patch has the following paths for mkknlimg.
daisy:
[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg which matches the previous hardcoded path before the patch so the path doesn't change with the patch for older branches

Quoted 4 lines

master:
[...]/sysroots/x86_64-linux/usr/libexec/mkknlimg
You can then do something similar for U-Boot.

Indeed I agree and sounds good. One problem though - I merged the Maciej's patches. Would you be able to patch current master and adapt your patch on it? If not I'll try to do it this weekend. Thanks a lot.

--
Andrei Gherzan

Jonathan Liu

author

2016-02-27 13:47 UTC #9 lore raw

Quoted 85 lines · Andrei Gherzan

Quoted 84 lines · Jonathan Liu
Quoted 62 lines · Andrei Gherzan
Quoted 52 lines · Jonathan Liu
Quoted 43 lines · Andrei Gherzan
Quoted 42 lines · Andrei Gherzan
   --
   Andrei Gherzan
   On Fri, Feb 26, 2016 at 6:48 PM, Petter Mabäcker
   <[1][email protected]> wrote:

   2016-02-26 18:14 skrev Andrei Gherzan:
On Fri, Feb 26, 2016 at 08:26:57PM +1100, Jonathan Liu wrote:
     The path had libexecdir hardcoded so it was no longer correct when
     libexecdir was changed in meta/conf/bitbake.conf from
     ${libdir}/${BPN} to ${prefix_native}/libexec for nativesdk recipes.
     Fixes "No such file or directory" error when executing
     do_rpiboot_mkimage. Signed-off-by: Jonathan Liu
     <[2][email protected]> --- recipes-kernel/linux/linux-raspberrypi.inc
     | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git
     a/recipes-kernel/linux/linux-raspberrypi.inc
     b/recipes-kernel/linux/linux-raspberrypi.inc index 70e8bfe..8c7c46c
     100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++
     b/recipes-kernel/linux/linux-raspberrypi.inc @@ -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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT}
     ${KERNEL_OUTPUT} fi fi } -- 2.7.1
Back alive. testing this.
--
Andrei Gherzan
Hi,
I think we should use the older patchset from Maciej Borzecki (that solves this and some other minor stuffs) instead. It also keeps the rpi-mkimage structure:
   [3]https://lists.yoctoproject.org/pipermail/yocto/2016-February/028271.
   html
   BR Petter
Quoted 7 lines
Quoted 1 line
Very good catch Petter. I'll test that PR.
Merged the patch set sent by Maciej. Which covers this patch too. Thanks,
--
Andrei Gherzan
Quoted 8 lines
Note that Maciej's patch doesn't really preserve the path on older branches like you expect.
On master branch:
${libexecdir}/rpi-mkimage expands to /usr/libexec/rpi-mkimage
On daisy branch:
${libexecdir}/rpi-mkimage expands to /usr/lib/rpi-mkimage/rpi-mkimage
Quoted 7 lines
This is a very good catch. But for now this patch is not in daisy it is only in master which is supposed to work with poky master. I do understand your concern. And I think it is the same thing on jethro too. So you propose relying on STAGING_LIBEXECDIR_NATIVE and let it append or not BPN?
--
Andrei Gherzan
I propose my patch instead which has the following behavior and goes along with the libexecdir change rather than trying to go against it.
My patch has the following paths for mkknlimg.
daisy:
[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg which matches the previous hardcoded path before the patch so the path doesn't change with the patch for older branches
master:
[...]/sysroots/x86_64-linux/usr/libexec/mkknlimg

Quoted 8 lines

Quoted 1 line
You can then do something similar for U-Boot.
Indeed I agree and sounds good. One problem though - I merged the Maciej's patches. Would you be able to patch current master and adapt your patch on it? If not I'll try to do it this weekend. Thanks a lot.
--
Andrei Gherzan

I have submitted a patchset against current master.

Regards,
Jonathan

Petter Mabäcker

2016-02-28 07:43 UTC #10 lore raw

In reply to Jonathan Liu

2016-02-27 13:25 skrev Jonathan Liu:

Quoted 1 line

On 27 February 2016 at

Quoted 2 lines · Andrei Gherzan

Quoted 2 lines
On Sat, Feb 27,

Quoted 2 lines · Jonathan Liu

Quoted 2 lines
Quoted 2 lines
On 27 February

Quoted 2 lines · Andrei Gherzan

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
On

Quoted 3 lines · Andrei Gherzan

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
-- Andrei Gherzan On Fri, Feb 26, 2016 at 6:48 PM, Petter

Mabäcker <[1][email protected]> wrote: 2016-02-26 18:14 skrev Andrei
Gherzan: On Fri, Feb 26, 2016 at 08:26:57PM +1100, Jonathan Liu wrote:
The path had libexecdir hardcoded so it was no longer correct when libexecdir was changed in meta/conf/bitbake.conf from ${libdir}/${BPN} to ${prefix_native}/libexec for nativesdk recipes. Fixes "No such file or directory" error when executing do_rpiboot_mkimage. Signed-off-by:
Jonathan Liu <[2][email protected]> --- recipes-kernel/linux/linux-raspberrypi.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index 70e8bfe..8c7c46c 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc @@ -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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT} fi fi } -- 2.7.1 Back alive. testing this. -- Andrei Gherzan Hi, I think we should use the older patchset from Maciej Borzecki (that solves this and some other minor stuffs) instead. It also keeps the rpi-mkimage structure:
[3]https://lists.yoctoproject.org/pipermail/yocto/2016-February/028271 [1]. html BR Petter Very good catch Petter. I'll test that PR.

Quoted 1 line

Quoted 1 line
Quoted 1 line
Quoted 1 line

Merged the patch set sent by Maciej. Which covers this patch too. Thanks, -- Andrei Gherzan

Quoted 1 line

Quoted 1 line
Quoted 1 line
Note that Maciej's patch doesn't really

preserve the path on older branches like you expect. On master branch:
${libexecdir}/rpi-mkimage expands to /usr/libexec/rpi-mkimage On daisy
branch: ${libexecdir}/rpi-mkimage expands to /usr/lib/rpi-mkimage/rpi-mkimage

Quoted 1 line

Quoted 1 line
This is a very good catch. But for

now this patch is not in daisy it is only in master which is supposed to work with poky master. I do understand your concern. And I think it is the same thing on jethro too. So you propose relying on STAGING_LIBEXECDIR_NATIVE and let it append or not BPN? -- Andrei Gherzan

Quoted 2 lines

I propose my patch instead which has the following behavior

and goes

Quoted 1 line

along with the libexecdir change rather than trying to go

against it.

Quoted 4 lines

My patch has the following paths for mkknlimg.

daisy:

Quoted 2 lines

[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage/mkknlimg

which matches the previous hardcoded path before the patch so the path

Quoted 1 line

doesn't change with the patch for older branches

Quoted 3 lines

master:

[...]/sysroots/x86_64-linux/usr/libexec/mkknlimg

Quoted 2 lines

You can then do

something similar for U-Boot.

Ah, nice. I agree that this difference
from the other solutions for this problem, gives an additional value and should be merged. I can see that this info is described in the commit message for the new commits, good =)

BR Petter

Quoted 1 line

Regards, Jonathan

Links:
------
[1]
https://lists.yoctoproject.org/pipermail/yocto/2016-February/028271