sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Merge sysmocom-generic-builder:generic-poky into edison

This commit is contained in:
Holger Hans Peter Freyther 2013-03-02 16:54:17 +01:00
parent 9b48f833cf 9383d3a2a6
commit 0473bf96d3
18 changed files with 216 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-sysmocom-bsp/conf/machine/include/sysmobts.inc
View File

@ -20,6 +20,7 @@ MACHINE_FEATURES = "kernel26 serial"
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
busybox-ifplugd \
watchdog \
kernel \
kernel-module-davinci-wdt \
kernel-module-dspdl \
kernel-module-dspdl-dm644x \

3
meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/files/sysmocom-bsc/udhcpd.conf
View File

@ -3,3 +3,6 @@ end 10.23.24.254
interface eth1
option subnet 10.23.24.0
option router 10.23.24.1
option broadcast 10.23.24.255

1
meta-sysmocom-bsp/recipes-apps/sysmocom-udhcpd-config/sysmocom-udhcpd-config_1.bb
View File

@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://udhcpd.conf"
PR = "r2"
CONFFILES_${PN} = "${sysconfdir}/udhcpd.conf"

2
meta-sysmocom-bsp/recipes-apps/tasks/task-core-boot.bbappend
View File

@ -1,3 +1,3 @@
PRINC = "6"
PRINC = "7"
RDEPENDS_task-core-boot += ""

8
meta-sysmocom-bsp/recipes-bsp/linux/linux-sysmocom_git.bb
View File

@ -1,7 +1,7 @@
inherit kernel
require linux-sysmocom.inc
LINUX_VERSION ?= "3.2.35"
LINUX_VERSION ?= "3.2.36"
LINUX_VERSION_EXTENSION ?= "-sysmocom-${LINUX_KERNEL_TYPE}"
# Overrides for the sysmocom bts v1
@ -10,9 +10,9 @@ BTS_FIRMWARE_NAME_sysmobts-v1 = "sysmobts-v1"
# Overrides for the sysmocom bts v2
BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
SRCREV = "20b5f4f07eb6719e41cc6d25fc2a73d95337421c"
SRCREV = "1db46a2b69e034677802b2c83b7d523b4338769f"
PR = "r26"
PR = "r27"
PV = "${LINUX_VERSION}+git${SRCPV}"
SRC_URI = "git://git.sysmocom.de/sysmo-bts/linux.git;protocol=git;branch=v3.2 \
@ -44,7 +44,7 @@ module_autoload_msgqueue = "msgqueue"
module_autoload_rtfifo = "rtfifo"
# module configs (alphabetically sorted)
module_conf_dspdl_dm644x = "options dspdl_dm644x fw_name=${BTS_FIRMWARE_NAME}.out debug=1"
module_conf_dspdl_dm644x = "options dspdl_dm644x fw_name=${BTS_FIRMWARE_NAME}.out debug=0"
module_conf_fpgadl_par = "options fpgadl_par fw_name=${BTS_FIRMWARE_NAME}.bit"
module_conf_msgqueue = "options msgqueue fw_name=${BTS_FIRMWARE_NAME}.out"
module_conf_rtfifo = "options rtfifo fw_name=${BTS_FIRMWARE_NAME}.out"

1
meta-sysmocom-bsp/recipes-sysmobts/femtobts-api/femtobts-api_git.bb
View File

@ -3,6 +3,7 @@ SECTION = "kernel"
LICENSE = "CLOSED"
SRC_URI = "git://git.sysmocom.de/sysmo-bts/layer1-api.git;protocol=git;branch=master"
SRCREV = "superfemto_v3.0.1pre"
SRCREV_sysmobts-v2 = "superfemto_v3.0.1pre"
SRCREV_sysmobts-v1 = "femtobts_v2.7"
PV = "${SRCREV}+git${SRCPV}"

2
meta-sysmocom-bsp/recipes-sysmobts/firmware/sysmobts-firmware_2.7.bb
View File

