Sent from Samsung Mobile -------- Original message -------- From: Jeff Epler <[email protected]> Date: 02/09/2014 2:11 PM (GMT-05:00) To: [email protected] Subject: [Emc-commit] master: rtapi: drop support for rtai "24.x" rtapi: drop support for rtai "24.x" .. this version of rtai was for kernel 2.4.x, which are no longer supported. Signed-off-by: Jeff Epler <[email protected]> http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=f7ef304 --- scripts/rtapi.conf.in | 8 -------- src/configure.in | 49 +------------------------------------------------ 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/scripts/rtapi.conf.in b/scripts/rtapi.conf.in index a6163be..1a3b1c0 100644 --- a/scripts/rtapi.conf.in +++ b/scripts/rtapi.conf.in @@ -29,12 +29,4 @@ if [ "@RTAI@" = "3" ] ; then \ MODPATH_rtai_shm=@MODPATH_rtai_shm@ MODPATH_rtai_sem=@MODPATH_rtai_sem@ MODPATH_rtai_math=@MODPATH_rtai_math@ -elif [ $RTPREFIX = rtai ] ; then - MODULES="adeos rtai rt_mem_mgr rtai_sched rtai_fifos rtai_shm rtai_libm" - MODPATH_adeos=@MODPATH_adeos@ - MODPATH_rtai=@MODPATH_rtai@ - MODPATH_rt_mem_mgr=@MODPATH_rt_mem_mgr@ - MODPATH_rtai_sched=@MODPATH_rtai_sched@ - MODPATH_rtai_shm=@MODPATH_rtai_shm@ - MODPATH_rtai_libm=@MODPATH_rtai_libm@ fi diff --git a/src/configure.in b/src/configure.in index fb68bbf..340cd46 100644 --- a/src/configure.in +++ b/src/configure.in @@ -151,7 +151,6 @@ KERNELDIR="" RTFLAGS="" RTAI3_MOD="" -RTAI_MOD="" ############################################################################## # Subsection 2.1 # @@ -197,7 +196,6 @@ AC_SUBST([RTS]) # 2. If no RT has been specified explicitely by the user, one has to be # # found by search. In order to do that the following code will search for a # # RT-specific script: # -# realtime-config for RTAI 24.1.x # # rtai-config for RTAI 3.x # ############################################################################## @@ -249,7 +247,7 @@ else RTS="" for location in $DIRS; do for subdir in . scripts bin; do - for signature in rtai realtime; do + for signature in rtai; do candidate=$location/$subdir/$signature-config if test -z "$RTS" -a -e $candidate; then RTS=$candidate @@ -288,33 +286,6 @@ case $RTS in KERNELDIR=`$RTS --linux-dir` RTARCH=`$RTS --arch` ;; -*/realtime-config) -# For RTAI-24.1x $RTS = realtime-config -# Options and their return values for realtime-config -# Option Returns -# --prefix Path to the rtai installation (usually /usr/realtime), not the original source tree. - USE WITH CAUTION -# --version Should return the version number - Appears to return 0.0.0 for most 24.1.x releases. -# --cc The compiler used for the C sources - Not necessarily the default cc -# --cflags Flags used to compile the realtime modules with. -# --cflags-fp Flags to use when compiling realtime modules with floating point math. -# --dump Dumps the .buildvars to screen - Grep for linuxdir - RTNAME=rtai - RTPREFIX=rtai - RTAI=1 - - # any other rtai-24.1.x system - TEMP=`$RTS --prefix` - if (test -d $TEMP) ; then - RTDIR=$(cd $TEMP ; pwd -P ) - else - RTDIR=${RTS%%/scripts/realtime-config} - fi - RTFLAGS=`$RTS --cflags-fp | head -n 1` - RTFLAGS="$RTFLAGS -DRTAI=1" - KERNELDIR=$($RTS --dump | grep -i linuxdir | awk -F'[[ ="]]+' '{print $2}') -#" - KERNELDIR=$(cd $KERNELDIR ; pwd -P ) -;; uspace) RTPREFIX=uspace RTDIR=$(pwd -P) @@ -373,18 +344,9 @@ AC_DEFINE_UNQUOTED([RTDIR], "$RTDIR", [Directory of the installed realtime syste ############################################################################## # Subsection 3.1 - checking for a CC (we must use the same one used for RT) # -# Check CC version - (P.C.) We need to verify the compiler is the same one # -# used for the realtime extensions... Hence the need to find the RT signature# -# first. # -# $RTS --cc should return the C compiler used - Verify this is acceptable. # -# if version is gcc-2.96 check for alternative # ############################################################################## AC_MSG_CHECKING([for cc version]) -# The compiler MUST match the one used to compile the realtime modules if the -# kernel level code is to function correctly. But if the kernel has been -# compiled with gcc-2.96, it is unlikely to ever work ! -# However realtime-config doesn't seem to have such an option if (test ${RTS##*/} = rtai-config ) ; then RTSCC=`$RTS --cc` AC_MSG_RESULT(found $RTSCC in rtai-config) @@ -1129,7 +1091,6 @@ USE_STUBS="" MATHLIB="" MATHINC="" -#we need to make sure that $RTS has a --module-dir option #only rtai-config has, well rtlinux-config has a --module_dir and lacks the rtai_* modules if (test ${RTS##*/} = rtai-config ) ; then if (test -r $($RTS --module-dir)/rtai_math${MODEXT} ) ; then @@ -1191,10 +1152,8 @@ AC_SUBST([MATHLIB]) # Export substitution symbols for module loading AC_SUBST([RTAI3_MOD]) -AC_SUBST([RTAI_MOD]) for m in adeos rtai_hal rtai_ksched rtai_fifos rtai_shm rtai_sem rtai_math \ - rtai rt_mem_mgr rtai_sched rtai_libm \ ; do AC_MSG_CHECKING([for $m]) TMP=$(find $MODULE_DIR -name $m$MODEXT 2>/dev/null) @@ -1212,12 +1171,6 @@ AC_SUBST(MODPATH_rtai_fifos) AC_SUBST(MODPATH_rtai_shm) AC_SUBST(MODPATH_rtai_sem) AC_SUBST(MODPATH_rtai_math) -AC_SUBST(MODPATH_adeos) -AC_SUBST(MODPATH_rtai) -AC_SUBST(MODPATH_rt_mem_mgr) -AC_SUBST(MODPATH_rtai_sched) -AC_SUBST(MODPATH_rtai_shm) -AC_SUBST(MODPATH_rtai_libm) fi # Checks for header files. ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ _____________________________________________ Emc-commit mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-commit ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/ _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
