Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10959 )
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(-) Approvals: Pau Espin Pedrol: Verified Harald Welte: Looks good to me, approved 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/10959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: laforge/nightly Gerrit-MessageType: merged Gerrit-Change-Id: Ie6e6855cd34dd171e7e550646b8e37d606fc5653 Gerrit-Change-Number: 10959 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol <pes...@sysmocom.de> Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org> Gerrit-Reviewer: Pau Espin Pedrol <pes...@sysmocom.de>