* [meta][PATCH 1/3] Fix some issues in the fitImage generation
@ 2017-10-25 18:03 Thomas Perrot
2017-10-25 18:03 ` [meta][PATCH 2/3] " Thomas Perrot
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Thomas Perrot @ 2017-10-25 18:03 UTC (permalink / raw)
To: openembedded-core
Bad image type replacement for aarch64
Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr>
---
meta/classes/kernel-fitimage.bbclass | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 179185b6b2..9baf399f2e 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -7,9 +7,12 @@ python __anonymous () {
depends = "%s u-boot-mkimage-native dtc-native" % depends
d.setVar("DEPENDS", depends)
- if d.getVar("UBOOT_ARCH") == "mips":
+ uarch = d.getVar("UBOOT_ARCH")
+ if uarch == "arm64":
+ replacementtype = "Image"
+ elif uarch == "mips":
replacementtype = "vmlinuz.bin"
- elif d.getVar("UBOOT_ARCH") == "x86":
+ elif uarch == "x86":
replacementtype = "bzImage"
else:
replacementtype = "zImage"
--
2.13.6
^ permalink raw reply related [flat|nested] 6+ messages in thread* [meta][PATCH 2/3] Fix some issues in the fitImage generation
2017-10-25 18:03 [meta][PATCH 1/3] Fix some issues in the fitImage generation Thomas Perrot
@ 2017-10-25 18:03 ` Thomas Perrot
2017-10-26 10:28 ` André Draszik
2017-10-25 18:03 ` [meta][PATCH 3/3] " Thomas Perrot
2017-10-25 18:32 ` ✗ patchtest: failure for "[meta] Fix some issues in the ..." and 2 more Patchwork
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Perrot @ 2017-10-25 18:03 UTC (permalink / raw)
To: openembedded-core
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.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 756707a3c2..7f8c8985f3 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -208,7 +208,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] 6+ messages in thread* Re: [meta][PATCH 2/3] Fix some issues in the fitImage generation
2017-10-25 18:03 ` [meta][PATCH 2/3] " Thomas Perrot
@ 2017-10-26 10:28 ` André Draszik
0 siblings, 0 replies; 6+ messages in thread
From: André Draszik @ 2017-10-26 10:28 UTC (permalink / raw)
To: openembedded-core
Hi Thomas,
On Wed, 2017-10-25 at 20:03 +0200, Thomas Perrot wrote:
> Ignore fitImage type in do_bundle_initramfs task because the packaging is
> made by do_assemble_fitimage_initramfs
You should also follow the instructions from the patchtest email you're
receiving
http://lists.openembedded.org/pipermail/openembedded-core/2017-October/143668.html
In particular https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Otherwise your patches won't be merged.
In this case, you should prefix your patch subject line with the <target>,
and it's always helpful to add some log output e.g.
---snip---
kernel.bbclass: support fitImage and INITRAMFS_IMAGE_BUNDLE together
When enabling INITRAMFS_IMAGE_BUNDLE and fitImages, the build
aborts because
| mv: cannot stat 'arch/arm64/boot/fitImage': No such file or directory
| WARNING: .../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 .../temp/log.do_bundle_initramfs.30337)
| ERROR: Task (kernel.bb.bb:do_bundle_initramfs) failed with exit code '1'
This is because do_bundle_initramfs incorrectly treats 'fitImage'
as a kernel make target that needs to be re-run to achieve initramfs
image bundling, which it shouldn't.
Fix by simply skipping 'fitImage' in this case.
Signed-off-by: ...
---snap---
Same for all the other patches.
We'll get there :-)
Cheers,
Andre'
>
> Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr>
> ---
> meta/classes/kernel.bbclass | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 756707a3c2..7f8c8985f3 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -208,7 +208,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 [flat|nested] 6+ messages in thread
* [meta][PATCH 3/3] Fix some issues in the fitImage generation
2017-10-25 18:03 [meta][PATCH 1/3] Fix some issues in the fitImage generation Thomas Perrot
2017-10-25 18:03 ` [meta][PATCH 2/3] " Thomas Perrot
@ 2017-10-25 18:03 ` Thomas Perrot
2017-10-26 10:34 ` André Draszik
2017-10-25 18:32 ` ✗ patchtest: failure for "[meta] Fix some issues in the ..." and 2 more Patchwork
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Perrot @ 2017-10-25 18:03 UTC (permalink / raw)
To: openembedded-core
Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
when UBOOT_SIGN_ENABLE is active:
Dependency loop #1 found:
do_concat_dtb (dependent Tasks ['linux-yocto_4.10.bb:do_assemble_fitimage'])
do_install (dependent Tasks ['pseudo_1.8.2.bb:do_populate_sysroot', 'u-boot_2017.01.bb:do_compile', 'u-boot_2017.01.bb:do_concat_dtb'])
do_deploy (dependent Tasks ['u-boot_2017.01.bb:do_deploy_dtb', 'u-boot_2017.01.bb:do_install'])
do_assemble_fitimage (dependent Tasks ['linux-yocto_4.10.bb:do_compile', 'u-boot_2017.01.bb:do_deploy'])
Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr>
---
meta/classes/kernel-fitimage.bbclass | 2 +-
meta/classes/uboot-sign.bbclass | 21 +++++++++------------
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 9baf399f2e..2779ce5226 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -33,7 +33,7 @@ python __anonymous () {
# the fitImage:
if d.getVar('UBOOT_SIGN_ENABLE') == "1":
uboot_pn = d.getVar('PREFERRED_PROVIDER_u-boot') or 'u-boot'
- d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy' % uboot_pn)
+ d.appendVarFlag('do_assemble_fitimage', 'depends', ' %s:do_deploy_dtb' % uboot_pn)
}
# Options for the device tree compiler passed to mkimage '-D' feature:
diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass
index 8ee904e7df..2f616bf2a9 100644
--- a/meta/classes/uboot-sign.bbclass
+++ b/meta/classes/uboot-sign.bbclass
@@ -47,16 +47,14 @@ do_deploy_dtb () {
cd ${DEPLOYDIR}
if [ -f ${B}/${UBOOT_DTB_BINARY} ]; then
- install ${B}/${UBOOT_DTB_BINARY} ${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
- rm -f ${UBOOT_DTB_BINARY} ${UBOOT_DTB_SYMLINK}
- ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_SYMLINK}
- ln -sf ${UBOOT_DTB_IMAGE} ${UBOOT_DTB_BINARY}
+ install ${B}/${UBOOT_DTB_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}
+ ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_SYMLINK}
+ ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_BINARY}
fi
if [ -f ${B}/${UBOOT_NODTB_BINARY} ]; then
- install ${B}/${UBOOT_NODTB_BINARY} ${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}
- rm -f ${UBOOT_NODTB_BINARY} ${UBOOT_NODTB_SYMLINK}
- ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_SYMLINK}
- ln -sf ${UBOOT_NODTB_IMAGE} ${UBOOT_NODTB_BINARY}
+ install ${B}/${UBOOT_NODTB_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}
+ ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_SYMLINK}
+ ln -sf ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_BINARY}
fi
}
@@ -70,11 +68,10 @@ do_concat_dtb () {
oe_runmake EXT_DTB=${DEPLOYDIR}/${UBOOT_DTB_IMAGE}
install ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
install ${B}/${UBOOT_BINARY} ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE}
- elif [ -e "${DEPLOYDIR}/${UBOOT_NODTB_IMAGE}" -a -e "${DEPLOYDIR}/${UBOOT_DTB_IMAGE}" ]; then
- cd ${DEPLOYDIR}
- cat ${UBOOT_NODTB_IMAGE} ${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
+ elif [ -e "${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE}" -a -e "${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE}" ]; then
+ cat ${DEPLOY_DIR_IMAGE}/${UBOOT_NODTB_IMAGE} ${DEPLOY_DIR_IMAGE}/${UBOOT_DTB_IMAGE} | tee ${B}/${UBOOT_BINARY} > ${UBOOT_IMAGE}
else
- bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available."
+ bbfatal "Failure while adding public key to u-boot binary. Verified boot won't be available."
fi
fi
}
--
2.13.6
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [meta][PATCH 3/3] Fix some issues in the fitImage generation
2017-10-25 18:03 ` [meta][PATCH 3/3] " Thomas Perrot
@ 2017-10-26 10:34 ` André Draszik
0 siblings, 0 replies; 6+ messages in thread
From: André Draszik @ 2017-10-26 10:34 UTC (permalink / raw)
To: openembedded-core
Hi Thomas,
On Wed, 2017-10-25 at 20:03 +0200, Thomas Perrot wrote:
> Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
> when UBOOT_SIGN_ENABLE is active:
>
> Dependency loop #1 found:
> do_concat_dtb (dependent Tasks ['linux-
> yocto_4.10.bb:do_assemble_fitimage'])
> do_install (dependent Tasks ['pseudo_1.8.2.bb:do_populate_sysroot', 'u-
> boot_2017.01.bb:do_compile', 'u-boot_2017.01.bb:do_concat_dtb'])
> do_deploy (dependent Tasks ['u-boot_2017.01.bb:do_deploy_dtb', 'u-
> boot_2017.01.bb:do_install'])
> do_assemble_fitimage (dependent Tasks ['linux-yocto_4.10.bb:do_compile',
> 'u-boot_2017.01.bb:do_deploy'])
Can you please re-read
http://lists.openembedded.org/pipermail/openembedded-core/2017-October/143637.html
Have you actually tried building on master, or at least cherry-picked the
two patches that are in master to pyro locally?
I am using exactly the same two patches I keep referring to on my local pyro
without any problem.
In case you have actually tried them, I'd like to know why they don't work
for you, otherwise I'd still say that this patch is not needed.
Cheers,
Andre'
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✗ patchtest: failure for "[meta] Fix some issues in the ..." and 2 more
2017-10-25 18:03 [meta][PATCH 1/3] Fix some issues in the fitImage generation Thomas Perrot
2017-10-25 18:03 ` [meta][PATCH 2/3] " Thomas Perrot
2017-10-25 18:03 ` [meta][PATCH 3/3] " Thomas Perrot
@ 2017-10-25 18:32 ` Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-10-25 18:32 UTC (permalink / raw)
To: Thomas PERROT; +Cc: openembedded-core
== Series Details ==
Series: "[meta] Fix some issues in the ..." and 2 more
Revision: 1
URL : https://patchwork.openembedded.org/series/9488/
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,1/3] 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] 6+ messages in thread
end of thread, other threads:[~2017-10-26 10:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-25 18:03 [meta][PATCH 1/3] Fix some issues in the fitImage generation Thomas Perrot
2017-10-25 18:03 ` [meta][PATCH 2/3] " Thomas Perrot
2017-10-26 10:28 ` André Draszik
2017-10-25 18:03 ` [meta][PATCH 3/3] " Thomas Perrot
2017-10-26 10:34 ` André Draszik
2017-10-25 18:32 ` ✗ patchtest: failure for "[meta] Fix some issues in the ..." and 2 more Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox