[PATCH] kernel: fitimage: deploy real fit-image

[PATCH] kernel: fitimage: deploy real fit-image

[Gaël PORTAY]

Currently, do_deploy installs a standard kernel image as an ITB. This
image is linux.bin and it is prepared by uboot_prep_kimage.

The real kernel fit-image is build under arch/${ARCH}/boot/fitImage.

This patch deploys the real fit-image instead of the one prepared by
u-boot and which is included in the ITB.

Note: this patch only concerns fit-images which are not signed by u-boot
or which do not contains initramfs. Only a kernel image with a
device-tree.

Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
---
Hi all,

This patch is a modified version of the one I wrote on a meta-arago/morty
build. Thus it is not tested, but it should work.

In the deploy image directory, I had

	$ file -L fitImage 
	fitImage: Linux kernel ARM boot executable zImage (little-endian)

With the patch, I have

	$ file -L fitImage 
	fitImage: data

Regards,
Gael

 meta/classes/kernel-fitimage.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 2630b47316..a745e873c1 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -453,9 +453,9 @@ kernel_do_deploy_append() {
 		its_base_name="fitImage-its-${PV}-${PR}-${MACHINE}-${DATETIME}"
 		its_symlink_name=fitImage-its-${MACHINE}
 		install -m 0644 fit-image.its ${DEPLOYDIR}/${its_base_name}.its
-		linux_bin_base_name="fitImage-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}"
-		linux_bin_symlink_name=fitImage-linux.bin-${MACHINE}
-		install -m 0644 linux.bin ${DEPLOYDIR}/${linux_bin_base_name}.bin
+		itb_base_name="fitImage-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}"
+		itb_symlink_name=fitImage-linux.bin-${MACHINE}
+		install -m 0644 arch/${ARCH}/boot/fitImage ${DEPLOYDIR}/${itb_base_name}.bin
 
 		if [ -n "${INITRAMFS_IMAGE}" ]; then
 			echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..."
@@ -469,7 +469,7 @@ kernel_do_deploy_append() {
 
 		cd ${DEPLOYDIR}
 		ln -sf ${its_base_name}.its ${its_symlink_name}.its
-		ln -sf ${linux_bin_base_name}.bin ${linux_bin_symlink_name}.bin
+		ln -sf ${itb_base_name}.bin ${itb_symlink_name}.bin
 
 		if [ -n "${INITRAMFS_IMAGE}" ]; then
 			ln -sf ${its_initramfs_base_name}.its ${its_initramfs_symlink_name}.its
-- 
2.13.2

Re: [PATCH] kernel: fitimage: deploy real fit-image

[Denys Dmytriyenko]

On Mon, Jul 17, 2017 at 08:54:57PM -0400, Gaël PORTAY wrote:
> Currently, do_deploy installs a standard kernel image as an ITB. This
> image is linux.bin and it is prepared by uboot_prep_kimage.
> 
> The real kernel fit-image is build under arch/${ARCH}/boot/fitImage.
> 
> This patch deploys the real fit-image instead of the one prepared by
> u-boot and which is included in the ITB.
> 
> Note: this patch only concerns fit-images which are not signed by u-boot
> or which do not contains initramfs. Only a kernel image with a
> device-tree.
> 
> Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>

Reviewed-by: Denys Dmytriyenko <denys@ti.com>


> ---
> Hi all,
> 
> This patch is a modified version of the one I wrote on a meta-arago/morty
> build. Thus it is not tested, but it should work.
> 
> In the deploy image directory, I had
> 
> 	$ file -L fitImage 
> 	fitImage: Linux kernel ARM boot executable zImage (little-endian)
> 
> With the patch, I have
> 
> 	$ file -L fitImage 
> 	fitImage: data
> 
> Regards,
> Gael
> 
>  meta/classes/kernel-fitimage.bbclass | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
> index 2630b47316..a745e873c1 100644
> --- a/meta/classes/kernel-fitimage.bbclass
> +++ b/meta/classes/kernel-fitimage.bbclass
> @@ -453,9 +453,9 @@ kernel_do_deploy_append() {
>  		its_base_name="fitImage-its-${PV}-${PR}-${MACHINE}-${DATETIME}"
>  		its_symlink_name=fitImage-its-${MACHINE}
>  		install -m 0644 fit-image.its ${DEPLOYDIR}/${its_base_name}.its
> -		linux_bin_base_name="fitImage-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}"
> -		linux_bin_symlink_name=fitImage-linux.bin-${MACHINE}
> -		install -m 0644 linux.bin ${DEPLOYDIR}/${linux_bin_base_name}.bin
> +		itb_base_name="fitImage-linux.bin-${PV}-${PR}-${MACHINE}-${DATETIME}"
> +		itb_symlink_name=fitImage-linux.bin-${MACHINE}
> +		install -m 0644 arch/${ARCH}/boot/fitImage ${DEPLOYDIR}/${itb_base_name}.bin
>  
>  		if [ -n "${INITRAMFS_IMAGE}" ]; then
>  			echo "Copying fit-image-${INITRAMFS_IMAGE}.its source file..."
> @@ -469,7 +469,7 @@ kernel_do_deploy_append() {
>  
>  		cd ${DEPLOYDIR}
>  		ln -sf ${its_base_name}.its ${its_symlink_name}.its
> -		ln -sf ${linux_bin_base_name}.bin ${linux_bin_symlink_name}.bin
> +		ln -sf ${itb_base_name}.bin ${itb_symlink_name}.bin
>  
>  		if [ -n "${INITRAMFS_IMAGE}" ]; then
>  			ln -sf ${its_initramfs_base_name}.its ${its_initramfs_symlink_name}.its
> -- 
> 2.13.2
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core