Module: xenomai-head Branch: master Commit: d654ecb12143845de4ec39286d8dbfc12d87bad8 URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=d654ecb12143845de4ec39286d8dbfc12d87bad8
Author: Philippe Gerum <[email protected]> Date: Mon Sep 5 14:45:20 2011 +0200 ksrc, scripts: enable building over linux v3.x kernels --- ksrc/Makefile | 4 ++-- ksrc/arch/Makefile | 4 ++-- ksrc/arch/generic/Makefile | 4 ++-- ksrc/arch/powerpc/Makefile | 4 ++-- ksrc/arch/x86/Makefile | 4 ++-- ksrc/drivers/Makefile | 4 ++-- ksrc/drivers/analogy/Makefile | 4 ++-- ksrc/drivers/analogy/intel/Makefile | 4 ++-- ksrc/drivers/analogy/national_instruments/Makefile | 4 ++-- ksrc/drivers/analogy/sensoray/Makefile | 4 ++-- ksrc/drivers/analogy/testing/Makefile | 4 ++-- ksrc/drivers/can/Makefile | 4 ++-- ksrc/drivers/can/mscan/Makefile | 4 ++-- ksrc/drivers/can/sja1000/Makefile | 4 ++-- ksrc/drivers/ipc/Makefile | 4 ++-- ksrc/drivers/serial/Makefile | 4 ++-- ksrc/drivers/testing/Makefile | 4 ++-- ksrc/nucleus/Makefile | 4 ++-- ksrc/skins/Makefile | 4 ++-- ksrc/skins/native/Makefile | 4 ++-- ksrc/skins/posix/Makefile | 4 ++-- ksrc/skins/psos+/Makefile | 4 ++-- ksrc/skins/rtdm/Makefile | 4 ++-- ksrc/skins/uitron/Makefile | 4 ++-- ksrc/skins/vrtx/Makefile | 4 ++-- ksrc/skins/vxworks/Makefile | 4 ++-- scripts/prepare-kernel.sh | 8 ++------ 27 files changed, 54 insertions(+), 58 deletions(-) diff --git a/ksrc/Makefile b/ksrc/Makefile index 7385d57..6e9ce03 100644 --- a/ksrc/Makefile +++ b/ksrc/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENOMAI) += arch/ nucleus/ skins/ diff --git a/ksrc/arch/Makefile b/ksrc/arch/Makefile index b3380ee..86f522f 100644 --- a/ksrc/arch/Makefile +++ b/ksrc/arch/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENOMAI) += generic/ diff --git a/ksrc/arch/generic/Makefile b/ksrc/arch/generic/Makefile index 6c23f50..9a03fbd 100644 --- a/ksrc/arch/generic/Makefile +++ b/ksrc/arch/generic/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENOMAI) += xeno_hal.o diff --git a/ksrc/arch/powerpc/Makefile b/ksrc/arch/powerpc/Makefile index 288a727..7eb800a 100644 --- a/ksrc/arch/powerpc/Makefile +++ b/ksrc/arch/powerpc/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENOMAI) += xeno_hal.o diff --git a/ksrc/arch/x86/Makefile b/ksrc/arch/x86/Makefile index 3e57e57..f8d2332 100644 --- a/ksrc/arch/x86/Makefile +++ b/ksrc/arch/x86/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x ifeq ($(CONFIG_X86_64),y) X86_MODE := 64 diff --git a/ksrc/drivers/Makefile b/ksrc/drivers/Makefile index 42a25c3..4968d87 100644 --- a/ksrc/drivers/Makefile +++ b/ksrc/drivers/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENOMAI) += serial/ testing/ can/ analogy/ ipc/ diff --git a/ksrc/drivers/analogy/Makefile b/ksrc/drivers/analogy/Makefile index 363d625..7b10797 100644 --- a/ksrc/drivers/analogy/Makefile +++ b/ksrc/drivers/analogy/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai -Idrivers/xenomai/analogy diff --git a/ksrc/drivers/analogy/intel/Makefile b/ksrc/drivers/analogy/intel/Makefile index 4bd3192..b9641c5 100644 --- a/ksrc/drivers/analogy/intel/Makefile +++ b/ksrc/drivers/analogy/intel/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai diff --git a/ksrc/drivers/analogy/national_instruments/Makefile b/ksrc/drivers/analogy/national_instruments/Makefile index 8a25ec1..5e4e40e 100644 --- a/ksrc/drivers/analogy/national_instruments/Makefile +++ b/ksrc/drivers/analogy/national_instruments/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai diff --git a/ksrc/drivers/analogy/sensoray/Makefile b/ksrc/drivers/analogy/sensoray/Makefile index 773da98..e5e97c9 100644 --- a/ksrc/drivers/analogy/sensoray/Makefile +++ b/ksrc/drivers/analogy/sensoray/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile flag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai diff --git a/ksrc/drivers/analogy/testing/Makefile b/ksrc/drivers/analogy/testing/Makefile index cb38daa..eb36ead 100644 --- a/ksrc/drivers/analogy/testing/Makefile +++ b/ksrc/drivers/analogy/testing/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai diff --git a/ksrc/drivers/can/Makefile b/ksrc/drivers/can/Makefile index 904c5cf..1b88967 100644 --- a/ksrc/drivers/can/Makefile +++ b/ksrc/drivers/can/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai -Idrivers/xenomai/can diff --git a/ksrc/drivers/can/mscan/Makefile b/ksrc/drivers/can/mscan/Makefile index 7ce9249..b87ccf6 100644 --- a/ksrc/drivers/can/mscan/Makefile +++ b/ksrc/drivers/can/mscan/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai -Idrivers/xenomai/can -Idrivers/xenomai/can/mscan diff --git a/ksrc/drivers/can/sja1000/Makefile b/ksrc/drivers/can/sja1000/Makefile index 389ca04..1d96767 100644 --- a/ksrc/drivers/can/sja1000/Makefile +++ b/ksrc/drivers/can/sja1000/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai -Idrivers/xenomai/can -Idrivers/xenomai/can/sja1000 diff --git a/ksrc/drivers/ipc/Makefile b/ksrc/drivers/ipc/Makefile index 04e162f..c4d00b5 100644 --- a/ksrc/drivers/ipc/Makefile +++ b/ksrc/drivers/ipc/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai -Idrivers/xenomai/ipc diff --git a/ksrc/drivers/serial/Makefile b/ksrc/drivers/serial/Makefile index 57d042e..144bf8b 100644 --- a/ksrc/drivers/serial/Makefile +++ b/ksrc/drivers/serial/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai diff --git a/ksrc/drivers/testing/Makefile b/ksrc/drivers/testing/Makefile index bc97886..3435992 100644 --- a/ksrc/drivers/testing/Makefile +++ b/ksrc/drivers/testing/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x EXTRA_CFLAGS += -D__IN_XENOMAI__ -Iinclude/xenomai diff --git a/ksrc/nucleus/Makefile b/ksrc/nucleus/Makefile index ab1042d..70ee9b8 100644 --- a/ksrc/nucleus/Makefile +++ b/ksrc/nucleus/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENO_OPT_NUCLEUS) += xeno_nucleus.o diff --git a/ksrc/skins/Makefile b/ksrc/skins/Makefile index e9186ed..63207cf 100644 --- a/ksrc/skins/Makefile +++ b/ksrc/skins/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENOMAI) += native/ posix/ rtdm/ psos+/ vrtx/ vxworks/ uitron/ diff --git a/ksrc/skins/native/Makefile b/ksrc/skins/native/Makefile index b634fa4..56be452 100644 --- a/ksrc/skins/native/Makefile +++ b/ksrc/skins/native/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENO_SKIN_NATIVE) += xeno_native.o diff --git a/ksrc/skins/posix/Makefile b/ksrc/skins/posix/Makefile index 95aaa93..ca80ba6 100644 --- a/ksrc/skins/posix/Makefile +++ b/ksrc/skins/posix/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENO_SKIN_POSIX) += xeno_posix.o diff --git a/ksrc/skins/psos+/Makefile b/ksrc/skins/psos+/Makefile index 57bebaf..935f841 100644 --- a/ksrc/skins/psos+/Makefile +++ b/ksrc/skins/psos+/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENO_SKIN_PSOS) += xeno_psos.o diff --git a/ksrc/skins/rtdm/Makefile b/ksrc/skins/rtdm/Makefile index 0f5015f..8a95f51 100644 --- a/ksrc/skins/rtdm/Makefile +++ b/ksrc/skins/rtdm/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENO_SKIN_RTDM) += xeno_rtdm.o diff --git a/ksrc/skins/uitron/Makefile b/ksrc/skins/uitron/Makefile index 2897b02..d7de10c 100644 --- a/ksrc/skins/uitron/Makefile +++ b/ksrc/skins/uitron/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENO_SKIN_UITRON) += xeno_uitron.o diff --git a/ksrc/skins/vrtx/Makefile b/ksrc/skins/vrtx/Makefile index 8291855..74e6f5a 100644 --- a/ksrc/skins/vrtx/Makefile +++ b/ksrc/skins/vrtx/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENO_SKIN_VRTX) += xeno_vrtx.o diff --git a/ksrc/skins/vxworks/Makefile b/ksrc/skins/vxworks/Makefile index 26fe583..8d11fb4 100644 --- a/ksrc/skins/vxworks/Makefile +++ b/ksrc/skins/vxworks/Makefile @@ -1,6 +1,6 @@ -ifeq ($(PATCHLEVEL),6) +ifneq ($(VERSION).$(PATCHLEVEL),2.4) -# Makefile frag for Linux v2.6 +# Makefile frag for Linux v2.6 and v3.x obj-$(CONFIG_XENO_SKIN_VXWORKS) += xeno_vxworks.o diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh index 8d4d118..b64724f 100755 --- a/scripts/prepare-kernel.sh +++ b/scripts/prepare-kernel.sh @@ -437,10 +437,10 @@ patch_kernelversion_specific="y" case $linux_VERSION.$linux_PATCHLEVEL in # - # Linux v2.6 section + # Linux v2.6 and 3.x section # - 2.6) + 2.6|3.*) config_file=Kconfig @@ -554,10 +554,6 @@ EOF patch_help ;; - # - # Paranoid section - # - *) echo "$me: Unsupported kernel version $linux_VERSION.$linux_PATCHLEVEL.x" >&2 _______________________________________________ Xenomai-git mailing list [email protected] https://mail.gna.org/listinfo/xenomai-git
