* [meta][pyro][PATCHv2] Fix some issues in the fitImage generation
@ 2017-10-20 9:47 Thomas Perrot
2017-10-20 10:02 ` ✗ patchtest: failure for Fix some issues in the fitImage generation (rev3) Patchwork
2017-10-24 7:38 ` [meta][pyro][PATCHv2] Fix some issues in the fitImage generation akuster808
0 siblings, 2 replies; 4+ messages in thread
From: Thomas Perrot @ 2017-10-20 9:47 UTC (permalink / raw)
To: openembedded-core
- Bad image type replacement for aarch64
- Fix DTB path in fitimage.its
- Ignore fitImage type in do_bundle_initramfs task because the packaging is made by do_assemble_fitimage_initramfs
- the images for arm64 are not compressed the linux_comp variable must therefore be none
Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr>
---
meta/classes/kernel-fitimage.bbclass | 6 +++++-
meta/classes/kernel-uboot.bbclass | 11 ++++++++---
meta/classes/kernel.bbclass | 4 +++-
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 2630b47316..abbc309b09 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -7,8 +7,11 @@ python __anonymous () {
depends = "%s u-boot-mkimage-native dtc-native" % depends
d.setVar("DEPENDS", depends)
- if d.getVar("UBOOT_ARCH") == "x86":
+ uarch = d.getVar("UBOOT_ARCH")
+ if uarch == "x86":
replacementtype = "bzImage"
+ elif uarch == "arm64":
+ replacementtype = "Image"
else:
replacementtype = "zImage"
@@ -351,6 +354,7 @@ fitimage_assemble() {
DTB_PATH="arch/${ARCH}/boot/${DTB}"
fi
+ DTB=$(echo "${DTB}" | tr '/' '_')
DTBS="${DTBS} ${DTB}"
fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}
done
diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass
index 868e97d7a7..940f91d90e 100644
--- a/meta/classes/kernel-uboot.bbclass
+++ b/meta/classes/kernel-uboot.bbclass
@@ -1,12 +1,17 @@
uboot_prep_kimage() {
- if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then
+ if [ -e arch/${ARCH}/boot/compressed/vmlinux ] ; then
vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
linux_suffix=""
linux_comp="none"
else
vmlinux_path="vmlinux"
- linux_suffix=".gz"
- linux_comp="gzip"
+ if [ "${ARCH}" = "arm64" ] ; then
+ linux_suffix=""
+ linux_comp="none"
+ else
+ linux_suffix=".gz"
+ linux_comp="gzip"
+ fi
fi
${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ce2cab65ae..14677ac0fc 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -219,7 +219,9 @@ do_bundle_initramfs () {
# Backing up kernel image relies on its type(regular file or symbolic link)
tmp_path=""
for type in ${KERNEL_IMAGETYPES} ; do
- if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
+ if [ "$type" = "fitImage" ] ; then
+ continue
+ elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
linkpath=`readlink -n ${KERNEL_OUTPUT_DIR}/$type`
realpath=`readlink -fn ${KERNEL_OUTPUT_DIR}/$type`
mv -f $realpath $realpath.bak
--
2.13.6
^ permalink raw reply related [flat|nested] 4+ messages in thread* ✗ patchtest: failure for Fix some issues in the fitImage generation (rev3)
2017-10-20 9:47 [meta][pyro][PATCHv2] Fix some issues in the fitImage generation Thomas Perrot
@ 2017-10-20 10:02 ` Patchwork
2017-10-24 7:38 ` [meta][pyro][PATCHv2] Fix some issues in the fitImage generation akuster808
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2017-10-20 10:02 UTC (permalink / raw)
To: Thomas PERROT; +Cc: openembedded-core
== Series Details ==
Series: Fix some issues in the fitImage generation (rev3)
Revision: 3
URL : https://patchwork.openembedded.org/series/9386/
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:
* Patch [meta,pyro,v2] Fix some issues in the fitImage generation
Issue Shortlog does not follow expected format [test_shortlog_format]
Suggested fix Commit shortlog (first line of commit message) should follow the format "<target>: <summary>"
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] 4+ messages in thread
* Re: [meta][pyro][PATCHv2] Fix some issues in the fitImage generation
2017-10-20 9:47 [meta][pyro][PATCHv2] Fix some issues in the fitImage generation Thomas Perrot
2017-10-20 10:02 ` ✗ patchtest: failure for Fix some issues in the fitImage generation (rev3) Patchwork
@ 2017-10-24 7:38 ` akuster808
2017-10-25 8:05 ` Thomas PERROT
1 sibling, 1 reply; 4+ messages in thread
From: akuster808 @ 2017-10-24 7:38 UTC (permalink / raw)
To: Thomas Perrot, openembedded-core
On 10/20/2017 02:47 AM, Thomas Perrot wrote:
> - Bad image type replacement for aarch64
> - Fix DTB path in fitimage.its
> - Ignore fitImage type in do_bundle_initramfs task because the packaging is made by do_assemble_fitimage_initramfs
> - the images for arm64 are not compressed the linux_comp variable must therefore be none
>
> Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr>
> ---
> meta/classes/kernel-fitimage.bbclass | 6 +++++-
> meta/classes/kernel-uboot.bbclass | 11 ++++++++---
> meta/classes/kernel.bbclass | 4 +++-
I don't see this in master. Please resubmit for Master.
- armin
> 3 files changed, 16 insertions(+), 5 deletions(-)
>
> diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
> index 2630b47316..abbc309b09 100644
> --- a/meta/classes/kernel-fitimage.bbclass
> +++ b/meta/classes/kernel-fitimage.bbclass
> @@ -7,8 +7,11 @@ python __anonymous () {
> depends = "%s u-boot-mkimage-native dtc-native" % depends
> d.setVar("DEPENDS", depends)
>
> - if d.getVar("UBOOT_ARCH") == "x86":
> + uarch = d.getVar("UBOOT_ARCH")
> + if uarch == "x86":
> replacementtype = "bzImage"
> + elif uarch == "arm64":
> + replacementtype = "Image"
> else:
> replacementtype = "zImage"
>
> @@ -351,6 +354,7 @@ fitimage_assemble() {
> DTB_PATH="arch/${ARCH}/boot/${DTB}"
> fi
>
> + DTB=$(echo "${DTB}" | tr '/' '_')
> DTBS="${DTBS} ${DTB}"
> fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}
> done
> diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass
> index 868e97d7a7..940f91d90e 100644
> --- a/meta/classes/kernel-uboot.bbclass
> +++ b/meta/classes/kernel-uboot.bbclass
> @@ -1,12 +1,17 @@
> uboot_prep_kimage() {
> - if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then
> + if [ -e arch/${ARCH}/boot/compressed/vmlinux ] ; then
> vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
> linux_suffix=""
> linux_comp="none"
> else
> vmlinux_path="vmlinux"
> - linux_suffix=".gz"
> - linux_comp="gzip"
> + if [ "${ARCH}" = "arm64" ] ; then
> + linux_suffix=""
> + linux_comp="none"
> + else
> + linux_suffix=".gz"
> + linux_comp="gzip"
> + fi
> fi
>
> ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index ce2cab65ae..14677ac0fc 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -219,7 +219,9 @@ do_bundle_initramfs () {
> # Backing up kernel image relies on its type(regular file or symbolic link)
> tmp_path=""
> for type in ${KERNEL_IMAGETYPES} ; do
> - if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
> + if [ "$type" = "fitImage" ] ; then
> + continue
> + elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
> linkpath=`readlink -n ${KERNEL_OUTPUT_DIR}/$type`
> realpath=`readlink -fn ${KERNEL_OUTPUT_DIR}/$type`
> mv -f $realpath $realpath.bak
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [meta][pyro][PATCHv2] Fix some issues in the fitImage generation
2017-10-24 7:38 ` [meta][pyro][PATCHv2] Fix some issues in the fitImage generation akuster808
@ 2017-10-25 8:05 ` Thomas PERROT
0 siblings, 0 replies; 4+ messages in thread
From: Thomas PERROT @ 2017-10-25 8:05 UTC (permalink / raw)
To: akuster808; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 3983 bytes --]
Hi,
It's done, I just submit the path for the master branch.
Best regards,
Thomas P.
On Tue, Oct 24, 2017 at 9:38 AM, akuster808 <akuster808@gmail.com> wrote:
>
>
> On 10/20/2017 02:47 AM, Thomas Perrot wrote:
> > - Bad image type replacement for aarch64
> > - Fix DTB path in fitimage.its
> > - Ignore fitImage type in do_bundle_initramfs task because the packaging
> is made by do_assemble_fitimage_initramfs
> > - the images for arm64 are not compressed the linux_comp variable must
> therefore be none
> >
> > Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr>
> > ---
> > meta/classes/kernel-fitimage.bbclass | 6 +++++-
> > meta/classes/kernel-uboot.bbclass | 11 ++++++++---
> > meta/classes/kernel.bbclass | 4 +++-
> I don't see this in master. Please resubmit for Master.
>
> - armin
> > 3 files changed, 16 insertions(+), 5 deletions(-)
> >
> > diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-
> fitimage.bbclass
> > index 2630b47316..abbc309b09 100644
> > --- a/meta/classes/kernel-fitimage.bbclass
> > +++ b/meta/classes/kernel-fitimage.bbclass
> > @@ -7,8 +7,11 @@ python __anonymous () {
> > depends = "%s u-boot-mkimage-native dtc-native" % depends
> > d.setVar("DEPENDS", depends)
> >
> > - if d.getVar("UBOOT_ARCH") == "x86":
> > + uarch = d.getVar("UBOOT_ARCH")
> > + if uarch == "x86":
> > replacementtype = "bzImage"
> > + elif uarch == "arm64":
> > + replacementtype = "Image"
> > else:
> > replacementtype = "zImage"
> >
> > @@ -351,6 +354,7 @@ fitimage_assemble() {
> > DTB_PATH="arch/${ARCH}/boot/${DTB}"
> > fi
> >
> > + DTB=$(echo "${DTB}" | tr '/' '_')
> > DTBS="${DTBS} ${DTB}"
> > fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH}
> > done
> > diff --git a/meta/classes/kernel-uboot.bbclass
> b/meta/classes/kernel-uboot.bbclass
> > index 868e97d7a7..940f91d90e 100644
> > --- a/meta/classes/kernel-uboot.bbclass
> > +++ b/meta/classes/kernel-uboot.bbclass
> > @@ -1,12 +1,17 @@
> > uboot_prep_kimage() {
> > - if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then
> > + if [ -e arch/${ARCH}/boot/compressed/vmlinux ] ; then
> > vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
> > linux_suffix=""
> > linux_comp="none"
> > else
> > vmlinux_path="vmlinux"
> > - linux_suffix=".gz"
> > - linux_comp="gzip"
> > + if [ "${ARCH}" = "arm64" ] ; then
> > + linux_suffix=""
> > + linux_comp="none"
> > + else
> > + linux_suffix=".gz"
> > + linux_comp="gzip"
> > + fi
> > fi
> >
> > ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}"
> linux.bin
> > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> > index ce2cab65ae..14677ac0fc 100644
> > --- a/meta/classes/kernel.bbclass
> > +++ b/meta/classes/kernel.bbclass
> > @@ -219,7 +219,9 @@ do_bundle_initramfs () {
> > # Backing up kernel image relies on its type(regular file
> or symbolic link)
> > tmp_path=""
> > for type in ${KERNEL_IMAGETYPES} ; do
> > - if [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
> > + if [ "$type" = "fitImage" ] ; then
> > + continue
> > + elif [ -h ${KERNEL_OUTPUT_DIR}/$type ] ; then
> > linkpath=`readlink -n
> ${KERNEL_OUTPUT_DIR}/$type`
> > realpath=`readlink -fn
> ${KERNEL_OUTPUT_DIR}/$type`
> > mv -f $realpath $realpath.bak
>
>
[-- Attachment #2: Type: text/html, Size: 5845 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-10-25 8:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-20 9:47 [meta][pyro][PATCHv2] Fix some issues in the fitImage generation Thomas Perrot
2017-10-20 10:02 ` ✗ patchtest: failure for Fix some issues in the fitImage generation (rev3) Patchwork
2017-10-24 7:38 ` [meta][pyro][PATCHv2] Fix some issues in the fitImage generation akuster808
2017-10-25 8:05 ` Thomas PERROT
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox