mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-07-27 07:27:04 +00:00
Code Issues Projects Releases Wiki Activity

arm-autonomy: replace xen distro feature dependencies with arm-autonomy-host

Browse Source 
Features in meta-arm-autonomy should depend on the 'arm-autonomy-host'
DISTRO_FEATURES entry rather than 'xen'

Issue-Id: SCM-2040
Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
Change-Id: Ib39b761827dbeaf80635c748e6fc3a6d6109a1a1
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Nathan Dunne
2021-03-10 17:32:55 +00:00
committed by Jon Mason
parent 2bc44548b9
commit 255ca59858
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
+8 -8
View File
@@ -1,14 +1,14 @@
# Use OVERRIDES to minimize the usage of # Use OVERRIDES to minimize the usage of
# ${@bb.utils.contains('DISTRO_FEATURES', 'xen', ... # ${@bb.utils.contains('DISTRO_FEATURES', 'autonomy-host', ...
OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ':xen', '', d)}" OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ':autonomy-host', '', d)}"
FILESEXTRAPATHS_prepend_xen := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend_autonomy-host := "${THISDIR}/${PN}:"
DEPENDS_append_xen = " dos2unix-native" DEPENDS_append_autonomy-host = " dos2unix-native"
SRC_URI_append_xen = " file://add-xen-support.patch;patchdir=../" SRC_URI_append_autonomy-host = " file://add-xen-support.patch;patchdir=../"
do_install_append_xen() { do_install_append_autonomy-host() {
mv -v ${D}/${UNPACK_DIR}/SOFTWARE/uEnv.txt \ mv -v ${D}/${UNPACK_DIR}/SOFTWARE/uEnv.txt \
${D}/${UNPACK_DIR}/SOFTWARE/uenvfile ${D}/${UNPACK_DIR}/SOFTWARE/uenvfile
for dir in $(ls ${D}/${UNPACK_DIR}/SITE1/) for dir in $(ls ${D}/${UNPACK_DIR}/SITE1/)
@@ -18,11 +18,11 @@ do_install_append_xen() {
} }
DEPLOY_EXTRA_DEPS ??= "" DEPLOY_EXTRA_DEPS ??= ""
DEPLOY_EXTRA_DEPS_xen = "xen:do_deploy xen-devicetree:do_deploy" DEPLOY_EXTRA_DEPS_autonomy-host = "xen:do_deploy xen-devicetree:do_deploy"
do_deploy[depends] += "${DEPLOY_EXTRA_DEPS}" do_deploy[depends] += "${DEPLOY_EXTRA_DEPS}"
do_deploy_prepend_xen() { do_deploy_prepend_autonomy-host() {
# To avoid dependency loop between firmware-image-juno:do_install, # To avoid dependency loop between firmware-image-juno:do_install,
# xen:do_deploy and xen-devicetree:do_deploy when # xen:do_deploy and xen-devicetree:do_deploy when
# INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and # INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and
meta-arm-autonomy/recipes-bsp/grub/grub-efi_%.bbappend
+1 -1
View File
@@ -1 +1 @@
GRUB_BUILDIN += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'xen_boot', '', d)}" GRUB_BUILDIN += "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', 'xen_boot', '', d)}"
meta-arm-autonomy/recipes-devtools/qemu/qemu_%.bbappend
+6 -6
View File
@@ -1,12 +1,12 @@
# Use OVERRIDES to minimize the usage of # Use OVERRIDES to minimize the usage of
# ${@bb.utils.contains('DISTRO_FEATURES', 'xen', ... # ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ...
OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ':xen', '', d)}" OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ':autonomy-host', '', d)}"
# For Xen we only need the i386 binaries # For Xen we only need the i386 binaries
QEMU_TARGETS_xen = "i386" QEMU_TARGETS_autonomy-host = "i386"
PACKAGECONFIG[noaudio] = "--audio-drv-list='',," PACKAGECONFIG[noaudio] = "--audio-drv-list='',,"
PACKAGECONFIG_append_xen = " noaudio" PACKAGECONFIG_append_autonomy-host = " noaudio"
PACKAGECONFIG_remove_xen = "fdt sdl kvm" PACKAGECONFIG_remove_autonomy-host = "fdt sdl kvm"
require ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'recipes-devtools/qemu/${BPN}-package-split.inc', '', d)} require ${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', 'recipes-devtools/qemu/${BPN}-package-split.inc', '', d)}