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

[Harald Welte]

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

Change subject: osmo-msc: handle systemd and cfg files through autotools
......................................................................

osmo-msc: handle systemd and cfg files through autotools

Change-Id: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a
---
M recipes-osmocom/osmo-msc/osmo-msc.inc
1 file changed, 7 insertions(+), 10 deletions(-)

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



diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc
index e5364cd..59280ce 100644
--- a/recipes-osmocom/osmo-msc/osmo-msc.inc
+++ b/recipes-osmocom/osmo-msc/osmo-msc.inc
@@ -5,23 +5,20 @@
 
 DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw osmo-hlr"
 
-INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
 
 inherit autotools pkgconfig systemd
 
-PACKAGECONFIG ??= "smpp ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)}"
+PACKAGECONFIG ??= "\
+    smpp \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'iu', d)} \
+    "
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
 PACKAGECONFIG[iu] = "--enable-iu,--disable-iu,libasn1c osmo-iuh,"
 PACKAGECONFIG[smpp] = "--enable-smpp,--disable-smpp,libsmpp34,"
 
 RDEPENDS_${PN} = "libdbd-sqlite3"
 
-do_install_append() {
-	install -d ${D}${systemd_system_unitdir}/
-	install -d ${D}${sysconfdir}/osmocom/
-
-	install -m 0644 ${S}/doc/examples/osmo-msc/osmo-msc.cfg ${D}${sysconfdir}/osmocom/
-	install -m 0644 ${S}/contrib/systemd/osmo-msc.service ${D}${systemd_system_unitdir}/
-}
-
 SYSTEMD_SERVICE_${PN} = "${PN}.service"
 CONFFILES_osmo-msc = "${sysconfdir}/osmocom/osmo-msc.cfg"

-- 
To view, visit https://gerrit.osmocom.org/12751
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: I0ccddd158f88fdd5dbe8e9a36c62d515b973486a
Gerrit-Change-Number: 12751
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/9ca0ec16/attachment.htm>