[Armadeus-commitlog] SF.net SVN: armadeus:[1163] trunk/buildroot/package/xenomai
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1163] trunk/buildroot/package/xenomai
|
From: <gwe...@us...> - 2009-03-13 15:22:49
|
Revision: 1163
http://armadeus.svn.sourceforge.net/armadeus/?rev=1163&view=rev
Author: gwenhael
Date: 2009-03-13 15:22:39 +0000 (Fri, 13 Mar 2009)
Log Message:
-----------
[BUIDROOT] xenomai : correct patch problem with dirclean + typo
Modified Paths:
--------------
trunk/buildroot/package/xenomai/xenomai.mk
Added Paths:
-----------
trunk/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch
trunk/buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch
trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch
trunk/buildroot/package/xenomai/xeno-kernel.config
Removed Paths:
-------------
trunk/buildroot/package/xenomai/01-adeos-2.6.27-1.12-00.patch
trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch
trunk/buildroot/package/xenomai/04-suppr-patch.patch
trunk/buildroot/package/xenomai/configXenoKernel
Copied: trunk/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch (from rev 1162, trunk/buildroot/package/xenomai/04-suppr-patch.patch)
===================================================================
--- trunk/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch (rev 0)
+++ trunk/buildroot/package/xenomai/00-adeos-compatibility_with_armadeus.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imx-regs.h
++++ b/arch/arm/mach-imx/include/mach/imx-regs.h
+@@ -411,7 +411,6 @@
+ #define PCR_BPIX_8 (3<<25)
+ #define PCR_BPIX_12 (4<<25)
+ #define PCR_BPIX_16 (4<<25)
+-#define PCR_BPIX_MASK (7<<25)
+ #define PCR_PIXPOL (1<<24)
+ #define PCR_FLMPOL (1<<23)
+ #define PCR_LPPOL (1<<22)
Copied: trunk/buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch (from rev 1162, trunk/buildroot/package/xenomai/01-adeos-2.6.27-1.12-00.patch)
===================================================================
--- trunk/buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch (rev 0)
+++ trunk/buildroot/package/xenomai/01-adeos-1.12-00-imx_compatibility.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -0,0 +1,24 @@
+diff -ru a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
+--- a/arch/arm/mach-imx/irq.c 2009-02-17 11:32:52.000000000 +0100
++++ b/arch/arm/mach-imx/irq.c 2009-02-23 14:12:43.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include <asm/io.h>
+
+ #include <asm/mach/irq.h>
+-#include <asm/arch/imx-regs.h>
++#include <mach/imx-regs.h>
+
+
+ /* Used for IMX INTERRUPT priority: Still Experimental */
+diff -ru a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
+--- a/arch/arm/mach-imx/time.c 2009-02-25 17:03:34.000000000 +0100
++++ b/arch/arm/mach-imx/time.c 2009-02-25 16:36:16.000000000 +0100
+@@ -294,6 +294,8 @@
+ #ifdef CONFIG_IPIPE
+ void __ipipe_mach_acktimer(void)
+ {
++ uint32_t tstat;
++ tstat = IMX_TSTAT(TIMER_BASE);
+ IMX_TSTAT(TIMER_BASE) = 0;
+ }
+
Deleted: trunk/buildroot/package/xenomai/01-adeos-2.6.27-1.12-00.patch
===================================================================
--- trunk/buildroot/package/xenomai/01-adeos-2.6.27-1.12-00.patch 2009-03-13 14:56:36 UTC (rev 1162)
+++ trunk/buildroot/package/xenomai/01-adeos-2.6.27-1.12-00.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -1,24 +0,0 @@
-diff -ru a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c
---- a/arch/arm/mach-imx/irq.c 2009-02-17 11:32:52.000000000 +0100
-+++ b/arch/arm/mach-imx/irq.c 2009-02-23 14:12:43.000000000 +0100
-@@ -35,7 +35,7 @@
- #include <asm/io.h>
-
- #include <asm/mach/irq.h>
--#include <asm/arch/imx-regs.h>
-+#include <mach/imx-regs.h>
-
-
- /* Used for IMX INTERRUPT priority: Still Experimental */
-diff -ru a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
---- a/arch/arm/mach-imx/time.c 2009-02-25 17:03:34.000000000 +0100
-+++ b/arch/arm/mach-imx/time.c 2009-02-25 16:36:16.000000000 +0100
-@@ -294,6 +294,8 @@
- #ifdef CONFIG_IPIPE
- void __ipipe_mach_acktimer(void)
- {
-+ uint32_t tstat;
-+ tstat = IMX_TSTAT(TIMER_BASE);
- IMX_TSTAT(TIMER_BASE) = 0;
- }
-
Copied: trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch (from rev 1162, trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch)
===================================================================
--- trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch (rev 0)
+++ trunk/buildroot/package/xenomai/02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -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
Deleted: trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch
===================================================================
--- trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch 2009-03-13 14:56:36 UTC (rev 1162)
+++ trunk/buildroot/package/xenomai/02-xenomai-supprSudo.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -1,12 +0,0 @@
-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
Deleted: trunk/buildroot/package/xenomai/04-suppr-patch.patch
===================================================================
--- trunk/buildroot/package/xenomai/04-suppr-patch.patch 2009-03-13 14:56:36 UTC (rev 1162)
+++ trunk/buildroot/package/xenomai/04-suppr-patch.patch 2009-03-13 15:22:39 UTC (rev 1163)
@@ -1,10 +0,0 @@
---- a/arch/arm/mach-imx/include/mach/imx-regs.h
-+++ b/arch/arm/mach-imx/include/mach/imx-regs.h
-@@ -411,7 +411,6 @@
- #define PCR_BPIX_8 (3<<25)
- #define PCR_BPIX_12 (4<<25)
- #define PCR_BPIX_16 (4<<25)
--#define PCR_BPIX_MASK (7<<25)
- #define PCR_PIXPOL (1<<24)
- #define PCR_FLMPOL (1<<23)
- #define PCR_LPPOL (1<<22)
Deleted: trunk/buildroot/package/xenomai/configXenoKernel
===================================================================
--- trunk/buildroot/package/xenomai/configXenoKernel 2009-03-13 14:56:36 UTC (rev 1162)
+++ trunk/buildroot/package/xenomai/configXenoKernel 2009-03-13 15:22:39 UTC (rev 1163)
@@ -1,59 +0,0 @@
-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
Copied: trunk/buildroot/package/xenomai/xeno-kernel.config (from rev 1162, trunk/buildroot/package/xenomai/configXenoKernel)
===================================================================
--- trunk/buildroot/package/xenomai/xeno-kernel.config (rev 0)
+++ trunk/buildroot/package/xenomai/xeno-kernel.config 2009-03-13 15:22:39 UTC (rev 1163)
@@ -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 14:56:36 UTC (rev 1162)
+++ trunk/buildroot/package/xenomai/xenomai.mk 2009-03-13 15:22:39 UTC (rev 1163)
@@ -35,32 +35,35 @@
xenomai-source: $(DL_DIR)/$(ADEOS_SOURCE)
-$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(ADEOS_SOURCE) $(DL_DIR)/$(XENOMAI_SOURCE)
+$(KERN_DIR)/.patched.adeos: $(DL_DIR)/$(ADEOS_SOURCE)
+ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
+ 00-adeos-compatibility_with_armadeus.patch
+ toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) \
+ $(ADEOS_SOURCE)
+ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
+ 01-adeos-$(ADEOS_VERSION)-imx_compatibility.patch
+ touch $@
+
+$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
$(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $@
-$(XENOMAI_DIR)/.patched: $(XENOMAI_DIR)/.unpacked
+$(XENOMAI_DIR)/.patched.makefile: $(XENOMAI_DIR)/.unpacked
toolchain/patch-kernel.sh $(XENOMAI_DIR) package/xenomai \
- 02-xenomai-supprSudo.patch
+ 02-xenomai-2.4.7-replace_sudo_with_fakeroot.patch
touch $@
-$(KERN_DIR)/.patch_xenomai: $(XENOMAI_DIR)/.patched
- 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
+$(KERN_DIR)/.patched.xenomai: $(KERN_DIR)/.patched.adeos $(XENOMAI_DIR)/.patched.makefile
$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
--linux=$(LINUX26_DIR) \
--arch=$(BR2_ARCH)
- cat package/xenomai/configXenoKernel >> $(LINUX26_DIR)/.config
+ cat package/xenomai/xeno-kernel.config >> $(LINUX26_DIR)/.config
touch $@
-
-xenomai-patch-kernel: $(KERN_DIR)/.patch_xenomai
-$(XENOMAI_DIR)/.configured: $(KERN_DIR)/.patch_xenomai
+xenomai-patch-kernel: $(KERN_DIR)/.patched.xenomai
+
+$(XENOMAI_DIR)/.configured: $(KERN_DIR)/.patched.xenomai
(cd $(XENOMAI_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
