[meta-raspberrypi][PATCH 0/3] libexecdir fixes

[meta-raspberrypi][PATCH 0/3] libexecdir fixes

[Maciej Borzecki]

A couple of fixes that resolve issues with recent change of libexecdir
in OE-core.

The first patch cleans up the recipe to install rpi-mkimage tools into
${libexecdir}/rpi-mkimage. This preserves the original nesting of
rpi-mkimage under ${libdir}.

The 2nd and 3rd patch use ${STAGING_LIBEXECDIR_NATIVE} rather than a mix
of ${STAGING_DIR_NATIVE}${libexecdir} to keep things clean.

Maciej Borzecki (3):
  rpi-mkimage: install tools under {libexecdir}/rpi-mkimage
  u-boot-rpi: use STAGING_LIBEXECDIR_NATIVE for rpi-mkimage tools
  linux-raspberrypi: use STAGING_LIBEXECDIR_NATIVE for rpi-mkimage tools

 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb | 4 ++--
 recipes-bsp/u-boot/u-boot-rpi_git.bb       | 2 +-
 recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

--
2.5.0

[meta-raspberrypi][PATCH 1/3] rpi-mkimage: install tools under {libexecdir}/rpi-mkimage

[Maciej Borzecki]

For consistency with other recipes that look for mkimage
tools (u-boot-rpi, linux-raspberrypi) under ${libexecdir}/rpi-mkimage,
make sure that the tools are installed at the proper location.

Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
---
 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb b/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
index ffcaa83683fd270cb2216b118a3f5be941cfdb89..2c8ecb173c804302ac6e13d4ae7af8ba35bccd26 100644
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
+++ b/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
@@ -15,8 +15,8 @@ SRC_URI = " \
 S = "${WORKDIR}/git"
 
 do_install () {
-    install -d ${D}${libexecdir}
-    cp ./mkimage/* ${D}${libexecdir}
+    install -d ${D}${libexecdir}/rpi-mkimage
+    install -t ${D}${libexecdir}/rpi-mkimage ./mkimage/*
 }
 
 BBCLASSEXTEND = "native"
-- 
2.5.0

[meta-raspberrypi][PATCH 2/3] u-boot-rpi: use STAGING_LIBEXECDIR_NATIVE for rpi-mkimage tools

[Maciej Borzecki]

The rpi-mkimage tools are installed ${libexecdir}/rpi-mkimage within
native sysroot, where ${libexecdir} resolves to /usr/libexec. This caused
the build to fail due to recipe trying to access ${libdir}/mkimage. Fix
the paths to use an unambiguous STAGING_LIBEXECDIR_NATIVE so that a
proper location is used.

Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
---
 recipes-bsp/u-boot/u-boot-rpi_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/u-boot/u-boot-rpi_git.bb b/recipes-bsp/u-boot/u-boot-rpi_git.bb
index db5ea84fc0408d90ccb17ed578305ce5b11f568b..ea0c173b59290d5d6d080c9b487be8bf789f0d58 100644
--- a/recipes-bsp/u-boot/u-boot-rpi_git.bb
+++ b/recipes-bsp/u-boot/u-boot-rpi_git.bb
@@ -24,6 +24,6 @@ COMPATIBLE_MACHINE = "raspberrypi"
 
 do_compile_append() {
     # Create kernel.img from uboot.bin and name it u-boot.img
-    ${STAGING_DIR_NATIVE}/usr/lib/rpi-mkimage/imagetool-uncompressed.py u-boot.bin
+    ${STAGING_LIBEXECDIR_NATIVE}/rpi-mkimage/imagetool-uncompressed.py u-boot.bin
     mv kernel.img u-boot.img
 }
-- 
2.5.0

[meta-raspberrypi][PATCH 3/3] linux-raspberrypi: use STAGING_LIBEXECDIR_NATIVE for rpi-mkimage tools

[Maciej Borzecki]

The rpi-mkimage tools are installed ${libexecdir}/rpi-mkimage within
native sysroot, where ${libexecdir} resolves to /usr/libexec. This caused
the build to fail due to recipe trying to access ${libdir}/mkimage. Fix
the paths to use an unambiguous STAGING_LIBEXECDIR_NATIVE so that a
proper location is used.

Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl>
---
 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 70e8bfebba75e29e55c8b48856fa51d74e586612..05f2d2b2957384667383e5f865ccfb487121e641 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}/rpi-mkimage/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
         fi
     fi
 }
-- 
2.5.0

Re: [meta-raspberrypi][PATCH 0/3] libexecdir fixes

[Andrei Gherzan]

On Tue, Feb 02, 2016 at 03:31:44PM +0100, Maciej Borzecki wrote:
> A couple of fixes that resolve issues with recent change of libexecdir
> in OE-core.
>
> The first patch cleans up the recipe to install rpi-mkimage tools into
> ${libexecdir}/rpi-mkimage. This preserves the original nesting of
> rpi-mkimage under ${libdir}.
>
> The 2nd and 3rd patch use ${STAGING_LIBEXECDIR_NATIVE} rather than a mix
> of ${STAGING_DIR_NATIVE}${libexecdir} to keep things clean.
>
> Maciej Borzecki (3):
>   rpi-mkimage: install tools under {libexecdir}/rpi-mkimage
>   u-boot-rpi: use STAGING_LIBEXECDIR_NATIVE for rpi-mkimage tools
>   linux-raspberrypi: use STAGING_LIBEXECDIR_NATIVE for rpi-mkimage tools
>
>  recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb | 4 ++--
>  recipes-bsp/u-boot/u-boot-rpi_git.bb       | 2 +-
>  recipes-kernel/linux/linux-raspberrypi.inc | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> --
> 2.5.0
>

Hi,

Merged the patch set to master. Thank you.

--
Andrei Gherzan