From 0f0e9e2d57a868f2978797a98a1c76945ffb7469 Mon Sep 17 00:00:00 2001 From: Chris Hofstaedtler Date: Mon, 8 Jan 2024 14:32:58 -0500 Subject: [PATCH] MT#55283 install files into /usr (DEP17 M2) Use the variable from pkg-config as install location for systemd units/links. Change-Id: I504eea66b874f70897e8fe0e2527653d56e604c2 Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060282 (cherry picked from commit 7e140e8a31bef41389d4fcc201698deafd84794b) --- debian/control | 2 ++ debian/ngcp-rtpengine-daemon.links | 8 ++++---- debian/ngcp-rtpengine-recording-daemon.links | 8 ++++---- debian/rules | 2 ++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index d66ab87b8..08b647e48 100644 --- a/debian/control +++ b/debian/control @@ -46,8 +46,10 @@ Build-Depends: libxtables-dev (>= 1.4) | iptables-dev (>= 1.4), markdown, pandoc, + pkgconf, python3, python3-websockets, + systemd-dev | systemd, zlib1g-dev, Testsuite: autopkgtest-pkg-dkms diff --git a/debian/ngcp-rtpengine-daemon.links b/debian/ngcp-rtpengine-daemon.links index 4e84c6eae..339a6b768 100644 --- a/debian/ngcp-rtpengine-daemon.links +++ b/debian/ngcp-rtpengine-daemon.links @@ -1,4 +1,4 @@ -/lib/systemd/system/ngcp-rtpengine-daemon.service /lib/systemd/system/rtpengine-daemon.service -/lib/systemd/system/ngcp-rtpengine-daemon.service /lib/systemd/system/rtpengine.service -/lib/systemd/system/ngcp-rtpengine-daemon@.service /lib/systemd/system/rtpengine-daemon@.service -/lib/systemd/system/ngcp-rtpengine-daemon@.service /lib/systemd/system/rtpengine@.service +${env:deb_systemdsystemunitdir}/ngcp-rtpengine-daemon.service ${env:deb_systemdsystemunitdir}/rtpengine-daemon.service +${env:deb_systemdsystemunitdir}/ngcp-rtpengine-daemon.service ${env:deb_systemdsystemunitdir}/rtpengine.service +${env:deb_systemdsystemunitdir}/ngcp-rtpengine-daemon@.service ${env:deb_systemdsystemunitdir}/rtpengine-daemon@.service +${env:deb_systemdsystemunitdir}/ngcp-rtpengine-daemon@.service ${env:deb_systemdsystemunitdir}/rtpengine@.service diff --git a/debian/ngcp-rtpengine-recording-daemon.links b/debian/ngcp-rtpengine-recording-daemon.links index e8e30d57d..77a80c563 100644 --- a/debian/ngcp-rtpengine-recording-daemon.links +++ b/debian/ngcp-rtpengine-recording-daemon.links @@ -1,4 +1,4 @@ -/lib/systemd/system/ngcp-rtpengine-recording-daemon.service /lib/systemd/system/rtpengine-recording-daemon.service -/lib/systemd/system/ngcp-rtpengine-recording-daemon.service /lib/systemd/system/rtpengine-recording.service -/lib/systemd/system/ngcp-rtpengine-recording-daemon@.service /lib/systemd/system/rtpengine-recording-daemon@.service -/lib/systemd/system/ngcp-rtpengine-recording-daemon@.service /lib/systemd/system/rtpengine-recording@.service +${env:deb_systemdsystemunitdir}/ngcp-rtpengine-recording-daemon.service ${env:deb_systemdsystemunitdir}/rtpengine-recording-daemon.service +${env:deb_systemdsystemunitdir}/ngcp-rtpengine-recording-daemon.service ${env:deb_systemdsystemunitdir}/rtpengine-recording.service +${env:deb_systemdsystemunitdir}/ngcp-rtpengine-recording-daemon@.service ${env:deb_systemdsystemunitdir}/rtpengine-recording-daemon@.service +${env:deb_systemdsystemunitdir}/ngcp-rtpengine-recording-daemon@.service ${env:deb_systemdsystemunitdir}/rtpengine-recording@.service diff --git a/debian/rules b/debian/rules index 2b169749d..84a454504 100755 --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,8 @@ endif export FIXTURES_PATH = /usr/share/rtpengine-perftest +export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd) + %: dh $@