* [meta-raspberrypi][PATCH 1/3] rpi-mkimage: install to bindir instead of libexecdir
@ 2016-03-01 13:35 Jonathan Liu
2016-03-01 13:35 ` [meta-raspberrypi][PATCH 2/3] linux-raspberrypi: update path to mkknlimg Jonathan Liu
2016-03-01 13:35 ` [meta-raspberrypi][PATCH 3/3] u-boot-rpi: update path to imagetool-uncompressed.py Jonathan Liu
0 siblings, 2 replies; 5+ messages in thread
From: Jonathan Liu @ 2016-03-01 13:35 UTC (permalink / raw)
To: yocto
On fido and earlier branches, ${libexecdir} depends on ${BPN} so it
is not a good choice as ${libexecdir} is different depending on the
recipe name.
For example, rpi-mkimage would install mkknlimg to:
[...]/sysroots/x86_64-linux/usr/lib/rpi-mkimage
but linux-raspberrypi would look for mkknlimg in the path:
[...]/sysroots/x86_64-linux/usr/lib/linux-raspberrypi
To resolve this, we use ${bindir} instead as it doesn't depend on
${BPN} in fido and earlier branches as well as in the master branch.
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
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 7dea43d..cce91d7 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}
- install -t ${D}${libexecdir} mkimage/*
+ install -d ${D}${bindir}
+ install -t ${D}${bindir} mkimage/*
}
BBCLASSEXTEND = "native"
--
2.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [meta-raspberrypi][PATCH 2/3] linux-raspberrypi: update path to mkknlimg
2016-03-01 13:35 [meta-raspberrypi][PATCH 1/3] rpi-mkimage: install to bindir instead of libexecdir Jonathan Liu
@ 2016-03-01 13:35 ` Jonathan Liu
2016-03-01 13:35 ` [meta-raspberrypi][PATCH 3/3] u-boot-rpi: update path to imagetool-uncompressed.py Jonathan Liu
1 sibling, 0 replies; 5+ messages in thread
From: Jonathan Liu @ 2016-03-01 13:35 UTC (permalink / raw)
To: yocto
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
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 8c7c46c..8abe7f2 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_LIBEXECDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
+ ${STAGING_BINDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT} ${KERNEL_OUTPUT}
fi
fi
}
--
2.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [meta-raspberrypi][PATCH 3/3] u-boot-rpi: update path to imagetool-uncompressed.py
2016-03-01 13:35 [meta-raspberrypi][PATCH 1/3] rpi-mkimage: install to bindir instead of libexecdir Jonathan Liu
2016-03-01 13:35 ` [meta-raspberrypi][PATCH 2/3] linux-raspberrypi: update path to mkknlimg Jonathan Liu
@ 2016-03-01 13:35 ` Jonathan Liu
1 sibling, 0 replies; 5+ messages in thread
From: Jonathan Liu @ 2016-03-01 13:35 UTC (permalink / raw)
To: yocto
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
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 8bffaa3..3e8d377 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_LIBEXECDIR_NATIVE}/imagetool-uncompressed.py u-boot.bin
+ ${STAGING_BINDIR_NATIVE}/imagetool-uncompressed.py u-boot.bin
mv kernel.img u-boot.img
}
--
2.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-raspberrypi][PATCH 1/3] rpi-mkimage: install to ${libexecdir}
@ 2016-02-27 13:46 Jonathan Liu
2016-02-27 13:46 ` [meta-raspberrypi][PATCH 3/3] u-boot-rpi: update path to imagetool-uncompressed.py Jonathan Liu
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Liu @ 2016-02-27 13:46 UTC (permalink / raw)
To: yocto
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 <net147@gmail.com>
---
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 2c8ecb1..7dea43d 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}/rpi-mkimage
- install -t ${D}${libexecdir}/rpi-mkimage ./mkimage/*
+ install -d ${D}${libexecdir}
+ install -t ${D}${libexecdir} mkimage/*
}
BBCLASSEXTEND = "native"
--
2.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [meta-raspberrypi][PATCH 3/3] u-boot-rpi: update path to imagetool-uncompressed.py
2016-02-27 13:46 [meta-raspberrypi][PATCH 1/3] rpi-mkimage: install to ${libexecdir} Jonathan Liu
@ 2016-02-27 13:46 ` Jonathan Liu
2016-02-28 10:22 ` Andrei Gherzan
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Liu @ 2016-02-27 13:46 UTC (permalink / raw)
To: yocto
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
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 ea0c173..8bffaa3 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_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
}
--
2.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [meta-raspberrypi][PATCH 3/3] u-boot-rpi: update path to imagetool-uncompressed.py
2016-02-27 13:46 ` [meta-raspberrypi][PATCH 3/3] u-boot-rpi: update path to imagetool-uncompressed.py Jonathan Liu
@ 2016-02-28 10:22 ` Andrei Gherzan
0 siblings, 0 replies; 5+ messages in thread
From: Andrei Gherzan @ 2016-02-28 10:22 UTC (permalink / raw)
To: Jonathan Liu; +Cc: yocto
On Sun, Feb 28, 2016 at 12:46:49AM +1100, Jonathan Liu wrote:
> Signed-off-by: Jonathan Liu <net147@gmail.com>
> ---
> 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 ea0c173..8bffaa3 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_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
> }
> --
> 2.7.1
>
> --
Merged to master. Thanks.
--
Andrei Gherzan
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-03-01 13:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-01 13:35 [meta-raspberrypi][PATCH 1/3] rpi-mkimage: install to bindir instead of libexecdir Jonathan Liu
2016-03-01 13:35 ` [meta-raspberrypi][PATCH 2/3] linux-raspberrypi: update path to mkknlimg Jonathan Liu
2016-03-01 13:35 ` [meta-raspberrypi][PATCH 3/3] u-boot-rpi: update path to imagetool-uncompressed.py Jonathan Liu
-- strict thread matches above, loose matches on Subject: below --
2016-02-27 13:46 [meta-raspberrypi][PATCH 1/3] rpi-mkimage: install to ${libexecdir} Jonathan Liu
2016-02-27 13:46 ` [meta-raspberrypi][PATCH 3/3] u-boot-rpi: update path to imagetool-uncompressed.py Jonathan Liu
2016-02-28 10:22 ` Andrei Gherzan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.