Package: comedi-source
Version: 0.7.76-1+RTAIFIX.1
Severity: important
Tags: patch
Since some versions the RTAI package in Debian uses a prefix of “/usr”.
As a result of this the RTAI headers need to build with RTAI support are
now found in “/usr/include/rtai”.
This makes at least two changes necessary in comedi-source package.
First the “--with-rtaidir” should point to “/usr”. This makes configure
find RTAI again. The second change is needed in the rtai.m4 macro.
Currently it checks or sets “${RTAI_DIR}/include” as “-I” for the
compiler. This makes COMEDI fail to build as the header are in
“/usr/include/rtai”.
See attached patch for the fix I currently use.
TIA
Daniel
-- System Information:
Debian Release: lenny/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.24-ipip (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages comedi-source depends on:
ii bzip2 1.0.5-0.1 high-quality block-sorting file co
ii debhelper 7.0.15 helper programs for debian/rules
ii module-assistant 0.10.11.0 tool to make module package creati
comedi-source recommends no packages.
Versions of packages comedi-source suggests:
ii kernel-package 11.001-0.1 A utility for building Linux kerne
-- no debconf information
--
Fachhochschule Dortmund
University of Applied Sciences and Arts
Daniel Heß
FB Informatik,
Emil-Figge-Str. 42 - D-44227 Dortmund
Raum EFS 42 C.2.45
Tel +49 231 755-6761
Fax +49 231 755-6710
[EMAIL PROTECTED]
http://www.fh-dortmund.de/
diff -u comedi-0.7.76/debian/control comedi-0.7.76/debian/control
--- comedi-0.7.76/debian/control
+++ comedi-0.7.76/debian/control
@@ -8,7 +8,7 @@
Package: comedi-source
Section: admin
Architecture: all
-Depends: module-assistant, debhelper (>= 5), bzip2
+Depends: module-assistant, debhelper (>= 5), bzip2, librtai-dev
Suggests: kernel-package, libcomedi0
Description: Comedi kernel module source
Comedi (Control and Measurement Device Interface) is a collection
diff -u comedi-0.7.76/debian/rules comedi-0.7.76/debian/rules
--- comedi-0.7.76/debian/rules
+++ comedi-0.7.76/debian/rules
@@ -53,7 +53,7 @@
CFLAGS="$(CFLAGS)" ./configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
- --with-rtaidir=/usr/lib/realtime \
+ --with-rtaidir=/usr \
--enable-pcmcia
$(MAKE) KERNEL_DIR=$(KSRC) KVERS=$(KVERS)
only in patch2:
unchanged:
--- comedi-0.7.76.orig/configure
+++ comedi-0.7.76/configure
@@ -5063,7 +5063,9 @@
if test "${ENABLE_RTAI}" = "yes" -a \( "${CONFIG_RTHAL}" != "no" -o "${CONFIG_ADEOS}" != "no" -o "${CONFIG_IPIPE}" != "no" \); then
{ echo "$as_me:$LINENO: checking RTAI directory ${RTAI_DIR}" >&5
echo $ECHO_N "checking RTAI directory ${RTAI_DIR}... $ECHO_C" >&6; }
- if [ -d ${RTAI_DIR}/include ] ; then
+ if [ -d ${RTAI_DIR}/include/rtai ] ; then
+ RTAI_CFLAGS="-I${RTAI_DIR}/include/rtai"
+ elif [ -d ${RTAI_DIR}/include ] ; then
RTAI_CFLAGS="-I${RTAI_DIR}/include"
else
if [ -d ${RTAI_DIR}/rtai-core/include ] ; then
only in patch2:
unchanged:
--- comedi-0.7.76.orig/m4/rtai.m4
+++ comedi-0.7.76/m4/rtai.m4
@@ -13,7 +13,9 @@
if test "${ENABLE_RTAI}" = "yes" -a \( "${CONFIG_RTHAL}" != "no" -o "${CONFIG_ADEOS}" != "no" -o "${CONFIG_IPIPE}" != "no" \); then
AC_MSG_CHECKING([RTAI directory ${RTAI_DIR}])
- if [[ -d ${RTAI_DIR}/include ]] ; then
+ if [[ -d ${RTAI_DIR}/include/rtai ]] ; then
+ RTAI_CFLAGS="-I${RTAI_DIR}/include/rtai"
+ elif [[ -d ${RTAI_DIR}/include ]] ; then
RTAI_CFLAGS="-I${RTAI_DIR}/include"
else
if [[ -d ${RTAI_DIR}/rtai-core/include ]] ; then
