mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-01-11 15:00:39 +00:00
Code Issues Projects Releases Wiki Activity

arm-systemready: Add parted dependency and inherit testimage

Browse Source 
Add the parted-native dependency explicitly which is needed to
use wic commands.

Also explicitly inherit testimage. This means that the kas config
is no longer required to include it in IMAGE_CLASSES.

Signed-off-by: Debbie Martin <Debbie.Martin@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Debbie Martin
2023-12-12 09:09:18 +00:00
committed by Jon Mason
parent 65460e5310
commit b59c60c03a
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kas/arm-systemready-ir-acs.yml
View File

@@ -8,10 +8,5 @@ env:
# The full testimage run typically takes around 12-24h on fvp-base. # The full testimage run typically takes around 12-24h on fvp-base.
TEST_OVERALL_TIMEOUT: "${@ 24*60*60}" TEST_OVERALL_TIMEOUT: "${@ 24*60*60}"
local_conf_header:
systemready-ir-acs: |
IMAGE_CLASSES:append = " testimage"
target: target:
- arm-systemready-ir-acs - arm-systemready-ir-acs

7
meta-arm-systemready/classes/arm-systemready-acs.bbclass
View File

@@ -12,12 +12,11 @@
INHIBIT_DEFAULT_DEPS = "1" INHIBIT_DEFAULT_DEPS = "1"
COMPATIBLE_HOST = "aarch64-*" COMPATIBLE_HOST = "aarch64-*"
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit nopackages deploy rootfs-postcommands ${IMAGE_CLASSES} python3native inherit nopackages deploy rootfs-postcommands ${IMAGE_CLASSES} python3native testimage
do_configure[noexec] = "1" do_configure[noexec] = "1"
do_compile[noexec] = "1" do_compile[noexec] = "1"
do_install[noexec] = "1" do_install[noexec] = "1"
do_testimage[depends] += "mtools-native:do_populate_sysroot"
# Deploy with this suffix so it is picked up in the machine configuration # Deploy with this suffix so it is picked up in the machine configuration
IMAGE_DEPLOY_SUFFIX ?= ".wic" IMAGE_DEPLOY_SUFFIX ?= ".wic"
@@ -80,7 +79,9 @@ RM_WORK_EXCLUDE_ITEMS += "${@ os.path.basename(d.getVar('TEST_LOG_DIR')) }"
do_testimage[postfuncs] += "acs_logs_handle" do_testimage[postfuncs] += "acs_logs_handle"
do_testimage[depends] += "edk2-test-parser-native:do_populate_sysroot \ do_testimage[depends] += "edk2-test-parser-native:do_populate_sysroot \
arm-systemready-scripts-native:do_populate_sysroot" arm-systemready-scripts-native:do_populate_sysroot \
mtools-native:do_populate_sysroot \
parted-native:do_populate_sysroot"
# Process the logs # Process the logs
python acs_logs_handle() { python acs_logs_handle() {