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

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/12755


Change subject: openbsc: handle systemd and cfg files through autotools
......................................................................

openbsc: handle systemd and cfg files through autotools

Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653
---
M recipes-osmocom/openbsc/openbsc.inc
1 file changed, 6 insertions(+), 15 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/55/12755/1

diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc
index ca3b124..71921b7 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -6,30 +6,21 @@
 
 RDEPENDS_osmo-nitb = "libdbd-sqlite3"
 
-INC_PR = "r3.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r4.${META_TELEPHONY_OSMO_INC}"
 
 EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729"
 
 inherit autotools systemd pkgconfig
 
 do_install_append() {
-	install -d ${D}${sysconfdir}/osmocom
-	install -m 0660 ${S}/doc/examples/osmo-nitb/nanobts/openbsc.cfg ${D}${sysconfdir}/osmocom/osmo-nitb.cfg
-	install -m 0660 ${S}/doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg
-	install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg
-	install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg
-
-	# Install systemd files and enable on sysinit
-	install -d ${D}${systemd_system_unitdir}/
-	install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/
-	install -m 0644 ${S}/contrib/systemd/osmo-bsc-sccplite.service ${D}${systemd_system_unitdir}/
-	install -m 0644 ${S}/contrib/systemd/osmo-bsc-nat.service ${D}${systemd_system_unitdir}/
-	install -m 0644 ${S}/contrib/systemd/osmo-bsc-mgcp.service ${D}${systemd_system_unitdir}/
-
 	install -d ${D}/var/lib/osmocom
-
 }
 
+PACKAGECONFIG ??= "\
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+    "
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir"
+
 PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp"
 SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp"
 

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

Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653
Gerrit-Change-Number: 12755
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190130/1cb82873/attachment.htm>