Change in meta-telephony[201705]: libosmo-sccp: handle systemd and cfg files through autotools

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12744 )

Change subject: libosmo-sccp: handle systemd and cfg files through autotools
......................................................................

libosmo-sccp: handle systemd and cfg files through autotools

Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c
---
M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
1 file changed, 6 insertions(+), 9 deletions(-)

Approvals:
  Pau Espin Pedrol: Verified
  Harald Welte: Looks good to me, approved



diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
index 60793e3..78dd525 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
@@ -3,12 +3,17 @@
 HOMEPAGE = "https://osmocom.org/projects/libosmo-sccp"
 LICENSE = "AGPLv3"
 
-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 inherit autotools pkgconfig systemd
 
+PACKAGECONFIG ??= "\
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+    "
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
+
 # we require the tests to link to the static libosmo-sigtran library to
 # access symbols not starting with osmo_*
 EXTRA_OECONF_remove = "--disable-static"
@@ -17,14 +22,6 @@
 SYSTEMD_PACKAGES = "osmo-stp"
 SYSTEMD_SERVICE_osmo-stp = "osmo-stp.service"
 
-do_install_append() {
-	install -d ${D}${systemd_system_unitdir}/
-	install -d ${D}${sysconfdir}/osmocom/
-
-	install -m 0644 ${S}/doc/examples/osmo-stp.cfg ${D}${sysconfdir}/osmocom/
-	install -m 0644 ${S}/contrib/systemd/osmo-stp.service ${D}${systemd_system_unitdir}/
-}
-
 FILES_osmo-stp = " \
 		${bindir}/osmo-stp \
 		${sysconfdir}/osmocom/osmo-stp.cfg \

-- 
To view, visit https://gerrit.osmocom.org/12744
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: merged
Gerrit-Change-Id: I7bb69bdad7582e29b66f075db1305305a9ca648c
Gerrit-Change-Number: 12744
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190131/43307bc6/attachment.htm>