* [PATCH] [arm-autonomy] firmware-image-juno: Add xen-devicetree dependency
@ 2020-05-07 10:30 Bertrand Marquis
2020-05-08 13:04 ` [meta-arm] " Jon Mason
0 siblings, 1 reply; 3+ messages in thread
From: Bertrand Marquis @ 2020-05-07 10:30 UTC (permalink / raw)
To: meta-arm; +Cc: nd
From: Diego Sueiro <diego.sueiro@arm.com>
The do_deploy task depends on xen-devicetree:do_deploy in order to
include the generated xen dtbs in the firmware image.
To avoid dependency loop between firmware-image-juno:do_install,
xen:do_deploy and xen-devicetree:do_deploy when
INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and
xen-devicetree binaries copying in the do_deploy task.
Also Use OVERRIDES to minimize the usage of
"@bb.utils.contains('DISTRO_FEATURES', 'xen', ..."
Change-Id: I8da476435de73445fb6d895ec418d85861b8c46c
Issue-Id: SCM-990
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
---
.../images/firmware-image-juno.bbappend | 27 ++++++++++++-------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
index 2904e0b..b0aae69 100644
--- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
+++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
@@ -1,14 +1,21 @@
-FILESEXTRAPATHS_prepend := "${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${THISDIR}/${PN}:', '', d)}"
+# Use OVERRIDES to minimize the usage of
+# ${@bb.utils.contains('DISTRO_FEATURES', 'xen', ...
+OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ':xen', '', d)}"
-INSTALL_EXTRA_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen:do_deploy', '', d)}"
+FILESEXTRAPATHS_prepend_xen := "${THISDIR}/${PN}:"
-do_install[depends] += "${INSTALL_EXTRA_DEPS}"
+DEPLOY_EXTRA_DEPS ??= ""
+DEPLOY_EXTRA_DEPS_xen = "xen:do_deploy xen-devicetree:do_deploy"
-do_install_append() {
- if [ "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'yes', 'no', d)}" = "yes" ]; then
- cp ${DEPLOY_DIR_IMAGE}/xen-${COMPATIBLE_MACHINE}.efi \
- ${D}/${UNPACK_DIR}/SOFTWARE/xen
- cp ${DEPLOY_DIR_IMAGE}/*xen.dtb \
- ${D}/${UNPACK_DIR}/SOFTWARE/
- fi
+do_deploy[depends] += "${DEPLOY_EXTRA_DEPS}"
+
+do_deploy_prepend_xen() {
+ # To avoid dependency loop between firmware-image-juno:do_install,
+ # xen:do_deploy and xen-devicetree:do_deploy when
+ # INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and
+ # xen-devicetree binaries copying in the do_deploy task.
+ cp ${DEPLOY_DIR_IMAGE}/xen-${COMPATIBLE_MACHINE}.efi \
+ ${D}/${UNPACK_DIR}/SOFTWARE/xen
+ cp ${DEPLOY_DIR_IMAGE}/*xen.dtb \
+ ${D}/${UNPACK_DIR}/SOFTWARE/
}
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [meta-arm] [PATCH] [arm-autonomy] firmware-image-juno: Add xen-devicetree dependency
2020-05-07 10:30 [PATCH] [arm-autonomy] firmware-image-juno: Add xen-devicetree dependency Bertrand Marquis
@ 2020-05-08 13:04 ` Jon Mason
0 siblings, 0 replies; 3+ messages in thread
From: Jon Mason @ 2020-05-08 13:04 UTC (permalink / raw)
To: meta-arm
On Thu, May 07, 2020 at 11:30:29AM +0100, Bertrand Marquis wrote:
> From: Diego Sueiro <diego.sueiro@arm.com>
>
> The do_deploy task depends on xen-devicetree:do_deploy in order to
> include the generated xen dtbs in the firmware image.
> To avoid dependency loop between firmware-image-juno:do_install,
> xen:do_deploy and xen-devicetree:do_deploy when
> INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and
> xen-devicetree binaries copying in the do_deploy task.
>
> Also Use OVERRIDES to minimize the usage of
> "@bb.utils.contains('DISTRO_FEATURES', 'xen', ..."
>
> Change-Id: I8da476435de73445fb6d895ec418d85861b8c46c
> Issue-Id: SCM-990
> Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Pulled into the master branch.
Thanks,
Jon
> ---
> .../images/firmware-image-juno.bbappend | 27 ++++++++++++-------
> 1 file changed, 17 insertions(+), 10 deletions(-)
>
> diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
> index 2904e0b..b0aae69 100644
> --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
> +++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
> @@ -1,14 +1,21 @@
> -FILESEXTRAPATHS_prepend := "${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${THISDIR}/${PN}:', '', d)}"
> +# Use OVERRIDES to minimize the usage of
> +# ${@bb.utils.contains('DISTRO_FEATURES', 'xen', ...
> +OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ':xen', '', d)}"
>
> -INSTALL_EXTRA_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen:do_deploy', '', d)}"
> +FILESEXTRAPATHS_prepend_xen := "${THISDIR}/${PN}:"
>
> -do_install[depends] += "${INSTALL_EXTRA_DEPS}"
> +DEPLOY_EXTRA_DEPS ??= ""
> +DEPLOY_EXTRA_DEPS_xen = "xen:do_deploy xen-devicetree:do_deploy"
>
> -do_install_append() {
> - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'yes', 'no', d)}" = "yes" ]; then
> - cp ${DEPLOY_DIR_IMAGE}/xen-${COMPATIBLE_MACHINE}.efi \
> - ${D}/${UNPACK_DIR}/SOFTWARE/xen
> - cp ${DEPLOY_DIR_IMAGE}/*xen.dtb \
> - ${D}/${UNPACK_DIR}/SOFTWARE/
> - fi
> +do_deploy[depends] += "${DEPLOY_EXTRA_DEPS}"
> +
> +do_deploy_prepend_xen() {
> + # To avoid dependency loop between firmware-image-juno:do_install,
> + # xen:do_deploy and xen-devicetree:do_deploy when
> + # INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and
> + # xen-devicetree binaries copying in the do_deploy task.
> + cp ${DEPLOY_DIR_IMAGE}/xen-${COMPATIBLE_MACHINE}.efi \
> + ${D}/${UNPACK_DIR}/SOFTWARE/xen
> + cp ${DEPLOY_DIR_IMAGE}/*xen.dtb \
> + ${D}/${UNPACK_DIR}/SOFTWARE/
> }
> --
> 2.17.1
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <160CB87CF829AD41.1278@lists.yoctoproject.org>]
* Re: [meta-arm] [PATCH] [arm-autonomy] firmware-image-juno: Add xen-devicetree dependency
[not found] <160CB87CF829AD41.1278@lists.yoctoproject.org>
@ 2020-05-08 9:00 ` Bertrand Marquis
0 siblings, 0 replies; 3+ messages in thread
From: Bertrand Marquis @ 2020-05-08 9:00 UTC (permalink / raw)
To: meta-arm@lists.yoctoproject.org; +Cc: nd
> On 7 May 2020, at 11:30, Bertrand Marquis via lists.yoctoproject.org <bertrand.marquis=arm.com@lists.yoctoproject.org> wrote:
>
> From: Diego Sueiro <diego.sueiro@arm.com>
>
> The do_deploy task depends on xen-devicetree:do_deploy in order to
> include the generated xen dtbs in the firmware image.
> To avoid dependency loop between firmware-image-juno:do_install,
> xen:do_deploy and xen-devicetree:do_deploy when
> INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and
> xen-devicetree binaries copying in the do_deploy task.
>
> Also Use OVERRIDES to minimize the usage of
> "@bb.utils.contains('DISTRO_FEATURES', 'xen', ..."
>
> Change-Id: I8da476435de73445fb6d895ec418d85861b8c46c
> Issue-Id: SCM-990
> Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
> ---
> .../images/firmware-image-juno.bbappend | 27 ++++++++++++-------
> 1 file changed, 17 insertions(+), 10 deletions(-)
>
> diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
> index 2904e0b..b0aae69 100644
> --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
> +++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
> @@ -1,14 +1,21 @@
> -FILESEXTRAPATHS_prepend := "${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${THISDIR}/${PN}:', '', d)}"
> +# Use OVERRIDES to minimize the usage of
> +# ${@bb.utils.contains('DISTRO_FEATURES', 'xen', ...
> +OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ':xen', '', d)}"
>
> -INSTALL_EXTRA_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen:do_deploy', '', d)}"
> +FILESEXTRAPATHS_prepend_xen := "${THISDIR}/${PN}:"
>
> -do_install[depends] += "${INSTALL_EXTRA_DEPS}"
> +DEPLOY_EXTRA_DEPS ??= ""
> +DEPLOY_EXTRA_DEPS_xen = "xen:do_deploy xen-devicetree:do_deploy"
>
> -do_install_append() {
> - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'yes', 'no', d)}" = "yes" ]; then
> - cp ${DEPLOY_DIR_IMAGE}/xen-${COMPATIBLE_MACHINE}.efi \
> - ${D}/${UNPACK_DIR}/SOFTWARE/xen
> - cp ${DEPLOY_DIR_IMAGE}/*xen.dtb \
> - ${D}/${UNPACK_DIR}/SOFTWARE/
> - fi
> +do_deploy[depends] += "${DEPLOY_EXTRA_DEPS}"
> +
> +do_deploy_prepend_xen() {
> + # To avoid dependency loop between firmware-image-juno:do_install,
> + # xen:do_deploy and xen-devicetree:do_deploy when
> + # INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and
> + # xen-devicetree binaries copying in the do_deploy task.
> + cp ${DEPLOY_DIR_IMAGE}/xen-${COMPATIBLE_MACHINE}.efi \
> + ${D}/${UNPACK_DIR}/SOFTWARE/xen
> + cp ${DEPLOY_DIR_IMAGE}/*xen.dtb \
> + ${D}/${UNPACK_DIR}/SOFTWARE/
> }
> --
> 2.17.1
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-08 13:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-07 10:30 [PATCH] [arm-autonomy] firmware-image-juno: Add xen-devicetree dependency Bertrand Marquis
2020-05-08 13:04 ` [meta-arm] " Jon Mason
[not found] <160CB87CF829AD41.1278@lists.yoctoproject.org>
2020-05-08 9:00 ` Bertrand Marquis
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.