Message ID | 20240108054633.1425680-1-Debbie.Martin@arm.com |
---|---|
State | New |
Headers | show |
Series | [1/2] arm-systemready: Add parted dependency and inherit testimage | expand |
These are for Nanbield branch. > On 8 Jan 2024, at 05:46, Debbie Martin via lists.yoctoproject.org <debbie.martin=arm.com@lists.yoctoproject.org> wrote: > > 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> > --- > kas/arm-systemready-ir-acs.yml | 5 ----- > meta-arm-systemready/classes/arm-systemready-acs.bbclass | 7 ++++--- > 2 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/kas/arm-systemready-ir-acs.yml b/kas/arm-systemready-ir-acs.yml > index 38604d7f..aef3e712 100644 > --- a/kas/arm-systemready-ir-acs.yml > +++ b/kas/arm-systemready-ir-acs.yml > @@ -8,10 +8,5 @@ env: > # The full testimage run typically takes around 12-24h on fvp-base. > TEST_OVERALL_TIMEOUT: "${@ 24*60*60}" > > -local_conf_header: > - systemready-ir-acs: | > - IMAGE_CLASSES:append = " testimage" > - > - > target: > - arm-systemready-ir-acs > diff --git a/meta-arm-systemready/classes/arm-systemready-acs.bbclass b/meta-arm-systemready/classes/arm-systemready-acs.bbclass > index e9888023..28e800c8 100644 > --- a/meta-arm-systemready/classes/arm-systemready-acs.bbclass > +++ b/meta-arm-systemready/classes/arm-systemready-acs.bbclass > @@ -12,12 +12,11 @@ > INHIBIT_DEFAULT_DEPS = "1" > COMPATIBLE_HOST = "aarch64-*" > 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_compile[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 > 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[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 > python acs_logs_handle() { > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#5318): https://lists.yoctoproject.org/g/meta-arm/message/5318 > Mute This Topic: https://lists.yoctoproject.org/mt/103592511/6875888 > Group Owner: meta-arm+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [ross.burton@arm.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/kas/arm-systemready-ir-acs.yml b/kas/arm-systemready-ir-acs.yml index 38604d7f..aef3e712 100644 --- a/kas/arm-systemready-ir-acs.yml +++ b/kas/arm-systemready-ir-acs.yml @@ -8,10 +8,5 @@ env: # The full testimage run typically takes around 12-24h on fvp-base. TEST_OVERALL_TIMEOUT: "${@ 24*60*60}" -local_conf_header: - systemready-ir-acs: | - IMAGE_CLASSES:append = " testimage" - - target: - arm-systemready-ir-acs diff --git a/meta-arm-systemready/classes/arm-systemready-acs.bbclass b/meta-arm-systemready/classes/arm-systemready-acs.bbclass index e9888023..28e800c8 100644 --- a/meta-arm-systemready/classes/arm-systemready-acs.bbclass +++ b/meta-arm-systemready/classes/arm-systemready-acs.bbclass @@ -12,12 +12,11 @@ INHIBIT_DEFAULT_DEPS = "1" COMPATIBLE_HOST = "aarch64-*" 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_compile[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 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[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 python acs_logs_handle() {
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> --- kas/arm-systemready-ir-acs.yml | 5 ----- meta-arm-systemready/classes/arm-systemready-acs.bbclass | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-)