Skip to contentSkip to conversation

RTAI updated to version 4.0.1 and bug fix so kernel gets patched cleanly

PATCH New Matthew Bastian 2 participants 2 messages Feb 24, 2015 – Apr 21, 2015

lore
Share & tools
lore

Matthew Bastian

author
#0 lore raw

PATCH 1/1 RTAI updated to version 4.0.1 and bug fix so kernel gets patched cleanly

From: Matthew Bastian <[email protected]>

Signed-off-by Matthew Bastian <[email protected]>
---
 linux/linux-ext-rtai.mk | 9 +++++----
 package/rtai/rtai.mk    | 4 +++-
 2 files changed, 8 insertions(+), 5 deletions(-)
linux/linux-ext-rtai.mk +5 -4
index bf998d5..2631535 100644
@@ -20,14 +20,15 @@ else
 RTAI_ARCH = $(KERNEL_ARCH)
 endif
 
+kver = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion`
+
 # Prepare kernel patch
 ifeq ($(RTAI_PATCH),)
 define RTAI_PREPARE_KERNEL
-	kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \
-	if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \
+	if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$(kver)-*patch ; then \
 		$(APPLY_PATCHES) $(LINUX_DIR)		 		\
-			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ 	\
-			hal-linux-$${kver}-*patch ; \
+			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches \
+				hal-linux-$(kver)-*patch ; \
 	else \
 		echo "No RTAI patch for your kernel version" ; \
 		exit 1 ; \
package/rtai/rtai.mk +3 -1
index 6f94121..dfd8e0c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RTAI_VERSION = 3.8.1
+RTAI_VERSION = 4.0.1
 RTAI_SOURCE = rtai-$(RTAI_VERSION).tar.bz2
 RTAI_SITE = https://www.rtai.org/userfiles/downloads/RTAI
 RTAI_INSTALL_STAGING = YES

@@ -22,6 +22,8 @@ RTAI_CONF_OPTS = \
 	--includedir=/usr/include/rtai \
 	--with-linux-dir=$(LINUX_DIR) 	\
 	--disable-leds		      	\
+	--enable-usi			\
+	--enable-align-priority		\
 	--disable-rtailab		\
 	--with-module-dir=/lib/modules/$(LINUX_VERSION_PROBED)/rtai
Signature · 1 line
1.9.1
Applied
#1 lore raw

PATCH 1/1 RTAI updated to version 4.0.1 and bug fix so kernel gets patched cleanly

Dear Matthew Bastian,

Quoted 3 lines · Matthew Bastian

From: Matthew Bastian <[email protected]>

Signed-off-by Matthew Bastian <[email protected]>

I've applied your patch, but did some additional changes to it, see below.

Quoted 14 lines
linux/linux-ext-rtai.mk +2 -1
index bf998d5..2631535 100644
@@ -20,14 +20,15 @@ else
 RTAI_ARCH = $(KERNEL_ARCH)
 endif
 
+kver = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion`
+
 # Prepare kernel patch
 ifeq ($(RTAI_PATCH),)
 define RTAI_PREPARE_KERNEL
-	kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \

linux/linux-ext-rtai.mk else · line 34

Quoted 10 lines
linux/linux-ext-rtai.mk +3 -3
-	if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \
+	if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$(kver)-*patch ; then \
 		$(APPLY_PATCHES) $(LINUX_DIR)		 		\
-			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ 	\
-			hal-linux-$${kver}-*patch ; \
+			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches \
+				hal-linux-$(kver)-*patch ; \
 	else \
 		echo "No RTAI patch for your kernel version" ; \
 		exit 1 ; \

These changes seemed to not be necessary. The RTAI patch applied just fine with the existing code. If you really think there is a problem here, please give a more detailed description, but for now, I've applied your patch without this part.

Quoted 14 lines
package/rtai/rtai.mk +1 -1
index 6f94121..dfd8e0c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RTAI_VERSION = 3.8.1
+RTAI_VERSION = 4.0.1
 RTAI_SOURCE = rtai-$(RTAI_VERSION).tar.bz2
 RTAI_SITE = https://www.rtai.org/userfiles/downloads/RTAI
 RTAI_INSTALL_STAGING = YES

package/rtai/rtai.mk RTAI_CONF_OPTS = \ · line 28

Quoted 7 lines
package/rtai/rtai.mk +2 -0
@@ -22,6 +22,8 @@ RTAI_CONF_OPTS = \
 	--includedir=/usr/include/rtai \
 	--with-linux-dir=$(LINUX_DIR) 	\
 	--disable-leds		      	\
+	--enable-usi			\
+	--enable-align-priority		\
 	--disable-rtailab		\
 	--with-module-dir=/lib/modules/$(LINUX_VERSION_PROBED)/rtai

I've applied this part.

Also, there is a RTAI 4.1 version. Could you look at sending a patch to use this version instead? It has some patches for much more recent kernel versions on x86.

Thanks a lot!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com