@ -4,7 +4,7 @@ PR = "r2.${INC_PR}"
require ${PN}.inc
do_install_sysmobts() {
do_install() {
install -d ${D}/lib/firmware/
install -m 0666 ${S}/Firmware/Dsp/femtobts.out ${D}/lib/firmware/sysmobts-v1.out

4
meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
View File

@ -4,10 +4,10 @@ LIC_FILES_CHKSUM="file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
SRC_URI = "git://git.osmocom.org/osmo-bts.git;protocol=git;branch=master;name=osmobts;destsuffix=git \
git://git.osmocom.org/openbsc;protocol=git;branch=master;name=openbsc;destsuffix=openbsc"
SRCREV_osmobts = "24b2128e2975f14f9941caa156890480005df81e"
SRCREV_osmobts = "18708dd3b60fa27e6a7121b686f11ee8c8069a4b"
SRCREV_openbsc = "f2621e506de5fdbe7d800c4b1a9e764d7c9cdeef"
PV = "0.1.0+git${SRCPV}"
PR = "r6.${META_TELEPHONY_OSMO_INC}"
PR = "r8.${META_TELEPHONY_OSMO_INC}"
S = "${WORKDIR}/git"
SRCREV_FORMAT = "openbsc-rosmobts"

2
meta-telephony/recipes-misc/libsmpp/libsmpp34_1.10.bb
View File

@ -1,5 +1,5 @@
DESCRIPTION = "C Open SMPP library"
HOMEPAGE = "http://sourceforge.net/projects/c-open-smpp-34/""
HOMEPAGE = "http://sourceforge.net/projects/c-open-smpp-34/"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
SECTION = "libs"

2
meta-telephony/recipes-misc/libsmpp/libsmpp34_git.bb
View File

@ -1,5 +1,5 @@
DESCRIPTION = "C Open SMPP library"
HOMEPAGE = "http://sourceforge.net/projects/c-open-smpp-34/""
HOMEPAGE = "http://sourceforge.net/projects/c-open-smpp-34/"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
SECTION = "libs"

114
meta-telephony/recipes-openmoko/openmoko-gsmd/files/cell-log.patch Normal file
View File

@ -0,0 +1,114 @@
From bde45e2f168597c8f4b2bb0599d58125fd24deb6 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Wed, 13 Jun 2012 11:17:33 +0200
Subject: [PATCH] cell_log: Use the RF-Lock handling to unlock the GSM network
This is missing the reason of why and when something is unlocked.
---
src/util/cell_log.c | 65 ++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 54 insertions(+), 11 deletions(-)
diff --git a/src/util/cell_log.c b/src/util/cell_log.c
index 59d8942..7a280aa 100644
--- a/src/util/cell_log.c
+++ b/src/util/cell_log.c
@@ -27,10 +27,14 @@
#include <fcntl.h>
#include <time.h>
#include <syslog.h>
+#include <stdint.h>
#include <sys/types.h>
+#include <sys/socket.h>
#include <sys/stat.h>
+#include <netinet/in.h>
+
#include <libgsmd/libgsmd.h>
#include <libgsmd/voicecall.h>
#include <libgsmd/misc.h>
@@ -58,31 +62,70 @@ static int pending_responses = 0;
#define MIN_NO_NET_SECS 60
#define OUR_MCC 901
#define OUR_MNC 99
-#define LOCK_PATH "/var/lock/bts_rf_lock"
static time_t last_network_seen;
unsigned int rf_lock_active = 0;
static void bts_rf_lock(int on)
{
- int fd;
+ int fd, rc;
+
+ static const uint8_t rf_lock[] = {
+ 0x00, 0x23, 0xEE, 0x00, 0x53, 0x45, 0x54, 0x20,
+ 0x31, 0x20, 0x6E, 0x65, 0x74, 0x2E, 0x72, 0x66,
+ 0x5F, 0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x67, 0x73,
+ 0x6D, 0x2C, 0x6C, 0x6F, 0x63, 0x6B, 0x2C, 0x6E,
+ 0x2F, 0x61, 0x2C, 0x6E, 0x2F, 0x61,
+ };
+
+ static const uint8_t rf_unlock[] = {
+ 0x00, 0x25, 0xEE, 0x00, 0x53, 0x45, 0x54, 0x20,
+ 0x31, 0x20, 0x6E, 0x65, 0x74, 0x2E, 0x72, 0x66,
+ 0x5F, 0x6C, 0x6F, 0x63, 0x6B, 0x20, 0x67, 0x73,
+ 0x6D, 0x2C, 0x75, 0x6E, 0x6C, 0x6F, 0x63, 0x6B,
+ 0x2C, 0x6E, 0x2F, 0x61, 0x2C, 0x6E, 0x2F, 0x61,
+ };
/* only print message on status change */
if (rf_lock_active != on)
syslog(LOG_NOTICE, "RF_LOCK: %sabling lock\n", on ? "En" : "Dis");
- /* for safety, always update the actual file on disk */
+ fd = socket(AF_INET, SOCK_STREAM, 0);
+ if (fd == -1) {
+ syslog(LOG_ERR, "RF_LOCK: socket creation failed: %d\n", errno);
+ return;
+ }
+
+ struct sockaddr_in addr;
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ addr.sin_port = htons(4249);
+ rc = connect(fd, (struct sockaddr *) &addr, sizeof(addr));
+ if (rc != 0) {
+ syslog(LOG_ERR, "RF_Lock: socket connect failed: %d\n", errno);
+ close(fd);
+ return;
+ }
+
if (on == 1) {
- struct stat st;
- if (stat(LOCK_PATH, &st) != 0) {
- fd = open(LOCK_PATH, O_WRONLY|O_CREAT, 0664);
- if (fd >= 0)
- close(fd);
- }
- } else
- unlink(LOCK_PATH);
+ rc = write(fd, rf_lock, sizeof(rf_lock));
+ if (rc != sizeof(rf_lock))
+ goto error;
+ } else {
+ rc = write(fd, rf_unlock, sizeof(rf_unlock));
+ if (rc != sizeof(rf_unlock))
+ goto error;
+ }
+ close(fd);
rf_lock_active = on;
+ return;
+
+error:
+ close(fd);
+ syslog(LOG_ERR, "RF_Lock: failed to send the message: %d\n", errno);
+ return;
}
--
1.7.10.4

3
meta-telephony/recipes-openmoko/openmoko-gsmd/openmoko-gsmd_git.bb
View File

@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
# Fork with wavecom support
SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \
file://cell-log.patch \
file://gsmd \
file://cell-log \
file://gsmd-respawn.sh \
@ -15,7 +16,7 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \
SRCREV = "28e25ae42da7d65face9ad2472075f7c4fc87e92"
S = "${WORKDIR}/git"
PR = "r11.4"
PR = "r11.5"
inherit autotools pkgconfig update-rc.d

4
meta-telephony/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
View File

@ -1,7 +1,7 @@
require ${PN}.inc
S = "${WORKDIR}/git"
SRCREV = "a49c24d9657471deb90a9425cabdb8d3d56f36df"
SRCREV = "d426d458ca96ba29793e35b1b2a73fbcb3b2c888"
SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
PV = "0.1.3+gitr${SRCPV}"
PR = "${INC_PR}.1"
PR = "${INC_PR}.2"

15
meta-telephony/recipes-osmocom/openbsc/openbsc.inc
View File

@ -8,8 +8,9 @@ RDEPENDS_osmo-nitb = "libdbd-sqlite3"
SRC_URI = "file://osmo-nitb.init \
file://osmo-bsc_mgcp.init \
file://osmo-bsc.init"
INC_PR = "r13.${META_TELEPHONY_OSMO_INC}"
file://osmo-bsc.init \
file://osmo-sgsn.init"
INC_PR = "r14.${META_TELEPHONY_OSMO_INC}"
EXTRA_OECONF += " --enable-nat --enable-osmo-bsc "
@ -28,9 +29,11 @@ do_install_append() {
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/osmo-bsc.cfg ${D}${sysconfdir}/osmocom/osmo-bsc.cfg
install -m 0660 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg
install -m 0660 ${S}/doc/examples/osmo-sgsn/osmo-sgsn.cfg ${D}${sysconfdir}/osmocom/osmo-sgsn.cfg
install -m 0775 ${WORKDIR}/osmo-nitb.init ${D}${sysconfdir}/init.d/osmo-nitb
install -m 0775 ${WORKDIR}/osmo-bsc_mgcp.init ${D}${sysconfdir}/init.d/osmo-bsc-mgcp
install -m 0775 ${WORKDIR}/osmo-bsc.init ${D}${sysconfdir}/init.d/osmo-bsc
install -m 0775 ${WORKDIR}/osmo-sgsn.init ${D}${sysconfdir}/init.d/osmo-sgsn
install -d ${D}/var/lib/osmocom
}
@ -61,7 +64,13 @@ FILES_osmo-nitb = " ${bindir}/osmo-nitb \
${sysconfdir}/init.d/osmo-nitb \
${sysconfdir}/osmocom/osmo-nitb.cfg"
FILES_osmo-sgsn = " ${bindir}/osmo-sgsn "
CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg"
INITSCRIPT_NAME_osmo-sgsn = "osmo-sgsn"
INITSCRIPT_PARAMS_osmo-sgsn = "defaults 30 30"
FILES_osmo-sgsn = " ${bindir}/osmo-sgsn \
${sysconfdir}/init.d/osmo-sgsn \
${sysconfdir}/osmocom/osmo-sgsn.cfg"
FILES_ipaccess-utils = " ${bindir}/ipaccess-find ${bindir}/ipaccess-config ${bindir}/ipaccess-proxy "
FILES_osmo-bsc-nat = " ${bindir}/osmo-bsc_nat "
FILES_osmo-gbproxy = " ${bindir}/osmo-gbproxy "

48
meta-telephony/recipes-osmocom/openbsc/openbsc/osmo-sgsn.init Executable file
View File

@ -0,0 +1,48 @@
#!/bin/sh
### BEGIN INIT INFO
# Provides: osmo-sgsn
# Required-Start: $syslog $networking
# Required-Stop: $syslog
# Default-Start: 5
# Default-Stop: 1
# Short-Description: Osmocom Serving GPRS Support Node
### END INIT INFO
DAEMON=/usr/bin/osmo-sgsn
NAME=osmo-sgsn
DESC="Osmocom Serving GPRS Support Node"
NORMAL_ARGS="-D -c /etc/osmocom/osmo-sgsn.cfg"
OSMOSGSN_EXTRA_ARGS=""
NO_START=0
set -e
test ! -r /etc/default/osmo-sgsn || . /etc/default/osmo-sgsn
test "$NO_START" = "0" || exit 0
test -x "$DAEMON" || exit 0
case "$1" in
start)
echo -n "Starting $DESC: "
start-stop-daemon -S \
-x "$DAEMON" -- $NORMAL_ARGS $OSMOSGSN_EXTRA_ARGS
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
start-stop-daemon -K -x "$DAEMON"
echo "$NAME."
;;
restart|force-reload)
$0 stop
$0 start
;;
*)
N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart}" >&2
exit 1
;;
esac
exit 0

2
meta-telephony/recipes-osmocom/openbsc/openbsc_git.bb
View File

@ -3,7 +3,7 @@ require ${PN}.inc
PV = "0.12.0+gitr${SRCPV}"
PR = "${INC_PR}.2"
SRCREV = "25b70cea9d9521b081ea0cc524f5d157a1b89baf"
SRCREV = "ce1d742f27b54b5a05d4cd351641f4da1d2e9524"
SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"
S = "${WORKDIR}/git/openbsc"

14
sysmocom-upload-bsc.sh Executable file
View File

@ -0,0 +1,14 @@
#!/bin/sh
if [ `pwd` != '/home/vagrant/generic-poky/build.sysmobsc' ]; then
echo "Must be called from the sysmoBSC build directory"
exit 0
fi
rsync --delete -avz tmp/deploy/ipk/ generic@sysmocom-downloads:sysmobsc/201208-testing/ipk
rsync --delete -avz tmp/deploy/images/ generic@sysmocom-downloads:sysmobsc/201208-testing/images
rsync --delete -avz tmp/deploy/tools/ generic@sysmocom-downloads:sysmobsc/201208-testing/tools
rsync --delete -avz tmp/deploy/sdk/ generic@sysmocom-downloads:sysmobsc/201208-testing/sdk
rsync --delete -avz tmp/cache/ generic@sysmocom-downloads:sysmobsc/201208-testing/cache-state
rsync -avz tmp/deploy/sources/ generic@sysmocom-downloads:sysmobsc/201208-testing/sources

7
sysmocom-upload.sh
View File

@ -1,7 +1,14 @@
#!/bin/sh
if [ `pwd` != '/home/vagrant/generic-poky/build' ]; then
echo "Must be called from the sysmoBTS build directory"
exit 0
fi
rsync --delete -avz tmp/deploy/ipk/ generic@sysmocom-downloads:sysmobts/201208-testing/ipk
rsync --delete -avz tmp/deploy/images/ generic@sysmocom-downloads:sysmobts/201208-testing/images
rsync --delete -avz tmp/deploy/tools/ generic@sysmocom-downloads:sysmobts/201208-testing/tools
rsync --delete -avz tmp/deploy/sdk/ generic@sysmocom-downloads:sysmobts/201208-testing/sdk
rsync --delete -avz tmp/cache/ generic@sysmocom-downloads:sysmobts/201208-testing/cache-state
rsync -avz tmp/deploy/sources/ generic@sysmocom-downloads:sysmobts/201208-testing/sources