Package: lirc-modules-source Version: 0.8.0-6 Severity: important Tags: patch
devfs has finally been removed in kernel 2.6.18, causing lirc kernel modules to fail compiling. The patch below, taken from CVS, fixes the issue. Regards, Peter -- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (500, 'unstable'), (400, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.18-rc7-maia Locale: LANG=C, [EMAIL PROTECTED] (charmap=ISO-8859-15) Versions of packages lirc-modules-source depends on: ii debconf [debconf-2.0] 1.5.4 Debian configuration management sy ii debhelper 5.0.37.3 helper programs for debian/rules ii debianutils 2.17.1 Miscellaneous utilities specific t ii ucf 2.0015 Update Configuration File: preserv Versions of packages lirc-modules-source recommends: ii dpkg-dev 1.13.22 package building tools for Debian ii gcc [c-compiler] 4:4.1.1-7 The GNU C compiler ii gcc-3.3 [c-compiler] 1:3.3.6-13 The GNU C compiler ii gcc-3.4 [c-compiler] 3.4.6-4 The GNU C compiler ii gcc-4.1 [c-compiler] 4.1.1-13 The GNU C compiler ii kernel-package 10.056 A utility for building Linux kerne ii make 3.81-3 The GNU version of the "make" util -- debconf information excluded
Index: drivers/kcompat.h =================================================================== RCS file: /cvsroot/lirc/lirc/drivers/kcompat.h,v retrieving revision 5.26 retrieving revision 5.27 diff -u -p -r5.26 -r5.27 --- drivers/kcompat.h 4 Mar 2006 23:16:02 -0000 5.26 +++ drivers/kcompat.h 23 Jul 2006 23:24:35 -0000 5.27 @@ -15,8 +15,11 @@ #include <linux/device.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) #define LIRC_HAVE_DEVFS #define LIRC_HAVE_DEVFS_26 +#endif + #define LIRC_HAVE_SYSFS #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) Index: drivers/lirc_dev/lirc_dev.c =================================================================== RCS file: /cvsroot/lirc/lirc/drivers/lirc_dev/lirc_dev.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -p -r1.46 -r1.47 --- drivers/lirc_dev/lirc_dev.c 16 Jul 2006 08:10:45 -0000 1.46 +++ drivers/lirc_dev/lirc_dev.c 23 Jul 2006 23:24:35 -0000 1.47 @@ -49,16 +49,18 @@ #endif #define __KERNEL_SYSCALLS__ #include <linux/unistd.h> + +#include "drivers/kcompat.h" + /* DevFS header */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) +#if defined(LIRC_HAVE_DEVFS) #include <linux/devfs_fs_kernel.h> #endif /* SysFS header */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#if defined(LIRC_HAVE_SYSFS) #include <linux/device.h> #endif -#include "drivers/kcompat.h" #include "drivers/lirc.h" #include "lirc_dev.h" Index: drivers/lirc_imon/lirc_imon.c =================================================================== RCS file: /cvsroot/lirc/lirc/drivers/lirc_imon/lirc_imon.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- drivers/lirc_imon/lirc_imon.c 4 Mar 2006 22:36:38 -0000 1.10 +++ drivers/lirc_imon/lirc_imon.c 23 Jul 2006 23:24:35 -0000 1.11 @@ -58,10 +58,13 @@ #include <linux/slab.h> #include <asm/uaccess.h> #include <linux/usb.h> +#include "drivers/kcompat.h" + +#if defined(LIRC_HAVE_DEVFS) #include <linux/devfs_fs_kernel.h> +#endif #include "drivers/lirc.h" -#include "drivers/kcompat.h" #include "drivers/lirc_dev/lirc_dev.h" Index: drivers/lirc_sasem/lirc_sasem.c =================================================================== RCS file: /cvsroot/lirc/lirc/drivers/lirc_sasem/lirc_sasem.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- drivers/lirc_sasem/lirc_sasem.c 4 Mar 2006 22:36:39 -0000 1.13 +++ drivers/lirc_sasem/lirc_sasem.c 23 Jul 2006 23:24:35 -0000 1.14 @@ -67,10 +67,13 @@ #include <linux/slab.h> #include <asm/uaccess.h> #include <linux/usb.h> + +#include "drivers/kcompat.h" +#if defined(LIRC_HAVE_DEVFS) #include <linux/devfs_fs_kernel.h> +#endif #include "drivers/lirc.h" -#include "drivers/kcompat.h" #include "drivers/lirc_dev/lirc_dev.h"
