From c53f213f9dc0de3131a1af325a268dba42a5bed6 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Fri, 16 Sep 2022 14:27:38 -0400 Subject: [PATCH] MT#55283 fix iptables install path for backports Older debhelpers don't support conditional installation locations. Restore the previous approach of doing it through the rules file. Change-Id: I427b44bed24bd9956c33c81cd28a75b262c46b68 --- pkg/deb/backports/buster | 11 +++++++++++ pkg/deb/backports/focal | 11 +++++++++++ pkg/deb/backports/stretch | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/pkg/deb/backports/buster b/pkg/deb/backports/buster index 7a892e7de..69b5462df 100755 --- a/pkg/deb/backports/buster +++ b/pkg/deb/backports/buster @@ -27,6 +27,17 @@ override_dh_dwz: # Disable, as dwz cannot cope with some of the plugins generated. EOF +# Fix module installation location +rm ${DIST}/rtpengine-iptables.dirs +rm ${DIST}/rtpengine-iptables.install +cat >> ${DIST}/rules <<'EOF' + +override_dh_install: + dh_install + dh_installdirs -prtpengine-iptables $(XTABLES_DIR) + install -m 0644 iptables-extension/libxt_RTPENGINE.so debian/rtpengine-iptables/$(XTABLES_DIR) +EOF + if command -v wrap-and-sort &>/dev/null ; then wrap-and-sort -sat -d ${DIST} else diff --git a/pkg/deb/backports/focal b/pkg/deb/backports/focal index 7f78849db..f70d02e03 100755 --- a/pkg/deb/backports/focal +++ b/pkg/deb/backports/focal @@ -27,6 +27,17 @@ override_dh_dwz: # Disable, as dwz cannot cope with some of the plugins generated. EOF +# Fix module installation location +rm ${DIST}/rtpengine-iptables.dirs +rm ${DIST}/rtpengine-iptables.install +cat >> ${DIST}/rules <<'EOF' + +override_dh_install: + dh_install + dh_installdirs -prtpengine-iptables $(XTABLES_DIR) + install -m 0644 iptables-extension/libxt_RTPENGINE.so debian/rtpengine-iptables/$(XTABLES_DIR) +EOF + if command -v wrap-and-sort &>/dev/null ; then wrap-and-sort -sat -d ${DIST} else diff --git a/pkg/deb/backports/stretch b/pkg/deb/backports/stretch index 295417dac..0308f5994 100755 --- a/pkg/deb/backports/stretch +++ b/pkg/deb/backports/stretch @@ -36,6 +36,17 @@ override_dh_systemd_start: dh_systemd_start -prtpengine-recording-daemon --name=rtpengine-recording-nfs-mount EOF +# Fix module installation location +rm ${DIST}/rtpengine-iptables.dirs +rm ${DIST}/rtpengine-iptables.install +cat >> ${DIST}/rules <<'EOF' + +override_dh_install: + dh_install + dh_installdirs -prtpengine-iptables $(XTABLES_DIR) + install -m 0644 iptables-extension/libxt_RTPENGINE.so debian/rtpengine-iptables/$(XTABLES_DIR) +EOF + if command -v wrap-and-sort &>/dev/null ; then wrap-and-sort -sat -d ${DIST} else