[Armadeus-commitlog] SF.net SVN: armadeus:[1159] trunk/buildroot/package/xenomai

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

Revision: 1159
          http://armadeus.svn.sourceforge.net/armadeus/?rev=1159&view=rev
Author:   gwenhael
Date:     2009-03-13 10:13:46 +0000 (Fri, 13 Mar 2009)

Log Message:
-----------
[BUILDROOT] Xenomai: Makefile correct and addition of a default configuration for the kernel

Modified Paths:
--------------
    trunk/buildroot/package/xenomai/xenomai.mk

Added Paths:
-----------
    trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch
    trunk/buildroot/package/xenomai/configXenoKernel

Added: trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch
===================================================================

--- trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch	                        (rev 0)
+++ trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch	2009-03-13 10:13:46 UTC (rev 1159)
@@ -0,0 +1,12 @@
+diff -u a/Makefile.in b/Makefile.in
+--- a/Makefile.in	2009-03-12 15:16:41.000000000 +0100
++++ b/Makefile.in	2009-03-12 15:16:54.000000000 +0100
+@@ -228,7 +228,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I config
+-SUDO = sudo
++SUDO = fakeroot
+ SUBDIRS = src include config @XENO_MAYBE_DOCDIR@ scripts
+ EXTRA_DIST = CREDITS README.INSTALL TROUBLESHOOTING ksrc examples debian
+ all: all-recursive

Added: trunk/buildroot/package/xenomai/configXenoKernel
===================================================================
--- trunk/buildroot/package/xenomai/configXenoKernel	                        (rev 0)
+++ trunk/buildroot/package/xenomai/configXenoKernel	2009-03-13 10:13:46 UTC (rev 1159)
@@ -0,0 +1,59 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
+CONFIG_XENO_OPT_PERVASIVE=y
+# CONFIG_XENO_OPT_ISHIELD is not set
+CONFIG_XENO_OPT_PRIOCPL=y
+CONFIG_XENO_OPT_PIPELINE_HEAD=y
+CONFIG_XENO_OPT_PIPE_NRDEV=32
+CONFIG_XENO_OPT_REGISTRY_NRSLOTS=512
+CONFIG_XENO_OPT_SYS_HEAPSZ=128
+CONFIG_XENO_OPT_SYS_STACKPOOLSZ=32
+CONFIG_XENO_OPT_STATS=y
+# CONFIG_XENO_OPT_DEBUG is not set
+# CONFIG_XENO_OPT_SHIRQ is not set
+CONFIG_XENO_OPT_TIMING_PERIODIC=y
+CONFIG_XENO_OPT_TIMING_SCHEDLAT=0
+# CONFIG_XENO_OPT_SCALABLE_SCHED is not set
+CONFIG_XENO_OPT_TIMER_LIST=y
+# CONFIG_XENO_OPT_TIMER_HEAP is not set
+# CONFIG_XENO_OPT_TIMER_WHEEL is not set
+CONFIG_XENO_HW_FPU=y
+CONFIG_XENO_SKIN_NATIVE=y
+CONFIG_XENO_OPT_NATIVE_PERIOD=0
+CONFIG_XENO_OPT_NATIVE_PIPE=y
+CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ=1024
+CONFIG_XENO_OPT_NATIVE_SEM=y
+CONFIG_XENO_OPT_NATIVE_EVENT=y
+CONFIG_XENO_OPT_NATIVE_MUTEX=y
+CONFIG_XENO_OPT_NATIVE_COND=y
+CONFIG_XENO_OPT_NATIVE_QUEUE=y
+CONFIG_XENO_OPT_NATIVE_HEAP=y
+CONFIG_XENO_OPT_NATIVE_ALARM=y
+CONFIG_XENO_OPT_NATIVE_MPS=y
+CONFIG_XENO_OPT_NATIVE_INTR=y
+CONFIG_XENO_SKIN_POSIX=y
+CONFIG_XENO_OPT_POSIX_PERIOD=0
+# 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_DEBUG_POSIX is not set
+# CONFIG_XENO_SKIN_PSOS is not set
+# CONFIG_XENO_SKIN_UITRON is not set
+# CONFIG_XENO_SKIN_VRTX is not set
+# CONFIG_XENO_SKIN_VXWORKS is not set
+# CONFIG_XENO_SKIN_RTAI is not set
+CONFIG_XENO_SKIN_RTDM=y
+CONFIG_XENO_OPT_RTDM_PERIOD=0
+CONFIG_XENO_OPT_RTDM_FILDES=128
+CONFIG_XENO_OPT_RTDM_SELECT=y
+# CONFIG_XENO_DRIVERS_16550A is not set
+CONFIG_XENO_DRIVERS_TIMERBENCH=m
+CONFIG_XENO_DRIVERS_KLATENCY=m
+CONFIG_XENO_DRIVERS_IRQBENCH=m
+CONFIG_XENO_DRIVERS_SWITCHTEST=m
+# CONFIG_XENO_DRIVERS_CAN is not set
+# CONFIG_ARM_FCSE is not set
+CONFIG_IPIPE=y
+CONFIG_IPIPE_DOMAINS=4
+CONFIG_IPIPE_COMPAT=y
+# CONFIG_IPIPE_DEBUG is not set
\ No newline at end of file

