[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2423-gb8cc4c9
Brought to you by:
sszy
|
From: Gwenhael <gwe...@us...> - 2011-07-27 17:15:11
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b8cc4c9250c03c6ec7a0ff7eea1c53f29fd88112 (commit)
from 947357b0be407ffeae9abe5d2d8acf7b788e9850 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b8cc4c9250c03c6ec7a0ff7eea1c53f29fd88112
Author: gwenhael <gw...@tr...>
Date: Wed Jul 27 19:04:49 2011 +0200
[BUILDROOT] Update Xenomai version and adds patch to compile again
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2010.11/072-xenomai-package.patch | 82 ++++++++++++++------
1 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/patches/buildroot/2010.11/072-xenomai-package.patch b/patches/buildroot/2010.11/072-xenomai-package.patch
index 4e78bd1..d1ec084 100644
--- a/patches/buildroot/2010.11/072-xenomai-package.patch
+++ b/patches/buildroot/2010.11/072-xenomai-package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-06-26 16:36:21.000000000 +0200
-+++ buildroot/package/Config.in 2011-06-26 16:42:59.000000000 +0200
-@@ -208,6 +208,7 @@
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -208,6 +208,7 @@ source "package/usb_modeswitch/Config.in
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
source "package/wipe/Config.in"
@@ -16,9 +16,9 @@ Index: buildroot/package/Config.in
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2011-06-26 16:36:21.000000000 +0200
-+++ buildroot/linux/linux.mk 2011-06-26 16:42:57.000000000 +0200
-@@ -117,6 +117,9 @@
+--- buildroot.orig/linux/linux.mk
++++ buildroot/linux/linux.mk
+@@ -117,6 +117,9 @@ ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
endif
@@ -30,8 +30,8 @@ Index: buildroot/linux/linux.mk
Index: buildroot/package/xenomai/Config.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/Config.in 2011-06-26 17:03:04.000000000 +0200
+--- /dev/null
++++ buildroot/package/xenomai/Config.in
@@ -0,0 +1,44 @@
+config BR2_PACKAGE_XENOMAI
+ bool "Xenomai"
@@ -79,9 +79,9 @@ Index: buildroot/package/xenomai/Config.in
+endif # BR2_PACKAGE_XENOMAI
Index: buildroot/package/xenomai/xenomai.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xenomai.mk 2011-06-26 17:02:00.000000000 +0200
-@@ -0,0 +1,119 @@
+--- /dev/null
++++ buildroot/package/xenomai/xenomai.mk
+@@ -0,0 +1,121 @@
+#############################################################
+#
+# xenomai :
@@ -100,7 +100,7 @@ Index: buildroot/package/xenomai/xenomai.mk
+KERNEL_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
+KERNEL_DIR:=$(BUILD_DIR)/linux-$(KERNEL_VERSION)
+
-+XENOMAI_VERSION:=2.4.8
++XENOMAI_VERSION:=2.5.2
+XENOMAI_SOURCE:=xenomai-$(XENOMAI_VERSION).tar.bz2
+XENOMAI_SITE:=http://download.gna.org/xenomai/stable
+XENOMAI_DIR:=$(BUILD_DIR)/xenomai-$(XENOMAI_VERSION)
@@ -150,6 +150,8 @@ Index: buildroot/package/xenomai/xenomai.mk
+ cat package/xenomai/xeno-kernel.config >> $(KERNEL_DIR)/.config
+ toolchain/patch-kernel.sh $(KERNEL_DIR) package/xenomai \
+ \*-after-adeos-\*.patch
++ toolchain/patch-kernel.sh $(XENOMAI_DIR) package/xenomai \
++ \*-xenomai-\*.patch
+ touch $@
+
+xenomai-patch-kernel: $(KERNEL_DIR)/.patched.xenomai
@@ -203,9 +205,9 @@ Index: buildroot/package/xenomai/xenomai.mk
+endif
Index: buildroot/package/xenomai/xeno-kernel.config
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xeno-kernel.config 2011-06-26 16:36:21.000000000 +0200
-@@ -0,0 +1,59 @@
+--- /dev/null
++++ buildroot/package/xenomai/xeno-kernel.config
+@@ -0,0 +1,69 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
+CONFIG_XENO_OPT_PERVASIVE=y
@@ -227,6 +229,8 @@ Index: buildroot/package/xenomai/xeno-kernel.config
+# CONFIG_XENO_OPT_TIMER_WHEEL is not set
+CONFIG_XENO_HW_FPU=y
+CONFIG_XENO_SKIN_NATIVE=y
++CONFIG_XENO_OPT_NATIVE_BUFFER=y
++# CONFIG_XENO_OPT_NOWARN_DEPRECATED is not set
+CONFIG_XENO_OPT_NATIVE_PERIOD=0
+CONFIG_XENO_OPT_NATIVE_PIPE=y
+CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ=1024
@@ -244,7 +248,12 @@ Index: buildroot/package/xenomai/xeno-kernel.config
+# CONFIG_XENO_OPT_POSIX_SHM is not set
+# CONFIG_XENO_OPT_POSIX_INTR is not set
+# CONFIG_XENO_OPT_POSIX_SELECT is not set
++# CONFIG_XENO_OPT_SCHED_CLASSES is not set
++CONFIG_XENO_OPT_SEM_HEAPSZ=12
++CONFIG_XENO_OPT_GLOBAL_SEM_HEAPSZ=12
+# CONFIG_XENO_OPT_DEBUG_POSIX is not set
++CONFIG_XENO_OPT_TIMING_VIRTICK=1000
++CONFIG_XENO_HW_UNLOCKED_SWITCH=y
+# CONFIG_XENO_SKIN_PSOS is not set
+# CONFIG_XENO_SKIN_UITRON is not set
+# CONFIG_XENO_SKIN_VRTX is not set
@@ -255,9 +264,12 @@ Index: buildroot/package/xenomai/xeno-kernel.config
+CONFIG_XENO_OPT_RTDM_FILDES=128
+CONFIG_XENO_OPT_RTDM_SELECT=y
+# CONFIG_XENO_DRIVERS_16550A is not set
++# CONFIG_XENO_DRIVERS_ANALOGY is not set
++# CONFIG_XENO_DRIVERS_RTIPC is not set
+CONFIG_XENO_DRIVERS_TIMERBENCH=m
+CONFIG_XENO_DRIVERS_KLATENCY=m
+CONFIG_XENO_DRIVERS_IRQBENCH=m
++# CONFIG_XENO_DRIVERS_SIGTEST is not set
+CONFIG_XENO_DRIVERS_SWITCHTEST=m
+# CONFIG_XENO_DRIVERS_CAN is not set
+# CONFIG_ARM_FCSE is not set
@@ -265,11 +277,10 @@ Index: buildroot/package/xenomai/xeno-kernel.config
+CONFIG_IPIPE_DOMAINS=4
+CONFIG_IPIPE_COMPAT=y
+# CONFIG_IPIPE_DEBUG is not set
-\ No newline at end of file
Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2011-06-26 16:36:21.000000000 +0200
+--- /dev/null
++++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imxfb.h
++++ b/arch/arm/mach-imx/include/mach/imxfb.h
@@ -283,8 +294,8 @@ Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.pat
+ #define PCR_LPPOL (1 << 22)
Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2011-06-26 16:36:21.000000000 +0200
+--- /dev/null
++++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
@@ -0,0 +1,23 @@
+Corrects Freeze problem with MX2 when Adeos is active and
+application/driver uses interruption on GPIO
@@ -309,10 +320,33 @@ Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_wit
+
+ gpio_irq_no = port[i].virtual_irq_start;
+
+Index: buildroot/package/xenomai/02-xenomai-makes_cond_torture_test_compiles_again.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/xenomai/02-xenomai-makes_cond_torture_test_compiles_again.patch
+@@ -0,0 +1,18 @@
++--- a/src/testsuite/unit/cond-torture.c
+++++ b/src/testsuite/unit/cond-torture.c
++@@ -47,13 +47,13 @@
++
++ pthread_mutexattr_init(&mattr);
++ pthread_mutexattr_settype(&mattr, type);
++- if (pi != 0)
+++ if (pi != 0){
++ #ifdef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
++ pthread_mutexattr_setprotocol(&mattr, PTHREAD_PRIO_INHERIT);
++
++ err = pthread_mutex_init(mutex, &mattr);
++ #else
++- else {
+++ } else {
++ err = ENOSYS;
++ goto out;
++ }
Index: buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-26 16:36:21.000000000 +0200
+--- /dev/null
++++ buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch
@@ -0,0 +1,21 @@
+Spinlocks are not implemented in uClibc when using old pthread API.
+Xenomai (clock_test) uses this flag to enable or not spinlocking and so, if
@@ -337,8 +371,8 @@ Index: buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_wit
+ #define _POSIX_SPAWN 200112L
Index: buildroot/toolchain/uClibc/uClibc-0.9.30.3-spin_locks_are_not_supported_with_old_pthread_api.patch
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.30.3-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-26 16:36:21.000000000 +0200
+--- /dev/null
++++ buildroot/toolchain/uClibc/uClibc-0.9.30.3-spin_locks_are_not_supported_with_old_pthread_api.patch
@@ -0,0 +1,22 @@
+Spinlocks are not implemented in uClibc when using old pthread API.
+Xenomai (clock_test) uses this flag to enable or not spinlocking and so, if
hooks/post-receive
--
armadeus
|