laforge submitted this change.

View Change

disable loader for the hardware echo canceller as it breaks on >= 6.15

Temporary disable loader for the hardware echo canceler on systems with
modern kernels.

Since Kernel 6.15
(https://github.com/torvalds/linux/commit/0b10177114d1e434af850b377cf5e6620dd1d525)
all objtool failures are fatal and linking dahdi_vpmadt032_loader.o fails:

https: //github.com/asterisk/dahdi-linux/issues/80
https: //github.com/asterisk/dahdi-linux/issues/97
Change-Id: I85ca443e98ce7f289a9207172407ca03cead8e90
---
M drivers/dahdi/Kbuild
1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/drivers/dahdi/Kbuild b/drivers/dahdi/Kbuild
index 4d05f12..48a4d58 100644
--- a/drivers/dahdi/Kbuild
+++ b/drivers/dahdi/Kbuild
@@ -135,40 +135,40 @@
 # VPMADT032 Loader
 ###############################################################################
 
-dahdi_vpmadt032_loader-objs := vpmadt032_loader/dahdi_vpmadt032_loader.o 
-
-ifneq ($(DAHDI_ARCH),)
-  ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped),)
-    $(shell touch $(KBUILD_EXTMOD)/vpmadt032_loader/.vpmadt032_$(DAHDI_ARCH).o.cmd)
-    VPMADT032_LOADER_PRESENT=yes
-    dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o
-    obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER)	+= dahdi_vpmadt032_loader.o
-  endif
-endif
-
-# FIXME: This workaround should not be necessary, but for some reason the rule
-# '$(obj)/%: $(src)/%_shipped' from linux.git scripts/Makefile.lib doesn't
-# cover this anymore.
-vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o: $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped
-	$(call cmd,copy)
-
+#dahdi_vpmadt032_loader-objs := vpmadt032_loader/dahdi_vpmadt032_loader.o 
+#
+#ifneq ($(DAHDI_ARCH),)
+#  ifneq ($(wildcard $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped),)
+#    $(shell touch $(KBUILD_EXTMOD)/vpmadt032_loader/.vpmadt032_$(DAHDI_ARCH).o.cmd)
+#    VPMADT032_LOADER_PRESENT=yes
+#    dahdi_vpmadt032_loader-objs += vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o
+#    obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VPMADT032_LOADER)	+= dahdi_vpmadt032_loader.o
+#  endif
+#endif
+#
+## FIXME: This workaround should not be necessary, but for some reason the rule
+## '$(obj)/%: $(src)/%_shipped' from linux.git scripts/Makefile.lib doesn't
+## cover this anymore.
+#vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o: $(src)/vpmadt032_loader/vpmadt032_$(DAHDI_ARCH).o_shipped
+#	$(call cmd,copy)
+#
 ###############################################################################
 # HPEC Support 
 ###############################################################################
-
-dahdi_echocan_hpec-objs := hpec/dahdi_echocan_hpec.o
-CFLAGS_dahdi_echocan_hpec.o := -I$(src)/hpec
-
-ifneq ($(DAHDI_ARCH),)
-  ifneq ($(wildcard $(src)/hpec/hpec_$(DAHDI_ARCH).o_shipped),)
-    HPEC_PRESENT=yes
-    dahdi_echocan_hpec-objs += hpec/hpec_$(DAHDI_ARCH).o
-  endif
-endif
-
-ifeq ($(HPEC_PRESENT),yes)
-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_HPEC)	+= dahdi_echocan_hpec.o
-endif
+#
+#dahdi_echocan_hpec-objs := hpec/dahdi_echocan_hpec.o
+#CFLAGS_dahdi_echocan_hpec.o := -I$(src)/hpec
+#
+#ifneq ($(DAHDI_ARCH),)
+#  ifneq ($(wildcard $(src)/hpec/hpec_$(DAHDI_ARCH).o_shipped),)
+#    HPEC_PRESENT=yes
+#    dahdi_echocan_hpec-objs += hpec/hpec_$(DAHDI_ARCH).o
+#  endif
+#endif
+#
+#ifeq ($(HPEC_PRESENT),yes)
+#obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_HPEC)	+= dahdi_echocan_hpec.o
+#endif
 
 
 hostprogs-y := makefw

To view, visit change 42002. To unsubscribe, or for help writing mail filters, visit settings.