Merge commit 'b28405e6a0706fe560bb29efc2691df9e22d092b' into dora

This commit is contained in:
Holger Hans Peter Freyther 2014-10-07 17:04:33 +02:00
commit 4cb109a0d5
3 changed files with 37 additions and 3 deletions

View File

@ -0,0 +1,21 @@
The line is not initiliazed to E1INP_TS_TYPE_SIGN by default
diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 145e471..49424e7 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -915,12 +915,14 @@ int e1inp_ipa_bts_rsl_connect_n(struct e1inp_line *line,
"trx_nr (%d) out of range\n", trx_nr);
return -EINVAL;
}
+/*
if (line->ts[E1INP_SIGN_RSL+trx_nr-1].type != E1INP_TS_TYPE_SIGN) {
LOGP(DLINP, LOGL_ERROR, "cannot create RSL BTS link: "
"trx_nr (%d) does not refer to a signalling link\n",
trx_nr);
return -EINVAL;
}
+*/
rsl_link = ipa_client_conn_create(tall_ipa_ctx,
&line->ts[E1INP_SIGN_RSL+trx_nr-1],

View File

@ -2,6 +2,7 @@ require ${PN}.inc
S = "${WORKDIR}/git"
SRCREV = "d9d1b5c19f40515cb7c660acda7265bbddbb73d6"
SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git \
file://fix-rsl-connect.patch "
PV = "0.3.0+gitr${SRCPV}"
PR = "${INC_PR}.0"
PR = "${INC_PR}.1"

View File

@ -1,6 +1,18 @@
#TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target task-core-standalone-osmo-sdk-target-dbg"
TOOLCHAIN_TARGET_OSMOTASK ?= "task-core-standalone-osmo-sdk-target"
TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_OSMOTASK}"
TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}-${DATETIME}"
TOOLCHAIN_OUTPUT_BASENAME = "${SDK_NAME}-toolchain-osmo-${DISTRO_VERSION}"
TOOLCHAIN_OUTPUTNAME = "${TOOLCHAIN_OUTPUT_BASENAME}-${DATETIME}"
PROVIDES = "meta-toolchain-sdk"
require recipes-core/meta/meta-toolchain.bb
do_populate_sdk_append() {
bb.build.exec_func("create_symlink", d)
}
create_symlink() {
cd ${SDK_DEPLOY}/
rm -f ${TOOLCHAIN_OUTPUT_BASENAME}.sh
ln -s ${TOOLCHAIN_OUTPUTNAME}.sh ${TOOLCHAIN_OUTPUT_BASENAME}.sh
}