All of lore.kernel.org
 help / color / mirror / Atom feed
* [openembedded-core][PATCH] kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that.
@ 2018-09-03  0:38 Leon Woestenberg
  2018-09-03  1:05 ` ✗ patchtest: failure for " Patchwork
  0 siblings, 1 reply; 7+ messages in thread
From: Leon Woestenberg @ 2018-09-03  0:38 UTC (permalink / raw)
  To: openembedded-core

kernel-fitimage.bbclass replaces an occurance of "fitImage" in
KERNEL_IMAGETYPE_FOR_MAKE by an image type that is buildable for the
architecture (such as zImage). The kernel-fitimage.bbclass packs that
image as sub-image in a flattened image tree image (fitImage) and
deploys this fitImage along with the image tree source file (.its).

kernel-fitimage.bbclass does not alter KERNEL_IMAGETYPES, which thus
also contains "fitImage", which kernel.bbclass will also deploy
redundantly with different naming.

The result is a dual deployment with slightly different naming,
each with a set of symlinks.

The solution chosen is to have fitImage deployment be handled by
kernel-fitimage.bbclass, and have kernel.bbclass ignore fitImage
types during deployment.

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
---
 meta/classes/kernel.bbclass | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index b341733..fd43ecd 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -675,8 +675,10 @@ kernel_do_deploy() {
 	fi
 
 	for type in ${KERNEL_IMAGETYPES} ; do
-		base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
-		install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} $deployDir/${base_name}.bin
+		if [ "$type" != "fitImage" ]; then
+			base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
+			install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} $deployDir/${base_name}.bin
+		fi
 	done
 	if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
 		mkdir -p ${D}/lib
@@ -685,21 +687,25 @@ kernel_do_deploy() {
 	fi
 
 	for type in ${KERNEL_IMAGETYPES} ; do
-		base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
-		symlink_name=${type}-${KERNEL_IMAGE_SYMLINK_NAME}
-		ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin
-		ln -sf ${base_name}.bin $deployDir/${type}
+		if [ "$type" != "fitImage" ]; then
+			base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
+			symlink_name=${type}-${KERNEL_IMAGE_SYMLINK_NAME}
+			ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin
+			ln -sf ${base_name}.bin $deployDir/${type}
+		fi
 	done
 
 	cd ${B}
 	# Update deploy directory
 	for type in ${KERNEL_IMAGETYPES} ; do
-		if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
-			echo "Copying deploy ${type} kernel-initramfs image and setting up links..."
-			initramfs_base_name=${type}-${INITRAMFS_BASE_NAME}
-			initramfs_symlink_name=${type}-initramfs-${MACHINE}
-			install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin
-			ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
+		if [ "$type" != "fitImage" ]; then
+			if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
+				echo "Copying deploy ${type} kernel-initramfs image and setting up links..."
+				initramfs_base_name=${type}-${INITRAMFS_BASE_NAME}
+				initramfs_symlink_name=${type}-initramfs-${MACHINE}
+				install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin
+				ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
+			fi
 		fi
 	done
 }
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* ✗ patchtest: failure for kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that.
  2018-09-03  0:38 [openembedded-core][PATCH] kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that Leon Woestenberg
@ 2018-09-03  1:05 ` Patchwork
  0 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2018-09-03  1:05 UTC (permalink / raw)
  To: Leon Woestenberg; +Cc: openembedded-core

== Series Details ==

Series: kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that.
Revision: 1
URL   : https://patchwork.openembedded.org/series/13858/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 853e0499be)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [openembedded-core][PATCH] kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that.
  2018-09-07 22:10 ` Andre McCurdy
@ 2018-09-08 13:38   ` Leon Woestenberg
  0 siblings, 0 replies; 7+ messages in thread
From: Leon Woestenberg @ 2018-09-08 13:38 UTC (permalink / raw)
  To: Andre McCurdy; +Cc: OE Core mailing list

Hi Andre,

thanks for reviewing.

On Sat, Sep 8, 2018 at 12:10 AM, Andre McCurdy <armccurdy@gmail.com> wrote:
> On Thu, Sep 6, 2018 at 2:06 PM, Leon Woestenberg <leon@sidebranch.com> wrote:
>> +               if [ "$imageType" != "fitImage" ]; then
>> +                       for imageType in ${KERNEL_IMAGETYPES} ; do
>
> This looks odd. You test imageType before the for loop which assigns a
> value to it?
>
Good catch. I will create new patch that turns the lines around, i.e.
test within the for loop

(The above acted on the last imageType of the previous for loop, which
had the correct order.)

>> +                               initramfs_base_name=${imageType}-${INITRAMFS_NAME}
>> +                               initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
>> +                               install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin
>> +                               ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
>> +                       done
>> +               fi
>>         fi
>>  }
>>  do_deploy[cleandirs] = "${DEPLOYDIR}"

Thanks,

Leon.


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [openembedded-core][PATCH] kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that.
  2018-09-06 21:06 [openembedded-core][PATCH] " Leon Woestenberg
@ 2018-09-07 22:10 ` Andre McCurdy
  2018-09-08 13:38   ` Leon Woestenberg
  0 siblings, 1 reply; 7+ messages in thread
From: Andre McCurdy @ 2018-09-07 22:10 UTC (permalink / raw)
  To: Leon Woestenberg; +Cc: OE Core mailing list

On Thu, Sep 6, 2018 at 2:06 PM, Leon Woestenberg <leon@sidebranch.com> wrote:
> kernel-fitimage.bbclass replaces an occurance of "fitImage" in
> KERNEL_IMAGETYPE_FOR_MAKE by an image type that is buildable for the
> architecture (such as zImage). The kernel-fitimage.bbclass packs that
> image as sub-image in a flattened image tree image (fitImage) and
> deploys this fitImage along with the image tree source file (.its).
>
> kernel-fitimage.bbclass does not alter KERNEL_IMAGETYPES, which thus
> also contains "fitImage", which kernel.bbclass will also deploy
> redundantly with different naming.
>
> The result is a dual deployment with slightly different naming,
> each with a set of symlinks.
>
> The solution chosen is to have fitImage deployment be handled by
> kernel-fitimage.bbclass, and have kernel.bbclass ignore fitImage
> types during deployment.
>
> Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
> ---
>  meta/classes/kernel.bbclass | 21 +++++++++++++--------
>  1 file changed, 13 insertions(+), 8 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index b57832c..5d168e8 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -669,8 +669,11 @@ kernel_do_deploy() {
>         fi
>
>         for imageType in ${KERNEL_IMAGETYPES} ; do
> -               base_name=${imageType}-${KERNEL_IMAGE_NAME}
> -               install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin
> +       for imageType in ${KERNEL_IMAGETYPES} ; do
> +               if [ "$imageType" != "fitImage" ]; then
> +                       base_name=${imageType}-${KERNEL_IMAGE_NAME}
> +                       install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin
> +               fi
>         done
>         if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
>                 mkdir -p ${D}/lib
> @@ -686,12 +689,14 @@ kernel_do_deploy() {
>         done
>
>         if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
> -               for imageType in ${KERNEL_IMAGETYPES} ; do
> -                       initramfs_base_name=${imageType}-${INITRAMFS_NAME}
> -                       initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
> -                       install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin
> -                       ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
> -               done
> +               if [ "$imageType" != "fitImage" ]; then
> +                       for imageType in ${KERNEL_IMAGETYPES} ; do

This looks odd. You test imageType before the for loop which assigns a
value to it?

> +                               initramfs_base_name=${imageType}-${INITRAMFS_NAME}
> +                               initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
> +                               install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin
> +                               ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
> +                       done
> +               fi
>         fi
>  }
>  do_deploy[cleandirs] = "${DEPLOYDIR}"
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [openembedded-core][PATCH] kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that.
@ 2018-09-06 21:06 Leon Woestenberg
  2018-09-07 22:10 ` Andre McCurdy
  0 siblings, 1 reply; 7+ messages in thread
From: Leon Woestenberg @ 2018-09-06 21:06 UTC (permalink / raw)
  To: openembedded-core

kernel-fitimage.bbclass replaces an occurance of "fitImage" in
KERNEL_IMAGETYPE_FOR_MAKE by an image type that is buildable for the
architecture (such as zImage). The kernel-fitimage.bbclass packs that
image as sub-image in a flattened image tree image (fitImage) and
deploys this fitImage along with the image tree source file (.its).

kernel-fitimage.bbclass does not alter KERNEL_IMAGETYPES, which thus
also contains "fitImage", which kernel.bbclass will also deploy
redundantly with different naming.

The result is a dual deployment with slightly different naming,
each with a set of symlinks.

The solution chosen is to have fitImage deployment be handled by
kernel-fitimage.bbclass, and have kernel.bbclass ignore fitImage
types during deployment.

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
---
 meta/classes/kernel.bbclass | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index b57832c..5d168e8 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -669,8 +669,11 @@ kernel_do_deploy() {
 	fi
 
 	for imageType in ${KERNEL_IMAGETYPES} ; do
-		base_name=${imageType}-${KERNEL_IMAGE_NAME}
-		install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin
+	for imageType in ${KERNEL_IMAGETYPES} ; do
+		if [ "$imageType" != "fitImage" ]; then
+			base_name=${imageType}-${KERNEL_IMAGE_NAME}
+			install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType} $deployDir/${base_name}.bin
+		fi
 	done
 	if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
 		mkdir -p ${D}/lib
@@ -686,12 +689,14 @@ kernel_do_deploy() {
 	done
 
 	if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
-		for imageType in ${KERNEL_IMAGETYPES} ; do
-			initramfs_base_name=${imageType}-${INITRAMFS_NAME}
-			initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
-			install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin
-			ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
-		done
+		if [ "$imageType" != "fitImage" ]; then
+			for imageType in ${KERNEL_IMAGETYPES} ; do
+				initramfs_base_name=${imageType}-${INITRAMFS_NAME}
+				initramfs_symlink_name=${imageType}-${INITRAMFS_LINK_NAME}
+				install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}.initramfs $deployDir/${initramfs_base_name}.bin
+				ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
+			done
+		fi
 	fi
 }
 do_deploy[cleandirs] = "${DEPLOYDIR}"
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [openembedded-core][PATCH] kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that.
  2018-09-03  0:35 Leon Woestenberg
@ 2018-09-03 16:54 ` Khem Raj
  0 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2018-09-03 16:54 UTC (permalink / raw)
  To: Leon Woestenberg; +Cc: openembeded-devel

Hi Leon

Please send these patches to openembedded-core ml
On Sun, Sep 2, 2018 at 5:36 PM Leon Woestenberg <leon@sidebranch.com> wrote:
>
> kernel-fitimage.bbclass replaces an occurance of "fitImage" in
> KERNEL_IMAGETYPE_FOR_MAKE by an image type that is buildable for the
> architecture (such as zImage). The kernel-fitimage.bbclass packs that
> image as sub-image in a flattened image tree image (fitImage) and
> deploys this fitImage along with the image tree source file (.its).
>
> kernel-fitimage.bbclass does not alter KERNEL_IMAGETYPES, which thus
> also contains "fitImage", which kernel.bbclass will also deploy
> redundantly with different naming.
>
> The result is a dual deployment with slightly different naming,
> each with a set of symlinks.
>
> The solution chosen is to have fitImage deployment be handled by
> kernel-fitimage.bbclass, and have kernel.bbclass ignore fitImage
> types during deployment.
>
> Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
> ---
>  meta/classes/kernel.bbclass | 30 ++++++++++++++++++------------
>  1 file changed, 18 insertions(+), 12 deletions(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index b341733..fd43ecd 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -675,8 +675,10 @@ kernel_do_deploy() {
>         fi
>
>         for type in ${KERNEL_IMAGETYPES} ; do
> -               base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
> -               install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} $deployDir/${base_name}.bin
> +               if [ "$type" != "fitImage" ]; then
> +                       base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
> +                       install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} $deployDir/${base_name}.bin
> +               fi
>         done
>         if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
>                 mkdir -p ${D}/lib
> @@ -685,21 +687,25 @@ kernel_do_deploy() {
>         fi
>
>         for type in ${KERNEL_IMAGETYPES} ; do
> -               base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
> -               symlink_name=${type}-${KERNEL_IMAGE_SYMLINK_NAME}
> -               ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin
> -               ln -sf ${base_name}.bin $deployDir/${type}
> +               if [ "$type" != "fitImage" ]; then
> +                       base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
> +                       symlink_name=${type}-${KERNEL_IMAGE_SYMLINK_NAME}
> +                       ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin
> +                       ln -sf ${base_name}.bin $deployDir/${type}
> +               fi
>         done
>
>         cd ${B}
>         # Update deploy directory
>         for type in ${KERNEL_IMAGETYPES} ; do
> -               if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
> -                       echo "Copying deploy ${type} kernel-initramfs image and setting up links..."
> -                       initramfs_base_name=${type}-${INITRAMFS_BASE_NAME}
> -                       initramfs_symlink_name=${type}-initramfs-${MACHINE}
> -                       install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin
> -                       ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
> +               if [ "$type" != "fitImage" ]; then
> +                       if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
> +                               echo "Copying deploy ${type} kernel-initramfs image and setting up links..."
> +                               initramfs_base_name=${type}-${INITRAMFS_BASE_NAME}
> +                               initramfs_symlink_name=${type}-initramfs-${MACHINE}
> +                               install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin
> +                               ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
> +                       fi
>                 fi
>         done
>  }
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [openembedded-core][PATCH] kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that.
@ 2018-09-03  0:35 Leon Woestenberg
  2018-09-03 16:54 ` Khem Raj
  0 siblings, 1 reply; 7+ messages in thread
From: Leon Woestenberg @ 2018-09-03  0:35 UTC (permalink / raw)
  To: openembedded-devel

kernel-fitimage.bbclass replaces an occurance of "fitImage" in
KERNEL_IMAGETYPE_FOR_MAKE by an image type that is buildable for the
architecture (such as zImage). The kernel-fitimage.bbclass packs that
image as sub-image in a flattened image tree image (fitImage) and
deploys this fitImage along with the image tree source file (.its).

kernel-fitimage.bbclass does not alter KERNEL_IMAGETYPES, which thus
also contains "fitImage", which kernel.bbclass will also deploy
redundantly with different naming.

The result is a dual deployment with slightly different naming,
each with a set of symlinks.

The solution chosen is to have fitImage deployment be handled by
kernel-fitimage.bbclass, and have kernel.bbclass ignore fitImage
types during deployment.

Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
---
 meta/classes/kernel.bbclass | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index b341733..fd43ecd 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -675,8 +675,10 @@ kernel_do_deploy() {
 	fi
 
 	for type in ${KERNEL_IMAGETYPES} ; do
-		base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
-		install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} $deployDir/${base_name}.bin
+		if [ "$type" != "fitImage" ]; then
+			base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
+			install -m 0644 ${KERNEL_OUTPUT_DIR}/${type} $deployDir/${base_name}.bin
+		fi
 	done
 	if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
 		mkdir -p ${D}/lib
@@ -685,21 +687,25 @@ kernel_do_deploy() {
 	fi
 
 	for type in ${KERNEL_IMAGETYPES} ; do
-		base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
-		symlink_name=${type}-${KERNEL_IMAGE_SYMLINK_NAME}
-		ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin
-		ln -sf ${base_name}.bin $deployDir/${type}
+		if [ "$type" != "fitImage" ]; then
+			base_name=${type}-${KERNEL_IMAGE_BASE_NAME}
+			symlink_name=${type}-${KERNEL_IMAGE_SYMLINK_NAME}
+			ln -sf ${base_name}.bin $deployDir/${symlink_name}.bin
+			ln -sf ${base_name}.bin $deployDir/${type}
+		fi
 	done
 
 	cd ${B}
 	# Update deploy directory
 	for type in ${KERNEL_IMAGETYPES} ; do
-		if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
-			echo "Copying deploy ${type} kernel-initramfs image and setting up links..."
-			initramfs_base_name=${type}-${INITRAMFS_BASE_NAME}
-			initramfs_symlink_name=${type}-initramfs-${MACHINE}
-			install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin
-			ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
+		if [ "$type" != "fitImage" ]; then
+			if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
+				echo "Copying deploy ${type} kernel-initramfs image and setting up links..."
+				initramfs_base_name=${type}-${INITRAMFS_BASE_NAME}
+				initramfs_symlink_name=${type}-initramfs-${MACHINE}
+				install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin
+				ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin
+			fi
 		fi
 	done
 }
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2018-09-08 13:38 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-03  0:38 [openembedded-core][PATCH] kernel.bbclass: do not deploy fitImage; kernel-fitimage.bbclass does that Leon Woestenberg
2018-09-03  1:05 ` ✗ patchtest: failure for " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2018-09-06 21:06 [openembedded-core][PATCH] " Leon Woestenberg
2018-09-07 22:10 ` Andre McCurdy
2018-09-08 13:38   ` Leon Woestenberg
2018-09-03  0:35 Leon Woestenberg
2018-09-03 16:54 ` Khem Raj

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.