From e695d0ee252e29ba3aa129012b26bfac91d223f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Herrera=20Arcila?= Date: Mon, 21 Nov 2022 10:43:51 -0500 Subject: [PATCH] atp: fix machine overrides in recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ensure meta-atp recipes are only performed if a compatible machine is selected. Signed-off-by: Adrián Herrera Arcila Signed-off-by: Jon Mason --- meta-atp/recipes-devtools/gem5/gem5-aarch64-dtb.bbappend | 8 +++++--- meta-atp/recipes-kernel/atp/atp-module_3.1.bb | 1 + meta-atp/recipes-kernel/atp/atp-test_3.1.bb | 1 + meta-atp/recipes-kernel/atp/atp-uapi_3.1.bb | 1 + meta-atp/recipes-kernel/linux/linux-yocto_%.bbappend | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/meta-atp/recipes-devtools/gem5/gem5-aarch64-dtb.bbappend b/meta-atp/recipes-devtools/gem5/gem5-aarch64-dtb.bbappend index 2b55b892..c96f2cdc 100644 --- a/meta-atp/recipes-devtools/gem5/gem5-aarch64-dtb.bbappend +++ b/meta-atp/recipes-devtools/gem5/gem5-aarch64-dtb.bbappend @@ -1,3 +1,5 @@ -# Export datadir paths for baremetal_atp.py script -export GEM5_DATADIR = "${STAGING_DATADIR_NATIVE}/gem5" -export ATP_DATADIR = "${STAGING_DATADIR_NATIVE}/gem5" +do_compile:prepend:gem5-atp-arm64() { + # Export datadir paths for baremetal_atp.py script + export GEM5_DATADIR="${STAGING_DATADIR_NATIVE}/gem5" + export ATP_DATADIR="${STAGING_DATADIR_NATIVE}/gem5" +} diff --git a/meta-atp/recipes-kernel/atp/atp-module_3.1.bb b/meta-atp/recipes-kernel/atp/atp-module_3.1.bb index 0bf4949b..9b54e1c8 100644 --- a/meta-atp/recipes-kernel/atp/atp-module_3.1.bb +++ b/meta-atp/recipes-kernel/atp/atp-module_3.1.bb @@ -1,3 +1,4 @@ +COMPATIBLE_MACHINE = "gem5-atp-arm64" require recipes-devtools/atp/atp-source_3.1.inc inherit module diff --git a/meta-atp/recipes-kernel/atp/atp-test_3.1.bb b/meta-atp/recipes-kernel/atp/atp-test_3.1.bb index e98e13cd..3c88e08d 100644 --- a/meta-atp/recipes-kernel/atp/atp-test_3.1.bb +++ b/meta-atp/recipes-kernel/atp/atp-test_3.1.bb @@ -1,3 +1,4 @@ +COMPATIBLE_MACHINE = "gem5-atp-arm64" require recipes-devtools/atp/atp-source_3.1.inc SUMMARY = "End-to-end tests evaluating ATP kernel modules service correctness" diff --git a/meta-atp/recipes-kernel/atp/atp-uapi_3.1.bb b/meta-atp/recipes-kernel/atp/atp-uapi_3.1.bb index 140105f8..a8b14796 100644 --- a/meta-atp/recipes-kernel/atp/atp-uapi_3.1.bb +++ b/meta-atp/recipes-kernel/atp/atp-uapi_3.1.bb @@ -1,3 +1,4 @@ +COMPATIBLE_MACHINE = "gem5-atp-arm64" require recipes-devtools/atp/atp-source_3.1.inc SUMMARY = "User API for accessing services from ATP kernel modules" diff --git a/meta-atp/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-atp/recipes-kernel/linux/linux-yocto_%.bbappend index f59f8d44..8cb86a97 100644 --- a/meta-atp/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/meta-atp/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI += "file://no_ftrace.cfg file://smmuv3.cfg" +FILESEXTRAPATHS:prepend:gem5-atp-arm64 := "${THISDIR}/files:" +SRC_URI:append:gem5-atp-arm64 = " file://no_ftrace.cfg file://smmuv3.cfg"