From ed4238487c81b3580e83c257b50745a832a6e717 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 12 Aug 2022 08:11:00 +0100 Subject: [PATCH] testexport: Fix to work as an image class The class is mainly an image based class but one recipe does need to look at values shared with the class and isn't an image. Move this to a conf file instead, avoiding the need to pollute all recipes globally. Signed-off-by: Richard Purdie --- meta/classes/testexport.bbclass | 5 ++--- meta/conf/testexport.conf | 3 +++ meta/recipes-core/meta/testexport-tarball.bb | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 meta/conf/testexport.conf diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass index 1b0fb44a4a8..b503c8d3578 100644 --- a/meta/classes/testexport.bbclass +++ b/meta/classes/testexport.bbclass @@ -23,10 +23,9 @@ TEST_TARGET ?= "simpleremote" TEST_TARGET_IP ?= "" TEST_SERVER_IP ?= "" -TEST_EXPORT_SDK_PACKAGES ?= "" +require conf/testexport.conf + TEST_EXPORT_SDK_ENABLED ?= "0" -TEST_EXPORT_SDK_NAME ?= "testexport-tools-nativesdk" -TEST_EXPORT_SDK_DIR ?= "sdk" TEST_EXPORT_DEPENDS = "" TEST_EXPORT_DEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'cpio-native:do_populate_sysroot', '', d)}" diff --git a/meta/conf/testexport.conf b/meta/conf/testexport.conf new file mode 100644 index 00000000000..8880f108fb6 --- /dev/null +++ b/meta/conf/testexport.conf @@ -0,0 +1,3 @@ +TEST_EXPORT_SDK_PACKAGES ?= "" +TEST_EXPORT_SDK_DIR ?= "sdk" +TEST_EXPORT_SDK_NAME ?= "testexport-tools-nativesdk" diff --git a/meta/recipes-core/meta/testexport-tarball.bb b/meta/recipes-core/meta/testexport-tarball.bb index bb9f8ded48c..abdd0092528 100644 --- a/meta/recipes-core/meta/testexport-tarball.bb +++ b/meta/recipes-core/meta/testexport-tarball.bb @@ -4,7 +4,7 @@ DESCRIPTION = "SDK type target for standalone tarball containing packages define SUMMARY = "Standalone tarball for test systems with missing software" LICENSE = "MIT" -TEST_EXPORT_SDK_PACKAGES ??= "" +require conf/testexport.conf TOOLCHAIN_TARGET_TASK ?= "" -- 2.47.3