sysmo-bts
/
meta-sysmocom-bsp
9
1
Fork 0
Code Issues Pull Requests Releases Activity

osmo-bts: Revert all sysmobgs-mgr related options 

The code has not been finished and doesn't meet the quality
standards we have for a product. Comment the sysmobts-mgr
related files that will be back soon.
This commit is contained in:
Holger Hans Peter Freyther 2014-06-16 18:29:16 +02:00
parent 0b39eca559
commit ea7e222c7b
2 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
recipes-sysmobts/osmo-bts/files/0001-sysmobts-Fix-the-initialization-of-the-BTS-manager-c.patch
View File

@ -1,42 +0,0 @@
From a7f9b58e44fa7119e7113269765302a0b8a619d5 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Fri, 30 May 2014 12:42:31 +0200
Subject: [PATCH] sysmobts: Fix the initialization of the BTS manager code
The code should only run for the sysmoBTS 2050 and TRX 0.
If the device is not marked as 2050 the code would attempt
to open /dev/ttyS0 and block forever.
---
src/osmo-bts-sysmo/misc/sysmobts_mgr.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Index: git/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
===================================================================
--- git.orig/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
+++ git/src/osmo-bts-sysmo/misc/sysmobts_mgr.c
@@ -188,16 +188,17 @@ static void initialize_sbts2050(void)
return;
}
- if (val == 2050) {
- if (sysmobts_par_get_int(SYSMOBTS_PAR_TRX_NR, &val) < 0) {
- LOGP(DFIND, LOGL_ERROR,
- "Failed to get the TRX number\n");
- return;
- }
+ if (val != 2050)
+ return;
- if (val != 0)
- return;
+ if (sysmobts_par_get_int(SYSMOBTS_PAR_TRX_NR, &val) < 0) {
+ LOGP(DFIND, LOGL_ERROR, "Failed to get the TRX number\n");
+ return;
}
+
+ if (val != 0)
+ return;
+
trx_nr = val;
ucontrol0.fd = osmo_serial_init(ucontrol0.path, 115200);

15
recipes-sysmobts/osmo-bts/osmo-bts_git.bb
View File

@ -3,10 +3,9 @@ LICENSE = "AGPLv3"
LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=sysmocom/features/handover;name=osmobts;destsuffix=git \
git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc \
file://0001-sysmobts-Fix-the-initialization-of-the-BTS-manager-c.patch"
SRCREV_osmobts = "0a1699ff8a5462c167c24e8b28186abb26331698"
SRCREV_openbsc = "1b148ec1009c32faea269331836e366cfff7d18e"
git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
SRCREV_osmobts = "a7f9b58e44fa7119e7113269765302a0b8a619d5"
SRCREV_openbsc = "421365eeaa104a9781214f9e12c55023c1099bf8"
PV = "0.4.1+git${SRCPV}"
PR = "r8.${META_TELEPHONY_OSMO_INC}"
S = "${WORKDIR}/git"
@ -35,7 +34,6 @@ do_compile_append_sysmobts-v2() {
do_install_append() {
install -d ${D}${sysconfdir}/osmocom
install -m 0660 ${S}/doc/examples/osmo-bts.cfg ${D}${sysconfdir}/osmocom
install -m 0660 ${S}/doc/examples/osmobts-mgr.cfg ${D}${sysconfdir}/osmocom
install -m 0755 ${S}/contrib/respawn.sh ${D}${sysconfdir}/osmocom/
install -m 0755 ${S}/contrib/respawn-only.sh ${D}${sysconfdir}/osmocom/
install -m 0644 ${S}/contrib/screenrc-sysmobts ${D}${sysconfdir}/osmocom/
@ -45,9 +43,12 @@ do_install_append() {
# Install systemd and enable on sysinit
install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
install -m 0644 ${S}/contrib/sysmobts.service ${D}${systemd_unitdir}/system/
install -m 0644 ${S}/contrib/sysmobts-mgr.service ${D}${systemd_unitdir}/system/
ln -sf ../sysmobts.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
ln -sf ../sysmobts-mgr.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
# Future sysmobts-mgr handling
#install -m 0660 ${S}/doc/examples/osmobts-mgr.cfg ${D}${sysconfdir}/osmocom
#install -m 0644 ${S}/contrib/sysmobts-mgr.service ${D}${systemd_unitdir}/system/
#ln -sf ../sysmobts-mgr.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
}
do_install_append_sysmobts-v2() {