Skip to contentSkip to conversation

rpi-mkimage: install to ${libexecdir}

PATCH Applied Jonathan Liu 2 participants 6 messages Feb 27, 2016 – Feb 28, 2016 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore

Jonathan Liu

author
#0 lore raw

PATCH 1/3 rpi-mkimage: install to ${libexecdir}

It doesn't make sense to install to ${libexecdir}/rpi-mkimage as it changes the path on fido and earlier branches from:
[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage
to:
[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage/rpi-mkimage

Using ${libexecdir} instead of ${libexecdir}/rpi-mkimage preserves the path for fido and earlier.

Signed-off-by Jonathan Liu <[email protected]>
---
 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb +2 -2
index 2c8ecb1..7dea43d 100644
@@ -15,8 +15,8 @@ SRC_URI = " \
 S = "${WORKDIR}/git"
 
 do_install () {
-    install -d ${D}${libexecdir}/rpi-mkimage
-    install -t ${D}${libexecdir}/rpi-mkimage ./mkimage/*
+    install -d ${D}${libexecdir}
+    install -t ${D}${libexecdir} mkimage/*
 }
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.7.1
author
#1 lore raw

PATCH 2/3 linux-raspberrypi: update path to mkknlimg

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 05f2d2b..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_LIBEXECDIR_NATIVE}/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
Applied
#2 lore raw

Re: [meta-raspberrypi][PATCH 2/3] linux-raspberrypi: update path to mkknlimg

Quoted 22 lines · Jonathan Liu
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 05f2d2b..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_LIBEXECDIR_NATIVE}/rpi-mkimage/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
+            ${STAGING_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
         fi
     fi
 }
Signature · 3 lines
2.7.1

--

Merged to master. Thanks.

Signature · 1 line
Andrei Gherzan
author
#3 lore raw

PATCH 3/3 u-boot-rpi: update path to imagetool-uncompressed.py

In reply to Jonathan Liu
Signed-off-by Jonathan Liu <[email protected]>
---
 recipes-bsp/u-boot/u-boot-rpi_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-bsp/u-boot/u-boot-rpi_git.bb +1 -1
index ea0c173..8bffaa3 100644
@@ -24,6 +24,6 @@ COMPATIBLE_MACHINE = "raspberrypi"
 
 do_compile_append() {
     # Create kernel.img from uboot.bin and name it u-boot.img
-    ${STAGING_LIBEXECDIR_NATIVE}/rpi-mkimage/imagetool-uncompressed.py u-boot.bin
+    ${STAGING_LIBEXECDIR_NATIVE}/imagetool-uncompressed.py u-boot.bin
     mv kernel.img u-boot.img
 }
Signature · 1 line
2.7.1
Applied
#4 lore raw

Re: [meta-raspberrypi][PATCH 3/3] u-boot-rpi: update path to imagetool-uncompressed.py

Quoted 21 lines · Jonathan Liu
Signed-off-by Jonathan Liu <[email protected]>
---
 recipes-bsp/u-boot/u-boot-rpi_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-bsp/u-boot/u-boot-rpi_git.bb +1 -1
index ea0c173..8bffaa3 100644
@@ -24,6 +24,6 @@ COMPATIBLE_MACHINE = "raspberrypi"
 
 do_compile_append() {
     # Create kernel.img from uboot.bin and name it u-boot.img
-    ${STAGING_LIBEXECDIR_NATIVE}/rpi-mkimage/imagetool-uncompressed.py u-boot.bin
+    ${STAGING_LIBEXECDIR_NATIVE}/imagetool-uncompressed.py u-boot.bin
     mv kernel.img u-boot.img
 }
Signature · 3 lines
2.7.1

--

Merged to master. Thanks.

Signature · 1 line
Andrei Gherzan
Applied
#5 lore raw
In reply to Jonathan Liu
Quoted 32 lines · Jonathan Liu

It doesn't make sense to install to ${libexecdir}/rpi-mkimage as it changes the path on fido and earlier branches from:
[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage
to:
[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage/rpi-mkimage

Using ${libexecdir} instead of ${libexecdir}/rpi-mkimage preserves the path for fido and earlier.

Signed-off-by Jonathan Liu <[email protected]>
---
 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb +2 -2
index 2c8ecb1..7dea43d 100644
@@ -15,8 +15,8 @@ SRC_URI = " \
 S = "${WORKDIR}/git"
 
 do_install () {
-    install -d ${D}${libexecdir}/rpi-mkimage
-    install -t ${D}${libexecdir}/rpi-mkimage ./mkimage/*
+    install -d ${D}${libexecdir}
+    install -t ${D}${libexecdir} mkimage/*
 }
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.7.1

Merged to master. Thanks.

Signature · 1 line
Andrei Gherzan