From 5e186d3d1f467eb4ea95bc27475fdf20a8db5ee9 Mon Sep 17 00:00:00 2001
From: Henning Heinold <henning@itconsulting-heinold.de>
Date: Tue, 30 Sep 2014 19:16:59 +0200
Subject: [PATCH 1/2] meta-toolchain-osmo: create symlink similar to images

---
 recipes-osmocom/meta/meta-toolchain-osmo.bb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/recipes-osmocom/meta/meta-toolchain-osmo.bb b/recipes-osmocom/meta/meta-toolchain-osmo.bb
index 3d4a00a7a4..566ec26726 100644
--- a/recipes-osmocom/meta/meta-toolchain-osmo.bb
+++ b/recipes-osmocom/meta/meta-toolchain-osmo.bb
@@ -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
+}

From b28405e6a0706fe560bb29efc2691df9e22d092b Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Thu, 2 Oct 2014 18:51:14 +0200
Subject: [PATCH 2/2] libosmo-abis: Revert parts of the multi-TRX support in
 libosmo-abis

The line doesn't have the signalling type set yet. It will be set
_after_ the rsl connection is considered up. This is addressing
RSL Connection failures like:

<0001> oml.c:1026 Rx IPA RSL CONNECT IP=1.2.3.4 PORT=3003 STREAM=0x00
<000f> input/ipaccess.c:921 cannot create RSL BTS link: trx_nr (0) does not refer to a signalling link
<0001> oml.c:1030 Error in abis_open(RSL): -22
<0001> oml.c:341 Sending FOM NACK with cause Message cannot be performed.
---
 .../libosmo-abis/files/fix-rsl-connect.patch  | 21 +++++++++++++++++++
 .../libosmo-abis/libosmo-abis_git.bb          |  5 +++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch

diff --git a/recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch b/recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch
new file mode 100644
index 0000000000..63c505251c
--- /dev/null
+++ b/recipes-osmocom/libosmo-abis/files/fix-rsl-connect.patch
@@ -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],
diff --git a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
index 52c7c98c16..fd8e8fda42 100644
--- a/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
+++ b/recipes-osmocom/libosmo-abis/libosmo-abis_git.bb
@@ -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"