- fixed without_xpp bcond

diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 4163ffe36ec226c323cda030f7a183b93ffe7222..8d205639d5218f1153e4370599072a4610063cf8 100644 (file)
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -1,14 +1,6 @@
 #
 # TODO:
 # - IMPORTANT rename: http://www.asterisk.org/zaptel-to-dahdi
-# - Fix --without xpp:
-#   + check_modules
-#   unpackaged module: drivers/dahdi/xpp/xpd_bri
-#   unpackaged module: drivers/dahdi/xpp/xpd_fxo
-#   unpackaged module: drivers/dahdi/xpp/xpd_fxs
-#   unpackaged module: drivers/dahdi/xpp/xpd_pri
-#   unpackaged module: drivers/dahdi/xpp/xpp
-#   unpackaged module: drivers/dahdi/xpp/xpp_usb
 #
 # Conditional build:
 %bcond_without  kernel         # don't build kernel modules
@@ -58,6 +50,7 @@ Source7:      %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
 Patch0:                kernel-4.14.patch
 Patch1:                kernel-5.18.patch
 Patch2:                kernel-6.1.patch
+Patch3:                no-xpp.patch
 URL:           http://www.asterisk.org/
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 BuildRequires: perl-base
@@ -158,6 +151,9 @@ cd ../..\
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%if %{without xpp}
+%patch3 -p1
+%endif
 
 for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
        ln -s $a drivers/dahdi/firmware

diff --git a/no-xpp.patch b/no-xpp.patch
new file mode 100644 (file)
index 0000000..8434436
--- /dev/null
+++ b/no-xpp.patch
@@ -0,0 +1,30 @@
+--- dahdi-linux-3.2.0/drivers/dahdi/xpp/Kconfig~       2022-09-22 14:23:24.000000000 +0200
++++ dahdi-linux-3.2.0/drivers/dahdi/xpp/Kconfig        2022-12-17 20:36:07.668645726 +0100
+@@ -5,7 +5,7 @@
+ menuconfig DAHDI_XPP
+       tristate "Xorcom Astribank Support"
+       depends on DAHDI
+-      default DAHDI
++      default n
+       ---help---
+         Infrastructure support for Xorcom Astribank products.
+ 
+--- dahdi-linux-3.2.0/drivers/dahdi/Kbuild~    2022-09-22 14:23:24.000000000 +0200
++++ dahdi-linux-3.2.0/drivers/dahdi/Kbuild     2022-12-17 20:38:05.611879322 +0100
+@@ -41,8 +41,6 @@
+ 
+ endif
+ 
+-obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPP)             += xpp/
+-
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_JPAH)    += dahdi_echocan_jpah.o
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE)   += dahdi_echocan_sec.o
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_STEVE2)  += dahdi_echocan_sec2.o
+--- dahdi-linux-3.2.0/drivers/dahdi/Kconfig~   2022-09-22 14:23:24.000000000 +0200
++++ dahdi-linux-3.2.0/drivers/dahdi/Kconfig    2022-12-17 20:38:16.388535301 +0100
+@@ -222,5 +222,3 @@
+ 
+         If unsure, say Y.
+ 
+-
+-source "drivers/dahdi/xpp/Kconfig"