diff options
| -rwxr-xr-x | Makefile | 5 | ||||
| -rwxr-xr-x | zaptel.h | 5 |
2 files changed, 9 insertions, 1 deletions
@@ -32,9 +32,13 @@ CFLAGS+=-DSTANDALONE_ZAPATA INSTALL_PREFIX= +BUILDVER=$(shell if uname -r | grep -q ^2.6; then echo "linux26"; else echo "linux24"; fi) MODCONF=$(shell if [ -d $(INSTALL_PREFIX)/etc/modprobe.d ]; then echo "$(INSTALL_PREFIX)/etc/modprobe.d/zaptel"; elif [ -d $(INSTALL_PREFIX)/etc/modutils ]; then echo "$(INSTALL_PREFIX)/etc/modutils/zaptel"; elif [ -f $(INSTALL_PREFIX)/etc/modprobe.conf ]; then echo "$(INSTALL_PREFIX)/modprobe.conf"; elif [ -f $(INSTALL_PREFIX)/etc/modules.conf ]; then echo "$(INSTALL_PREFIX)/etc/modules.conf"; else echo $(INSTALL_PREFIX)/etc/conf.modules ; fi) +ifeq (${BUILDVER},linux24) +#We only support DEVFS in linux 2.4 kernels, since its considered obsolete post 2.4 DEVFS=$(shell ps ax | grep -v grep | grep devfsd) +endif TZOBJS=zonedata.lo tonezone.lo LIBTONEZONE=libtonezone.so.1.0 @@ -53,7 +57,6 @@ PRIMARY=torisa #PRIMARY=wcfxo PWD=$(shell pwd) -BUILDVER=$(shell if uname -r | grep -q ^2.6; then echo "linux26"; else echo "linux24"; fi) all: $(BUILDVER) linux24: $(MODULESO) $(BINS) @@ -48,7 +48,12 @@ #include "fasthdlc.h" #endif #ifdef CONFIG_DEVFS_FS +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #include <linux/devfs_fs_kernel.h> +#else +#undef CONFIG_DEVFS_FS +#warning "Zaptel doesn't support DEVFS in post 2.4 kernels. Disabling DEVFS in zaptel" +#endif #endif /* CONFIG_DEVFS_FS */ #include <linux/ioctl.h> |