* [meta][pyro][PATCH] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
@ 2017-10-23 15:59 Thomas Perrot
2017-10-23 16:30 ` Thomas PERROT
2017-10-23 16:35 ` ✗ patchtest: failure for " Patchwork
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Perrot @ 2017-10-23 15:59 UTC (permalink / raw)
To: openembedded-core
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 abbc309b09..5ad439e82d 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -31,7 +31,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..86d531abc4 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_DTB_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] 3+ messages in thread
* Re: [meta][pyro][PATCH] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
2017-10-23 15:59 [meta][pyro][PATCH] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage Thomas Perrot
@ 2017-10-23 16:30 ` Thomas PERROT
2017-10-23 16:35 ` ✗ patchtest: failure for " Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Thomas PERROT @ 2017-10-23 16:30 UTC (permalink / raw)
To: OE-core
[-- Attachment #1: Type: text/plain, Size: 3997 bytes --]
Sorry, there is a bad copy/paste into this patch, I just pushed a version 2.
Still sorry for my mistake
Thomas P.
On Mon, Oct 23, 2017 at 5:59 PM, Thomas Perrot <thomas.perrot@tupi.fr>
wrote:
> 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 abbc309b09..5ad439e82d 100644
> --- a/meta/classes/kernel-fitimage.bbclass
> +++ b/meta/classes/kernel-fitimage.bbclass
> @@ -31,7 +31,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..86d531abc4 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_DTB_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
>
>
[-- Attachment #2: Type: text/html, Size: 5340 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* ✗ patchtest: failure for Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
2017-10-23 15:59 [meta][pyro][PATCH] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage Thomas Perrot
2017-10-23 16:30 ` Thomas PERROT
@ 2017-10-23 16:35 ` Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2017-10-23 16:35 UTC (permalink / raw)
To: Thomas PERROT; +Cc: openembedded-core
== Series Details ==
Series: Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
Revision: 1
URL : https://patchwork.openembedded.org/series/9444/
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] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
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] 3+ messages in thread
end of thread, other threads:[~2017-10-23 16:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-23 15:59 [meta][pyro][PATCH] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage Thomas Perrot
2017-10-23 16:30 ` Thomas PERROT
2017-10-23 16:35 ` ✗ patchtest: failure for " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox