Commit cd6136ce authored by Tzafrir Cohen's avatar Tzafrir Cohen

New upstream release: 3.0.0

* Droped some patches that were merged upstream.
* Also renamed a patch that was wrongly-named before.
Signed-off-by: Tzafrir Cohen's avatarTzafrir Cohen <tzafrir@debian.org>
parent 49fd3ad8
dahdi-tools (1:3.0.0-1) UNRELEASED; urgency=medium
* New upstream release.
- Patches no_xtalk_send, udevadm_path and dracut removed: merged upstream.
-- Tzafrir Cohen <tzafrir@debian.org> Sun, 03 Mar 2019 23:44:56 +0200
dahdi-tools (1:2.11.1-3) unstable; urgency=medium
* Team upload.
......
From ba09742a3f30947b5336b167ac703247506ac3a7 Mon Sep 17 00:00:00 2001
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Wed, 22 Mar 2017 15:45:32 +0200
Subject: [PATCH] xpp: prevent dracut from loading Astribank drivers
Prevent an early load of the Astribank (xpp) drivers at initrd time, as
they require some files from the root filesystem.
This installs a file in the dracut configuration directory that will
take effect the next time dracut generates an initrd image.
This installs an configuration file for dracut which is ignored if
dracut is not installed and is a no-op if xpp_usb is not loaded on your
system.
Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
---
xpp/50-dahdi.conf | 5 +++++
xpp/Makefile.am | 3 +++
2 files changed, 8 insertions(+)
create mode 100644 xpp/50-dahdi.conf
diff --git a/xpp/50-dahdi.conf b/xpp/50-dahdi.conf
new file mode 100644
index 0000000..a0a5ce8
--- /dev/null
+++ b/xpp/50-dahdi.conf
@@ -0,0 +1,5 @@
+# A dracut.conf(5) snippet
+# Disable loading the Astribank (xpp_usb) drivers. This is because
+# it relies on files in the root filesystem:
+# See https://issues.asterisk.org/jira/browse/DAHLIN-352
+omit_drivers+=" xpp_usb "
diff --git a/xpp/Makefile.am b/xpp/Makefile.am
index 05f1b1c..56ce64e 100644
--- a/xpp/Makefile.am
+++ b/xpp/Makefile.am
@@ -62,6 +62,9 @@ dist_sbin_SCRIPTS = $(perl_scripts)
man_MANS += $(perl_mans)
CLEANFILES = $(perl_checks) $(perl_mans)
+dracutconfdir = @prefix@/lib/dracut/dracut.conf.d
+dracutconf_DATA = 50-dahdi.conf
+
if PBX_USB
SUBDIRS += oct612x xtalk
--
2.11.0
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Subject: Don't install xtalk_send
xtalk_send is a helper tool for xtalk, a low-level libary used by some
Xorcom DAHDI userspace tools. It is hardly needed by most people.
--- a/xpp/xtalk/Makefile.am
+++ b/xpp/xtalk/Makefile.am
@@ -21,8 +21,7 @@ USB_NAME = libusb
endif
endif
-noinst_PROGRAMS = xlist_test xusb_test xusb_test_bypath xtalk_test xtalk_raw_test
-sbin_PROGRAMS = xtalk_send
+noinst_PROGRAMS = xlist_test xusb_test xusb_test_bypath xtalk_test xtalk_raw_test xtalk_send
noinst_LTLIBRARIES = libxtalk.la
dist_noinst_HEADERS = \
xtalk_base.h \
@@ -39,8 +38,6 @@ dist_noinst_HEADERS = \
include/xtalk/xtalk_iface.h \
#
-man_MANS = xtalk_send.8
-
libxtalk_la_CFLAGS = \
$(COMMON_CFLAGS) \
-I$(srcdir)/include \
......@@ -3,7 +3,4 @@ echocan_oslec
init_unload_oslec
remove_dahdi_speed
soname.patch
no_xtalk_send
udevadm_path.patch
dracut.patch
dahdi_spantypes.patch
From 623a19e319835e19f185e7c3fe71009a884fda33 Mon Sep 17 00:00:00 2001
From: Tzafrir Cohen <tzafrir@debian.org>
Date: Wed, 25 Jan 2017 17:55:30 +0200
Subject: [PATCH] xpp_fxloader: Also look for udevadm in /bin
* udevadm is being moved to /bin. /sbin/udevadm will remain as a
compatibility symlink.
* xpp_fxloader should also look for /bin/udevadm in addition to
/sbin/udevadm and /sbin/udevsettle
* Reverse the order: look for newer ones first.
---
xpp/astribank_hook | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/xpp/astribank_hook b/xpp/astribank_hook
index fdfa82a..3b5a6fb 100755
--- a/xpp/astribank_hook
+++ b/xpp/astribank_hook
@@ -94,22 +94,27 @@ wait_for_udev() {
UDEV_SETTLE_MAX_TIME=10
echo "Waiting for udev to settle down..."
- if [ -x /sbin/udevsettle ]; then
- # Old system, stand-alone udevsettle command
- /sbin/udevsettle --timeout="$UDEV_SETTLE_MAX_TIME"
+ udevsettle_cmd=
+ if [ -x /bin/udevadm ]; then
+ udevsettle_cmd="/bin/udevadm settle"
elif [ -x /sbin/udevadm ]; then
- # Assume modern system, udevadm has settle parameter
- if ! /sbin/udevadm settle --timeout="$UDEV_SETTLE_MAX_TIME"
- then
- echo "udevadm failed ($?)."
- echo "Fallback to sleep $UDEV_SETTLE_MAX_TIME seconds."
- sleep "$UDEV_SETTLE_MAX_TIME"
- fi
+ udevsettle_cmd="/sbin/udevadm settle"
+ elif [ -x /sbin/udevsettle ]; then
+ udevsettle_cmd="/sbin/udevsettle"
else
echo "No udevsettle/udevadm."
echo "Fallback to sleep $UDEV_SETTLE_MAX_TIME seconds."
sleep "$UDEV_SETTLE_MAX_TIME"
+ return
+ fi
+
+ if ! $udevsettle_cmd --timeout="$UDEV_SETTLE_MAX_TIME"
+ then
+ echo "udevadm failed ($?)."
+ echo "Fallback to sleep $UDEV_SETTLE_MAX_TIME seconds."
+ sleep "$UDEV_SETTLE_MAX_TIME"
fi
+
sleep 1 # Wait a bit more (races)
}
--
2.11.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment