mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/xenomai: move the version setting to Kconfig

Browse Source 
The xenomai version is decided in Kconfig, but the default value is
set in the .mk. This is unlike the other packages that have a version
choice (like linux, uboot...).

Move the value into Config.in.

This paves the way to using other custom sources, like from a git tree.

Note however that any existing configuration will need to be adapted to
the new settings. Adding legacy handling is non-trivial, so manual
intervention will be required.

Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
cc: Romain Naour <romain.naour@gmail.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Yann E. MORIN
2020-01-14 21:55:19 +01:00
committed by Thomas Petazzoni
parent ca72d6b2a0
commit 0f5bab043a
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
package/xenomai/Config.in
View File

@@ -41,17 +41,25 @@ config BR2_PACKAGE_XENOMAI
if BR2_PACKAGE_XENOMAI if BR2_PACKAGE_XENOMAI
config BR2_PACKAGE_XENOMAI_VERSION choice
string "Custom Xenomai version" bool "Xenomai version"
help help
Manually select Xenomai version. If left empty, the default
version will be used.
Make sure that the selected version has a patch for your Make sure that the selected version has a patch for your
selected Linux kernel. If it does not, download and select selected Linux kernel. If it does not, download and select a
a patch manually with patch manually with BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH,
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux in the Linux Kernel -> Linux Kernel Extensions menu.
Kernel -> Linux Kernel Extensions menu.
config BR2_PACKAGE_XENOMAI_LATEST_VERSION
bool "Latest version (3.0.10)"
config BR2_PACKAGE_XENOMAI_CUSTOM_VERSION
bool "Custom version"
endchoice
config BR2_PACKAGE_XENOMAI_VERSION
string "Custom Xenomai version" if !BR2_PACKAGE_XENOMAI_LATEST_VERSION
default "3.0.10" if BR2_PACKAGE_XENOMAI_LATEST_VERSION
choice choice
prompt "Xenomai core" prompt "Xenomai core"

10
package/xenomai/xenomai.mk
View File

@@ -5,14 +5,14 @@
################################################################################ ################################################################################
XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
ifeq ($(XENOMAI_VERSION),) XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
XENOMAI_VERSION = 3.0.10 XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
else
# Exclude all from the hash check, but the latest version.
ifeq ($(BR2_PACKAGE_XENOMAI)$(BR2_PACKAGE_XENOMAI_LATEST_VERSION),y)
BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
endif endif
XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPL-2.1+ (libraries), GPL-2.0+ (kernel), GFDL-1.2+ (docs), GPL-2.0 (ipipe patch, can driver) XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPL-2.1+ (libraries), GPL-2.0+ (kernel), GFDL-1.2+ (docs), GPL-2.0 (ipipe patch, can driver)
# GFDL is not included but refers to gnu.org # GFDL is not included but refers to gnu.org
XENOMAI_LICENSE_FILES = debian/copyright include/COPYING kernel/cobalt/COPYING \ XENOMAI_LICENSE_FILES = debian/copyright include/COPYING kernel/cobalt/COPYING \