Package: martian-modem-source
Version: 20080617-1
Severity: normal
Tags: patch
Hi,
`m-a a-i martian-modem` fails to complete against the 2.6.32 kernel in
unstable. The module-assistant build log and a patch for resolving this are
attached.
Geoff
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.32-trunk-686 (SMP w/1 CPU core)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages martian-modem-source depends on:
ii bzip2 1.0.5-3 high-quality block-sorting file co
ii debhelper 7.4.11 helper programs for debian/rules
ii make 3.81-7 An utility for Directing compilati
Versions of packages martian-modem-source recommends:
ii martian-modem 20080617-1 ltmodem alternative driver providi
ii module-assistant 0.11.1 tool to make module package creati
martian-modem-source suggests no packages.
-- no debconf information
rm -f build-arch-stamp build-indep-stamp configure-stamp
# Cleaning kernel module building dir
/usr/bin/make -C source clean
make[1]: Entering directory `/usr/src/modules/martian-modem/source'
/usr/bin/make -C /lib/modules/2.6.32-trunk-686/build
M="/usr/src/modules/martian-modem/source" clean
make[2]: Entering directory `/usr/src/linux-headers-2.6.32-trunk-686'
make[2]: Leaving directory `/usr/src/linux-headers-2.6.32-trunk-686'
make[1]: Leaving directory `/usr/src/modules/martian-modem/source'
/usr/bin/make -f debian/rules kdist_clean kdist_config binary-modules
make[1]: Entering directory `/usr/src/modules/martian-modem'
rm -f build-arch-stamp build-indep-stamp configure-stamp
# Cleaning kernel module building dir
/usr/bin/make -C source clean
make[2]: Entering directory `/usr/src/modules/martian-modem/source'
/usr/bin/make -C /lib/modules/2.6.32-trunk-686/build
M="/usr/src/modules/martian-modem/source" clean
make[3]: Entering directory `/usr/src/linux-headers-2.6.32-trunk-686'
make[3]: Leaving directory `/usr/src/linux-headers-2.6.32-trunk-686'
make[2]: Leaving directory `/usr/src/modules/martian-modem/source'
for templ in
/usr/src/modules/martian-modem/debian/martian-modem-modules-_KVERS_.postinst.modules.in;
do \
cp $templ `echo $templ | sed -e 's/_KVERS_/2.6.32-trunk-686/g'` ; \
done
for templ in `ls debian/*.modules.in` ; do \
test -e ${templ%.modules.in}.backup || cp ${templ%.modules.in}
${templ%.modules.in}.backup 2>/dev/null || true; \
sed -e 's/##KVERS##/2.6.32-trunk-686/g ;s/#KVERS#/2.6.32-trunk-686/g ;
s/_KVERS_/2.6.32-trunk-686/g ; s/##KDREV##/2.6.32-3/g ; s/#KDREV#/2.6.32-3/g ;
s/_KDREV_/2.6.32-3/g ' < $templ > ${templ%.modules.in}; \
done
dh_testroot
dh_clean -k
dh_installdirs lib/modules/2.6.32-trunk-686/extra
# Build the module
/usr/bin/make -C source KERNEL_DIR=/lib/modules/2.6.32-trunk-686/build
KVERS=2.6.32-trunk-686
make[2]: Entering directory `/usr/src/modules/martian-modem/source'
/usr/bin/make -C /lib/modules/2.6.32-trunk-686/build
M="/usr/src/modules/martian-modem/source" modules
make[3]: Entering directory `/usr/src/linux-headers-2.6.32-trunk-686'
CC [M] /usr/src/modules/martian-modem/source/martian.o
/usr/src/modules/martian-modem/source/martian.c: In function ‘martian_isr’:
/usr/src/modules/martian-modem/source/martian.c:131: warning: value computed is
not used
/usr/src/modules/martian-modem/source/martian.c:148: error:
‘TASK_INTERRUPTIBLE’ undeclared (first use in this function)
/usr/src/modules/martian-modem/source/martian.c:148: error: (Each undeclared
identifier is reported only once
/usr/src/modules/martian-modem/source/martian.c:148: error: for each function
it appears in.)
/usr/src/modules/martian-modem/source/martian.c: In function ‘martian_read’:
/usr/src/modules/martian-modem/source/martian.c:554: error:
‘TASK_INTERRUPTIBLE’ undeclared (first use in this function)
/usr/src/modules/martian-modem/source/martian.c:554: error: implicit
declaration of function ‘signal_pending’
/usr/src/modules/martian-modem/source/martian.c:554: error: implicit
declaration of function ‘schedule’
make[6]: *** [/usr/src/modules/martian-modem/source/martian.o] Error 1
make[5]: *** [_module_/usr/src/modules/martian-modem/source] Error 2
make[4]: *** [sub-make] Error 2
make[3]: *** [all] Error 2
make[3]: Leaving directory `/usr/src/linux-headers-2.6.32-trunk-686'
make[2]: *** [modules] Error 2
make[2]: Leaving directory `/usr/src/modules/martian-modem/source'
make[1]: *** [binary-modules] Error 2
make[1]: Leaving directory `/usr/src/modules/martian-modem'
make: *** [kdist_build] Error 2
only in patch2:
unchanged:
--- martian-modem-20080617.orig/kmodule/martian.c
+++ martian-modem-20080617/kmodule/martian.c
@@ -38,6 +38,10 @@
#include <linux/poll.h>
#include <linux/interrupt.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32)
+#include <linux/sched.h>
+#endif
+
#include "kmartian.h"
#include "../martian.h"
#include "marsio.h"
