* [Buildroot] [pull request] Pull request for branch for-2012.02/xenomai-update
@ 2012-01-03 20:48 Thomas Petazzoni
2012-01-03 20:48 ` [Buildroot] [PATCH 1/3] xenomai: bump to 2.6.0 Thomas Petazzoni
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Thomas Petazzoni @ 2012-01-03 20:48 UTC (permalink / raw)
To: buildroot
The following changes since commit 5528286147492aafa8740c09db63290042b79cb0:
rt-tests: fix build issues on uClibc (2012-01-03 09:15:17 +0100)
are available in the git repository at:
http://free-electrons.com/~thomas/buildroot.git for-2012.02/xenomai-update
Thomas Petazzoni (3):
xenomai: bump to 2.6.0
xenomai: restrict to the set of supported architectures
xenomai: mention which kernel versions are supported
linux/Config.ext.in | 8 +++
package/xenomai/Config.in | 62 +----------------------
package/xenomai/xenomai-fix-lfs-issue.patch | 72 +++++++++++++++++++++++++++
package/xenomai/xenomai.mk | 11 +----
4 files changed, 83 insertions(+), 70 deletions(-)
create mode 100644 package/xenomai/xenomai-fix-lfs-issue.patch
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 1/3] xenomai: bump to 2.6.0 2012-01-03 20:48 [Buildroot] [pull request] Pull request for branch for-2012.02/xenomai-update Thomas Petazzoni @ 2012-01-03 20:48 ` Thomas Petazzoni 2012-01-07 19:40 ` Peter Korsgaard 2012-01-03 20:48 ` [Buildroot] [PATCH 2/3] xenomai: restrict to the set of supported architectures Thomas Petazzoni ` (2 subsequent siblings) 3 siblings, 1 reply; 9+ messages in thread From: Thomas Petazzoni @ 2012-01-03 20:48 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/xenomai/Config.in | 60 ---------------------- package/xenomai/xenomai-fix-lfs-issue.patch | 72 +++++++++++++++++++++++++++ package/xenomai/xenomai.mk | 11 +---- 3 files changed, 73 insertions(+), 70 deletions(-) create mode 100644 package/xenomai/xenomai-fix-lfs-issue.patch diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in index cfeaa04..98ebf0a 100644 --- a/package/xenomai/Config.in +++ b/package/xenomai/Config.in @@ -43,66 +43,6 @@ config BR2_PACKAGE_XENOMAI_SMP This option allows to enable or disable SMP support. It has to match your kernel configuration. -choice - prompt "Xenomai ARM CPU type" - depends on BR2_arm - default BR2_PACKAGE_XENOMAI_CPU_GENERIC_ARM - help - On the ARM architecture, Xenomai needs to be configured for - a specific sub-architecture. Select the appropriate - sub-architecture from the list. - - config BR2_PACKAGE_XENOMAI_CPU_AT91RM9200 - bool "Atmel AT91RM9200" - - config BR2_PACKAGE_XENOMAI_CPU_AT91SAM926X - bool "Atmel AT91SAM926X" - - config BR2_PACKAGE_XENOMAI_CPU_INTEGRATOR - bool "ARM Ltd. Integrator" - - config BR2_PACKAGE_XENOMAI_CPU_IXP4XX - bool "Intel IXP4XX (XScale)" - - config BR2_PACKAGE_XENOMAI_CPU_IMX - bool "Freescale i.MX (MX1/MXL)" - - config BR2_PACKAGE_XENOMAI_CPU_IMX21 - bool "Freescale i.MX21" - - config BR2_PACKAGE_XENOMAI_CPU_MX2 - bool "Freescale MXC/MX2" - - config BR2_PACKAGE_XENOMAI_CPU_MX3 - bool "Freescale MXC/MX3" - - config BR2_PACKAGE_XENOMAI_CPU_SA1100 - bool "StrongARM SA1100" - - config BR2_PACKAGE_XENOMAI_CPU_S3C2410 - bool "S3C2410" - - config BR2_PACKAGE_XENOMAI_CPU_GENERIC_ARM - bool "Generic ARM" - -endchoice - -# Now set CPU type. We force manually selected type even if detected in case -# user takes the risk. -config BR2_PACKAGE_XENOMAI_CPU_TYPE - string - depends on BR2_PACKAGE_XENOMAI && BR2_arm - default "at91rm9200" if BR2_PACKAGE_XENOMAI_CPU_AT91RM9200 - default "at91sam926x" if BR2_PACKAGE_XENOMAI_CPU_AT91SAM926X - default "integrator" if BR2_PACKAGE_XENOMAI_CPU_INTEGRATOR - default "ixp4xx" if BR2_PACKAGE_XENOMAI_CPU_IXP4XX - default "generic" if BR2_PACKAGE_XENOMAI_CPU_GENERIC_ARM - default "imx" if BR2_PACKAGE_XENOMAI_CPU_IMX - default "imx21" if BR2_PACKAGE_XENOMAI_CPU_IMX21 - default "mx2" if BR2_PACKAGE_XENOMAI_CPU_MX2 - default "mx3" if BR2_PACKAGE_XENOMAI_CPU_MX3 - default "s3c2410" if BR2_PACKAGE_XENOMAI_CPU_S3C2410 - config BR2_PACKAGE_XENOMAI_TESTSUITE bool "Install testsuite" help diff --git a/package/xenomai/xenomai-fix-lfs-issue.patch b/package/xenomai/xenomai-fix-lfs-issue.patch new file mode 100644 index 0000000..157c8e2 --- /dev/null +++ b/package/xenomai/xenomai-fix-lfs-issue.patch @@ -0,0 +1,72 @@ +From: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> +Date: Sat, 5 Nov 2011 20:59:01 +0000 (+0100) +Subject: posix: fix compilation for LFS +X-Git-Url: http://git.xenomai.org/?p=xenomai-2.6.git;a=commitdiff_plain;h=06ae5c5e47fbfd9d8dbbe6fcf1a1db0c14bad9de;hp=8f6feff876029244dabc1257cdf13209fbd64fb5 + +posix: fix compilation for LFS +--- + +diff --git a/include/posix/sys/mman.h b/include/posix/sys/mman.h +index 455e565..a304755 100644 +--- a/include/posix/sys/mman.h ++++ b/include/posix/sys/mman.h +@@ -63,17 +63,16 @@ int __real_shm_open(const char *name, int oflag, mode_t mode); + + int __real_shm_unlink(const char *name); + +-#if !defined(_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64 + void *__real_mmap(void *addr, + size_t len, + int prot, + int flags, + int fildes, + long off); +-#else +-#define __real_mmap __real_mmap64 +-#endif +-#ifdef _LARGEFILE64_SOURCE ++ ++#if __WORDSIZE == 32 ++#if defined(_LARGEFILE64_SOURCE) \ ++ || defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 + void *__real_mmap64(void *addr, + size_t len, + int prot, +@@ -82,6 +81,11 @@ void *__real_mmap64(void *addr, + long long off); + #endif + ++#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 ++#define __real_mmap __real_mmap64 ++#endif ++#endif ++ + int __real_munmap(void *addr, size_t len); + + #ifdef __cplusplus +diff --git a/include/posix/unistd.h b/include/posix/unistd.h +index 49463a0..90cce86 100644 +--- a/include/posix/unistd.h ++++ b/include/posix/unistd.h +@@ -54,13 +54,17 @@ int ftruncate(int fildes, off_t length); + extern "C" { + #endif + +-#if !defined(_FILE_OFFSET_BITS) || _FILE_OFFSET_BITS != 64 + int __real_ftruncate(int fildes, long length); +-#else ++ ++#if __WORDSIZE == 32 ++#if defined(_LARGEFILE64_SOURCE) \ ++ || defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 ++int __real_ftruncate64(int fildes, long long length); ++#endif ++ ++#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64 + #define __real_ftruncate __real_ftruncate64 + #endif +-#ifdef _LARGEFILE64_SOURCE +-int __real_ftruncate64(int fildes, long long length); + #endif + + ssize_t __real_read(int fd, void *buf, size_t nbyte); diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index f795579..b1a492f 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -7,7 +7,7 @@ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) ifeq ($(XENOMAI_VERSION),) -XENOMAI_VERSION = 2.5.6 +XENOMAI_VERSION = 2.6.0 endif XENOMAI_SITE = http://download.gna.org/xenomai/stable/ @@ -15,15 +15,6 @@ XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 XENOMAI_INSTALL_STAGING = YES -ifeq ($(BR2_arm),y) -XENOMAI_CPU_TYPE = $(call qstrip,$(BR2_PACKAGE_XENOMAI_CPU_TYPE)) -# Set "generic" if not defined -ifeq ($(XENOMAI_CPU_TYPE),) -XENOMAI_CPU_TYPE = generic -endif -XENOMAI_CONF_OPT += --enable-arm-mach=$(XENOMAI_CPU_TYPE) -endif #BR2_arm - ifeq ($(BR2_PACKAGE_XENOMAI_SMP),y) XENOMAI_CONF_OPT += --enable-smp endif -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/3] xenomai: bump to 2.6.0 2012-01-03 20:48 ` [Buildroot] [PATCH 1/3] xenomai: bump to 2.6.0 Thomas Petazzoni @ 2012-01-07 19:40 ` Peter Korsgaard 2012-01-07 23:20 ` Thomas Petazzoni 0 siblings, 1 reply; 9+ messages in thread From: Peter Korsgaard @ 2012-01-07 19:40 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> It would have been to mention why the ARM variant stuff is no longer needed, but ok - Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/3] xenomai: bump to 2.6.0 2012-01-07 19:40 ` Peter Korsgaard @ 2012-01-07 23:20 ` Thomas Petazzoni 0 siblings, 0 replies; 9+ messages in thread From: Thomas Petazzoni @ 2012-01-07 23:20 UTC (permalink / raw) To: buildroot Le Sat, 07 Jan 2012 20:40:44 +0100, Peter Korsgaard <jacmet@uclibc.org> a ?crit : > It would have been to mention why the ARM variant stuff is no longer > needed, but ok - Committed, thanks. The --enable-arm-mach option has been removed, and the --enable-arm-tsc option is only useful is very specific situations. See: http://git.xenomai.org/?p=xenomai-2.6.git;a=commitdiff;h=1f988e5b616a884fb13b85056757349b6312a592 Regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/3] xenomai: restrict to the set of supported architectures 2012-01-03 20:48 [Buildroot] [pull request] Pull request for branch for-2012.02/xenomai-update Thomas Petazzoni 2012-01-03 20:48 ` [Buildroot] [PATCH 1/3] xenomai: bump to 2.6.0 Thomas Petazzoni @ 2012-01-03 20:48 ` Thomas Petazzoni 2012-01-07 19:42 ` Peter Korsgaard 2012-01-03 20:48 ` [Buildroot] [PATCH 3/3] xenomai: mention which kernel versions are supported Thomas Petazzoni 2012-01-04 8:20 ` [Buildroot] [pull request] Pull request for branch for-2012.02/xenomai-update Thomas De Schampheleire 3 siblings, 1 reply; 9+ messages in thread From: Thomas Petazzoni @ 2012-01-03 20:48 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- linux/Config.ext.in | 2 ++ package/xenomai/Config.in | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/linux/Config.ext.in b/linux/Config.ext.in index 8a9f87e..b304efd 100644 --- a/linux/Config.ext.in +++ b/linux/Config.ext.in @@ -3,6 +3,8 @@ menu "Linux Kernel Extensions" # Xenomai config BR2_LINUX_KERNEL_EXT_XENOMAI bool "Adeos/Xenomai Real-time patch" + depends on BR2_i386 || BR2_x86_64 || BR2_arm || \ + BR2_bfin || BR2_powerpc || BR2_sh4 select BR2_PACKAGE_XENOMAI help Xenomai Kernel part. diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in index 98ebf0a..ecab23e 100644 --- a/package/xenomai/Config.in +++ b/package/xenomai/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_XENOMAI bool "Xenomai Userspace" + depends on BR2_i386 || BR2_x86_64 || BR2_arm || \ + BR2_bfin || BR2_powerpc || BR2_sh4 help Real-Time Framework for Linux http://www.xenomai.org -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/3] xenomai: restrict to the set of supported architectures 2012-01-03 20:48 ` [Buildroot] [PATCH 2/3] xenomai: restrict to the set of supported architectures Thomas Petazzoni @ 2012-01-07 19:42 ` Peter Korsgaard 0 siblings, 0 replies; 9+ messages in thread From: Peter Korsgaard @ 2012-01-07 19:42 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/3] xenomai: mention which kernel versions are supported 2012-01-03 20:48 [Buildroot] [pull request] Pull request for branch for-2012.02/xenomai-update Thomas Petazzoni 2012-01-03 20:48 ` [Buildroot] [PATCH 1/3] xenomai: bump to 2.6.0 Thomas Petazzoni 2012-01-03 20:48 ` [Buildroot] [PATCH 2/3] xenomai: restrict to the set of supported architectures Thomas Petazzoni @ 2012-01-03 20:48 ` Thomas Petazzoni 2012-01-07 19:44 ` Peter Korsgaard 2012-01-04 8:20 ` [Buildroot] [pull request] Pull request for branch for-2012.02/xenomai-update Thomas De Schampheleire 3 siblings, 1 reply; 9+ messages in thread From: Thomas Petazzoni @ 2012-01-03 20:48 UTC (permalink / raw) To: buildroot Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- linux/Config.ext.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/linux/Config.ext.in b/linux/Config.ext.in index b304efd..172fa76 100644 --- a/linux/Config.ext.in +++ b/linux/Config.ext.in @@ -9,6 +9,12 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI help Xenomai Kernel part. + In the current version of Xenomai, the following kernel + versions are supported: on Blackfin, 2.6.34 and 2.6.36.9, on + SH4, 2.6.32.10, on x86, 2.6.35.9, 2.6.37.6, 2.6.38.8, on + ARM, 2.6.35.9, 2.6.37.6, 2.6.38.8, on NIOS2, 2.6.35, on + PowerPC, 2.6.35.7, 2.6.36.4, 3.0.8. + config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH depends on BR2_LINUX_KERNEL_EXT_XENOMAI string "Path for Adeos patch file" -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/3] xenomai: mention which kernel versions are supported 2012-01-03 20:48 ` [Buildroot] [PATCH 3/3] xenomai: mention which kernel versions are supported Thomas Petazzoni @ 2012-01-07 19:44 ` Peter Korsgaard 0 siblings, 0 replies; 9+ messages in thread From: Peter Korsgaard @ 2012-01-07 19:44 UTC (permalink / raw) To: buildroot >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: Thomas> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [pull request] Pull request for branch for-2012.02/xenomai-update 2012-01-03 20:48 [Buildroot] [pull request] Pull request for branch for-2012.02/xenomai-update Thomas Petazzoni ` (2 preceding siblings ...) 2012-01-03 20:48 ` [Buildroot] [PATCH 3/3] xenomai: mention which kernel versions are supported Thomas Petazzoni @ 2012-01-04 8:20 ` Thomas De Schampheleire 3 siblings, 0 replies; 9+ messages in thread From: Thomas De Schampheleire @ 2012-01-04 8:20 UTC (permalink / raw) To: buildroot On Tue, Jan 3, 2012 at 9:48 PM, Thomas Petazzoni < thomas.petazzoni@free-electrons.com> wrote: > The following changes since commit > 5528286147492aafa8740c09db63290042b79cb0: > > rt-tests: fix build issues on uClibc (2012-01-03 09:15:17 +0100) > > are available in the git repository at: > http://free-electrons.com/~thomas/buildroot.gitfor-2012.02/xenomai-update > > Thomas Petazzoni (3): > xenomai: bump to 2.6.0 > xenomai: restrict to the set of supported architectures > xenomai: mention which kernel versions are supported > > linux/Config.ext.in | 8 +++ > package/xenomai/Config.in | 62 +---------------------- > package/xenomai/xenomai-fix-lfs-issue.patch | 72 > +++++++++++++++++++++++++++ > package/xenomai/xenomai.mk | 11 +---- > 4 files changed, 83 insertions(+), 70 deletions(-) > create mode 100644 package/xenomai/xenomai-fix-lfs-issue.patch > Entire series: Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20120104/0c46752a/attachment.html> ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-01-07 23:20 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-01-03 20:48 [Buildroot] [pull request] Pull request for branch for-2012.02/xenomai-update Thomas Petazzoni 2012-01-03 20:48 ` [Buildroot] [PATCH 1/3] xenomai: bump to 2.6.0 Thomas Petazzoni 2012-01-07 19:40 ` Peter Korsgaard 2012-01-07 23:20 ` Thomas Petazzoni 2012-01-03 20:48 ` [Buildroot] [PATCH 2/3] xenomai: restrict to the set of supported architectures Thomas Petazzoni 2012-01-07 19:42 ` Peter Korsgaard 2012-01-03 20:48 ` [Buildroot] [PATCH 3/3] xenomai: mention which kernel versions are supported Thomas Petazzoni 2012-01-07 19:44 ` Peter Korsgaard 2012-01-04 8:20 ` [Buildroot] [pull request] Pull request for branch for-2012.02/xenomai-update Thomas De Schampheleire
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox