Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux: [554] trunk/package
|
From: <isc...@us...> - 2007-02-08 13:50:29
|
Revision: 554
http://svn.sourceforge.net/astlinux/?rev=554&view=rev
Author: ischraub
Date: 2007-02-08 05:50:26 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
mqueue-isdn update to latest stuff; we use now a specific version of chan_misdn; misdn startup procedure improved, keep created conf file
Modified Paths:
--------------
trunk/package/asterisk/asterisk.init
trunk/package/chan_misdn/chan_misdn.mk
trunk/package/mqueue-isdn/i4lmake.patch
trunk/package/mqueue-isdn/mqueue-isdn-make.patch
trunk/package/mqueue-isdn/mqueue-isdn.mk
trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch
Removed Paths:
-------------
trunk/package/mqueue-isdn/mqueue-isdn-config.patch
Modified: trunk/package/asterisk/asterisk.init
===================================================================
--- trunk/package/asterisk/asterisk.init 2007-02-07 18:46:41 UTC (rev 553)
+++ trunk/package/asterisk/asterisk.init 2007-02-08 13:50:26 UTC (rev 554)
@@ -84,7 +84,17 @@
if [ "$ISDN_MODPROBE" -o "$MISDN" ]
then
echo "Starting mISDN"
+if [ -d /mnt/kd ]
+then
+ln -s /mnt/kd/misdn-init.conf /tmp/etc/misdn-init.conf
+fi
+if [ -r /mnt/kd/misdn-init.conf ]
+then
+echo "misdn-init.conf already exists on /mnt/kd, skipping config."
+else
+/usr/sbin/misdn-init scan
/usr/sbin/misdn-init config
+fi
/usr/sbin/misdn-init start
# Not needed
#mknod /dev/mISDN c 46 0
Modified: trunk/package/chan_misdn/chan_misdn.mk
===================================================================
--- trunk/package/chan_misdn/chan_misdn.mk 2007-02-07 18:46:41 UTC (rev 553)
+++ trunk/package/chan_misdn/chan_misdn.mk 2007-02-08 13:50:26 UTC (rev 554)
@@ -3,9 +3,9 @@
# chan_misdn
#
#############################################################
-CHANMISDN_VER:=030
-CHANMISDN_SOURCE:=chan_misdn.tar.gz
-CHANMISDN_SITE:=http://www.beronet.com/downloads/chan_misdn/stable/
+CHANMISDN_VER:=0.3.1-rc29
+CHANMISDN_SOURCE:=chan_misdn-$(CHANMISDN_VER).tar.gz
+CHANMISDN_SITE:=http://www.beronet.com/downloads/chan_misdn/stable/candidates
CHANMISDN_DIR:=$(BUILD_DIR)/chan_misdn
CHANMISDN_CAT:=zcat
CHANMISDN_TARGET_DIR=$(TARGET_DIR)/usr/lib/asterisk/modules/
@@ -24,7 +24,7 @@
$(CHANMISDN_DIR)/.built: $(CHANMISDN_DIR)/.configured
$(MAKE) MISDNUSERLIB=$(TARGET_DIR)/usr/lib CFLAGS+=-I$(BUILD_DIR)/asterisk/include CFLAGS+=-I$(CHANMISDN_DIR)/misdn CFLAGS+=-I$(STAGING_DIR)/include CFLAGS+=-I$(STAGING_DIR)/usr/include CC=$(TARGET_CC) -C $(CHANMISDN_DIR)
- install -m 644 $(CHANMISDN_DIR)/chan_misdn.so $(TARGET_DIR)/usr/lib/asterisk/modules/
+ $(INSTALL) -m 644 $(CHANMISDN_DIR)/chan_misdn.so $(TARGET_DIR)/usr/lib/asterisk/modules/
$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/asterisk/modules/chan_misdn.so
cp $(CHANMISDN_DIR)/misdn.conf $(TARGET_DIR)/stat/etc/asterisk/
touch $(CHANMISDN_DIR)/.built
Modified: trunk/package/mqueue-isdn/i4lmake.patch
===================================================================
--- trunk/package/mqueue-isdn/i4lmake.patch 2007-02-07 18:46:41 UTC (rev 553)
+++ trunk/package/mqueue-isdn/i4lmake.patch 2007-02-08 13:50:26 UTC (rev 554)
@@ -1,11 +1,11 @@
---- i4lnet/Makefile.orig 2006-08-16 17:37:11.000000000 -0400
-+++ i4lnet/Makefile 2006-10-09 11:08:40.000000000 -0400
-@@ -10,7 +10,7 @@
- manager.o tone.o bchannel.o g711.o
+--- i4lnet/Makefile.orig 2006-12-21 10:25:22.000000000 +0100
++++ i4lnet/Makefile 2007-01-12 14:52:45.000000000 +0100
+@@ -28,7 +28,7 @@
+ $(RANLIB) $@
- libisdnnet.so: $(ISDNNETOBJ)
-- $(CC) -shared -Xlinker -x -o $@ $^
-+ $(CC) -shared -Xlinker -x -o $@ $^ ../lib/libmISDN.so
+ libisdnnet.so: $(ISDNNET_OBJ)
+- $(CC) $(CFLAGS) -shared -Xlinker -x -o $@ $^
++ $(CC) $(CFLAGS) -shared -Xlinker -x -o $@ $^ ../lib/libmISDN.so
- libisdnnet.a: $(ISDNNETOBJ)
- ar cr $@ $^
+ .c.o:
+ $(CC) $(CFLAGS) -o $@ -c $<
Deleted: trunk/package/mqueue-isdn/mqueue-isdn-config.patch
===================================================================
--- trunk/package/mqueue-isdn/mqueue-isdn-config.patch 2007-02-07 18:46:41 UTC (rev 553)
+++ trunk/package/mqueue-isdn/mqueue-isdn-config.patch 2007-02-08 13:50:26 UTC (rev 554)
@@ -1,251 +0,0 @@
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/avm_fritz.c mISDN/drivers/isdn/hardware/mISDN/avm_fritz.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/avm_fritz.c 2006-06-28 14:03:52.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/avm_fritz.c 2006-12-20 14:26:06.000000000 -0500
-@@ -8,7 +8,6 @@
- * This file is (c) under GNU PUBLIC LICENSE
- *
- */
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/pci.h>
- #ifdef NEW_ISAPNP
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/core.c mISDN/drivers/isdn/hardware/mISDN/core.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/core.c 2006-08-07 19:35:59.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/core.c 2006-12-20 14:26:06.000000000 -0500
-@@ -8,7 +8,6 @@
-
- #include <linux/types.h>
- #include <linux/stddef.h>
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/spinlock.h>
- #include "core.h"
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/dsp_core.c mISDN/drivers/isdn/hardware/mISDN/dsp_core.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/dsp_core.c 2006-09-06 13:24:22.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/dsp_core.c 2006-12-20 14:26:06.000000000 -0500
-@@ -172,7 +172,6 @@
- const char *dsp_revision = "$Revision: 1.24 $";
-
- #include <linux/delay.h>
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/vmalloc.h>
- #include "layer1.h"
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/dtmf.c mISDN/drivers/isdn/hardware/mISDN/dtmf.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/dtmf.c 2006-06-28 14:03:52.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/dtmf.c 2006-12-20 14:26:06.000000000 -0500
-@@ -15,7 +15,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include "layer1.h"
- #include "helper.h"
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/faxl3.c mISDN/drivers/isdn/hardware/mISDN/faxl3.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/faxl3.c 2006-03-23 08:11:43.000000000 -0500
-+++ mISDN/drivers/isdn/hardware/mISDN/faxl3.c 2006-12-20 14:26:06.000000000 -0500
-@@ -11,7 +11,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include "layer1.h"
- #include "m_capi.h"
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfc_multi.c mISDN/drivers/isdn/hardware/mISDN/hfc_multi.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/hfc_multi.c 2006-09-13 11:53:01.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/hfc_multi.c 2006-12-20 14:26:06.000000000 -0500
-@@ -93,7 +93,6 @@
- /* debug using register map (never use this, it will flood your system log) */
- //#define HFC_REGISTER_MAP
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/pci.h>
- #include <linux/delay.h>
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfc_pci.c mISDN/drivers/isdn/hardware/mISDN/hfc_pci.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/hfc_pci.c 2006-06-29 04:52:39.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/hfc_pci.c 2006-12-20 14:26:06.000000000 -0500
-@@ -25,7 +25,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/pci.h>
- #include <linux/delay.h>
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c mISDN/drivers/isdn/hardware/mISDN/hfcs_mini.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_mini.c 2006-06-28 14:03:52.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/hfcs_mini.c 2006-12-20 14:26:06.000000000 -0500
-@@ -49,7 +49,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/delay.h>
- #include <asm/timex.h>
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c mISDN/drivers/isdn/hardware/mISDN/hfcs_usb.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/hfcs_usb.c 2006-08-15 05:38:07.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/hfcs_usb.c 2006-12-20 14:26:06.000000000 -0500
-@@ -28,7 +28,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/delay.h>
- #include <linux/usb.h>
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/i4l_mISDN.c mISDN/drivers/isdn/hardware/mISDN/i4l_mISDN.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/i4l_mISDN.c 2006-03-23 08:11:43.000000000 -0500
-+++ mISDN/drivers/isdn/hardware/mISDN/i4l_mISDN.c 2006-12-20 14:26:06.000000000 -0500
-@@ -10,7 +10,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/isdnif.h>
- #include <linux/delay.h>
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/l1oip.c mISDN/drivers/isdn/hardware/mISDN/l1oip.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/l1oip.c 2006-03-23 08:11:43.000000000 -0500
-+++ mISDN/drivers/isdn/hardware/mISDN/l1oip.c 2006-12-20 14:26:06.000000000 -0500
-@@ -207,7 +207,6 @@
- */
-
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/delay.h>
-
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/layer1.c mISDN/drivers/isdn/hardware/mISDN/layer1.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/layer1.c 2006-06-28 14:03:52.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/layer1.c 2006-12-20 14:26:06.000000000 -0500
-@@ -10,7 +10,6 @@
-
- static char *l1_revision = "$Revision: 1.17 $";
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include "layer1.h"
- #include "helper.h"
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/loop.c mISDN/drivers/isdn/hardware/mISDN/loop.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/loop.c 2006-03-23 08:11:43.000000000 -0500
-+++ mISDN/drivers/isdn/hardware/mISDN/loop.c 2006-12-20 14:26:06.000000000 -0500
-@@ -25,7 +25,6 @@
-
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/delay.h>
-
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/memdbg.c mISDN/drivers/isdn/hardware/mISDN/memdbg.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/memdbg.c 2006-03-06 07:52:07.000000000 -0500
-+++ mISDN/drivers/isdn/hardware/mISDN/memdbg.c 2006-12-20 14:26:06.000000000 -0500
-@@ -1,5 +1,4 @@
- #include <linux/stddef.h>
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/list.h>
- #include <linux/slab.h>
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/netjet.c mISDN/drivers/isdn/hardware/mISDN/netjet.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/netjet.c 2006-08-07 07:53:02.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/netjet.c 2006-12-20 14:26:06.000000000 -0500
-@@ -7,7 +7,6 @@
- * Based on HiSax NETJet driver by Karsten Keil
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/pci.h>
- #include <linux/delay.h>
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/sedl_fax.c mISDN/drivers/isdn/hardware/mISDN/sedl_fax.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/sedl_fax.c 2006-06-29 05:11:08.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/sedl_fax.c 2006-12-20 14:26:06.000000000 -0500
-@@ -26,7 +26,6 @@
- * the firmware onto the card.
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/pci.h>
- #include <linux/delay.h>
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/socket.c mISDN/drivers/isdn/hardware/mISDN/socket.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/socket.c 2006-03-06 07:58:31.000000000 -0500
-+++ mISDN/drivers/isdn/hardware/mISDN/socket.c 2006-12-20 14:26:06.000000000 -0500
-@@ -22,7 +22,6 @@
-
-
- #include <linux/vmalloc.h>
--#include <linux/config.h>
- #include <linux/in.h>
- #include <net/sock.h>
-
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/udevice.c mISDN/drivers/isdn/hardware/mISDN/udevice.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/udevice.c 2006-08-01 07:25:10.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/udevice.c 2006-12-20 14:26:06.000000000 -0500
-@@ -8,7 +8,6 @@
- #include <linux/stddef.h>
- #include <linux/poll.h>
- #include <linux/vmalloc.h>
--#include <linux/config.h>
- #include <linux/timer.h>
- #ifdef CONFIG_DEVFS_FS
- #include <linux/devfs_fs_kernel.h>
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/w6692.c mISDN/drivers/isdn/hardware/mISDN/w6692.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/w6692.c 2006-06-28 14:03:52.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/w6692.c 2006-12-20 14:26:06.000000000 -0500
-@@ -21,7 +21,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/pci.h>
- #include <linux/delay.h>
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/x25_dte.c mISDN/drivers/isdn/hardware/mISDN/x25_dte.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/x25_dte.c 2006-06-28 14:03:52.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/x25_dte.c 2006-12-20 14:26:06.000000000 -0500
-@@ -12,7 +12,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include "x25_l3.h"
- #include "helper.h"
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/x25_l3.c mISDN/drivers/isdn/hardware/mISDN/x25_l3.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/x25_l3.c 2006-08-07 19:35:59.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/x25_l3.c 2006-12-20 14:26:06.000000000 -0500
-@@ -12,7 +12,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include "x25_l3.h"
- #include "helper.h"
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c mISDN/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c 2006-03-17 02:43:41.000000000 -0500
-+++ mISDN/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c 2006-12-20 14:26:06.000000000 -0500
-@@ -21,7 +21,6 @@
- *
- */
-
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/delay.h>
- #include "xhfc_su.h"
-diff -ur mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_su.c mISDN/drivers/isdn/hardware/mISDN/xhfc_su.c
---- mISDN.orig/drivers/isdn/hardware/mISDN/xhfc_su.c 2006-09-11 07:44:02.000000000 -0400
-+++ mISDN/drivers/isdn/hardware/mISDN/xhfc_su.c 2006-12-20 14:26:06.000000000 -0500
-@@ -51,7 +51,6 @@
- */
-
- #include <linux/mISDNif.h>
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/delay.h>
- #include <linux/pci.h>
Modified: trunk/package/mqueue-isdn/mqueue-isdn-make.patch
===================================================================
--- trunk/package/mqueue-isdn/mqueue-isdn-make.patch 2007-02-07 18:46:41 UTC (rev 553)
+++ trunk/package/mqueue-isdn/mqueue-isdn-make.patch 2007-02-08 13:50:26 UTC (rev 554)
@@ -1,9 +1,12 @@
---- mISDN/Makefile.orig 2006-05-29 14:30:35.000000000 +0200
-+++ mISDN/Makefile 2006-05-29 14:28:40.000000000 +0200
-@@ -1,16 +1,17 @@
+--- mISDN/Makefile.orig 2006-12-21 10:21:05.000000000 +0100
++++ mISDN/Makefile 2007-01-12 14:37:35.000000000 +0100
+@@ -1,4 +1,4 @@
-BASEDIR=$(shell pwd)
-+# BASEDIR=$(shell pwd)
++#BASEDIR=$(shell pwd)
+ MAJOR=1
+ MINOR=0
+@@ -6,14 +6,15 @@
INSTALL_PREFIX := /
export INSTALL_PREFIX
@@ -13,59 +16,52 @@
#LINUX=/usr/src/linux
-MODS=/lib/modules/$(shell uname -r)
-LINUX=$(MODS)/build
-+# MODS=/lib/modules/$(shell uname -r)
++#MODS=/lib/modules/$(shell uname -r)
+LINUX=$(MODS)/linux
LINUX_SOURCE=$(MODS)/source
-UPDATE_MODULES=$(shell which update-modules)
-MODULES_UPDATE=$(shell which modules-update)
-+# UPDATE_MODULES=$(shell which update-modules)
-+# MODULES_UPDATE=$(shell which modules-update)
++#UPDATE_MODULES=$(shell which update-modules)
++#MODULES_UPDATE=$(shell which modules-update)
DEPMOD=$(shell which depmod)
-@@ -39,7 +40,7 @@
+@@ -42,20 +43,19 @@
MINCLUDES+=-I$(MISDNDIR)/include
-all: test_old_misdn
+all:
- @echo
- @echo "Makeing mISDN"
- @echo "============="
-@@ -51,21 +52,20 @@
+ cp $(MISDNDIR)/drivers/isdn/hardware/mISDN/Makefile.v2.6 $(MISDNDIR)/drivers/isdn/hardware/mISDN/Makefile
+ export MINCLUDES=$(MISDNDIR)/include ; make -C $(LINUX) SUBDIRS=$(MISDN_SRC) modules $(CONFIGS)
- install: all
+ install: all modules-install misdn-init
+- $(DEPMOD)
+- $(UPDATE_MODULES)
+- $(MODULES_UPDATE)
++ $(DEPMOD) -ae -F $(MODS)/linux/System.map -b $(MODS)/root -r $(LINUX_VER)
+ make -C config install
+
+ modules-install:
cd $(LINUX) ; make INSTALL_MOD_PATH=$(INSTALL_PREFIX) SUBDIRS=$(MISDN_SRC) modules_install
- mkdir -p $(INSTALL_PREFIX)/usr/include/linux/
- cp $(MISDNDIR)/include/linux/*.h $(INSTALL_PREFIX)/usr/include/linux/
+ cd $(LINUX) ; make INSTALL_MOD_PATH=$(MODS)/root SUBDIRS=$(MISDN_SRC) modules_install
+ mkdir -p $(INSTALL_BUILD)/usr/include/linux/
+ cp $(MISDNDIR)/include/linux/*.h $(INSTALL_BUILD)/usr/include/linux/
- mkdir -p $(INSTALL_PREFIX)/usr/sbin/
- install -m755 misdn-init $(INSTALL_PREFIX)/usr/sbin/
- if [ -d $(INSTALL_PREFIX)/etc/init.d ]; then \
- if [ -e $(INSTALL_PREFIX)/etc/init.d/misdn-init ]; then rm -rf $(INSTALL_PREFIX)/etc/init.d/misdn-init; fi; \
- ln -s $(INSTALL_PREFIX)/usr/sbin/misdn-init $(INSTALL_PREFIX)/etc/init.d/misdn-init; \
- fi
- mkdir -p $(INSTALL_PREFIX)/etc/modprobe.d
- cp mISDN.modprobe.d $(INSTALL_PREFIX)/etc/modprobe.d/mISDN
- mkdir -p $(INSTALL_PREFIX)/etc/modules.d
- cp mISDN.modprobe.d $(INSTALL_PREFIX)/etc/modules.d/mISDN
-- $(DEPMOD)
-- $(UPDATE_MODULES)
-- $(MODULES_UPDATE)
-+ $(DEPMOD) -ae -F $(MODS)/linux/System.map -b $(MODS)/root -r $(LINUX_VER)
- test_old_misdn:
- @if echo -ne "#include <linux/mISDNif.h>" | gcc -C -E - 2>/dev/null 1>/dev/null ; then \
-@@ -87,8 +87,8 @@
+ misdn-init:
+ mkdir -p $(INSTALL_PREFIX)/usr/sbin/
+@@ -89,9 +89,9 @@
rm -f /usr/include/linux/isdn_compat.h
clean:
- rm -rf drivers/isdn/hardware/mISDN/*.o
- rm -rf drivers/isdn/hardware/mISDN/*.ko
+- rm -rf *~
+ rm -rf $(INSTALL_PREFIX)/drivers/isdn/hardware/mISDN/*.o
+ rm -rf $(INSTALL_PREFIX)/drivers/isdn/hardware/mISDN/*.ko
- rm -rf *~
++ rm -rf $(INSTALL_PREFIX)/*~
find . -iname ".*.cmd" -exec rm -rf {} \;
find . -iname ".*.d" -exec rm -rf {} \;
+ find . -iname "*.mod.c" -exec rm -rf {} \;
Modified: trunk/package/mqueue-isdn/mqueue-isdn.mk
===================================================================
--- trunk/package/mqueue-isdn/mqueue-isdn.mk 2007-02-07 18:46:41 UTC (rev 553)
+++ trunk/package/mqueue-isdn/mqueue-isdn.mk 2007-02-08 13:50:26 UTC (rev 554)
@@ -5,8 +5,8 @@
# mISDNuser
#
#############################################################
-MQUEUEISDN_ISDN_VER:=CVS-2006-09-16
-MQUEUEISDN_USER_VER:=CVS-2006-08-17
+MQUEUEISDN_ISDN_VER:=CVS-2007-01-26
+MQUEUEISDN_USER_VER:=CVS-2006-12-29
MQUEUEISDN_ISDN_SOURCE:=mISDN-$(MQUEUEISDN_ISDN_VER).tar.bz2
MQUEUEISDN_USER_SOURCE:=mISDNuser-$(MQUEUEISDN_USER_VER).tar.bz2
MQUEUEISDN_SITE:=ftp://ftp.isdn4linux.de/pub/isdn4linux/CVS-Snapshots
@@ -30,6 +30,7 @@
toolchain/patch-kernel.sh $(MQUEUEISDN_DIR)/mISDN package/mqueue-isdn/ mqueue-isdn\*.patch
toolchain/patch-kernel.sh $(MQUEUEISDN_DIR)/mISDNuser package/mqueue-isdn/ mqueue-user-isdn\*.patch
toolchain/patch-kernel.sh $(MQUEUEISDN_DIR)/mISDNuser/i4lnet package/mqueue-isdn/ i4lmake.patch
+ touch $(BUILD_DIR)/linux/include/linux/config.h
touch $(MQUEUEISDN_DIR)/.configured
$(MQUEUEISDN_DIR)/.built1: $(MQUEUEISDN_DIR)/.configured
@@ -37,7 +38,7 @@
touch $(MQUEUEISDN_DIR)/.built1
$(MQUEUEISDN_DIR)/.installed1: $(MQUEUEISDN_DIR)/.built1
- $(MAKE) LINUX_VER=$(LINUX_VERSION) MODS=$(BUILD_DIR) INSTALL_BUILD=$(BUILD_DIR)/linux BASEDIR=$(MQUEUEISDN_DIR)/mISDN CC=$(TARGET_CC) \
+ $(MAKE) LINUX_VER=$(LINUX_VER) MODS=$(BUILD_DIR) INSTALL_BUILD=$(BUILD_DIR)/linux BASEDIR=$(MQUEUEISDN_DIR)/mISDN CC=$(TARGET_CC) \
INSTALL_PREFIX=$(TARGET_DIR) $(TARGET_CONFIGURE_OPTS) -C $(MQUEUEISDN_DIR)/mISDN install
mkdir -p $(STAGING_DIR)/usr/include/linux
rm -rf $(TARGET_DIR)/etc/modprobe.d
@@ -62,6 +63,9 @@
cp $(MQUEUEISDN_DIR)/mISDNuser/include/*.h $(STAGING_DIR)/usr/include/mISDNuser
cp $(MQUEUEISDN_DIR)/mISDNuser/i4lnet/*.h $(STAGING_DIR)/usr/include/mISDNuser
ln -sf ../../usr/sbin/misdn-init $(TARGET_DIR)/etc/init.d/misdn-init
+ rm -f $(TARGET_DIR)/usr/lib/libmISDN*.a
+ rm -f $(TARGET_DIR)/usr/lib/libisdn*.a
+ rm -f $(TARGET_DIR)/usr/lib/libsuppserv*.a
touch $(MQUEUEISDN_DIR)/.installed2
mqueue_misdn: uclibc linux asterisk bc bash pciutils usbutils $(MQUEUEISDN_DIR)/.installed2
Modified: trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch
===================================================================
--- trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch 2007-02-07 18:46:41 UTC (rev 553)
+++ trunk/package/mqueue-isdn/mqueue-user-isdn-make.patch 2007-02-08 13:50:26 UTC (rev 554)
@@ -1,15 +1,14 @@
---- mISDNuser/Makefile.orig 2006-08-15 14:57:31.000000000 -0400
-+++ mISDNuser/Makefile 2006-10-09 11:05:39.000000000 -0400
-@@ -1,7 +1,7 @@
+--- mISDNuser/Makefile.orig 2006-12-21 10:25:22.000000000 +0100
++++ mISDNuser/Makefile 2007-01-12 14:46:34.000000000 +0100
+@@ -6,20 +6,20 @@
#
# Set this to your local copy of mISDN
#
-MISDNDIR := /usr/src/mqueue/mISDN
-+# MISDNDIR := /usr/src/mqueue/mISDN
++#MISDNDIR := /usr/src/mqueue/mISDN
-
PWD=$(shell pwd)
-@@ -9,13 +9,13 @@
+ #
# Change this to create an install prefix for the shared libs, programms and
# includes
#
@@ -25,15 +24,16 @@
export mISDN_DIR
INCLUDEDIR := $(mISDN_DIR)/include
-@@ -23,16 +23,18 @@
+@@ -32,17 +32,19 @@
+ CFLAGS+= -D CLOSE_REPORT=1
- CFLAGS:= -g -Wall -O2 -I $(INCLUDEDIR) -I $(MISDNINCLUDEDIR)
- CFLAGS+= -D CLOSE_REPORT=1
+ #disable this if your system does not support PIC (position independent code)
-ifeq ($(shell uname -m),x86_64)
+#ifeq ($(shell uname -m),x86_64)
- CFLAGS += -fPIC
+ CFLAGS += -fPIC
-endif
+#endif
+
export CFLAGS
-mISDNLIB := $(PWD)/lib/libmISDN.a
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
