From e4040d0d8e1d3d3b77de582b8354eca641a0613d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 9 Aug 2022 16:31:25 +0200 Subject: [PATCH] package/xenomai: rework custom handling - Drop default value of BR2_PACKAGE_XENOMAI_REPOSITORY - Add BR2_PACKAGE_XENOMAI_{CUSTOM_VERSION_VALUE,REPOSITORY_VERSION} to mimick what is done by other packages (e.g. barebox, u-boot) Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/xenomai/Config.in | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in index ec6d9e5d29..269b85b5ce 100644 --- a/package/xenomai/Config.in +++ b/package/xenomai/Config.in @@ -64,17 +64,29 @@ config BR2_PACKAGE_XENOMAI_CUSTOM_GIT endchoice +config BR2_PACKAGE_XENOMAI_CUSTOM_VERSION_VALUE + string "Xenomai version" + depends on BR2_PACKAGE_XENOMAI_CUSTOM_VERSION + config BR2_PACKAGE_XENOMAI_REPOSITORY string "URL of custom repository" - default "https://gitlab.denx.de/Xenomai/xenomai.git" depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT +config BR2_PACKAGE_XENOMAI_REPOSITORY_VERSION + string "Custom repository version" + depends on BR2_PACKAGE_XENOMAI_CUSTOM_GIT + help + Revision to use in the typical format used by Git, i.e a + SHA1 or a tag. + config BR2_PACKAGE_XENOMAI_VERSION - string "Custom Xenomai version" if \ - !BR2_PACKAGE_XENOMAI_LATEST_VERSION && \ - !BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL + string default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION + default BR2_PACKAGE_XENOMAI_CUSTOM_VERSION_VALUE \ + if BR2_PACKAGE_XENOMAI_CUSTOM_VERSION default "custom" if BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL + default BR2_PACKAGE_XENOMAI_REPOSITORY_VERSION \ + if BR2_PACKAGE_XENOMAI_CUSTOM_GIT config BR2_PACKAGE_XENOMAI_CUSTOM_TARBALL_URL string "URL of custom tarball"