[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-130-g6661738

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  666173862bf084490785d24e961614affbd08055 (commit)
       via  98d3290dd96c6b3dc802eeaee96bdb76ee22101c (commit)
       via  34721f31fe75a2ef0250e668e0466fefaef8188e (commit)
      from  cb430fef1029c454090d9342d8a5454334f2ba0d (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 666173862bf084490785d24e961614affbd08055
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Feb 19 10:02:27 2014 +0100

    [BUILDROOT] Add a config for Xenomai on APF9328

commit 98d3290dd96c6b3dc802eeaee96bdb76ee22101c
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Feb 19 09:59:43 2014 +0100

    [BUILDROOT] Xenomai 2.4/2.5: make it compile again on APF9328

commit 34721f31fe75a2ef0250e668e0466fefaef8188e
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Feb 19 09:57:35 2014 +0100

    [BUILDROOT] Busybox 1.21: Add ash getopts in default config to ease xenomai tests usage

-----------------------------------------------------------------------

Summary of changes:
 ...{apf9328_defconfig => apf9328xenomai_defconfig} |    6 +++-
 .../target/device/armadeus/busybox-1.21.config     |    2 +-
 ...ai-add-configure-options-for-old-versions.patch |   37 ++++++++++++++++++++
 ...makes-dependecy-evaluated-before-patching.patch |   23 ++++++++++++
 4 files changed, 66 insertions(+), 2 deletions(-)
 copy buildroot/configs/{apf9328_defconfig => apf9328xenomai_defconfig} (92%)
 create mode 100644 patches/buildroot/2013.11/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
 create mode 100644 patches/buildroot/2013.11/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch

diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328xenomai_defconfig
similarity index 92%
copy from buildroot/configs/apf9328_defconfig
copy to buildroot/configs/apf9328xenomai_defconfig
index a1fce98..8ce2a08 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328xenomai_defconfig
@@ -22,7 +22,6 @@ BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_TARGET_GENERIC_HOSTNAME="apf9328"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
 BR2_ROOTFS_DEVICE_TABLE="$(ARMADEUS_PATH)/rootfs/device_table.txt"
 BR2_ROOTFS_SKELETON_CUSTOM=y
 BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
@@ -40,6 +39,8 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
 BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_EXT_XENOMAI=y
+BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
 BR2_PACKAGE_FPGAREGS=y
 BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
@@ -62,6 +63,9 @@ BR2_PACKAGE_TSLIB=y
 BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_NTP_NTPD is not set
 BR2_PACKAGE_PORTMAP=y
+BR2_PACKAGE_XENOMAI_VERSION="2.4.9"
+BR2_PACKAGE_XENOMAI_CONF_OPT="--enable-arm-mach=imx"
+BR2_PACKAGE_XENOMAI_TESTSUITE=y
 BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_PAD=y
diff --git a/buildroot/target/device/armadeus/busybox-1.21.config b/buildroot/target/device/armadeus/busybox-1.21.config
index d57a6ed..99a16f6 100644
--- a/buildroot/target/device/armadeus/busybox-1.21.config
+++ b/buildroot/target/device/armadeus/busybox-1.21.config
@@ -970,7 +970,7 @@ CONFIG_ASH_BASH_COMPAT=y
 CONFIG_ASH_IDLE_TIMEOUT=y
 CONFIG_ASH_JOB_CONTROL=y
 CONFIG_ASH_ALIAS=y
-# CONFIG_ASH_GETOPTS is not set
+CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_BUILTIN_ECHO=y
 CONFIG_ASH_BUILTIN_PRINTF=y
 CONFIG_ASH_BUILTIN_TEST=y
diff --git a/patches/buildroot/2013.11/073-armadeus-xenomai-add-configure-options-for-old-versions.patch b/patches/buildroot/2013.11/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
new file mode 100644
index 0000000..971d244
--- /dev/null
+++ b/patches/buildroot/2013.11/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
@@ -0,0 +1,37 @@
+Allows to have old xenomai userspace (2.4/2.5) with recent BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/xenomai/Config.in
+===================================================================
+--- buildroot.orig/package/xenomai/Config.in	2014-02-18 15:37:18.603402789 +0100
++++ buildroot/package/xenomai/Config.in	2014-02-18 16:52:48.733866495 +0100
+@@ -45,6 +45,13 @@
+ 	  BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux
+ 	  Kernel -> Linux Kernel Extensions menu.
+ 
++config BR2_PACKAGE_XENOMAI_CONF_OPT
++	string "Additionnal configuration options"
++	help
++	  Additionnal options that will be passed to configure stage and that
++	  can be used for example with old versions of xenomai.
++	  For example: --enable-arm-mach=imx with xeno 2.4/2.5
++
+ config BR2_PACKAGE_XENOMAI_TESTSUITE
+ 	bool "Install testsuite"
+ 	help
+Index: buildroot/package/xenomai/xenomai.mk
+===================================================================
+--- buildroot.orig/package/xenomai/xenomai.mk	2014-02-18 15:37:15.335386585 +0100
++++ buildroot/package/xenomai/xenomai.mk	2014-02-18 16:52:28.381765572 +0100
+@@ -20,6 +20,10 @@
+ XENOMAI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-user
+ 
+ XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/
++XENOMAI_ADDITIONAL_CONF_OPT = $(call qstrip,$(BR2_PACKAGE_XENOMAI_CONF_OPT))
++ifneq ($(XENOMAI_ADDITIONAL_CONF_OPT),)
++XENOMAI_CONF_OPT += $(XENOMAI_ADDITIONAL_CONF_OPT)
++endif
+ 
+ define XENOMAI_REMOVE_DEVFILES
+ 	for i in xeno-config xeno-info wrap-link.sh ; do \
diff --git a/patches/buildroot/2013.11/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch b/patches/buildroot/2013.11/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch
new file mode 100644
index 0000000..1d43008
--- /dev/null
+++ b/patches/buildroot/2013.11/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch
@@ -0,0 +1,23 @@
+Mainly to have xenomai stuff ready befoe having to patch Linux kernel (which
+depends on it).
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/pkg-generic.mk
+===================================================================
+--- buildroot.orig/package/pkg-generic.mk	2014-02-18 17:22:20.586652642 +0100
++++ buildroot/package/pkg-generic.mk	2014-02-18 17:23:07.070883136 +0100
+@@ -394,10 +394,10 @@
+ #  extract
+ #  patch
+ #  configure
+-$(1)-configure:		$(1)-patch $(1)-depends \
+-			$$($(2)_TARGET_CONFIGURE)
++$(1)-configure:		$(1)-patch $$($(2)_TARGET_CONFIGURE)
+ 
+-$(1)-patch:		$(1)-extract $$($(2)_TARGET_PATCH)
++$(1)-patch:		$(1)-extract $(1)-depends \
++			$$($(2)_TARGET_PATCH)
+ 
+ $(1)-extract:		$(1)-source \
+ 			$$($(2)_TARGET_EXTRACT)


hooks/post-receive
-- 
armadeus


