| Message ID | 20220211105608.2483647-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] CI: build perf via CORE_IMAGE_EXTRA_INSTALL | expand |
On Fri, 11 Feb 2022 10:56:04 +0000, Ross Burton wrote: > Instead of adding perf to the target: list, add it to > CORE_IMAGE_EXTRA_INSTALL. This means that machine configurations which > need to change the target don't need to also build perf explicitly. Applied, thanks! [1/5] CI: build perf via CORE_IMAGE_EXTRA_INSTALL commit: f868b51fd3d007dbbaf6ceb8c9932c13f91a3142 [2/5] CI: improve coverage of corstone1000 commit: 94a08c23b0a5b6b8a406e818941243f9162e2b80 [3/5] arm/trusted-firmware-m: stop FetchContent from fetching commit: c6b347d3e6cff0b3438d54c3ff430deb7e7bbe5c [4/5] arm-bsp/trusted-firmware-m: add OpenAMP to the CS1K build commit: 77fac4cf2a3f2ad14bbda1c6472cb00f5ebd8924 [5/5] arm/secure-partitions: allow network operations during do_configure commit: 59db2ebad7198464be76af5615fb0c8b56482315 Best regards,
diff --git a/ci/base.yml b/ci/base.yml index 795bd11f..6c2f8df1 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -40,9 +40,9 @@ local_conf_header: DISTRO_FEATURES:remove = "ptest" kvm: | QEMU_USE_KVM = "" - + perf: | + CORE_IMAGE_EXTRA_INSTALL += "perf" machine: unset target: - core-image-base - - perf diff --git a/ci/gem5-arm64.yml b/ci/gem5-arm64.yml index 8b8e66ba..90913f37 100644 --- a/ci/gem5-arm64.yml +++ b/ci/gem5-arm64.yml @@ -13,5 +13,4 @@ machine: gem5-arm64 target: - core-image-minimal - - perf - gem5-aarch64-native diff --git a/ci/qemu-generic-arm64.yml b/ci/qemu-generic-arm64.yml index 2b7b839c..87cbd2f8 100644 --- a/ci/qemu-generic-arm64.yml +++ b/ci/qemu-generic-arm64.yml @@ -11,5 +11,4 @@ machine: qemu-generic-arm64 target: - core-image-base - - perf - sbsa-acs diff --git a/ci/qemuarm64-secureboot.yml b/ci/qemuarm64-secureboot.yml index d06514d0..acc65303 100644 --- a/ci/qemuarm64-secureboot.yml +++ b/ci/qemuarm64-secureboot.yml @@ -12,7 +12,6 @@ local_conf_header: target: - core-image-base - - perf - optee-examples - optee-test - optee-spdevkit diff --git a/ci/tc0.yml b/ci/tc0.yml index dd94d874..b2f75d55 100644 --- a/ci/tc0.yml +++ b/ci/tc0.yml @@ -7,4 +7,3 @@ machine: tc0 target: - tc-artifacts-image - - perf diff --git a/ci/tc1.yml b/ci/tc1.yml index 987e5248..fd9acbd2 100644 --- a/ci/tc1.yml +++ b/ci/tc1.yml @@ -7,4 +7,3 @@ machine: tc1 target: - tc-artifacts-image - - perf
Instead of adding perf to the target: list, add it to CORE_IMAGE_EXTRA_INSTALL. This means that machine configurations which need to change the target don't need to also build perf explicitly. Signed-off-by: Ross Burton <ross.burton@arm.com> --- ci/base.yml | 4 ++-- ci/gem5-arm64.yml | 1 - ci/qemu-generic-arm64.yml | 1 - ci/qemuarm64-secureboot.yml | 1 - ci/tc0.yml | 1 - ci/tc1.yml | 1 - 6 files changed, 2 insertions(+), 7 deletions(-)