From 007846d348733463ef069447a51ee5d80ae2d2bc Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 29 Oct 2020 14:02:16 +0000 Subject: [PATCH] move dahdi/{user,dahdi_config,wctdm_user}.h to include/uapi The userspace related header files need to be in include/uapi, not incllude/linux. --- .../linux-4.19-dahdi-3.1.0-7-g699e7a0.patch | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/debian/patches/linux-4.19-dahdi-3.1.0-7-g699e7a0.patch b/debian/patches/linux-4.19-dahdi-3.1.0-7-g699e7a0.patch index b1aebccca..1de10b9e7 100644 --- a/debian/patches/linux-4.19-dahdi-3.1.0-7-g699e7a0.patch +++ b/debian/patches/linux-4.19-dahdi-3.1.0-7-g699e7a0.patch @@ -209564,9 +209564,9 @@ diff -Nru linux-source-4.19/include/linux/dahdi/Kbuild linux-source-4.19-dahdi/i +header-y += user.h +header-y += wctdm_user.h +header-y += version.h -diff -Nru linux-source-4.19/include/linux/dahdi/dahdi_config.h linux-source-4.19-dahdi/include/linux/dahdi/dahdi_config.h ---- linux-source-4.19/include/linux/dahdi/dahdi_config.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-source-4.19-dahdi/include/linux/dahdi/dahdi_config.h 2020-10-28 00:17:08.663192245 +0100 +diff -Nru linux-source-4.19/include/uapi/dahdi/dahdi_config.h linux-source-4.19-dahdi/include/linux/dahdi/dahdi_config.h +--- linux-source-4.19/include/uapi/dahdi/dahdi_config.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-source-4.19-dahdi/include/uapi/dahdi/dahdi_config.h 2020-10-28 00:17:08.663192245 +0100 @@ -0,0 +1,201 @@ +/* + * DAHDI configuration options @@ -209769,9 +209769,9 @@ diff -Nru linux-source-4.19/include/linux/dahdi/dahdi_config.h linux-source-4.19 +#define CONFIG_DAHDI_DYNAMIC_LOC + +#endif -diff -Nru linux-source-4.19/include/linux/dahdi/fasthdlc.h linux-source-4.19-dahdi/include/linux/dahdi/fasthdlc.h ---- linux-source-4.19/include/linux/dahdi/fasthdlc.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-source-4.19-dahdi/include/linux/dahdi/fasthdlc.h 2020-10-28 00:17:08.663192245 +0100 +diff -Nru linux-source-4.19/include/uapi/dahdi/fasthdlc.h linux-source-4.19-dahdi/include/uapi/dahdi/fasthdlc.h +--- linux-source-4.19/include/uapi/dahdi/fasthdlc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-source-4.19-dahdi/include/uapi/dahdi/fasthdlc.h 2020-10-28 00:17:08.663192245 +0100 @@ -0,0 +1,533 @@ +/* + * Mark's Mythical Table-based raw HDLC implementation @@ -211951,9 +211951,9 @@ diff -Nru linux-source-4.19/include/linux/dahdi/kernel.h linux-source-4.19-dahdi +#endif /* DAHDI_PRINK_MACROS_USE_debug */ + +#endif /* _DAHDI_KERNEL_H */ -diff -Nru linux-source-4.19/include/linux/dahdi/user.h linux-source-4.19-dahdi/include/linux/dahdi/user.h ---- linux-source-4.19/include/linux/dahdi/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-source-4.19-dahdi/include/linux/dahdi/user.h 2020-10-28 00:17:08.663192245 +0100 +diff -Nru linux-source-4.19/include/uapi/dahdi/user.h linux-source-4.19-dahdi/include/uapi/dahdi/user.h +--- linux-source-4.19/include/uapi/dahdi/user.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-source-4.19-dahdi/include/uapi/dahdi/user.h 2020-10-28 00:17:08.663192245 +0100 @@ -0,0 +1,1220 @@ +/* + * DAHDI Telephony Interface @@ -213185,9 +213185,9 @@ diff -Nru linux-source-4.19/include/linux/dahdi/version.h linux-source-4.19-dahd + */ +#define DAHDI_VERSION "3.1.0-7-g699e7a0" + -diff -Nru linux-source-4.19/include/linux/dahdi/wctdm_user.h linux-source-4.19-dahdi/include/linux/dahdi/wctdm_user.h ---- linux-source-4.19/include/linux/dahdi/wctdm_user.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-source-4.19-dahdi/include/linux/dahdi/wctdm_user.h 2020-10-28 00:17:08.663192245 +0100 +diff -Nru linux-source-4.19/include/uapi/dahdi/wctdm_user.h linux-source-4.19-dahdi/include/uapi/dahdi/wctdm_user.h +--- linux-source-4.19/include/uapi/dahdi/wctdm_user.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-source-4.19-dahdi/include/uapi/dahdi/wctdm_user.h 2020-10-28 00:17:08.663192245 +0100 @@ -0,0 +1,68 @@ +/* + * Wildcard S100P FXS Interface Driver for DAHDI Telephony interface