rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
bsp/buildroot/package/xenomai/0001-bfin-remove-inline-keyword.patch
View File

@@ -1,62 +0,0 @@
From 2a96c8bbe19a193d9ae6d0780fc274abc4df03e3 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Sat, 5 Nov 2016 19:09:00 +0100
Subject: [PATCH] bfin: remove inline keyword
Xenomai user space tools fail to build for bfin target since it's
provide it's own pthread_atfork(), shm_open() and shm_unlink()
definition using the inline keyword and weak attribute.
With gcc 5+ the weak attribute is discarded by the inline keyword,
so each symbol are global and are redefined several time while
linking.
Fixes:
http://autobuild.buildroot.net/results/0c2/0c2e5eb4edd4f9427f61d3c9b67a12a7a0e24140
Patch status: upstream,
https://git.xenomai.org/xenomai-2.6.git/commit/?id=917dcebb26ec492f276cdc3b55867aa90e01fa12
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
include/asm-blackfin/syscall.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/asm-blackfin/syscall.h b/include/asm-blackfin/syscall.h
index 9eda8b9..b5728b5 100644
--- a/include/asm-blackfin/syscall.h
+++ b/include/asm-blackfin/syscall.h
@@ -132,9 +132,9 @@ static inline int __xn_interrupted_p(struct pt_regs *regs)
#define XENOMAI_SKINCALL5(id,op,a1,a2,a3,a4,a5) XENOMAI_DO_SYSCALL(5,id,op,a1,a2,a3,a4,a5)
/* uClibc does not provide pthread_atfork() for this arch; provide it
- here. Note: let the compiler decides whether it wants to actually
- inline this routine, i.e. do not force always_inline. */
-inline __attribute__((weak)) int pthread_atfork(void (*prepare)(void),
+ here.
+*/
+__attribute__((weak)) int pthread_atfork(void (*prepare)(void),
void (*parent)(void),
void (*child)(void))
{
@@ -143,7 +143,7 @@ inline __attribute__((weak)) int pthread_atfork(void (*prepare)(void),
#include <errno.h>
-inline __attribute__((weak)) int shm_open(const char *name,
+__attribute__((weak)) int shm_open(const char *name,
int oflag,
mode_t mode)
{
@@ -151,7 +151,7 @@ inline __attribute__((weak)) int shm_open(const char *name,
return -1;
}
-inline __attribute__((weak)) int shm_unlink(const char *name)
+__attribute__((weak)) int shm_unlink(const char *name)
{
errno = ENOSYS;
return -1;
--
2.5.5

117
bsp/buildroot/package/xenomai/Config.in
View File

@@ -2,7 +2,7 @@ config BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS
bool
default y
depends on BR2_i386 || BR2_x86_64 || (BR2_arm && !BR2_ARM_CPU_ARMV7M) || \
BR2_bfin || BR2_powerpc || BR2_sh4
BR2_bfin || BR2_powerpc
comment "xenomai needs an glibc or uClibc toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL
@@ -51,6 +51,81 @@ config BR2_PACKAGE_XENOMAI_VERSION
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux
Kernel -> Linux Kernel Extensions menu.
choice
prompt "Xenomai core"
default BR2_PACKAGE_XENOMAI_MERCURY
help
Select the Xenomai core: dual kernel (Cobalt)
or native Linux Kernel (Mercury).
config BR2_PACKAGE_XENOMAI_MERCURY
bool "Mercury"
depends on !BR2_LINUX_KERNEL_EXT_XENOMAI
help
Select Mercury core for the Xenomai userspace.
You want to use it if you have the native Linux Kernel.
config BR2_PACKAGE_XENOMAI_COBALT
bool "Cobalt"
help
Select Cobalt core (dual kernel) for the Xenomai
userspace. Use this if you use a Xenomai-patched
Linux kernel.
If you want to use Cobalt core, your kernel must have
the Adeos and Xenomai patches applied to it. You can
add these through the BR2_LINUX_KERNEL_EXT_XENOMAI option
in the Linux Kernel Extensions menu.
endchoice
config BR2_PACKAGE_XENOMAI_ENABLE_SMP
bool "Enable SMP support"
default y
help
This option enables SMP support in Xenomai userspace.
If this option is turned on while no SMP support is enabled
in the kernel, things will still work. However, if SMP is
enabled in the kernel but this option is not turned on,
Xenomai applications will complain with:
feature mismatch: missing="smp/nosmp"
Please refer to this troubleshooting guide for more
information:
http://xenomai.org/troubleshooting-a-dual-kernel-configuration/#feature_mismatch_missing8221smpnosmp8221
config BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY
bool "Enable registry"
depends on !BR2_STATIC_LIBS # libfuse
depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
depends on BR2_USE_MMU # libfuse
select BR2_PACKAGE_LIBFUSE
help
Xenomai APIs can export their internal state through a
pseudo-filesystem, whose files may be read to obtain
information about the existing real-time objects, such as
tasks, semaphores, message queues and so on.
comment "registry needs a toolchain w/ threads, dynamic library"
depends on BR2_USE_MMU
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY_PATH
string "Custom registry root path"
depends on BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY
help
Specify the root path of the registry here.
To use the Xenomai default (currently: /var/run/xenomai),
leave this option empty.
config BR2_PACKAGE_XENOMAI_ADDITIONAL_CONF_OPTS
string "Additional configure options"
help
Specify any additional options to pass to the configure
script here. See Xenomai documentation for details.
config BR2_PACKAGE_XENOMAI_TESTSUITE
bool "Install testsuite"
help
@@ -67,41 +142,51 @@ config BR2_PACKAGE_XENOMAI_ANALOGY
This option allows to install the Xenomai Analogy utilities
and libraries
menu "Skin selection"
config BR2_PACKAGE_XENOMAI_NATIVE_SKIN
bool "Native skin library"
bool "Alchemy (native) skin"
default y
help
This option allows to install the Native Xenomai skin
This option allows to install the Alchemy Xenomai skin,
previously called 'native'
config BR2_PACKAGE_XENOMAI_POSIX_SKIN
bool "POSIX skin library"
bool "POSIX skin"
default y
help
This option allows to install the POSIX Xenomai skin
config BR2_PACKAGE_XENOMAI_VXWORKS_SKIN
bool "VX-Works skin library"
help
This option allows to install the VX-Works Xenomai skin
config BR2_PACKAGE_XENOMAI_PSOS_SKIN
bool "PSOS skin library"
bool "pSOS skin"
help
This option allows to install the PSOS Xenomai skin
This option allows to install the pSOS Xenomai skin
config BR2_PACKAGE_XENOMAI_RTAI_SKIN
bool "RTAI skin library"
bool "RTAI skin"
help
This option allows to install the RTAI Xenomai skin
config BR2_PACKAGE_XENOMAI_UITRON_SKIN
bool "uiTron skin library"
config BR2_PACKAGE_XENOMAI_SMOKEY_SKIN
bool "Smokey skin"
help
This option allows to install the uiTron Xenomai skin
This option allows to install the Smokey Xenomai skin
config BR2_PACKAGE_XENOMAI_UITRON_SKIN
bool "uITRON skin"
help
This option allows to install the uITRON Xenomai skin
config BR2_PACKAGE_XENOMAI_VRTX_SKIN
bool "VRTX skin library"
bool "VRTX skin"
help
This option allows to install the VRTX Xenomai skin
config BR2_PACKAGE_XENOMAI_VXWORKS_SKIN
bool "VxWorks skin"
help
This option allows to install the VxWorks Xenomai skin
endmenu
endif

2
bsp/buildroot/package/xenomai/xenomai.hash
View File

@@ -1,2 +1,2 @@
# Locally computed;
sha256 b6ff723cb0f3b1c2c4e15bccfd114b248dea1b4164a0ac0e612815379ce7caf8 xenomai-2.6.4.tar.bz2
sha256 2c0dd3f0e36e4a10f97e0028989bb873e80f4d1ce212ac55fd3b28857c464f94 xenomai-3.0.6.tar.bz2

88
bsp/buildroot/package/xenomai/xenomai.mk
View File

@@ -6,16 +6,26 @@
XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
ifeq ($(XENOMAI_VERSION),)
XENOMAI_VERSION = 2.6.4
XENOMAI_VERSION = 3.0.6
else
BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
endif
XENOMAI_SITE = https://xenomai.org/downloads/xenomai/stable
XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
XENOMAI_LICENSE = GPLv2+ with exception (headers), LGPLv2.1+ (libraries), GPLv2+ (kernel), GFDLv1.2+ (docs), GPLv2 (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
XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYING ksrc/nucleus/COPYING
XENOMAI_LICENSE_FILES = debian/copyright include/COPYING kernel/cobalt/COPYING \
kernel/cobalt/posix/COPYING kernel/cobalt/rtdm/COPYING \
lib/alchemy/COPYING lib/analogy/COPYING \
lib/boilerplate/iniparser/LICENSE lib/boilerplate/COPYING \
lib/cobalt/COPYING lib/copperplate/COPYING lib/psos/COPYING \
lib/smokey/COPYING lib/trank/COPYING lib/vxworks/COPYING
XENOMAI_DEPENDENCIES = host-pkgconf
# 0002-boilerplate-build-obstack-support-conditionally.patch
XENOMAI_AUTORECONF = YES
XENOMAI_INSTALL_STAGING = YES
XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user
@@ -23,24 +33,54 @@ XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ --disable-doc-install
define XENOMAI_REMOVE_DEVFILES
for i in xeno-config xeno-info wrap-link.sh ; do \
ifeq ($(BR2_PACKAGE_XENOMAI_MERCURY),y)
XENOMAI_CONF_OPTS += --with-core=mercury
else
XENOMAI_CONF_OPTS += --with-core=cobalt
endif
ifeq ($(BR2_PACKAGE_XENOMAI_ENABLE_SMP),y)
XENOMAI_CONF_OPTS += --enable-smp
else
XENOMAI_CONF_OPTS += --disable-smp
endif
ifeq ($(BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY),y)
XENOMAI_DEPENDENCIES += libfuse
XENOMAI_REGISTRY_PATH = $(call qstrip,$(BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY_PATH))
ifeq ($(XENOMAI_REGISTRY_PATH),)
XENOMAI_CONF_OPTS += --enable-registry
else
XENOMAI_CONF_OPTS += --enable-registry=$(XENOMAI_REGISTRY_PATH)
endif
else
XENOMAI_CONF_OPTS += --disable-registry
endif
XENOMAI_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_XENOMAI_ADDITIONAL_CONF_OPTS))
# Some of these files may be desired by some users -- at that point specific
# config options need to be added to keep a particular set.
define XENOMAI_REMOVE_UNNEEDED_FILES
for i in xeno xeno-config xeno-info wrap-link.sh ; do \
rm -f $(TARGET_DIR)/usr/bin/$$i ; \
done
for i in autotune corectl hdb rtnet nomaccfg rtcfg rtifconfig \
rtiwconfig rtping rtroute tdmacfg rtps slackspot version; do \
rm -f $(TARGET_DIR)/usr/sbin/$$i ; \
done
endef
XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_DEVFILES
XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UNNEEDED_FILES
ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),)
define XENOMAI_REMOVE_TESTSUITE
rm -rf $(TARGET_DIR)/usr/share/xenomai/
for i in klatency rtdm xeno xeno-load check-vdso \
irqloop cond-torture-posix switchtest arith \
sigtest clocktest cyclictest latency wakeup-time \
xeno-test cond-torture-native mutex-torture-posix \
mutex-torture-native ; do \
for i in clocktest gpiotest latency spitest switchtest \
xeno-test-run-wrapper dohell xeno-test-run xeno-test ; do \
rm -f $(TARGET_DIR)/usr/bin/$$i ; \
done
rm -rf $(TARGET_DIR)/usr/demo/
endef
XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_TESTSUITE
@@ -59,23 +99,26 @@ endif
ifeq ($(BR2_PACKAGE_XENOMAI_ANALOGY),)
define XENOMAI_REMOVE_ANALOGY
for i in cmd_bits cmd_read cmd_write insn_write \
insn_bits insn_read ; do \
for i in cmd_read cmd_write cmd_bits insn_read insn_write insn_bits \
wf_generate ; do \
rm -f $(TARGET_DIR)/usr/bin/$$i ; \
done
rm -f $(TARGET_DIR)/usr/sbin/analogy_config
for i in analogy_config analogy_calibrate ; do \
rm -f $(TARGET_DIR)/usr/sbin/$$i ; \
done
rm -f $(TARGET_DIR)/usr/lib/libanalogy.*
endef
XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_ANALOGY
endif
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,native)
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,alchemy)
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix)
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks)
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos)
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_RTAI_SKIN),,rtai)
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_SMOKEY_SKIN),,smokey)
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_UITRON_SKIN),,uitron)
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks)
XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx)
define XENOMAI_REMOVE_SKINS
@@ -84,15 +127,18 @@ define XENOMAI_REMOVE_SKINS
if [ $$i == "posix" ] ; then \
rm -f $(TARGET_DIR)/usr/lib/posix.wrappers ; \
fi ; \
if [ $$i == "smokey" ] ; then \
rm -f $(TARGET_DIR)/usr/bin/smokey* ; \
fi ; \
done
endef
XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_SKINS
define XENOMAI_DEVICES
/dev/rtheap c 666 0 0 10 254 0 0 -
/dev/rtscope c 666 0 0 10 253 0 0 -
/dev/rtp c 666 0 0 150 0 0 1 32
/dev/rtheap c 666 0 0 10 254 0 0 -
/dev/rtscope c 666 0 0 10 253 0 0 -
/dev/rtp c 666 0 0 150 0 0 1 32
endef
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
@@ -100,7 +146,7 @@ XENOMAI_DEPENDENCIES += udev
define XENOMAI_INSTALL_UDEV_RULES
if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \
for f in $(@D)/ksrc/nucleus/udev/*.rules ; do \
for f in $(@D)/kernel/cobalt/udev/*.rules ; do \
cp $$f $(TARGET_DIR)/etc/udev/rules.d/ || exit 1 ; \
done ; \
fi;