From 416d1f6c245aaf05f7c0f5ab7298db240ce333f7 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Thu, 19 Mar 2020 18:39:19 +0100 Subject: [PATCH] dahdi-linux: bump to version 3.1.0 This commit provides compatibility with kernel 5.4. Except for the version bump this commit updates the HFC-S PCI driver to not rely on the macro "dahdi_pci_module" anymore, because it has been removed upstream in commit 4af6f69. Also, a patch is added that makes the include of "" conditional on the kernel version, because starting with kernel 5.4 this header has been removed and its contents merged into "pci.h". Signed-off-by: Sebastian Kemper --- libs/dahdi-linux/Makefile | 4 ++-- .../patches/100-add-support-for-hfc-s-pci.patch | 2 +- libs/dahdi-linux/patches/120-pci-header.patch | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 libs/dahdi-linux/patches/120-pci-header.patch diff --git a/libs/dahdi-linux/Makefile b/libs/dahdi-linux/Makefile index dd8cda4..e648217 100644 --- a/libs/dahdi-linux/Makefile +++ b/libs/dahdi-linux/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=dahdi-linux -PKG_VERSION:=3.0.0 +PKG_VERSION:=3.1.0 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:=02a8a680d20a3e243f37259edc3554ab9a488595a28562c45c33da3792d12caa +PKG_HASH:=db5b758437d066a7edad34b54313f08a4ccdde28373492986b72c798e8561b4d PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE 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 index b8418cc..4e40f94 100644 --- 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 @@ -1716,7 +1716,7 @@ + hfc_proc_dahdi_hfcs_dir = proc_mkdir(hfc_DRIVER_NAME, proc_root_driver); +#endif + -+ ret = dahdi_pci_module(&hfc_driver); ++ ret = pci_register_driver(&hfc_driver); + return ret; +} + diff --git a/libs/dahdi-linux/patches/120-pci-header.patch b/libs/dahdi-linux/patches/120-pci-header.patch new file mode 100644 index 0000000..9e2245c --- /dev/null +++ b/libs/dahdi-linux/patches/120-pci-header.patch @@ -0,0 +1,13 @@ +--- a/include/dahdi/kernel.h ++++ b/include/dahdi/kernel.h +@@ -59,8 +59,10 @@ + #include + + #ifdef CONFIG_PCI ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) + #include + #endif ++#endif + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) + #define HAVE_NET_DEVICE_OPS -- 2.30.2