Package: sl-modem-source
Version: 2.9.11~20090222-1
Severity: normal
Tags: patch
Hi,
dkms fails to build slamr.ko against the 2.6.32 kernel in unstable:
====
600x:/home/gsimmons# dkms build -m sl-modem -v 2.9.11~20090222
Kernel preparation unnecessary for this kernel. Skipping...
Building module:
cleaning build area....
pushd /var/lib/dkms/sl-modem/2.9.11~20090222/build; make -C drivers USB=1
KERNEL_DIR=/lib/modules/2.6.32-trunk-686/build KVERS=2.6.32-trunk-686; make -C
ungrab-winmodem KERNEL_DIR=/lib/modules/2.6.32-trunk-686/build
KVERS=2.6.32-trunk-686; popd.......
Error! Build of slamr.ko failed for: 2.6.32-trunk-686 (i686)
Consult the make.log in the build directory
/var/lib/dkms/sl-modem/2.9.11~20090222/build/ for more information.
====
The make.log file is attached, despite it containing no useful information.
Also provided is a log from a manual build attempt.
A patch is attached to resolve this issue.
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 sl-modem-source depends on:
ii libc6-dev 2.10.2-3 Embedded GNU C Library: Developmen
ii quilt 0.48-3 Tool to work with series of patche
Versions of packages sl-modem-source recommends:
ii dkms 2.1.1.0-2 Dynamic Kernel Module Support Fram
pn kernel-package <none> (no description available)
ii linux-headers-2.6.32-trunk-68 2.6.32-3 Header files for Linux 2.6.32-trun
sl-modem-source suggests no packages.
-- no debconf information
DKMS make.log for sl-modem-2.9.11~20090222 for kernel 2.6.32-trunk-686 (i686)
Wed Jan 6 02:02:28 EST 2010
/var/lib/dkms/sl-modem/2.9.11~20090222/build
gsimm...@600x:~/src/sl-modem-2.9.11~20090222/drivers$ make
doing kernel-ver::
cc -I/lib/modules/2.6.32-trunk-686/build/include -o kernel-ver kernel-ver.c
make all KERNEL_VER=2.6.32-trunk-686
make[1]: Entering directory
`/home/gsimmons/src/sl-modem-2.9.11~20090222/drivers'
obj-m=slamr.o
slamr-objs=amrmo_init.o sysdep_amr.o amrlibs.o
make modules -C /lib/modules/2.6.32-trunk-686/build
SUBDIRS=/home/gsimmons/src/sl-modem-2.9.11~20090222/drivers
make[2]: Entering directory `/usr/src/linux-headers-2.6.32-trunk-686'
CC [M] /home/gsimmons/src/sl-modem-2.9.11~20090222/drivers/amrmo_init.o
/home/gsimmons/src/sl-modem-2.9.11~20090222/drivers/amrmo_init.c: In function
`amrmo_update_status':
/home/gsimmons/src/sl-modem-2.9.11~20090222/drivers/amrmo_init.c:381: error:
`TASK_NORMAL' undeclared (first use in this function)
/home/gsimmons/src/sl-modem-2.9.11~20090222/drivers/amrmo_init.c:381: error:
(Each undeclared identifier is reported only once
/home/gsimmons/src/sl-modem-2.9.11~20090222/drivers/amrmo_init.c:381: error:
for each function it appears in.)
make[5]: *** [/home/gsimmons/src/sl-modem-2.9.11~20090222/drivers/amrmo_init.o]
Error 1
make[4]: *** [_module_/home/gsimmons/src/sl-modem-2.9.11~20090222/drivers]
Error 2
make[3]: *** [sub-make] Error 2
make[2]: *** [all] Error 2
make[2]: Leaving directory `/usr/src/linux-headers-2.6.32-trunk-686'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/gsimmons/src/sl-modem-2.9.11~20090222/drivers'
make: *** [all] Error 2
only in patch2:
unchanged:
--- sl-modem-2.9.11~20090222.orig/drivers/amrmo_init.c
+++ sl-modem-2.9.11~20090222/drivers/amrmo_init.c
@@ -83,6 +83,10 @@
#define pci_match_id(tbl, dev) pci_match_device(tbl, dev)
#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
+#include <linux/sched.h>
+#endif
+
#include <modem_defs.h>
#define AMRMO_MODULE_NAME "slamr"
