* [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
@ 2017-10-23 16:23 Thomas Perrot
2017-10-23 16:35 ` ✗ patchtest: failure for Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage (rev2) Patchwork
2017-10-24 8:08 ` [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage André Draszik
0 siblings, 2 replies; 4+ messages in thread
From: Thomas Perrot @ 2017-10-23 16:23 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..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] 4+ messages in thread
* ✗ patchtest: failure for Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage (rev2)
2017-10-23 16:23 [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage Thomas Perrot
@ 2017-10-23 16:35 ` Patchwork
2017-10-24 8:08 ` [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage André Draszik
1 sibling, 0 replies; 4+ 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 (rev2)
Revision: 2
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, v2] 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] 4+ messages in thread
* Re: [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
2017-10-23 16:23 [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage Thomas Perrot
2017-10-23 16:35 ` ✗ patchtest: failure for Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage (rev2) Patchwork
@ 2017-10-24 8:08 ` André Draszik
2017-10-25 7:24 ` Thomas PERROT
1 sibling, 1 reply; 4+ messages in thread
From: André Draszik @ 2017-10-24 8:08 UTC (permalink / raw)
To: openembedded-core
Hi,
On Mon, 2017-10-23 at 18:23 +0200, Thomas Perrot wrote:
> Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr>
Your commit message doesn't explain what problem you're trying to solve.
I can only guess that it's the same as this:
http://lists.openembedded.org/pipermail/openembedded-core/2017-September/142619.html
http://lists.openembedded.org/pipermail/openembedded-core/2017-September/142621.html
? If so, just submit requests for backporting, or explain why this doesn't
work in pyro.
> ---
> 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)
You should also update the description of the executed tasks at the top of
uboot-sign.bbclass if you're changing this.
Cheers,
Andre'
> }
>
> # 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 [flat|nested] 4+ messages in thread
* Re: [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage
2017-10-24 8:08 ` [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage André Draszik
@ 2017-10-25 7:24 ` Thomas PERROT
0 siblings, 0 replies; 4+ messages in thread
From: Thomas PERROT @ 2017-10-25 7:24 UTC (permalink / raw)
To: André Draszik; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 5045 bytes --]
Hi,
It is an issue with the fitImage generation when UBOOT_SIGN_ENABLE is
enabled, unrelated to extlinux.
I just update the commit message and push a v3 of this patch.
Best regards,
Thomas P.
On Tue, Oct 24, 2017 at 10:08 AM, André Draszik <git@andred.net> wrote:
> Hi,
>
> On Mon, 2017-10-23 at 18:23 +0200, Thomas Perrot wrote:
> > Signed-off-by: Thomas Perrot <thomas.perrot@tupi.fr>
>
> Your commit message doesn't explain what problem you're trying to solve.
>
> I can only guess that it's the same as this:
> http://lists.openembedded.org/pipermail/openembedded-core/
> 2017-September/142619.html
> http://lists.openembedded.org/pipermail/openembedded-core/
> 2017-September/142621.html
>
> ? If so, just submit requests for backporting, or explain why this doesn't
> work in pyro.
>
>
> > ---
> > 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)
>
> You should also update the description of the executed tasks at the top of
> uboot-sign.bbclass if you're changing this.
>
> Cheers,
> Andre'
>
>
> > }
> >
> > # 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
> >
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 7781 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-10-25 7:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-23 16:23 [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage Thomas Perrot
2017-10-23 16:35 ` ✗ patchtest: failure for Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage (rev2) Patchwork
2017-10-24 8:08 ` [meta][pyro][PATCHv2] Avoid a circular dependency between do_concat_dtb and do_assemble_fitimage André Draszik
2017-10-25 7:24 ` Thomas PERROT
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.