From a92b74c20cfd21830814ec7010144dabab86a0d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Wed, 29 Jan 2025 13:54:10 +0100 Subject: [PATCH] package/optee-test: add option to use same version as optee-os MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can select a custom official version for the optee-os package; add an option to select the same version for optee-test, to easily keep them synchronized. Break one unrelated long line in the mean time to keep formatting harmonious. Signed-off-by: Vincent Stehlé Cc: Étienne Carrière Signed-off-by: Julien Olivain --- package/optee-test/Config.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in index a29eb355ac..03b532e338 100644 --- a/package/optee-test/Config.in +++ b/package/optee-test/Config.in @@ -36,10 +36,17 @@ if BR2_PACKAGE_OPTEE_TEST choice prompt "optee-test version" - default BR2_PACKAGE_OPTEE_TEST_LATEST if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS + default BR2_PACKAGE_OPTEE_TEST_AS_OS \ + if BR2_TARGET_OPTEE_OS_CUSTOM_VERSION + default BR2_PACKAGE_OPTEE_TEST_LATEST \ + if BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS help Select the version of optee-test you want to use +config BR2_PACKAGE_OPTEE_TEST_AS_OS + bool "Same as optee-os being built" + depends on BR2_TARGET_OPTEE_OS_CUSTOM_VERSION + config BR2_PACKAGE_OPTEE_TEST_LATEST bool "4.3.0" help @@ -68,6 +75,8 @@ endif config BR2_PACKAGE_OPTEE_TEST_VERSION string + default BR2_TARGET_OPTEE_OS_CUSTOM_VERSION_VALUE \ + if BR2_PACKAGE_OPTEE_TEST_AS_OS default "4.3.0" if BR2_PACKAGE_OPTEE_TEST_LATEST default "custom" if BR2_PACKAGE_OPTEE_TEST_CUSTOM_TARBALL