|
[-]
[+]
|
Changed |
zaptel.spec
|
|
|
|
|
Renamed |
12787-1.patch
^
|
|
[-]
[+]
|
Added |
device.patch
^
|
| @@ -0,0 +1,93 @@
+--- kernel/zaptel-base.c 2008-05-11 03:57:08.000000000 +0200
++++ kernel/zaptel-base.c.new 2008-08-03 12:11:11.000000000 +0200
+@@ -163,12 +163,30 @@
+ /* udev necessary data structures. Yeah! */
+ #ifdef CONFIG_ZAP_UDEV
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++#define CLASS_DEV_CREATE(class, devt, device, name) \
++ device_create(class, device, devt, name)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+ #define CLASS_DEV_CREATE(class, devt, device, name) \
+ class_device_create(class, NULL, devt, device, name)
+-#else
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
+ #define CLASS_DEV_CREATE(class, devt, device, name) \
+ class_device_create(class, devt, device, name)
++#else
++#define CLASS_DEV_CREATE(class, devt, device, name) \
++ class_simple_device_add(class, devt, device, name)
++#endif
++
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++#define CLASS_DEV_DESTROY(class, devt) \
++ device_destroy(class, devt)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
++#define CLASS_DEV_DESTROY(class, devt) \
++ class_device_destroy(class, devt)
++#else
++#define CLASS_DEV_DESTROY(class, devt) \
++ class_simple_device_remove(class, devt)
+ #endif
+
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
+@@ -177,13 +195,10 @@
+ static struct class_simple *zap_class = NULL;
+ #define class_create class_simple_create
+ #define class_destroy class_simple_destroy
+-#define class_device_create class_simple_device_add
+-#define class_device_destroy(a, b) class_simple_device_remove(b)
+ #endif
+
+ #endif /* CONFIG_ZAP_UDEV */
+
+-
+ /* There is a table like this in the PPP driver, too */
+
+ static int deftaps = 64;
+@@ -5282,7 +5297,11 @@
+ #ifdef CONFIG_ZAP_UDEV
+ for (x = 0; x < span->channels; x++) {
+ if (span->chans[x].channo < 250)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++ device_destroy(zap_class, MKDEV(ZT_MAJOR, span->chans[x].channo));
++#else
+ class_device_destroy(zap_class, MKDEV(ZT_MAJOR, span->chans[x].channo));
++#endif
+ }
+ #endif /* CONFIG_ZAP_UDEV */
+
+@@ -7703,7 +7722,11 @@
+ int zt_unregister_chardev(struct zt_chardev *dev)
+ {
+ #ifdef CONFIG_ZAP_UDEV
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++ device_destroy(zap_class, MKDEV(ZT_MAJOR, dev->minor));
++#else
+ class_device_destroy(zap_class, MKDEV(ZT_MAJOR, dev->minor));
++#endif
+ #endif /* CONFIG_ZAP_UDEV */
+
+ #ifdef CONFIG_DEVFS_FS
+@@ -7782,11 +7805,19 @@
+ devfs_unregister_chrdev(ZT_MAJOR, "zaptel");
+ #else
+ #ifdef CONFIG_ZAP_UDEV
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++ device_destroy(zap_class, MKDEV(ZT_MAJOR, 253)); /* timer */
++ device_destroy(zap_class, MKDEV(ZT_MAJOR, 254)); /* channel */
++ device_destroy(zap_class, MKDEV(ZT_MAJOR, 255)); /* pseudo */
++ device_destroy(zap_class, MKDEV(ZT_MAJOR, 0)); /* ctl */
++ class_destroy(zap_class);
++#else
+ class_device_destroy(zap_class, MKDEV(ZT_MAJOR, 253)); /* timer */
+ class_device_destroy(zap_class, MKDEV(ZT_MAJOR, 254)); /* channel */
+ class_device_destroy(zap_class, MKDEV(ZT_MAJOR, 255)); /* pseudo */
+ class_device_destroy(zap_class, MKDEV(ZT_MAJOR, 0)); /* ctl */
+ class_destroy(zap_class);
++#endif
+ #endif /* CONFIG_ZAP_UDEV */
+ unregister_chrdev(ZT_MAJOR, "zaptel");
+ #endif
|
|
[-]
[+]
|
Deleted |
zaptel-wctel2xp.diff
^
|
| @@ -1,7047 +0,0 @@
-diff -uNr zaptel-1.4.8/wcte12xp/base.c zaptel-1.4/wcte12xp/base.c
---- zaptel-1.4.8/wcte12xp/base.c 2008-01-11 23:39:16.000000000 +0100
-+++ zaptel-1.4/wcte12xp/base.c 2008-02-03 17:46:02.000000000 +0100
-@@ -47,8 +47,11 @@
- #include "../wct4xxp/wct4xxp.h" /* For certain definitions */
-
- #include "wcte12xp.h"
-+
-+#if defined(VPM_SUPPORT)
- #include "vpmadt032.h"
- #include "GpakApi.h"
-+#endif
-
- struct pci_driver te12xp_driver;
-
-@@ -92,6 +95,9 @@
- int vpmsupport = 1;
- int vpmdtmfsupport = 0;
- int vpmtsisupport = 0;
-+int vpmnlptype = 1;
-+int vpmnlpthresh = 24;
-+int vpmnlpmaxsupp = 0;
- #endif
-
- struct t1 *ifaces[WC_MAX_IFACES];
-@@ -1352,8 +1358,12 @@
- snprintf(wc->span.desc, sizeof(wc->span.desc) - 1, "%s Card %d", wc->variety, wc->num);
- wc->span.manufacturer = "Digium";
- strncpy(wc->span.devicetype, wc->variety, sizeof(wc->span.devicetype) - 1);
-+
-+#if defined(VPM_SUPPORT)
- if (wc->vpm150m)
- strncat(wc->span.devicetype, " with VPMADT032", sizeof(wc->span.devicetype) - 1);
-+#endif
-+
- snprintf(wc->span.location, sizeof(wc->span.location) - 1,
- "PCI Bus %02d Slot %02d", wc->dev->bus->number, PCI_SLOT(wc->dev->devfn) + 1);
-
-@@ -2012,9 +2022,9 @@
-
- static void __devexit te12xp_remove_one(struct pci_dev *pdev)
- {
-- unsigned long flags;
- struct t1 *wc = pci_get_drvdata(pdev);
- #ifdef VPM_SUPPORT
-+ unsigned long flags;
- struct vpm150m *vpm150m = wc->vpm150m;
- #endif
- if (!wc)
-@@ -2115,6 +2125,9 @@
- MODULE_PARM(vpmsupport, "i");
- MODULE_PARM(vpmdtmfsupport, "i");
- MODULE_PARM(vpmtsisupport, "i");
-+MODULE_PARM(vpmnlptype, "i");
-+MODULE_PARM(vpmnlpthresh, "i");
-+MODULE_PARM(vpmnlpmaxsupp, "i");
- #endif
- #endif
-
-diff -uNr zaptel-1.4.8/wcte12xp/Kbuild zaptel-1.4/wcte12xp/Kbuild
---- zaptel-1.4.8/wcte12xp/Kbuild 2007-12-11 09:43:22.000000000 +0100
-+++ zaptel-1.4/wcte12xp/Kbuild 2008-02-03 17:46:02.000000000 +0100
-@@ -2,6 +2,10 @@
-
- EXTRA_CFLAGS := -I$(src)/.. -Wno-undef
-
-+ifeq ($(HOTPLUG_FIRMWARE),yes)
-+ EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
-+endif
-+
- wcte12xp-objs := base.o vpmadt032.o GpakApi.o
-
- ifneq ($(HOTPLUG_FIRMWARE),yes)
-diff -uNr zaptel-1.4.8/wcte12xp/Makefile zaptel-1.4/wcte12xp/Makefile
---- zaptel-1.4.8/wcte12xp/Makefile 2007-12-11 09:43:22.000000000 +0100
-+++ zaptel-1.4/wcte12xp/Makefile 2008-02-03 17:46:02.000000000 +0100
-@@ -1,24 +1,22 @@
- ifneq ($(KBUILD_EXTMOD),)
--# We only get here on kernels 2.6.0-2.6.8 .
-+# We only get here on kernels 2.6.0-2.6.9 .
- # For newer kernels, Kbuild will be included directly by the kernel
- # build system.
- include $(src)/Kbuild
-
- else
-
-+# building for 2.4 kernels means no VPM support, so none of the VPM support
-+# modules are included in the Makefile rules
-+
- all: wcte12xp.o
-
- %.o: %.c
- $(CC) $(KFLAGS) -o $@ -c $<
-
--base.o: ../zaptel.h vpmadt032.h
--
--vpmadt032.o: vpmadt032.h
--
--../firmware/zaptel-fw-vpmadt032.o: base.o
-- $(MAKE) -C ../firmware zaptel-fw-vpmadt032.o
-+base.o: ../zaptel.h
-
--wcte12xp.o: base.o vpmadt032.o GpakApi.o ../firmware/zaptel-fw-vpmadt032.o
-+wcte12xp.o: base.o
- $(LD) -r -o $@ $^
-
- clean:
-diff -uNr zaptel-1.4.8/wcte12xp/.svn/all-wcprops zaptel-1.4/wcte12xp/.svn/all-wcprops
---- zaptel-1.4.8/wcte12xp/.svn/all-wcprops 1970-01-01 01:00:00.000000000 +0100
-+++ zaptel-1.4/wcte12xp/.svn/all-wcprops 2008-02-03 17:46:02.000000000 +0100
-@@ -0,0 +1,71 @@
-+K 25
-+svn:wc:ra_dav:version-url
-+V 47
-+/svn/zaptel/!svn/ver/3748/branches/1.4/wcte12xp
-+END
-+vpmadt032.c
-+K 25
-+svn:wc:ra_dav:version-url
-+V 59
-+/svn/zaptel/!svn/ver/3731/branches/1.4/wcte12xp/vpmadt032.c
-+END
-+GpakApi.h
-+K 25
-+svn:wc:ra_dav:version-url
-+V 57
-+/svn/zaptel/!svn/ver/3371/branches/1.4/wcte12xp/GpakApi.h
-+END
-+wcte12xp.h
-+K 25
-+svn:wc:ra_dav:version-url
-+V 58
-+/svn/zaptel/!svn/ver/3738/branches/1.4/wcte12xp/wcte12xp.h
-+END
-+GpakErrs.h
-+K 25
-+svn:wc:ra_dav:version-url
-+V 58
-+/svn/zaptel/!svn/ver/3371/branches/1.4/wcte12xp/GpakErrs.h
-+END
-+vpmadt032.h
-+K 25
-+svn:wc:ra_dav:version-url
-+V 59
-+/svn/zaptel/!svn/ver/3649/branches/1.4/wcte12xp/vpmadt032.h
-+END
-+GpakHpi.h
-+K 25
-+svn:wc:ra_dav:version-url
-+V 57
-+/svn/zaptel/!svn/ver/3371/branches/1.4/wcte12xp/GpakHpi.h
-+END
-+Kbuild
-+K 25
-+svn:wc:ra_dav:version-url
-+V 54
-+/svn/zaptel/!svn/ver/3721/branches/1.4/wcte12xp/Kbuild
-+END
-+base.c
-+K 25
-+svn:wc:ra_dav:version-url
-+V 54
-+/svn/zaptel/!svn/ver/3738/branches/1.4/wcte12xp/base.c
-+END
-+GpakApi.c
-+K 25
-+svn:wc:ra_dav:version-url
-+V 57
-+/svn/zaptel/!svn/ver/3371/branches/1.4/wcte12xp/GpakApi.c
-+END
-+Makefile
-+K 25
-+svn:wc:ra_dav:version-url
-+V 56
-+/svn/zaptel/!svn/ver/3748/branches/1.4/wcte12xp/Makefile
-+END
-+gpakenum.h
-+K 25
-+svn:wc:ra_dav:version-url
-+V 58
-+/svn/zaptel/!svn/ver/3371/branches/1.4/wcte12xp/gpakenum.h
-+END
-diff -uNr zaptel-1.4.8/wcte12xp/.svn/dir-prop-base zaptel-1.4/wcte12xp/.svn/dir-prop-base
---- zaptel-1.4.8/wcte12xp/.svn/dir-prop-base 1970-01-01 01:00:00.000000000 +0100
-+++ zaptel-1.4/wcte12xp/.svn/dir-prop-base 2008-02-03 17:46:02.000000000 +0100
-@@ -0,0 +1,8 @@
-+K 10
-+svn:ignore
-+V 19
-+*.mod.c
-+*.cmd
-+*.ko
-+
-+END
-diff -uNr zaptel-1.4.8/wcte12xp/.svn/entries zaptel-1.4/wcte12xp/.svn/entries
---- zaptel-1.4.8/wcte12xp/.svn/entries 1970-01-01 01:00:00.000000000 +0100
-+++ zaptel-1.4/wcte12xp/.svn/entries 2008-02-03 17:46:02.000000000 +0100
-@@ -0,0 +1,160 @@
-+8
|
|
[-]
[+]
|
Deleted |
zaptel-wctel2xp_2.diff
^
|
| @@ -1,43 +0,0 @@
---- branches/1.4/wcte12xp/base.c 2008/01/25 23:13:41 3738
-+++ branches/1.4/wcte12xp/base.c 2008/02/05 23:48:24 3805
-@@ -1898,6 +1898,7 @@
- /* Read interrupts */
- spin_lock(&wc->reglock);
- ints = __t1_getctl(wc, 0x0028);
-+ ints &= 0x3fef; /* Just look at the interrupt conditions */
-
- if (!ints) {
- spin_unlock(&wc->reglock);
-@@ -1910,7 +1911,6 @@
-
- /* clear interrupts interrupts (we only get here if interrupt is for us) */
- __t1_setctl(wc, 0x0028, ints);
-- ints &= wc->intmask;
-
- if (ints & 0x00000041) {
- do {
-@@ -1918,6 +1918,13 @@
- res |= t1_check_descriptor(wc, 1);
- } while(res);
- }
-+
-+ if (ints & 0x0000a3ae) {
-+ /* This will allow us to recover if interrupts are held for a long period of time */
-+ debug_printk(1, "Abnormal interrupt %08x detected\n", ints);
-+ __t1_setctl(wc, 0x0008, 0x00000000);
-+ __t1_setctl(wc, 0x0010, 0x00000000);
-+ }
- spin_unlock(&wc->reglock);
-
- #ifdef LINUX26
-@@ -2114,6 +2121,9 @@
- module_param(vpmsupport, int, S_IRUGO | S_IWUSR);
- module_param(vpmdtmfsupport, int, S_IRUGO | S_IWUSR);
- module_param(vpmtsisupport, int, S_IRUGO | S_IWUSR);
-+module_param(vpmnlptype, int, S_IRUGO | S_IWUSR);
-+module_param(vpmnlpthresh, int, S_IRUGO | S_IWUSR);
-+module_param(vpmnlpmaxsupp, int, S_IRUGO | S_IWUSR);
- #endif
- #else
- MODULE_PARM(debug, "i");
-
|
|
[-]
[+]
|
Added |
zaptel.patch
^
|
| @@ -0,0 +1,107 @@
+--- firmware/Makefile.orig 2008-09-15 08:55:22.000000000 +0200
++++ firmware/Makefile 2008-09-15 08:56:15.000000000 +0200
+@@ -72,7 +72,7 @@
+
+ # Download and extract firmware tarballs
+ zaptel-fw-%.tar.gz:
+- @if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/usr/lib/hotplug/firmware ] && ! [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.$(subst .tar.gz,,$*) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.$(subst .tar.gz,,$*) ] ); then \
++ @if ( [ "$(HOTPLUG_FIRMWARE)" = "no" ] ) || ( [ -d $(DESTDIR)/$(LIBDIR)/hotplug/firmware ] && ! [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.$(subst .tar.gz,,$*) ] ) || ( [ -d $(DESTDIR)/lib/firmware ] && ! [ -f $(DESTDIR)/lib/firmware/.$(subst .tar.gz,,$*) ] ); then \
+ echo "Attempting to download $@"; \
+ if test ! -f $@; then $(DOWNLOAD) $(WGET_ARGS) $(FIRMWARE_URL)/$@; fi; \
+ if test ! -f $@; then exit 1; fi; \
+@@ -82,17 +82,17 @@
+ # Create object files suitable for linking against
+ object-build: $(FIRMWARE) $(OBJECT_FILES)
+
+-$(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware:
++$(DESTDIR)/$(LIBDIR)/hotplug/firmware $(DESTDIR)/lib/firmware:
+ mkdir -p $@
+
+ # Install all downloaded firmware images for hotplug usage
+-hotplug-install: $(DESTDIR)/usr/lib/hotplug/firmware $(DESTDIR)/lib/firmware $(FIRMWARE)
++hotplug-install: $(DESTDIR)/$(LIBDIR)/hotplug/firmware $(DESTDIR)/lib/firmware $(FIRMWARE)
+ ifneq ($(findstring zaptel-fw-oct6114-064,$(FIRMWARE)),)
+-ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
++ifeq ($(shell if ( [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
+ @echo "Installing zaptel-fw-oct6114-064.bin to hotplug firmware directories"
+- @$(INSTALL) -m 644 zaptel-fw-oct6114-064.bin $(DESTDIR)/usr/lib/hotplug/firmware
+- @rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-*
+- @touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION)
++ @$(INSTALL) -m 644 zaptel-fw-oct6114-064.bin $(DESTDIR)/$(LIBDIR)/hotplug/firmware
++ @rm -rf $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-oct6114-064-*
++ @touch $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION)
+ @$(INSTALL) -m 644 zaptel-fw-oct6114-064.bin $(DESTDIR)/lib/firmware
+ @rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-*
+ @touch $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-064-$(OCT6114_064_VERSION)
+@@ -101,11 +101,11 @@
+ endif
+ endif
+ ifneq ($(findstring zaptel-fw-oct6114-128,$(FIRMWARE)),)
+-ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
++ifeq ($(shell if ( [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
+ @echo "Installing zaptel-fw-oct6114-128.bin to hotplug firmware directories"
+- @$(INSTALL) -m 644 zaptel-fw-oct6114-128.bin $(DESTDIR)/usr/lib/hotplug/firmware
+- @rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-*
+- @touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION)
++ @$(INSTALL) -m 644 zaptel-fw-oct6114-128.bin $(DESTDIR)/$(LIBDIR)/hotplug/firmware
++ @rm -rf $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-oct6114-128-*
++ @touch $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION)
+ @$(INSTALL) -m 644 zaptel-fw-oct6114-128.bin $(DESTDIR)/lib/firmware
+ @rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-*
+ @touch $(DESTDIR)/lib/firmware/.zaptel-fw-oct6114-128-$(OCT6114_128_VERSION)
+@@ -114,11 +114,11 @@
+ endif
+ endif
+ ifneq ($(findstring zaptel-fw-tc400m,$(FIRMWARE)),)
+-ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
++ifeq ($(shell if ( [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
+ @echo "Installing zaptel-fw-tc400m.bin to hotplug firmware directories"
+- @$(INSTALL) -m 644 zaptel-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware
+- @rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-*
+- @touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION)
++ @$(INSTALL) -m 644 zaptel-fw-tc400m.bin $(DESTDIR)/$(LIBDIR)/hotplug/firmware
++ @rm -rf $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-tc400m-*
++ @touch $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION)
+ @$(INSTALL) -m 644 zaptel-fw-tc400m.bin $(DESTDIR)/lib/firmware
+ @rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-*
+ @touch $(DESTDIR)/lib/firmware/.zaptel-fw-tc400m-$(TC400M_VERSION)
+@@ -127,11 +127,11 @@
+ endif
+ endif
+ ifneq ($(findstring zaptel-fw-vpmadt032,$(FIRMWARE)),)
+-ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
++ifeq ($(shell if ( [ -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
+ @echo "Installing zaptel-fw-vpmadt032.bin to hotplug firmware directories"
+- @$(INSTALL) -m 644 zaptel-fw-vpmadt032.bin $(DESTDIR)/usr/lib/hotplug/firmware
+- @rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-*
+- @touch $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION)
++ @$(INSTALL) -m 644 zaptel-fw-vpmadt032.bin $(DESTDIR)/$(LIBDIR)/hotplug/firmware
++ @rm -rf $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-vpmadt032-*
++ @touch $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION)
+ @$(INSTALL) -m 644 zaptel-fw-vpmadt032.bin $(DESTDIR)/lib/firmware
+ @rm -rf $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-*
+ @touch $(DESTDIR)/lib/firmware/.zaptel-fw-vpmadt032-$(VPMADT032_VERSION)
+@@ -142,9 +142,9 @@
+
+ # Uninstall any installed zaptel firmware images from hotplug firmware directories
+ hotplug-uninstall:
+- if [ -d $(DESTDIR)/usr/lib/hotplug/firmware ]; then \
+- rm -f $(DESTDIR)/usr/lib/hotplug/firmware/zaptel-fw-*.bin; \
+- rm -f $(DESTDIR)/usr/lib/hotplug/firmware/.zaptel-fw*; \
++ if [ -d $(DESTDIR)/$(LIBDIR)/hotplug/firmware ]; then \
++ rm -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/zaptel-fw-*.bin; \
++ rm -f $(DESTDIR)/$(LIBDIR)/hotplug/firmware/.zaptel-fw*; \
+ fi
+ if [ -d $(DESTDIR)/lib/firmware ]; then \
+ rm -f $(DESTDIR)/lib/firmware/zaptel-fw-*.bin; \
+--- Makefile.orig 2008-09-15 09:10:59.000000000 +0200
++++ Makefile 2008-09-15 09:11:21.000000000 +0200
+@@ -479,7 +479,7 @@
+
+ install-firmware: menuselect.makeopts
+ ifeq ($(HOTPLUG_FIRMWARE),yes)
+- $(MAKE) -C firmware hotplug-install DESTDIR=$(DESTDIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
++ $(MAKE) -C firmware hotplug-install DESTDIR=$(DESTDIR) LIBDIR=$(LIB_DIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
+ endif
+
+ install-libs: libs
|
|
|
Added |
firmware.tar.bz2
^
|
|
|
Deleted |
misdn-b410p.tar.gz
^
|
|
|
Deleted |
zaptel-1.4.10.1.tar.gz
^
|
|
|
Deleted |
zaptel-1.4.11.tar.gz
^
|
|
|
Renamed |
zaptel-1.4.12.1.tar.bz2
^
|
|
|
Deleted |
zaptel-1.4.12.tar.gz
^
|
|
|
Deleted |
zaptel-1.4.7.1.tar.gz
^
|
|
|
Deleted |
zaptel-1.4.8.tar.gz
^
|
|
|
Deleted |
zaptel-1.4.9.2.tar.gz
^
|
|
|
Deleted |
zaptel-1.4.9.tar.gz
^
|
|
|
Deleted |
zaptel-1.4.tar.gz
^
|
