[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-241-g76c7fa1
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-241-g76c7fa1
|
From: Julien B a. A. <ar...@us...> - 2011-06-26 19:07:10
|
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 76c7fa1f4ace790ac1ed973fe525166db4ddcd13 (commit)
from ad208d0a1713b36a426249c7db43a723d017af61 (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 76c7fa1f4ace790ac1ed973fe525166db4ddcd13
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jun 26 21:06:15 2011 +0200
[BUILDROOT] Makes Xenomai compiles again and improve Makefile a little
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2010.11/072-xenomai-package.patch | 124 ++++++++++++++------
1 files changed, 90 insertions(+), 34 deletions(-)
diff --git a/patches/buildroot/2010.11/072-xenomai-package.patch b/patches/buildroot/2010.11/072-xenomai-package.patch
index ad0c34e..4e78bd1 100644
--- a/patches/buildroot/2010.11/072-xenomai-package.patch
+++ b/patches/buildroot/2010.11/072-xenomai-package.patch
@@ -4,8 +4,8 @@ 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 17:18:40.000000000 +0200
+--- 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 @@
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
@@ -16,8 +16,8 @@ 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 17:18:30.000000000 +0200
+--- 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 @@
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
@@ -31,19 +31,57 @@ 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-24 13:50:40.000000000 +0200
-@@ -0,0 +1,6 @@
++++ buildroot/package/xenomai/Config.in 2011-06-26 17:03:04.000000000 +0200
+@@ -0,0 +1,44 @@
+config BR2_PACKAGE_XENOMAI
+ bool "Xenomai"
+ help
+ Real-Time Framework for Linux
+
+ http://xenomai.org
++
++if BR2_PACKAGE_XENOMAI
++
++if BR2_x86
++config BR2_PACKAGE_XENOMAI_SMP
++ bool "Enable SMP support"
++ help
++ Enable SMP support
++
++config BR2_PACKAGE_XENOMAI_SEP
++ bool "Enable x86 SEP instructions"
++ help
++ Enable x86 SEP instructions
++ You will also need NPTL
++endif #BR2_x86
++
++config BR2_PACKAGE_XENOMAI_MACH
++ string "Machine architecture"
++ default "generic"
++ depends on BR2_arm
++ help
++ Select for which machine we are compiling.
++ Possible choices are :
++ - at91rm9200
++ - at91sam926x
++ - generic
++ - imx
++ - imx21
++ - integrator
++ - ixp4xx
++ - mx2
++ - mx3
++ - pxa
++ - pxa3xx
++ - s3c2410
++ - sa1100
++
++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-24 13:50:40.000000000 +0200
-@@ -0,0 +1,101 @@
++++ buildroot/package/xenomai/xenomai.mk 2011-06-26 17:02:00.000000000 +0200
+@@ -0,0 +1,119 @@
+#############################################################
+#
+# xenomai :
@@ -62,8 +100,6 @@ Index: buildroot/package/xenomai/xenomai.mk
+KERNEL_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
+KERNEL_DIR:=$(BUILD_DIR)/linux-$(KERNEL_VERSION)
+
-+XENOMAI_ARCH:=$(shell echo $(BR2_ARCH))
-+
+XENOMAI_VERSION:=2.4.8
+XENOMAI_SOURCE:=xenomai-$(XENOMAI_VERSION).tar.bz2
+XENOMAI_SITE:=http://download.gna.org/xenomai/stable
@@ -71,26 +107,41 @@ Index: buildroot/package/xenomai/xenomai.mk
+XENOMAI_CAT:=bzcat
+XENOMAI_BINARY:=xeno-load
+XENOMAI_TARGET_BINARY:=usr/xenomai/bin/$(XENOMAI_BINARY)
++XENOMAI_ARCH:=$(shell echo $(BR2_ARCH))
++XENOMAI_CONF:=--host=$(XENOMAI_ARCH)-linux --datarootdir=/xenodoc
+
-+ifeq ($(BR2_CPU_NAME),"imx27")
-+ CPU_TYPE:=mx2
-+else
-+ifeq ($(BR2_CPU_NAME),"imxl")
-+ CPU_TYPE:=imx
++ifeq ($(BR2_arm),y)
++ XENOMAI_CONF +=--enable-arm-mach=$(shell echo $(BR2_PACKAGE_XENOMAI_MACH))
++ ifeq ($(BR2_ARM_EABI),y)
++ XENOMAI_CONF += --enable-$(XENOMAI_ARCH)-eabi=yes
++ else
++ XENOMAI_CONF += --enable-$(XENOMAI_ARCH)-eabi=no
++ endif
+endif
++
++ifeq ($(BR2_x86),y)
++ ifeq ($(BR2_PACKAGE_XENOMAI_SMP),y)
++ XENOMAI_CONF+=--enable-smp=yes
++ endif
++ ifeq ($(BR2_PACKAGE_XENOMAI_SEP),y)
++ XENOMAI_CONF+=--enable-x86-sep=yes
++ endif
+endif
+
+$(DL_DIR)/$(XENOMAI_SOURCE):
++ @$(call MESSAGE,"Downloading Xenomai")
+ $(call DOWNLOAD,$(XENOMAI_SITE),$(XENOMAI_SOURCE))
+
+xenomai-source: $(DL_DIR)/$(XENOMAI_SOURCE)
+
+$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
++ @$(call MESSAGE,"Extracting Xenomai")
+ $(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ touch $@
+
+$(KERNEL_DIR)/.patched.xenomai: $(XENOMAI_DIR)/.unpacked
-+ toolchain/patch-kernel.sh $(KERNEL_DIR) package/xenomai \
++ @$(call MESSAGE,"Patching/Preparing Linux for Xenomai")
++ toolchain/patch-kernel.sh $(KERNEL_DIR) package/xenomai \
+ \*-before-adeos-\*.patch
+ $(XENOMAI_DIR)/scripts/prepare-kernel.sh \
+ --linux=$(KERNEL_DIR) \
@@ -104,37 +155,42 @@ Index: buildroot/package/xenomai/xenomai.mk
+xenomai-patch-kernel: $(KERNEL_DIR)/.patched.xenomai
+
+$(XENOMAI_DIR)/.configured: $(KERNEL_DIR)/.patched.xenomai
++ @$(call MESSAGE,"Configuring Xenomai")
+ (cd $(XENOMAI_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
-+ ./configure \
-+ --enable-$(XENOMAI_ARCH)-mach=$(CPU_TYPE) \
-+ --enable-$(XENOMAI_ARCH)-eabi=$(if $(BR2_ARM_EABI),yes,no) \
-+ --host=$(XENOMAI_ARCH)-linux \
-+ --datarootdir=/xenodoc \
++ ./configure $(XENOMAI_CONF) \
+ )
+ touch $@
+
-+$(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY): $(XENOMAI_DIR)/.configured
++$(KERNEL_DIR)/.built.xenomai: $(XENOMAI_DIR)/.configured
++ $(MAKE) -C $(BASE_DIR)/.. linux26
++ touch $@
++
++$(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY): $(KERNEL_DIR)/.built.xenomai
++ @$(call MESSAGE,"Compiling Xenomai")
+ $(MAKE) -C $(XENOMAI_DIR) CC="$(TARGET_CC)" LD="$(TARGET_LD)"
+
+$(TARGET_DIR)/$(XENOMAI_TARGET_BINARY): $(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY)
-+ echo $@
-+ $(STAGING_DIR)/usr/bin/fakeroot $(MAKE) -C $(XENOMAI_DIR) \
-+ CC=$(TARGET_CC) LD=$(TARGET_LD) \
-+ DESTDIR=$(TARGET_DIR) install
++ @$(call MESSAGE,"Installing Xenomai")
++ # Use fakeroot to pretend to do 'make install' as root
++ $(HOST_DIR)/usr/bin/fakeroot $(MAKE) -C $(XENOMAI_DIR) \
++ CC="$(TARGET_CC)" LD="$(TARGET_LD)" \
++ DESTDIR="$(TARGET_DIR)" install
+ rm -rf $(TARGET_DIR)/xenodoc
+ echo "/usr/xenomai/lib" > $(TARGET_DIR)/etc/ld.so.conf
+ echo -e 'export PATH=/usr/xenomai/bin:$${PATH}' >> $(TARGET_DIR)/etc/profile
+
-+xenomai: uclibc host-fakeroot kernel-headers $(TARGET_DIR)/$(XENOMAI_TARGET_BINARY)
++xenomai: linux26 host-fakeroot kernel-headers $(TARGET_DIR)/$(XENOMAI_TARGET_BINARY)
+
+xenomai-clean:
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) uninstall
+ -$(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) clean
+
-+xenomai-dirclean: xenomai-clean
++xenomai-dirclean: linux26-dirclean
++ if [ -d "$(XENOMAI_DIR)" ]; then \
++ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) uninstall; fi
+ rm -rf $(XENOMAI_DIR)
+
+#############################################################
@@ -148,7 +204,7 @@ Index: buildroot/package/xenomai/xenomai.mk
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-24 13:50:40.000000000 +0200
++++ buildroot/package/xenomai/xeno-kernel.config 2011-06-26 16:36:21.000000000 +0200
@@ -0,0 +1,59 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
@@ -213,7 +269,7 @@ Index: buildroot/package/xenomai/xeno-kernel.config
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-24 13:50:40.000000000 +0200
++++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2011-06-26 16:36:21.000000000 +0200
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imxfb.h
++++ b/arch/arm/mach-imx/include/mach/imxfb.h
@@ -228,7 +284,7 @@ Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.pat
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-24 13:50:40.000000000 +0200
++++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2011-06-26 16:36:21.000000000 +0200
@@ -0,0 +1,23 @@
+Corrects Freeze problem with MX2 when Adeos is active and
+application/driver uses interruption on GPIO
@@ -256,7 +312,7 @@ Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_wit
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-24 18:00:05.000000000 +0200
++++ 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
@@ -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
@@ -279,10 +335,10 @@ Index: buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_wit
+
+ /* 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
+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-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-24 18:03:39.000000000 +0200
++++ 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
@@ -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
|
