[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-240-gad208d0
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2011-06-24 17:20:28
|
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 ad208d0a1713b36a426249c7db43a723d017af61 (commit)
from 0e5cda998ed6ee39869f9cc69448f6dd85ae4dd6 (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 ad208d0a1713b36a426249c7db43a723d017af61
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 24 19:19:47 2011 +0200
[BUILDROOT] Xenomai: add spin_lock patch for uClibc 0.9.30 too
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2010.11/072-xenomai-package.patch | 58 +++++++++++++++-----
patches/buildroot/2010.11/cleanup_buildroot.sh | 2 +-
2 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/patches/buildroot/2010.11/072-xenomai-package.patch b/patches/buildroot/2010.11/072-xenomai-package.patch
index 80941a4..ad0c34e 100644
--- a/patches/buildroot/2010.11/072-xenomai-package.patch
+++ b/patches/buildroot/2010.11/072-xenomai-package.patch
@@ -5,7 +5,7 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2011-06-24 13:50:40.000000000 +0200
-+++ buildroot/package/Config.in 2011-06-24 14:02:24.000000000 +0200
++++ buildroot/package/Config.in 2011-06-24 17:18:40.000000000 +0200
@@ -208,6 +208,7 @@
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/linux/linux.mk
===================================================================
--- buildroot.orig/linux/linux.mk 2011-06-24 13:50:40.000000000 +0200
-+++ buildroot/linux/linux.mk 2011-06-24 14:02:21.000000000 +0200
++++ buildroot/linux/linux.mk 2011-06-24 17:18:30.000000000 +0200
@@ -117,6 +117,9 @@
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
@@ -253,28 +253,56 @@ Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_wit
+
+ gpio_irq_no = port[i].virtual_irq_start;
+
-Index: buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
+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-fix-spin_locks.patch 2011-06-24 14:06:22.000000000 +0200
-@@ -0,0 +1,20 @@
-+Spinlocks are still not yet implemented in uClibc for ARM targets.
-+However, Xenomai-2.4.3 use this flags to enable or not spinlocking.
-+If _POSIX_SPIN_LOCKS is set, Xenomai will fail to compile. So comment it.
++++ buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-24 18:00:05.000000000 +0200
+@@ -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
++_POSIX_SPIN_LOCKS is set, but not implemented, then Xenomai will fail to build.
++
++To check: is LINUXTHREADS_NEW the right #ifdef ?
+
+diff -purN uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h
+--- uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:25:03.000000000 +0200
++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:39:38.000000000 +0200
-+@@ -124,8 +124,11 @@
++@@ -124,8 +124,10 @@
+ /* We support the Timeouts option. */
+ #define _POSIX_TIMEOUTS 200112L
+
-++/* Armadeus patch for Xenomai-2.4.3: Spinlocks are still not yet implemented
-++ * in uClibc for ARM targets.
-++ */
-+ /* We support spinlocks. */
-+-#define _POSIX_SPIN_LOCKS 200112L
-++/* #define _POSIX_SPIN_LOCKS 200112L */
++-/* We support spinlocks. */
+++/* We support spinlocks when using new pthread API. */
+++#ifdef LINUXTHREADS_NEW
++ #define _POSIX_SPIN_LOCKS 200112L
+++#endif
+
+ /* The `spawn' function family is supported. */
+ #define _POSIX_SPAWN 200112L
+Index: buildroot/toolchain/uClibc/uClibc-0.9.30-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-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-24 18:03:39.000000000 +0200
+@@ -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
++_POSIX_SPIN_LOCKS is set, but not implemented, then Xenomai will fail to build.
++
++To check: is LINUXTHREADS_NEW the right #ifdef ?
++
++Index: uClibc-0.9.30.3/libc/sysdeps/linux/common/bits/posix_opt.h
++===================================================================
++--- uClibc-0.9.30.3.orig/libc/sysdeps/linux/common/bits/posix_opt.h 2011-06-24 17:50:34.000000000 +0200
+++++ uClibc-0.9.30.3/libc/sysdeps/linux/common/bits/posix_opt.h 2011-06-24 17:52:30.000000000 +0200
++@@ -124,8 +124,10 @@
++ /* We support the Timeouts option. */
++ #define _POSIX_TIMEOUTS 200112L
++
++-/* We support spinlocks. */
+++/* We support spinlocks when using new pthread API. */
+++#ifdef LINUXTHREADS_NEW
++ #define _POSIX_SPIN_LOCKS 200112L
+++#endif
++
++ /* The `spawn' function family is supported. */
++ #if 0 /* no support in uClibc (yet) */
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index d7d6d26..0f6c8c7 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -53,4 +53,4 @@ rm -rf buildroot/package/portmap/
rm -rf buildroot/package/bluez3/
rm -rf buildroot/package/ngircd/
rm -rf buildroot/package/can-utils/
-
+rm -f buildroot/toolchain/uClibc/*.patch
hooks/post-receive
--
armadeus
|