From 0e533cbf823d63261384f7a478689b86927cc36f Mon Sep 17 00:00:00 2001 From: pagnin Date: Wed, 4 Feb 2004 09:21:19 +0000 Subject: [PATCH] Fix for integration tracker problem ID=884665. RTLINUX_DIR variable was used inconsistently (different meaning inside rtlinux tree compared to the general meaning in the OCERA tree). Solution adopted, to maintain compatibility toward external developers, the particular rtlinux meaning of the variable has been isolated in the rtlinux tree and, more important, has been adopted a different variable RTL_DIR that has the same meaning both inside and outside the rtlinux tree. --- Makefile.rules | 16 ++++++++-------- aclocal.m4 | 10 +++++----- admin/linux.m4 | 10 +++++----- configure | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index d8f4ffc..49cf9a9 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -23,11 +23,11 @@ # xxx_SOURCES .. list of specific target sources # # LINUX_DIR .. location of Linux kernel sources -# RTLINUX_DIR .. location of RT-Linux sources +# RTL_DIR .. location of RT-Linux sources # Hack to check RT-Linux rules #LINUX_DIR := /home/cvs/ocera/ocera-build/kernel/linux -#RTLINUX_DIR := /home/cvs/ocera/ocera-build/kernel/rtlinux +#RTL_DIR := /home/cvs/ocera/ocera-build/kernel/rtlinux OCERA_DIR := $(shell ( cd -L $(MAKERULES_DIR)/../../../.. ; pwd -L ) ) # We need to ensure definition of sources directory first @@ -61,7 +61,7 @@ USER_UTILS_DIR := $(OCERA_DIR)/$(COMPILED_DIR_NAME)/user/utils USER_BIN_DIR := $(OCERA_DIR)/$(COMPILED_DIR_NAME)/user/bin USER_BUILD_DIR := $(OCERA_DIR)/$(BUILD_DIR_NAME)/user/orte LINUX_DIR := $(OCERA_DIR)/kernel/linux -#RTLINUX_DIR := $(OCERA_DIR)/kernel/rtlinux +#RTL_DIR := $(OCERA_DIR)/kernel/rtlinux CONFIG_FILE := $(OCERA_DIR)/emdebsys/.config else KERN_INCLUDE_DIR := $(MAKERULES_DIR)/$(COMPILED_DIR_NAME)/include-kern @@ -81,7 +81,7 @@ LINUX_DIR=/lib/modules/$(LINUX_VERSION)/build endif endif -export SOURCES_DIR MAKERULES_DIR RELATIVE_DIR LINUX_DIR LINUX_VERSION RTLINUX_DIR +export SOURCES_DIR MAKERULES_DIR RELATIVE_DIR LINUX_DIR LINUX_VERSION RTL_DIR CFLAGS = -O2 -ggdb @@ -236,8 +236,8 @@ ifdef KERN_RULE_TEMPLATES $(KERN_MODULES_DIR)/kernel.mk: $(LINUX_DIR)/.config $(MAKERULES_DIR)/kernelcfg2mk $(MAKERULES_DIR)/kernelcfg2mk $(LINUX_DIR) $(KERN_MODULES_DIR) -ifdef RTLINUX_DIR -include $(RTLINUX_DIR)/rtl.mk +ifdef RTL_DIR +include $(RTL_DIR)/rtl.mk KERN_CC = $(CC) INCLUDES := -I $(KERN_INCLUDE_DIR) $(INCLUDE) $(rtlinux_INCLUDES) $(kernel_INCLUDES) @@ -248,7 +248,7 @@ KERN_EXE_SUFFIX := .o KERN_ARCH = $(ARCH) KERN_LD = ld -m elf_$(KERN_ARCH) -else # RTLINUX_DIR +else # RTL_DIR include $(KERN_MODULES_DIR)/kernel.mk @@ -359,7 +359,7 @@ $(foreach lib,$(kernel_LIBRARIES),$(eval $(call LIBRARY_kern_template,$(lib)))) endif -ifdef RTLINUX_DIR +ifdef RTL_DIR kernel-pass-local: $(rtlinux_MODULES:%=$(KERN_MODULES_DIR)/%$(KERN_EXE_SUFFIX)) diff --git a/aclocal.m4 b/aclocal.m4 index d778854..5041087 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1144,15 +1144,15 @@ AC_DEFUN(DS_RTLINUX, AC_ARG_WITH([rtlinuxdir], [AC_HELP_STRING([--with-rtlinuxdir=DIR], [specify path to RTLinux source directory])], - [RTLINUX_DIR="${withval}"], - [RTLINUX_DIR=/usr/src/rtlinux]) + [RTL_DIR="${withval}"], + [RTL_DIR=/usr/src/rtlinux]) DS_LINUX_CONFIG_OPTION_MODULE([CONFIG_RTLINUX]) if test "${CONFIG_RTLINUX}" != "no" ; then - AC_MSG_CHECKING([RTLinux directory ${RTLINUX_DIR} for rtl.mk]) - if [[ -d ${RTLINUX_DIR}/include ]] ; then - RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk` + AC_MSG_CHECKING([RTLinux directory ${RTL_DIR} for rtl.mk]) + if [[ -d ${RTL_DIR}/include ]] ; then + RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTL_DIR}/rtl.mk` else AC_MSG_ERROR([incorrect RTLinux directory?]) fi diff --git a/admin/linux.m4 b/admin/linux.m4 index c630b39..c8c126a 100644 --- a/admin/linux.m4 +++ b/admin/linux.m4 @@ -271,15 +271,15 @@ AC_DEFUN(DS_RTLINUX, AC_ARG_WITH([rtlinuxdir], [AC_HELP_STRING([--with-rtlinuxdir=DIR], [specify path to RTLinux source directory])], - [RTLINUX_DIR="${withval}"], - [RTLINUX_DIR=/usr/src/rtlinux]) + [RTL_DIR="${withval}"], + [RTL_DIR=/usr/src/rtlinux]) DS_LINUX_CONFIG_OPTION_MODULE([CONFIG_RTLINUX]) if test "${CONFIG_RTLINUX}" != "no" ; then - AC_MSG_CHECKING([RTLinux directory ${RTLINUX_DIR} for rtl.mk]) - if [[ -d ${RTLINUX_DIR}/include ]] ; then - RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk` + AC_MSG_CHECKING([RTLinux directory ${RTL_DIR} for rtl.mk]) + if [[ -d ${RTL_DIR}/include ]] ; then + RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTL_DIR}/rtl.mk` else AC_MSG_ERROR([incorrect RTLinux directory?]) fi diff --git a/configure b/configure index 3f72121..d4a9969 100755 --- a/configure +++ b/configure @@ -2108,9 +2108,9 @@ _ACEOF # Check whether --with-rtlinuxdir or --without-rtlinuxdir was given. if test "${with_rtlinuxdir+set}" = set; then withval="$with_rtlinuxdir" - RTLINUX_DIR="${withval}" + RTL_DIR="${withval}" else - RTLINUX_DIR=/usr/src/rtlinux + RTL_DIR=/usr/src/rtlinux fi; @@ -2147,10 +2147,10 @@ fi if test "${CONFIG_RTLINUX}" != "no" ; then - echo "$as_me:$LINENO: checking RTLinux directory ${RTLINUX_DIR} for rtl.mk" >&5 -echo $ECHO_N "checking RTLinux directory ${RTLINUX_DIR} for rtl.mk... $ECHO_C" >&6 - if [ -d ${RTLINUX_DIR}/include ] ; then - RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTLINUX_DIR}/rtl.mk` + echo "$as_me:$LINENO: checking RTLinux directory ${RTL_DIR} for rtl.mk" >&5 +echo $ECHO_N "checking RTLinux directory ${RTL_DIR} for rtl.mk... $ECHO_C" >&6 + if [ -d ${RTL_DIR}/include ] ; then + RTLINUX_CFLAGS=`sed -n -e 's/^CFLAGS *=\(.*\)$/\1/p' ${RTL_DIR}/rtl.mk` else { { echo "$as_me:$LINENO: error: incorrect RTLinux directory?" >&5 echo "$as_me: error: incorrect RTLinux directory?" >&2;} -- 2.39.2