Pau Espin Pedrol has uploaded this change for review. (
https://gerrit.osmocom.org/10210
Change subject: osmo-bsc: Don't try to package anything bsc-nat related
......................................................................
osmo-bsc: Don't try to package anything bsc-nat related
osmo-bsc_nat has been fully removed from osmo-bsc.git in
1c9b8b19176854ecf4a3d57e9eef6b495361557f.
Instead, build the one from openbsc.git.
Change-Id: I98109914d53cce1880f259f5d8d366879c2aff61
---
M recipes-osmocom/openbsc/openbsc.inc
M recipes-osmocom/osmo-bsc/osmo-bsc.inc
2 files changed, 11 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/10/10210/1
diff --git a/recipes-osmocom/openbsc/openbsc.inc
b/recipes-osmocom/openbsc/openbsc.inc
index 36c57e7..9f23d52 100644
--- a/recipes-osmocom/openbsc/openbsc.inc
+++ b/recipes-osmocom/openbsc/openbsc.inc
@@ -11,9 +11,9 @@
file://osmo-bsc-sccplite.service \
"
-INC_PR = "r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR = "r1.${META_TELEPHONY_OSMO_INC}"
-EXTRA_OECONF += "--enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding
--with-g729"
+EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp
--enable-mgcp-transcoding --with-g729"
inherit autotools update-rc.d pkgconfig
@@ -21,6 +21,7 @@
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/
# Install sysv-init files
install -d ${D}${sysconfdir}/init.d
@@ -37,7 +38,7 @@
}
-PACKAGES =+ "osmo-bsc-sccplite osmo-nitb"
+PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb"
INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb"
@@ -62,3 +63,9 @@
${sysconfdir}/osmocom/osmo-nitb.cfg \
${systemd_unitdir}/system/osmo-nitb.service \
"
+
+CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg"
+FILES_osmo-bsc-nat = " \
+ ${bindir}/osmo-bsc_nat \
+ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \
+ "
diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc
b/recipes-osmocom/osmo-bsc/osmo-bsc.inc
index f20362f..d066a58 100644
--- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc
+++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc
@@ -14,12 +14,11 @@
install -d ${D}${sysconfdir}/osmocom/
install -m 0644 ${S}/doc/examples/osmo-bsc/osmo-bsc.cfg
${D}${sysconfdir}/osmocom/
- install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg
${D}${sysconfdir}/osmocom/
install -m 0644 ${S}/contrib/systemd/osmo-bsc.service
${D}${systemd_system_unitdir}/
}
-PACKAGES =+ "osmo-bsc-nat-doc osmo-bsc-nat meas-utils ipaccess-utils
bs11-utils abisip-find"
+PACKAGES =+ "meas-utils ipaccess-utils bs11-utils abisip-find"
SYSTEMD_PACKAGES = "osmo-bsc"
SYSTEMD_SERVICE_osmo-bsc = "osmo-bsc.service"
@@ -43,11 +42,3 @@
${bindir}/osmo-meas-pcap2db \
${bindir}/meas_json \
"
-
-FILES_osmo-bsc-nat = " \
- ${bindir}/osmo-bsc_nat \
- ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \
- "
-CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg"
-
-FILES_osmo-bsc-nat-doc = " ${docdir}/osmo-bsc/examples/osmo-bsc_nat "
--
To view, visit https://gerrit.osmocom.org/10210
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: I98109914d53cce1880f259f5d8d366879c2aff61
Gerrit-Change-Number: 10210
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <[email protected]>
