mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-02 13:30:09 +00:00
Code Issues Projects Releases Wiki Activity

arm-autonomy: Add missing new override syntax

Browse Source 
Issue-Id: SCM-2987
Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
Change-Id: I8d200f1594005f0f9288683d4f1a5f31c2f29b44
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Kamil Dziezyk
2021-09-16 19:02:10 +02:00
committed by Jon Mason
parent e7d2c8eea4
commit d857095f79
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-autonomy/classes/image_types_xenguest.bbclass
+3 -3
View File
@@ -22,7 +22,7 @@ xenguest_image_add_kernel() {
# Add rootfs file to the image # Add rootfs file to the image
xenguest_image_add_rootfs() { xenguest_image_add_rootfs() {
call_xenguest_mkimage partial \ call_xenguest_mkimage partial \
--disk-add-file=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${IMAGE_TYPEDEP_xenguest}:rootfs.${IMAGE_TYPEDEP_xenguest} --disk-add-file=${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${IMAGE_TYPEDEP:xenguest}:rootfs.${IMAGE_TYPEDEP:xenguest}
} }
# Pack xenguest image # Pack xenguest image
@@ -57,7 +57,7 @@ do_bootimg_xenguest[depends] += "xenguest-base-image:do_deploy"
do_bootimg_xenguest[depends] += "${PN}:do_rootfs" do_bootimg_xenguest[depends] += "${PN}:do_rootfs"
# This set in python anonymous after, just set a default value here # This set in python anonymous after, just set a default value here
IMAGE_TYPEDEP_xenguest ?= "tar" IMAGE_TYPEDEP:xenguest ?= "tar"
# We must not be built at rootfs build time because we need the kernel # We must not be built at rootfs build time because we need the kernel
IMAGE_TYPES_MASKED += "xenguest" IMAGE_TYPES_MASKED += "xenguest"
@@ -158,7 +158,7 @@ python __anonymous() {
# do_bootimg_xenguest will need the tar file # do_bootimg_xenguest will need the tar file
d.appendVarFlag('do_bootimg_xenguest', 'depends', ' %s:do_image_tar' % (d.getVar('PN'))) d.appendVarFlag('do_bootimg_xenguest', 'depends', ' %s:do_image_tar' % (d.getVar('PN')))
# set our TYPEDEP to the proper compression # set our TYPEDEP to the proper compression
d.setVar('IMAGE_TYPEDEP_xenguest', 'tar' + (rootfs_file.split('.tar', 1)[1] or '')) d.setVar('IMAGE_TYPEDEP:xenguest', 'tar' + (rootfs_file.split('.tar', 1)[1] or ''))
if kernel_needed: if kernel_needed:
# Tell do_bootimg_xenguest to call xenguest_image_add_kernel # Tell do_bootimg_xenguest to call xenguest_image_add_kernel
meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend
+1 -1
View File
@@ -18,7 +18,7 @@ do_install:append:autonomy-host() {
} }
DEPLOY_EXTRA_DEPS ??= "" DEPLOY_EXTRA_DEPS ??= ""
DEPLOY_EXTRA_DEPS_autonomy-host = "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}"
meta-arm-autonomy/recipes-extended/xen/xen_%.bbappend
+1 -1
View File
@@ -5,6 +5,6 @@ OVERRIDES:append = "${ARM_AUTONOMY_HOST_OVERRIDES}"
# Make Xen machine specific # Make Xen machine specific
# This ensures that sstate is properly handled and that each machine can have # This ensures that sstate is properly handled and that each machine can have
# its own configuration # its own configuration
PACKAGE_ARCH_autonomy-host = "${MACHINE_ARCH}" PACKAGE_ARCH:autonomy-host = "${MACHINE_ARCH}"
PACKAGECONFIG:remove:autonomy-host = "sdl" PACKAGECONFIG:remove:autonomy-host = "sdl"