[Pkg-voip-commits] r5510 - in /misdn-kernel/branches: ./ maniac-guest/ maniac-guest/debian/ maniac-guest/debian/patches/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Mon Apr 7 07:44:11 UTC 2008
Author: maniac-guest
Date: Mon Apr 7 07:44:11 2008
New Revision: 5510
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5510
Log:
Created my own branch with the changes I am using.
Added:
misdn-kernel/branches/
misdn-kernel/branches/maniac-guest/
- copied from r5492, misdn-kernel/trunk/
misdn-kernel/branches/maniac-guest/debian/misdn-config.dirs
misdn-kernel/branches/maniac-guest/debian/misdn-config.install
misdn-kernel/branches/maniac-guest/debian/patches/2_6_23_fix
misdn-kernel/branches/maniac-guest/debian/patches/perms_dev_mISDN
Modified:
misdn-kernel/branches/maniac-guest/debian/changelog
misdn-kernel/branches/maniac-guest/debian/control
misdn-kernel/branches/maniac-guest/debian/control-template
misdn-kernel/branches/maniac-guest/debian/patches/series
misdn-kernel/branches/maniac-guest/debian/rules-template
Modified: misdn-kernel/branches/maniac-guest/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/branches/maniac-guest/debian/changelog?rev=5510&op=diff
==============================================================================
--- misdn-kernel/branches/maniac-guest/debian/changelog (original)
+++ misdn-kernel/branches/maniac-guest/debian/changelog Mon Apr 7 07:44:11 2008
@@ -1,3 +1,15 @@
+misdn-kernel (1.1.7.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * 2_6_23_fix applied upstream.
+ * New upstream release
+ * added new misdn-config package
+ * added patch to use perms compatible with asterisk
+ * added CONFIGS variable to rules-template. Removed exports
+ * added MISDNVERSION variable to rules-template.
+
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Wed, 9 Jan 2008 18:00:44 +0100
+
misdn-kernel (1.1.7-2) UNRELEASED; urgency=low
[ Kilian Krause ]
Modified: misdn-kernel/branches/maniac-guest/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/branches/maniac-guest/debian/control?rev=5510&op=diff
==============================================================================
--- misdn-kernel/branches/maniac-guest/debian/control (original)
+++ misdn-kernel/branches/maniac-guest/debian/control Mon Apr 7 07:44:11 2008
@@ -30,3 +30,13 @@
.
You need this package if you intend to compile userspace applications that
access mISDN specific interfaces.
+
+Package: misdn-config
+Architecture: all
+Depends: xsltproc
+Description: init-script to auto-configure and load the mISDN kernel drivers
+ This script makes it easy to configure and activate mISDN compatible
+ adapter cards. It scans an eyecandy config file named mISDN.conf
+ for your card and port settings, then it loads the driver modules properly.
+ The mISDN.conf can also be autogenerated by the mISDN script.
+
Modified: misdn-kernel/branches/maniac-guest/debian/control-template
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/branches/maniac-guest/debian/control-template?rev=5510&op=diff
==============================================================================
--- misdn-kernel/branches/maniac-guest/debian/control-template (original)
+++ misdn-kernel/branches/maniac-guest/debian/control-template Mon Apr 7 07:44:11 2008
@@ -7,6 +7,7 @@
Package: misdn-modules-@@Kernel-Version@@
Architecture: any
Provides: misdn-modules
+Depends: bc, pciutils
Description: mISDN modules for Linux (kernel @@Kernel-Version@@)
The modular ISDN drivers are the bleeding edge implementation of ISDN support
in the Linux kernel. The most prominent new feature is support for ISDN cards
@@ -14,7 +15,7 @@
.
This package contains the compiled kernel modules for @@Kernel-Version@@
.
- If you have compiled your own kernel, you will most likely need to build your
- own mISDN modules. The misdn-source package has been provided for use with
- module-assistant or make-kpkg to produce a version of misdn-kernel-module for
- your kernel.
+ If you have compiled your own kernel, you will most likely need to build
+ your own misdn-kernel-modules. The misdn-kernel-source package has been
+ provided for use with the Debian kernel-package utility to produce a version
+ of misdn-kernel-module for your kernel.
Added: misdn-kernel/branches/maniac-guest/debian/misdn-config.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/branches/maniac-guest/debian/misdn-config.dirs?rev=5510&op=file
==============================================================================
--- misdn-kernel/branches/maniac-guest/debian/misdn-config.dirs (added)
+++ misdn-kernel/branches/maniac-guest/debian/misdn-config.dirs Mon Apr 7 07:44:11 2008
@@ -1,0 +1,2 @@
+usr/sbin/
+usr/lib/mISDN/
Added: misdn-kernel/branches/maniac-guest/debian/misdn-config.install
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/branches/maniac-guest/debian/misdn-config.install?rev=5510&op=file
==============================================================================
--- misdn-kernel/branches/maniac-guest/debian/misdn-config.install (added)
+++ misdn-kernel/branches/maniac-guest/debian/misdn-config.install Mon Apr 7 07:44:11 2008
@@ -1,0 +1,2 @@
+config/mISDN usr/sbin/
+config/*.xsl usr/lib/mISDN/
Added: misdn-kernel/branches/maniac-guest/debian/patches/2_6_23_fix
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/branches/maniac-guest/debian/patches/2_6_23_fix?rev=5510&op=file
==============================================================================
--- misdn-kernel/branches/maniac-guest/debian/patches/2_6_23_fix (added)
+++ misdn-kernel/branches/maniac-guest/debian/patches/2_6_23_fix Mon Apr 7 07:44:11 2008
@@ -1,0 +1,74 @@
+Index: misdn-kernel-1.1.7/drivers/isdn/hardware/mISDN/capi.c
+===================================================================
+--- misdn-kernel-1.1.7.orig/drivers/isdn/hardware/mISDN/capi.c 2008-01-15 10:39:36.000000000 +0000
++++ misdn-kernel-1.1.7/drivers/isdn/hardware/mISDN/capi.c 2008-01-15 10:40:42.000000000 +0000
+@@ -258,7 +258,11 @@
+ #else
+ sizeof(_cmsg),
+ #endif
+- 0, 0, NULL, NULL);
++ 0, 0, NULL
++#ifdef MISDN_COMPAT_KMEMCACHE
++ , NULL
++#endif
++ );
+ if (!mISDN_cmsg_cp) {
+ CapiCachesFree();
+ return(-ENOMEM);
+@@ -269,7 +273,12 @@
+ #else
+ sizeof(AppPlci_t),
+ #endif
+- 0, 0, NULL, NULL);
++ 0, 0, NULL
++#ifdef MISDN_COMPAT_KMEMCACHE
++ , NULL
++#endif
++ );
++
+ if (!mISDN_AppPlci_cp) {
+ CapiCachesFree();
+ return(-ENOMEM);
+@@ -280,7 +289,11 @@
+ #else
+ sizeof(Ncci_t),
+ #endif
+- 0, 0, NULL, NULL);
++ 0, 0, NULL
++#ifdef MISDN_COMPAT_KMEMCACHE
++ , NULL
++#endif
++ );
+ if (!mISDN_ncci_cp) {
+ CapiCachesFree();
+ return(-ENOMEM);
+@@ -291,7 +304,12 @@
+ #else
+ sizeof(SSProcess_t),
+ #endif
+- 0, 0, NULL, NULL);
++ 0, 0, NULL
++#ifdef MISDN_COMPAT_KMEMCACHE
++ , NULL
++#endif
++ );
++
+ if (!mISDN_sspc_cp) {
+ CapiCachesFree();
+ return(-ENOMEM);
+Index: misdn-kernel-1.1.7/drivers/isdn/hardware/mISDN/udevice.c
+===================================================================
+--- misdn-kernel-1.1.7.orig/drivers/isdn/hardware/mISDN/udevice.c 2008-01-15 10:39:50.000000000 +0000
++++ misdn-kernel-1.1.7/drivers/isdn/hardware/mISDN/udevice.c 2008-01-15 10:40:42.000000000 +0000
+@@ -2025,9 +2025,8 @@
+ if ((err = mISDN_unregister(&udev_obj))) {
+ printk(KERN_ERR "Can't unregister UserDevice(%d)\n", err);
+ }
+- if ((err = unregister_chrdev(mISDN_MAJOR, "mISDN"))) {
+- printk(KERN_WARNING "mISDN: devices busy on remove\n");
+- }
++
++ unregister_chrdev(mISDN_MAJOR, "mISDN");
+ #ifdef CONFIG_DEVFS_FS
+ devfs_remove("mISDN");
+ #endif
Added: misdn-kernel/branches/maniac-guest/debian/patches/perms_dev_mISDN
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/branches/maniac-guest/debian/patches/perms_dev_mISDN?rev=5510&op=file
==============================================================================
--- misdn-kernel/branches/maniac-guest/debian/patches/perms_dev_mISDN (added)
+++ misdn-kernel/branches/maniac-guest/debian/patches/perms_dev_mISDN Mon Apr 7 07:44:11 2008
@@ -1,0 +1,15 @@
+Index: misdn-kernel-1.1.7/config/mISDN
+===================================================================
+--- misdn-kernel-1.1.7.orig/config/mISDN 2007-04-17 10:26:15.000000000 +0200
++++ misdn-kernel-1.1.7/config/mISDN 2007-04-26 11:58:49.000000000 +0200
+@@ -84,8 +84,8 @@
+ L1OIP_id=''
+
+ DEVNODE_user='root'
+-DEVNODE_group='root'
+-DEVNODE_mode='0644'
++DEVNODE_group='dialout'
++DEVNODE_mode='660'
+
+ declare -a SCAN_card
+ declare -a SCAN_opts
Modified: misdn-kernel/branches/maniac-guest/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/branches/maniac-guest/debian/patches/series?rev=5510&op=diff
==============================================================================
--- misdn-kernel/branches/maniac-guest/debian/patches/series (original)
+++ misdn-kernel/branches/maniac-guest/debian/patches/series Mon Apr 7 07:44:11 2008
@@ -1,2 +1,4 @@
hfcmulti_c90
hfcmulti_bigendian
+#2_6_23_fix
+perms_dev_mISDN
Modified: misdn-kernel/branches/maniac-guest/debian/rules-template
URL: http://svn.debian.org/wsvn/pkg-voip/misdn-kernel/branches/maniac-guest/debian/rules-template?rev=5510&op=diff
==============================================================================
--- misdn-kernel/branches/maniac-guest/debian/rules-template (original)
+++ misdn-kernel/branches/maniac-guest/debian/rules-template Mon Apr 7 07:44:11 2008
@@ -81,23 +81,55 @@
export EXTRA_CFLAGS
+# export way...
+
CONFIG_MISDN_DRV=m
ifneq ($(CONFIG_PPC64),y)
-CONFIG_MISDN_AVM_FRITZ=y
+CONFIG_MISDN_AVM_FRITZ=m
endif
-CONFIG_MISDN_HFCPCI=y
-CONFIG_MISDN_HFCUSB=y
-CONFIG_MISDN_SPEEDFAX=y
-CONFIG_MISDN_W6692=y
-CONFIG_MISDN_HFCMULTI=y
-CONFIG_MISDN_NETJET=y
-CONFIG_MISDN_NETDEV=y
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_NETJET=m
+#CONFIG_MISDN_NETDEV=y
#CONFIG_I4L_CAPI_LAYER=y
export CONFIG_MISDN_DRV CONFIG_MISDN_AVM_FRITZ CONFIG_MISDN_HFCPCI
export CONFIG_MISDN_HFCUSB CONFIG_MISDN_SPEEDFAX CONFIG_MISDN_W6692
export CONFIG_MISDN_HFCMULTI CONFIG_MISDN_NETJET CONFIG_MISDN_NETDEV
export CONFIG_I4L_CAPI_LAYER
+
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_HFCMINI=m
+CONFIG_MISDN_XHFC=m
+
+MAJOR=1
+MINOR=1
+SUBMINOR=7_2
+MISDNVERSION=$(shell echo $(MAJOR)_$(MINOR)_$(SUBMINOR))
+
+export CONFIG_MISDN_DSP CONFIG_MISDN_HFCMINI CONFIG_MISDN_XHFC
+export MISDNVERSION
+
+# CONFIGS way
+
+CONFIGS+=CONFIG_MISDN_DRV=m
+ifneq ($(CONFIG_PPC64),y)
+CONFIGS+=CONFIG_MISDN_AVM_FRITZ=m
+endif
+CONFIGS+=CONFIG_MISDN_HFCPCI=m
+CONFIGS+=CONFIG_MISDN_HFCUSB=m
+CONFIGS+=CONFIG_MISDN_SPEEDFAX=m
+CONFIGS+=CONFIG_MISDN_W6692=m
+CONFIGS+=CONFIG_MISDN_HFCMULTI=m
+CONFIGS+=CONFIG_MISDN_NETJET=m
+CONFIGS+=CONFIG_MISDN_DSP=m
+CONFIGS+=CONFIG_MISDN_HFCMINI=m
+CONFIGS+=CONFIG_MISDN_XHFC=m
+CONFIGS+=MISDNVERSION=$(MISDNVERSION)
+CONFIGS+=EXTRA_CFLAGS=$(EXTRA_CFLAGS)
kdist: kdist_clean kdist_config kdist_image
@@ -121,6 +153,7 @@
M=$M \
$(parallel) \
$(EXTRAV_ARG) \
+ $(CONFIGS) \
modules
binary-modules: build-modules
More information about the Pkg-voip-commits
mailing list