[MERGED] meta-telephony[201705]: libosmo-sccp: Move version independent bits to .inc file

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: libosmo-sccp: Move version independent bits to .inc file
......................................................................


libosmo-sccp: Move version independent bits to .inc file

Change-Id: I7c4078826c4a4d34221d3b503d6836788cc38012
---
M recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
M recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
2 files changed, 22 insertions(+), 22 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 d269dae..c388c32 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp.inc
@@ -9,4 +9,26 @@
 
 inherit autotools pkgconfig systemd
 
+# we require the tests to link to the static libosmo-sigtran library to
+# access symbols not starting with osmo_*
+EXTRA_OECONF_remove = "--disable-static"
+
+PACKAGES =+ "osmo-stp"
+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 \
+		"
+CONFFILES_osmo-stp = "${sysconfdir}/osmocom/osmo-stp.cfg"
+
 ALLOW_EMPTY_libosmo-sccp = "1"
diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
index b353acb..20cecb8 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
@@ -5,25 +5,3 @@
 SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git"
 PV = "0.8.1+gitr${SRCPV}"
 PR = "${INC_PR}.0"
-
-# we require the tests to link to the static libosmo-sigtran library to
-# access symbols not starting with osmo_*
-EXTRA_OECONF_remove = "--disable-static"
-
-PACKAGES =+ "osmo-stp"
-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 \
-		"
-CONFFILES_osmo-stp = "${sysconfdir}/osmocom/osmo-stp.cfg"

-- 
To view, visit https://gerrit.osmocom.org/8049
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c4078826c4a4d34221d3b503d6836788cc38012
Gerrit-PatchSet: 1
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
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>