* [meta][pyro][PATCH] Fix some issues in the fitImage generation
@ 2017-10-17 16:54 Thomas Perrot
2017-10-17 16:56 ` Burton, Ross
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Thomas Perrot @ 2017-10-17 16:54 UTC (permalink / raw)
To: openembedded-core
- Bad image type replacement for aarch64
- Fix DTB path in fitimage.its
- Ignore fitImage type during the packaging of the initramfs
Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr>
---
meta/classes/kernel-fitimage.bbclass | 6 +++++-
meta/classes/kernel.bbclass | 4 +++-
2 files changed, 8 insertions(+), 2 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.bbclass b/meta/classes/kernel.bbclass
index ce2cab65ae..a8b0d0a061 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] 11+ messages in thread* Re: [meta][pyro][PATCH] Fix some issues in the fitImage generation 2017-10-17 16:54 [meta][pyro][PATCH] Fix some issues in the fitImage generation Thomas Perrot @ 2017-10-17 16:56 ` Burton, Ross 2017-10-18 7:00 ` André Draszik 2017-10-17 17:00 ` ✗ patchtest: failure for " Patchwork ` (2 subsequent siblings) 3 siblings, 1 reply; 11+ messages in thread From: Burton, Ross @ 2017-10-17 16:56 UTC (permalink / raw) To: Thomas Perrot; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 2708 bytes --] Is this *only* for Pyro or should it be applied to master too? Ross On 17 October 2017 at 17:54, Thomas Perrot <thomas.perrot@tupi.fr> wrote: > - Bad image type replacement for aarch64 > - Fix DTB path in fitimage.its > - Ignore fitImage type during the packaging of the initramfs > > Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr> > --- > meta/classes/kernel-fitimage.bbclass | 6 +++++- > meta/classes/kernel.bbclass | 4 +++- > 2 files changed, 8 insertions(+), 2 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.bbclass b/meta/classes/kernel.bbclass > index ce2cab65ae..a8b0d0a061 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 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 3889 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta][pyro][PATCH] Fix some issues in the fitImage generation 2017-10-17 16:56 ` Burton, Ross @ 2017-10-18 7:00 ` André Draszik 0 siblings, 0 replies; 11+ messages in thread From: André Draszik @ 2017-10-18 7:00 UTC (permalink / raw) To: openembedded-core On Tue, 2017-10-17 at 17:56 +0100, Burton, Ross wrote: > Is this *only* for Pyro or should it be applied to master too? I've posted backport requests from master to pyro recently which touch similar locations. Can those be applied first please. Namely... > On 17 October 2017 at 17:54, Thomas Perrot <thomas.perrot@tupi.fr> wrote: > > > - Bad image type replacement for aarch64 > > - Fix DTB path in fitimage.its > > - Ignore fitImage type during the packaging of the initramfs > > > > Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr> > > --- > > meta/classes/kernel-fitimage.bbclass | 6 +++++- > > meta/classes/kernel.bbclass | 4 +++- > > 2 files changed, 8 insertions(+), 2 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" here > > > > @@ -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 and here. Cheers, Andre' > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > > index ce2cab65ae..a8b0d0a061 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 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* ✗ patchtest: failure for Fix some issues in the fitImage generation 2017-10-17 16:54 [meta][pyro][PATCH] Fix some issues in the fitImage generation Thomas Perrot 2017-10-17 16:56 ` Burton, Ross @ 2017-10-17 17:00 ` Patchwork 2017-10-17 19:09 ` [meta][pyro][PATCH] " Denys Dmytriyenko 2017-10-18 7:02 ` André Draszik 3 siblings, 0 replies; 11+ messages in thread From: Patchwork @ 2017-10-17 17:00 UTC (permalink / raw) To: Thomas PERROT; +Cc: openembedded-core == Series Details == Series: Fix some issues in the fitImage generation Revision: 1 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] 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] -> ...). --- 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] 11+ messages in thread
* Re: [meta][pyro][PATCH] Fix some issues in the fitImage generation 2017-10-17 16:54 [meta][pyro][PATCH] Fix some issues in the fitImage generation Thomas Perrot 2017-10-17 16:56 ` Burton, Ross 2017-10-17 17:00 ` ✗ patchtest: failure for " Patchwork @ 2017-10-17 19:09 ` Denys Dmytriyenko [not found] ` <BL2PR02MB2163A3231B9F61417D92A803B94C0@BL2PR02MB2163.namprd02.prod.outlook.com> 2017-10-18 7:02 ` André Draszik 3 siblings, 1 reply; 11+ messages in thread From: Denys Dmytriyenko @ 2017-10-17 19:09 UTC (permalink / raw) To: Thomas Perrot; +Cc: openembedded-core On Tue, Oct 17, 2017 at 06:54:24PM +0200, Thomas Perrot wrote: > - Bad image type replacement for aarch64 > - Fix DTB path in fitimage.its I've seen the above 2 fixes before, but they never made it. > - Ignore fitImage type during the packaging of the initramfs Can you please explain this one a bit more? And in general, commit message should rather explain "why" and not "what" > Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr> > --- > meta/classes/kernel-fitimage.bbclass | 6 +++++- > meta/classes/kernel.bbclass | 4 +++- > 2 files changed, 8 insertions(+), 2 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.bbclass b/meta/classes/kernel.bbclass > index ce2cab65ae..a8b0d0a061 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 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <BL2PR02MB2163A3231B9F61417D92A803B94C0@BL2PR02MB2163.namprd02.prod.outlook.com>]
* Re: [meta][pyro][PATCH] Fix some issues in the fitImage generation [not found] ` <BL2PR02MB2163A3231B9F61417D92A803B94C0@BL2PR02MB2163.namprd02.prod.outlook.com> @ 2017-10-17 22:20 ` Denys Dmytriyenko [not found] ` <BL2PR02MB216333023A57FEE778BC75DCB94C0@BL2PR02MB2163.namprd02.prod.outlook.com> 0 siblings, 1 reply; 11+ messages in thread From: Denys Dmytriyenko @ 2017-10-17 22:20 UTC (permalink / raw) To: Manjukumar Harthikote Matha; +Cc: openembedded-core@lists.openembedded.org On Tue, Oct 17, 2017 at 09:35:12PM +0000, Manjukumar Harthikote Matha wrote: > Hi Denys, > > > -----Original Message----- > > From: openembedded-core-bounces@lists.openembedded.org > > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of > > Denys Dmytriyenko > > Sent: Tuesday, October 17, 2017 12:09 PM > > To: Thomas Perrot <thomas.perrot@tupi.fr> > > Cc: openembedded-core@lists.openembedded.org > > Subject: Re: [OE-core] [meta][pyro][PATCH] Fix some issues in the fitImage > > generation > > > > On Tue, Oct 17, 2017 at 06:54:24PM +0200, Thomas Perrot wrote: > > > - Bad image type replacement for aarch64 > > > - Fix DTB path in fitimage.its > > > > I've seen the above 2 fixes before, but they never made it. > > > > > > > - Ignore fitImage type during the packaging of the initramfs > > > > Can you please explain this one a bit more? > > > > And in general, commit message should rather explain "why" and not "what" > > > I see this behavior: > https://lists.yoctoproject.org/pipermail/yocto/2017-October/038438.html > > When you build using initramfs and fitimage, we see a failure in kernel deploy. Please provide any relevant logs for the failure. > I think we need even fixes to deploy class as well. > > > Thanks, > Manju > > > > > > Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr> > > > --- > > > meta/classes/kernel-fitimage.bbclass | 6 +++++- > > > meta/classes/kernel.bbclass | 4 +++- > > > 2 files changed, 8 insertions(+), 2 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.bbclass b/meta/classes/kernel.bbclass > > > index ce2cab65ae..a8b0d0a061 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 > > > > > > -- > > > _______________________________________________ > > > Openembedded-core mailing list > > > Openembedded-core@lists.openembedded.org > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > ^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <BL2PR02MB216333023A57FEE778BC75DCB94C0@BL2PR02MB2163.namprd02.prod.outlook.com>]
* Re: [meta][pyro][PATCH] Fix some issues in the fitImage generation [not found] ` <BL2PR02MB216333023A57FEE778BC75DCB94C0@BL2PR02MB2163.namprd02.prod.outlook.com> @ 2017-10-17 23:18 ` Denys Dmytriyenko 0 siblings, 0 replies; 11+ messages in thread From: Denys Dmytriyenko @ 2017-10-17 23:18 UTC (permalink / raw) To: Manjukumar Harthikote Matha; +Cc: openembedded-core@lists.openembedded.org On Tue, Oct 17, 2017 at 10:27:07PM +0000, Manjukumar Harthikote Matha wrote: > > > > -----Original Message----- > > From: Denys Dmytriyenko [mailto:denis@denix.org] > > Sent: Tuesday, October 17, 2017 3:20 PM > > To: Manjukumar Harthikote Matha <MANJUKUM@xilinx.com> > > Cc: Thomas Perrot <thomas.perrot@tupi.fr>; openembedded- > > core@lists.openembedded.org > > Subject: Re: [OE-core] [meta][pyro][PATCH] Fix some issues in the fitImage > > generation > > > > On Tue, Oct 17, 2017 at 09:35:12PM +0000, Manjukumar Harthikote Matha wrote: > > > Hi Denys, > > > > > > > -----Original Message----- > > > > From: openembedded-core-bounces@lists.openembedded.org > > > > [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf > > > > Of Denys Dmytriyenko > > > > Sent: Tuesday, October 17, 2017 12:09 PM > > > > To: Thomas Perrot <thomas.perrot@tupi.fr> > > > > Cc: openembedded-core@lists.openembedded.org > > > > Subject: Re: [OE-core] [meta][pyro][PATCH] Fix some issues in the > > > > fitImage generation > > > > > > > > On Tue, Oct 17, 2017 at 06:54:24PM +0200, Thomas Perrot wrote: > > > > > - Bad image type replacement for aarch64 > > > > > - Fix DTB path in fitimage.its > > > > > > > > I've seen the above 2 fixes before, but they never made it. > > > > > > > > > > > > > - Ignore fitImage type during the packaging of the initramfs > > > > > > > > Can you please explain this one a bit more? > > > > > > > > And in general, commit message should rather explain "why" and not "what" > > > > > > > I see this behavior: > > > https://lists.yoctoproject.org/pipermail/yocto/2017-October/038438.htm > > > l > > > > > > When you build using initramfs and fitimage, we see a failure in kernel deploy. > > > > Please provide any relevant logs for the failure. > > > > > > Here you go: Thanks! Now it's clearer. Apparently, I don't see this issue as I don't use INITRAMFS_IMAGE_BUNDLE = "1" for appending initramfs into the kernel... > Initialising tasks: 100% |#################################################################################################################################################| Time: 0:00:03 > NOTE: Executing SetScene Tasks > NOTE: Executing RunQueue Tasks > ERROR: linux-xlnx-4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0 do_bundle_initramfs: Function failed: do_bundle_initramfs (log file is located at /workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/temp/log.do_bundle_initramfs.30337) > ERROR: Logfile of failure stored in: /workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/temp/log.do_bundle_initramfs.30337 > Log data follows: > | DEBUG: Executing shell function do_bundle_initramfs > | Creating a kernel image with a bundled initramfs... > | Copying initramfs into ./usr ... > | Finished copy of initramfs into ./usr > | NOTE: make HOSTCC=gcc -isystem/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/usr/lib -L/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/lib -Wl,-rpath-link,/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/lib -Wl,-rpath,/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v201 > 7.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/lib -Wl,-O1 HOSTCPP=gcc -E Image CC=aarch64-poky-linux-gcc -fuse-ld=bfd --sysroot=/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot -ffile-prefix-map=/workspaces2/manjukum/meta-xilinx-master/build/tmp/work-shared/zcu102-zynqmp/kernel-source=/kernel-source/ LD=aarch64-poky-linux-ld.bfd --sysroot=/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot CONFIG_INITRAMFS_SOURCE=/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/linux-zcu102_zynqmp-standard-build/usr/core-image-minimal-zcu102-zynqmp.cpio > | CHK include/config/kernel.release > | Using /workspaces2/manjukum/meta-xilinx-master/build/tmp/work-shared/zcu102-zynqmp/kernel-source as source for kernel > | GEN ./Makefile > | CHK include/generated/uapi/linux/version.h > | CHK include/generated/utsrelease.h > | CHK include/generated/bounds.h > | CHK include/generated/timeconst.h > | CHK include/generated/asm-offsets.h > | CALL /workspaces2/manjukum/meta-xilinx-master/build/tmp/work-shared/zcu102-zynqmp/kernel-source/scripts/checksyscalls.sh > | CHK include/generated/compile.h > | GEN usr/initramfs_data.cpio.gz > | AS usr/initramfs_data.o > | LD usr/built-in.o > | CHK kernel/config_data.h > | LD vmlinux.o > | MODPOST vmlinux.o > | GEN .version > | CHK include/generated/compile.h > | UPD include/generated/compile.h > | CC init/version.o > | LD init/built-in.o > | KSYM .tmp_kallsyms1.o > | KSYM .tmp_kallsyms2.o > | LD vmlinux > | SORTEX vmlinux > | SYSMAP System.map > | OBJCOPY arch/arm64/boot/Image > | NOTE: make HOSTCC=gcc -isystem/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/usr/include -O2 -pipe -L/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/usr/lib -L/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/lib -Wl,-rpath-link,/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/usr/lib -Wl,-rpath-link,/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/lib -Wl,-rpath,/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v201 > 7.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/usr/lib -Wl,-rpath,/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot-native/lib -Wl,-O1 HOSTCPP=gcc -E Image CC=aarch64-poky-linux-gcc -fuse-ld=bfd --sysroot=/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot -ffile-prefix-map=/workspaces2/manjukum/meta-xilinx-master/build/tmp/work-shared/zcu102-zynqmp/kernel-source=/kernel-source/ LD=aarch64-poky-linux-ld.bfd --sysroot=/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/recipe-sysroot CONFIG_INITRAMFS_SOURCE=/workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/linux-zcu102_zynqmp-standard-build/usr/core-image-minimal-zcu102-zynqmp.cpio > | CHK include/config/kernel.release > | Using /workspaces2/manjukum/meta-xilinx-master/build/tmp/work-shared/zcu102-zynqmp/kernel-source as source for kernel > | GEN ./Makefile > | CHK include/generated/uapi/linux/version.h > | CHK include/generated/utsrelease.h > | CHK include/generated/bounds.h > | CHK include/generated/timeconst.h > | CHK include/generated/asm-offsets.h > | CALL /workspaces2/manjukum/meta-xilinx-master/build/tmp/work-shared/zcu102-zynqmp/kernel-source/scripts/checksyscalls.sh > | CHK include/generated/compile.h > | CHK kernel/config_data.h > | mv: cannot stat 'arch/arm64/boot/fitImage': No such file or directory > | WARNING: /workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/temp/run.do_bundle_initramfs.30337:1 exit 1 from 'mv -f arch/arm64/boot/$type arch/arm64/boot/$type.initramfs' > | ERROR: Function failed: do_bundle_initramfs (log file is located at /workspaces2/manjukum/meta-xilinx-master/build/tmp/work/zcu102_zynqmp-poky-linux/linux-xlnx/4.9-xilinx-v2017.3+gitAUTOINC+f1b1e077d6-r0/temp/log.do_bundle_initramfs.30337) > ERROR: Task (/workspaces2/manjukum/meta-xilinx-master/sources/yocto/meta-xilinx/recipes-kernel/linux/linux-xlnx_2017.3.bb:do_bundle_initramfs) failed with exit code '1' > NOTE: Tasks Summary: Attempted 2371 tasks of which 2370 didn't need to be rerun and 1 failed. > > > Thanks, > Manju > > > > I think we need even fixes to deploy class as well. > > > > > > > > > Thanks, > > > Manju > > > > > > > > > > > > Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr> > > > > > --- > > > > > meta/classes/kernel-fitimage.bbclass | 6 +++++- > > > > > meta/classes/kernel.bbclass | 4 +++- > > > > > 2 files changed, 8 insertions(+), 2 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.bbclass > > > > > b/meta/classes/kernel.bbclass index ce2cab65ae..a8b0d0a061 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 > > > > > > > > > > -- > > > > > _______________________________________________ > > > > > Openembedded-core mailing list > > > > > Openembedded-core@lists.openembedded.org > > > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > -- > > > > _______________________________________________ > > > > Openembedded-core mailing list > > > > Openembedded-core@lists.openembedded.org > > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta][pyro][PATCH] Fix some issues in the fitImage generation 2017-10-17 16:54 [meta][pyro][PATCH] Fix some issues in the fitImage generation Thomas Perrot ` (2 preceding siblings ...) 2017-10-17 19:09 ` [meta][pyro][PATCH] " Denys Dmytriyenko @ 2017-10-18 7:02 ` André Draszik 2017-10-18 9:54 ` Thomas PERROT 3 siblings, 1 reply; 11+ messages in thread From: André Draszik @ 2017-10-18 7:02 UTC (permalink / raw) To: openembedded-core On Tue, 2017-10-17 at 18:54 +0200, Thomas Perrot wrote: > - Bad image type replacement for aarch64 > - Fix DTB path in fitimage.its > - Ignore fitImage type during the packaging of the initramfs > > Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr> > --- > meta/classes/kernel-fitimage.bbclass | 6 +++++- > meta/classes/kernel.bbclass | 4 +++- > 2 files changed, 8 insertions(+), 2 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" I can't see this in master - it should go there first. Cheers, Andre' ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [meta][pyro][PATCH] Fix some issues in the fitImage generation 2017-10-18 7:02 ` André Draszik @ 2017-10-18 9:54 ` Thomas PERROT 0 siblings, 0 replies; 11+ messages in thread From: Thomas PERROT @ 2017-10-18 9:54 UTC (permalink / raw) To: André Draszik; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 1811 bytes --] Hi, I updated the commit message with the reason for the third change. When INITRAMFS_IMAGE_BUNDLE is set to 1 and the kernel image type is a fitimage the task do_bundle_initramfs should be only substitute the initramfs of KERNEL_IMAGETYPE_FOR_MAKE (e.g Image for aarch64, zImage for arm...). Best regards, Thomas P. On Wed, Oct 18, 2017 at 9:02 AM, André Draszik <git@andred.net> wrote: > On Tue, 2017-10-17 at 18:54 +0200, Thomas Perrot wrote: > > - Bad image type replacement for aarch64 > > - Fix DTB path in fitimage.its > > - Ignore fitImage type during the packaging of the initramfs > > > > Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr> > > --- > > meta/classes/kernel-fitimage.bbclass | 6 +++++- > > meta/classes/kernel.bbclass | 4 +++- > > 2 files changed, 8 insertions(+), 2 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" > > I can't see this in master - it should go there first. > > Cheers, > Andre' > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > [-- Attachment #2: Type: text/html, Size: 3589 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* [meta][pyro][PATCH] Fix some issues in the fitImage generation @ 2017-10-18 7:46 Thomas Perrot 2017-10-18 8:09 ` André Draszik 0 siblings, 1 reply; 11+ messages in thread From: Thomas Perrot @ 2017-10-18 7:46 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 Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr> --- meta/classes/kernel-fitimage.bbclass | 6 +++++- meta/classes/kernel.bbclass | 4 +++- 2 files changed, 8 insertions(+), 2 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.bbclass b/meta/classes/kernel.bbclass index ce2cab65ae..a8b0d0a061 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] 11+ messages in thread
* Re: [meta][pyro][PATCH] Fix some issues in the fitImage generation 2017-10-18 7:46 Thomas Perrot @ 2017-10-18 8:09 ` André Draszik 0 siblings, 0 replies; 11+ messages in thread From: André Draszik @ 2017-10-18 8:09 UTC (permalink / raw) To: openembedded-core On Wed, 2017-10-18 at 09:46 +0200, 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 > > Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr> > --- > meta/classes/kernel-fitimage.bbclass | 6 +++++- > meta/classes/kernel.bbclass | 4 +++- > 2 files changed, 8 insertions(+), 2 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" This isn't in master yet. > else: > replacementtype = "zImage" > > @@ -351,6 +354,7 @@ fitimage_assemble() { > DTB_PATH="arch/${ARCH}/boot/${DTB}" > fi > > + DTB=$(echo "${DTB}" | tr '/' '_') There is a backport request from master to pyro for this pending already. > DTBS="${DTBS} ${DTB}" > fitimage_emit_section_dtb ${1} ${DTB} ${DTB_PATH} > done > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index ce2cab65ae..a8b0d0a061 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 ^^ This is a bashism, and this change isn't in master yet either. Cheers, Andre' ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-10-18 9:55 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-17 16:54 [meta][pyro][PATCH] Fix some issues in the fitImage generation Thomas Perrot
2017-10-17 16:56 ` Burton, Ross
2017-10-18 7:00 ` André Draszik
2017-10-17 17:00 ` ✗ patchtest: failure for " Patchwork
2017-10-17 19:09 ` [meta][pyro][PATCH] " Denys Dmytriyenko
[not found] ` <BL2PR02MB2163A3231B9F61417D92A803B94C0@BL2PR02MB2163.namprd02.prod.outlook.com>
2017-10-17 22:20 ` Denys Dmytriyenko
[not found] ` <BL2PR02MB216333023A57FEE778BC75DCB94C0@BL2PR02MB2163.namprd02.prod.outlook.com>
2017-10-17 23:18 ` Denys Dmytriyenko
2017-10-18 7:02 ` André Draszik
2017-10-18 9:54 ` Thomas PERROT
-- strict thread matches above, loose matches on Subject: below --
2017-10-18 7:46 Thomas Perrot
2017-10-18 8:09 ` André Draszik
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox