dahdi-linux: bump to latest git head

This compiles with newer kernels now. Signed-off-by: Sebastian Kemper <[email protected]>
openwrt · Oct 13, 2023 · 9797652 · 9797652
1 parent 5f998af
commit 9797652
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 782 deletions.
diff --git a/libs/dahdi-linux/Makefile b/libs/dahdi-linux/Makefile
@@ -9,12 +9,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=dahdi-linux
-PKG_VERSION:=3.1.0
-PKG_RELEASE:=5
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases
-PKG_HASH:=db5b758437d066a7edad34b54313f08a4ccdde28373492986b72c798e8561b4d
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/asterisk/dahdi-linux.git
+PKG_SOURCE_DATE=2023-09-21
+PKG_SOURCE_VERSION:=1bb9088f2baff8c4e3fec536044cc48072cf9905
+PKG_MIRROR_HASH:=d88da88f21f7c1fb38480ba2420789b230c84fed18e74ee399706feacd8e3ebb
 
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE

diff --git a/libs/dahdi-linux/patches/003-fix-oslec-build.patch b/libs/dahdi-linux/patches/003-fix-oslec-build.patch
@@ -1,6 +1,6 @@
 --- a/drivers/dahdi/Kbuild
 +++ b/drivers/dahdi/Kbuild
-@@ -54,9 +54,8 @@ obj-m += $(DAHDI_MODULES_EXTRA)
+@@ -64,9 +64,8 @@ obj-m += $(DAHDI_MODULES_EXTRA)
  # If you want to build OSLEC, include the code in the standard location:
  # drivers/staging/echo . The DAHDI OSLEC echo canceller will be built as
  # well:

diff --git a/libs/dahdi-linux/patches/100-add-support-for-hfc-s-pci.patch b/libs/dahdi-linux/patches/100-add-support-for-hfc-s-pci.patch
@@ -6,11 +6,11 @@
  obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTE13XP)		+= wcte13xp.o
 +obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_HFCS)		+= hfcs/
 
- wcte13xp-objs := wcte13xp-base.o wcxb_spi.o wcxb.o wcxb_flash.o
- CFLAGS_wcte13xp-base.o += -I$(src)/oct612x -I$(src)/oct612x/include -I$(src)/oct612x/octdeviceapi -I$(src)/oct612x/octdeviceapi/oct6100api
+ ifndef HOTPLUG_FIRMWARE
+ ifneq (,$(filter y m,$(CONFIG_FW_LOADER)))
 --- a/drivers/dahdi/Kconfig
 +++ b/drivers/dahdi/Kconfig
-@@ -223,4 +223,14 @@ config DAHDI_DYNAMIC_LOC
+@@ -235,4 +235,14 @@ config DAHDI_DYNAMIC_LOC
  	  If unsure, say Y.
 
 

diff --git a/libs/dahdi-linux/patches/120-pci-header.patch b/libs/dahdi-linux/patches/120-pci-header.patch
diff --git a/libs/dahdi-linux/patches/130-DAHLIN-371-pld-linux-math64.patch b/libs/dahdi-linux/patches/130-DAHLIN-371-pld-linux-math64.patch
@@ -8,7 +8,7 @@
  #include <linux/proc_fs.h>
  #include <linux/seq_file.h>
  #include <linux/slab.h>
-@@ -1754,11 +1755,13 @@ out:
+@@ -1768,11 +1769,13 @@ out:
 
  static void xbus_fill_proc_queue(struct seq_file *sfile, struct xframe_queue *q)
  {
@@ -127,7 +127,7 @@
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
  #include <asm/uaccess.h>
  #else
-@@ -886,7 +887,7 @@ static void xpp_send_callback(struct urb
+@@ -891,7 +892,7 @@ static void xpp_send_callback(struct urb
  		usec = 0; /* System clock jumped */
  	if (usec > xusb->max_tx_delay)
  		xusb->max_tx_delay = usec;