[patch] patch for zaptel 1.4.9

zaptel-1.4.9-gentoo.diff (text/plain), 4.84 KB, created by Thomas Stein on 2008-02-19 09:34:43 UTC

--- zaptel/Makefile	2008-02-18 10:09:35.000000000 +0100
+++ zaptel.gentoo/Makefile	2008-02-18 17:20:18.000000000 +0100
@@ -47,13 +47,20 @@
   BUILDVER:=linux26
 endif
 
+# This is not related to the version that we build. Rather, to the
+# version that we runs. If we build for 2.4 using 2.4 headers on a 2.6
+# system with udev mounted on /dev , no point in installing files to /dev
+# because they'll be wiped at next reboot. XXX: should this be a use-flag? Perhaps: noudev?
+DYNFS:=$(shell ps ax | grep -v grep | grep -qw 'devfsd\|udevd' && echo "yes")
+
+# Check for udev rules directories
+ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d))
+  UDEVRULES=yes
+endif
+
 # Set HOTPLUG_FIRMWARE=no to override automatic building with hotplug support
 # if it is enabled in the kernel.
 ifeq ($(BUILDVER),linux26)
-  ifneq (,$(wildcard $(DESTDIR)/etc/udev/rules.d))
-    DYNFS=yes
-    UDEVRULES=yes
-  endif
   HOTPLUG_FIRMWARE:=$(shell if grep CONFIG_FW_LOADER $(KINCLUDES)/linux/autoconf.h | grep -q undef; then echo "no"; else echo "yes"; fi)
 endif
 
@@ -171,7 +178,7 @@
   HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE) KBUILD_OBJ_M="$(KBUILD_OBJ_M)"
 endif
 KMAKE_INST = $(KMAKE) \
-  INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=misc modules_install
+  INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=zaptel modules_install 
 
 ROOT_PREFIX=
 
@@ -225,11 +232,11 @@
 # configure).
 # we use /sbin, rather than configure's $(sbindir) because we use /sbin
 # for historical reasons.
-BIN_DIR:=/sbin
+BIN_DIR:=/usr/bin
 LIB_DIR:=$(libdir)
 INC_DIR:=$(includedir)/zaptel
 MAN_DIR:=$(mandir)/man8
-MOD_DIR:=$(DESTDIR)/lib/modules/$(KVERS)/misc
+MOD_DIR:=$(DESTDIR)/lib/modules/$(KVERS)/zaptel
 
 # Utilities we build with a standard build procedure:
 UTILS		= zttool zttest ztmonitor ztspeed sethdlc-new ztcfg \
@@ -382,7 +389,7 @@
 $(UTILSO): %.o: %.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 
-install: all devices install-modules install-programs install-firmware
+install: devices install-modules install-programs install-firmware
 	@echo "###################################################"
 	@echo "###"
 	@echo "### Zaptel installed successfully."
@@ -407,10 +414,8 @@
 
 # Pushing those two to a separate target that is not used by default:
 install-modconf:
+	install -d -m 755 $(DESTDIR)/etc/modules.d
 	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)"
-	@if [ -d /etc/modutils ]; then \
-		/sbin/update-modules ; \
-	fi
 
 install-firmware:
 ifeq ($(HOTPLUG_FIRMWARE),yes)
@@ -422,7 +427,7 @@
 	$(INSTALL) -D -m 755 $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
 ifeq (,$(DESTDIR))
 	if [ `id -u` = 0 ]; then \
-		/sbin/ldconfig || : ;\
+		/sbin/ldconfig -n "$(INSTALL_PREFIX)"/usr/lib || : ;\
 	fi
 endif
 	rm -f $(DESTDIR)$(LIB_DIR)$(LTZ_SO)
@@ -470,8 +475,8 @@
 	done
 else # DYNFS
   ifdef UDEVRULES
-	install -d $(DESTDIR)/etc/udev/rules.d
-	build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules
+	build_tools/genudevrules > zaptel.rules
+	install -D -m 644 zaptel.rules $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules
   else # !UDEVRULES
 	@echo "**** Dynamic filesystem detected -- not creating device nodes"
   endif
@@ -488,7 +493,7 @@
 	@./build_tools/uninstall-modules $(DESTDIR)/lib/modules/$(KVERS) $(BASENAMES)
 	@for x in $(ALL_MODULES); do \
 		rm -f $(DESTDIR)/lib/modules/$(KVERS)/extra/$$x ; \
-		rm -f $(DESTDIR)/lib/modules/$(KVERS)/misc/$$x ; \
+		rm -f $(DESTDIR)/lib/modules/$(KVERS)/zaptel/$$x ; \
 		rm -f $(DESTDIR)/lib/modules/$(KVERS)/zaptel/$$x ; \
 	done;
 endif
@@ -501,7 +506,7 @@
 install-modules: 
 	$(KMAKE_INST)
 endif
-	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
+	[ -z "$(DESTDIR)" -a `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
 
 config:
 ifneq (,$(COPY_INITD))
--- zaptel/build_tools/genudevrules	2008-02-18 10:09:16.000000000 +0100
+++ zaptel.gentoo/build_tools/genudevrules	2008-02-18 16:08:38.000000000 +0100
@@ -31,5 +31,5 @@
 KERNEL${match}"zap[0-9]*", NAME="zap/%n"
 
 # zaptel devices with ownership/permissions for running as non-root
-SUBSYSTEM=="zaptel",  OWNER="asterisk", GROUP="asterisk", MODE="0660"
+SUBSYSTEM=="zaptel",  OWNER="root", GROUP="dialout", MODE="0660"
 EOF
--- zaptel/build_tools/genmodconf	2008-02-18 10:09:16.000000000 +0100
+++ zaptel.gentoo/build_tools/genmodconf	2008-02-18 16:08:12.000000000 +0100
@@ -79,20 +79,6 @@
 
 echo Building ${target}...
 
-if [ "${1}" = "linux24" ]; then
-    for mod in ${3}; do
-	if ! grep -q "post-install ${mod} " ${target}; then
-	    echo "post-install ${mod} /sbin/ztcfg" >> ${target}
-	fi
-    done
-elif [ "${1}" = "linux26" ]; then
-    for mod in ${3}; do
-	if ! grep -q "install ${mod} " ${target}; then
-	    echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
-	fi
-    done
-fi
-
 if [ -z "${combined}" ]; then
     echo "***"
     echo "*** WARNING:"