Modified: trunk/buildroot/package/xenomai/xenomai.mk
===================================================================
--- trunk/buildroot/package/xenomai/xenomai.mk	2009-03-13 09:17:55 UTC (rev 1158)
+++ trunk/buildroot/package/xenomai/xenomai.mk	2009-03-13 10:13:46 UTC (rev 1159)
@@ -13,6 +13,7 @@
 #
 #############################################################
 
+KERN_DIR:=$(PROJECT_BUILD_DIR)/linux-$(shell echo $(BR2_LINUX26_VERSION))
 XENOMAI_VERSION:=2.4.7
 XENOMAI_SOURCE:=xenomai-$(XENOMAI_VERSION).tar.bz2
 XENOMAI_SITE:=http://download.gna.org/xenomai/stable
@@ -22,9 +23,7 @@
 XENOMAI_TARGET_BINARY:=usr/xenomai/bin/xeno-load
 
 ADEOS_VERSION:=1.12-00
-
-ADEOS_SOURCE:=adeos-ipipe-$(strip $(subst ",,$(BR2_KERNEL_THIS_VERSION)))-arm-$(ADEOS_VERSION).patch
-#"
+ADEOS_SOURCE:=adeos-ipipe-$(shell echo $(BR2_KERNEL_THIS_VERSION))-arm-$(ADEOS_VERSION).patch
 ADEOS_SITE:=http://download.gna.org/adeos/patches/v2.6/arm/older/
 
 $(DL_DIR)/$(XENOMAI_SOURCE):
@@ -35,36 +34,38 @@
 
 xenomai-source: $(DL_DIR)/$(ADEOS_SOURCE)
 
-$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
+$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(ADEOS_SOURCE) $(DL_DIR)/$(XENOMAI_SOURCE)
 	$(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	touch $@
 
-xenomai-test: $(XENOMAI_DIR)/.patch
 
-$(LINUX_DIR)/.patch_xenomai: $(DL_DIR)/$(ADEOS_SOURCE) $(XENOMAI_DIR)/.unpacked
-	if [ -f "$(LINUX_DIR)/.patched.board" ]; then \
-		toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
-			04-suppr-patch.patch; \
-	fi
+
+$(XENOMAI_DIR)/.patchXeno: $(XENOMAI_DIR)/.unpacked
+	toolchain/patch-kernel.sh $(XENOMAI_DIR) package/xenomai \
+		02-xenomai-supprSudo.patch
+	touch $(XENOMAI_DIR)/.patchXeno
+
+
+$(KERN_DIR)/.patch_xenomai: $(XENOMAI_DIR)/.patchXeno
+	@echo "$@"
+	toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
+		04-suppr-patch.patch
 	toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) \
 		$(ADEOS_SOURCE)
 	toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
 		01-adeos-2.6.27-1.12-00.patch
-	if [ ! -f "$(LINUX_DIR)/.patched.board" ]; then \
-		toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
-			04-suppr-patch.patch; \
-	fi
 	$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
 		--linux=${LINUX_DIR} \
 		--arch=arm
+	cat package/xenomai/configXenoKernel >> $(LINUX26_DIR)/.config
 	touch $@
+	
+xenomai-patch-kernel: $(KERN_DIR)/.patch_xenomai
 
-xenomai-patch-kernel: $(LINUX_DIR)/.patch_xenomai
-
-$(XENOMAI_DIR)/.configured: xenomai-patch-kernel
+$(XENOMAI_DIR)/.configured: $(KERN_DIR)/.patch_xenomai
 	(cd $(XENOMAI_DIR); rm -rf config.cache; \
                 $(TARGET_CONFIGURE_OPTS) \
-                $(TARGET_CONFIGURE_ARGS) \
+		                $(TARGET_CONFIGURE_ARGS) \
                 CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
 			./configure \
 			--enable-arm-mach=imx \
@@ -78,6 +79,7 @@
 		CC="$(TARGET_CC)" LD="$(TARGET_LD)"  
 
 $(TARGET_DIR)/$(XENOMAI_TARGET_BINARY): $(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY)
+	echo $@
 	$(MAKE) -C $(XENOMAI_DIR) \
 		CC=$(TARGET_CC) LD=$(TARGET_LD) \
 		DESTDIR=$(TARGET_DIR) install
@@ -91,7 +93,7 @@
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) uninstall
 	-$(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) clean
 
-xenomai-dirclean:
+xenomai-dirclean: xenomai-clean
 	rm -rf $(XENOMAI_DIR)
 
 #############################################################


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


