Change in meta-telephony[201705]: osmo-ggsn: Split into .inc and _git.bb

[Harald Welte]

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

Change subject: osmo-ggsn: Split into .inc and _git.bb
......................................................................

osmo-ggsn: Split into .inc and _git.bb

Change-Id: Ic92309726c6a256c7e543a2be04725023d43d9b7
---
A recipes-osmocom/osmo-ggsn/osmo-ggsn.inc
M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
2 files changed, 43 insertions(+), 40 deletions(-)

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



diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc
new file mode 100644
index 0000000..49dd1ee
--- /dev/null
+++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc
@@ -0,0 +1,38 @@
+DESCRIPTION = "Osmocom GGSN implementation"
+HOMEPAGE = "https://osmocom.org/projects/openggsn"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+
+DEPENDS = "libosmocore"
+
+INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+
+PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu"
+RDEPENDS_${PN} += "iptables"
+RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun"
+
+inherit autotools update-rc.d pkgconfig systemd
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${systemd_system_unitdir}/
+	install -d ${D}/${sysconfdir}/osmocom/
+
+	install -m 0776 ${WORKDIR}/osmo-ggsn.init ${D}${sysconfdir}/init.d/osmo-ggsn
+	install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/
+	install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/
+}
+
+SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service"
+
+INITSCRIPT_PACKAGES = "osmo-ggsn"
+INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn"
+INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29"
+
+CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg"
+
+FILES_libgtp = "${libdir}/*${SOLIBS}"
+FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la"
+FILES_libgtp-staticdev = "${libdir}/*.a"
+
+FILES_osmo-sgsnemu = "${bindir}/sgsnemu"
diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
index 8c948cc..5219c03 100644
--- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
+++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
@@ -1,45 +1,10 @@
-DESCRIPTION = "Osmocom GGSN implementation"
-HOMEPAGE = "https://osmocom.org/projects/openggsn"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-PV = "1.2.2+gitr${SRCPV}"
-PR = "r0"
+require ${PN}.inc
 
+S = "${WORKDIR}/git"
 SRCREV = "b673d1c438488fb74abda344e563d733e5ce451a"
 SRC_URI = "git://git.osmocom.org/osmo-ggsn                   \
            file://osmo-ggsn.init                             \
-	   file://libgtp-queue_depth_32.patch		    \
+           file://libgtp-queue_depth_32.patch		    \
           "
-S = "${WORKDIR}/git"
-
-DEPENDS = "libosmocore"
-
-PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu"
-RDEPENDS_${PN} += "iptables"
-RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun"
-
-inherit autotools update-rc.d pkgconfig systemd
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d
-	install -d ${D}${systemd_system_unitdir}/
-	install -d ${D}/${sysconfdir}/osmocom/
-
-	install -m 0776 ${WORKDIR}/osmo-ggsn.init ${D}${sysconfdir}/init.d/osmo-ggsn
-	install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/
-	install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/
-}
-
-SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service"
-
-INITSCRIPT_PACKAGES = "osmo-ggsn"
-INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn"
-INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29"
-
-CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg"
-
-FILES_libgtp = "${libdir}/*${SOLIBS}"
-FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la"
-FILES_libgtp-staticdev = "${libdir}/*.a"
-
-FILES_osmo-sgsnemu = "${bindir}/sgsnemu"
+PV = "1.2.2+gitr${SRCPV}"
+PR = "${INC_PR}.0"

-- 
To view, visit https://gerrit.osmocom.org/10944
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: Ic92309726c6a256c7e543a2be04725023d43d9b7
Gerrit-Change-Number: 10944
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/20180915/de0cc294/attachment.htm>