|
[-]
[+]
|
Added |
dahdi-linux.changes
|
|
|
|
[-]
[+]
|
Changed |
dahdi-linux.spec
^
|
|
|
|
[-]
[+]
|
Added |
dahdi-kill-xpp_h.diff
^
|
| @@ -0,0 +1,71 @@
+From: Jan Engelhardt <jengelh@medozas.de>
+Date: 2011-10-10 02:43:57.731063007 +0200
+Upstream: tbd
+
+build: fix mixing BUILT_SOURCES with normal SOURCES
+
+In automake terminology, xpp_version.h would have to be declared as
+BUILT_SOURCES, because .c files depend on a still-to-be-built file.
+But since that does not exist in Kbuild (to my knowledge), do away
+with xpp_version.h entirely and, in fact, replace it by something
+much more simpler that I would also use with automake.
+
+---
+ drivers/dahdi/xpp/Kbuild | 15 ++-------------
+ drivers/dahdi/xpp/xdefs.h | 3 ---
+ 2 files changed, 2 insertions(+), 16 deletions(-)
+
+Index: dahdi-linux-2.5.0.1/drivers/dahdi/xpp/Kbuild
+===================================================================
+--- dahdi-linux-2.5.0.1.orig/drivers/dahdi/xpp/Kbuild
++++ dahdi-linux-2.5.0.1/drivers/dahdi/xpp/Kbuild
+@@ -3,7 +3,7 @@ EXTRA_CFLAGS = $(XPP_LOCAL_CFLAGS) \
+ -DPOLL_DIGITAL_INPUTS \
+ -DDEBUG_PCMTX \
+ -DPROTOCOL_DEBUG \
+- -g
++ -g -DXPP_VERSION=\"${XPP_VERSION_STR}\"
+ #
+
+ WITH_BRISTUFF := $(shell grep -c '^[[:space:]]*\#[[:space:]]*define[[:space:]]\+CONFIG_DAHDI_BRI_DCHANS\>' $(src)/../../../include/dahdi/dahdi_config.h)
+@@ -38,17 +38,6 @@ endif
+
+ # Handle versioning
+ XPP_VERSION_STR ?= $(shell if [ -r $(obj)/.version ]; then echo "\"`cat $(obj)/.version`\""; else echo '"Unknown"'; fi)
+-clean-files += xpp_version.h
+-
+-$(obj)/card_fxs.o $(obj)/card_fxo.o $(obj)/card_bri.o $(obj)/card_pri.o $(obj)/xpp_usb.o $(obj)/xpp.o: $(obj)/xpp_version.h
+-
+-$(obj)/xpp_version.h: FORCE
+- @echo ' VERSION $@'
+- $(Q)echo '#define XPP_VERSION $(XPP_VERSION_STR)' > $@.tmp
+- $(Q)if cmp -s $@.tmp $@ ; then echo; else \
+- mv $@.tmp $@ ; \
+- fi
+- $(Q)rm -f $@.tmp
+
+ # Validations:
+ # - Syntactic verification of perl scripts
+@@ -69,7 +58,7 @@ FXO_MODES = $(src)/../fxo_modes.h
+ FXO_VERIFY = $(obj)/init_card_2_$(XPP_PROTOCOL_VERSION) -v $(obj)/init_fxo_modes
+
+ hostprogs-y := print_fxo_modes
+-always := $(xpp_verified) xpp_version.h
++always := $(xpp_verified)
+ print_fxo_modes-objs := print_fxo_modes.o
+ HOSTCFLAGS_print_fxo_modes.o += -include $(FXO_MODES)
+
+Index: dahdi-linux-2.5.0.1/drivers/dahdi/xpp/xdefs.h
+===================================================================
+--- dahdi-linux-2.5.0.1.orig/drivers/dahdi/xpp/xdefs.h
++++ dahdi-linux-2.5.0.1/drivers/dahdi/xpp/xdefs.h
+@@ -21,9 +21,6 @@
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+-
+-#include "xpp_version.h"
+-
+ #ifdef __KERNEL__
+
+ #include <linux/kernel.h>
|
|
[-]
[+]
|
Added |
dahdi-moddir.diff
^
|
| @@ -0,0 +1,20 @@
+From: Jan Engelhardt <jengelh@medozas.de>
+
+Stop forcing paths on the user and use default paths.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: dahdi-linux-2.4.0/Makefile
+===================================================================
+--- dahdi-linux-2.4.0.orig/Makefile
++++ dahdi-linux-2.4.0/Makefile
+@@ -162,7 +162,7 @@ endif
+ DAHDI_INCLUDE=${PWD}/include \
+ DAHDI_MODULES_EXTRA="${DAHDI_MODULES_EXTRA}" \
+ HOTPLUG_FIRMWARE="${HOTPLUG_FIRMWARE}" \
+- INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
++ INSTALL_MOD_PATH=$(DESTDIR) modules_install
+ [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
+
+ uninstall-modules:
|
|
[-]
[+]
|
Added |
dahdi-pmake.diff
^
|
| @@ -0,0 +1,38 @@
+From: Jan Engelhardt <jengelh@medozas.de>
+
+For parallel make to work, ${MAKE} must be seen verbatim -
+no indirection via extra variable like KMAKE is allowed.
+---
+ Makefile | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+Index: dahdi-linux-2.4.0/Makefile
+===================================================================
+--- dahdi-linux-2.4.0.orig/Makefile
++++ dahdi-linux-2.4.0/Makefile
+@@ -79,7 +79,11 @@ ifeq (no,$(HAS_KSRC))
+ @echo "You do not appear to have the sources for the $(KVERS) kernel installed."
+ @exit 1
+ endif
+- $(KMAKE) modules DAHDI_BUILD_ALL=$(DAHDI_BUILD_ALL)
++ ${MAKE} -C ${KSRC} M=${PWD}/drivers/dahdi \
++ DAHDI_INCLUDE=${PWD}/include \
++ DAHDI_MODULES_EXTRA="${DAHDI_MODULES_EXTRA}" \
++ HOTPLUG_FIRMWARE="${HOTPLUG_FIRMWARE}" \
++ DAHDI_BUILD_ALL=${DAHDI_BUILD_ALL}
+
+ include/dahdi/version.h: FORCE
+ @DAHDIVERSION="${DAHDIVERSION}" build_tools/make_version_h > $@.tmp
+@@ -154,7 +158,11 @@ ifndef DESTDIR
+ fi
+ build_tools/uninstall-modules dahdi $(KVERS)
+ endif
+- $(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
++ ${MAKE} -C ${KSRC} M=${PWD}/drivers/dahdi \
++ DAHDI_INCLUDE=${PWD}/include \
++ DAHDI_MODULES_EXTRA="${DAHDI_MODULES_EXTRA}" \
++ HOTPLUG_FIRMWARE="${HOTPLUG_FIRMWARE}" \
++ INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
+ [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
+
+ uninstall-modules:
|
|
[-]
[+]
|
Added |
dahdi-warn-on-once.diff
^
|
| @@ -0,0 +1,35 @@
+From: Jan Engelhardt <jengelh@medozas.de>
+Date: 2011-10-17 21:16:28.811145336 +0200
+Upstream: if you can get past the Asterisk Contributor Agreement for this GPL-only piece...
+
+WARN_ON_ONCE was absent from wctdm24xxp.
+
+---
+ drivers/dahdi/wctdm24xxp/base.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+Index: dahdi-linux-2.5.0.1/drivers/dahdi/wctdm24xxp/base.c
+===================================================================
+--- dahdi-linux-2.5.0.1.orig/drivers/dahdi/wctdm24xxp/base.c
++++ dahdi-linux-2.5.0.1/drivers/dahdi/wctdm24xxp/base.c
+@@ -81,6 +81,20 @@ Tx Gain - W/Pre-Emphasis: -23.99 to 0.00
+ #include "voicebus/GpakCust.h"
+ #include "voicebus/GpakApi.h"
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
++#ifndef WARN_ON_ONCE
++#define WARN_ON_ONCE(__condition) do { \
++ static int __once = 1; \
++ if (unlikely(__condition)) { \
++ if (__once) { \
++ __once = 0; \
++ WARN_ON(0); \
++ } \
++ } \
++} while (0)
++#endif
++#endif
++
+ #if VOICEBUS_SFRAME_SIZE != SFRAME_SIZE
+ #error SFRAME_SIZE must match the VOICEBUS_SFRAME_SIZE
+ #endif
|
|
|
Added |
dahdi-linux-2.5.0.1.tar.bz2
^
|
|
[-]
[+]
|
Added |
dahdi-linux-preamble
^
|
| @@ -0,0 +1,5 @@
+Enhances: kernel-%1
+Provides: kmp(dahdi) = %version
+Supplements: packageand(kernel-%1:dahdi)
+# For firmware
+Requires: dahdi-linux
|
|
|
Added |
firmware-20111005.tar.bz2
^
|
