Change in osmo-ttcn3-hacks[master]: Depend on our own fork of titan.ProtocolModules.BSSMAP

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Tue May 21 12:12:41 UTC 2019


Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/14104 )

Change subject: Depend on our own fork of titan.ProtocolModules.BSSMAP
......................................................................

Depend on our own fork of titan.ProtocolModules.BSSMAP

Since we use some BSSMAP extensions to signal Osmux, we need to maintain
our own fork of BSSMAP_Types in order to supports those IEs in BSSMAP
RESET and BSSMAP Assin Req/Compl. Hence, switch all build componenets to
fetch and use our fork.

Depends: titan.ProtocolModules.BSSMAP Iaf1e137269c0da20b2c96fd104b57edf336693af
Change-Id: Ic8debe5f3ffe8e1d4258fa6b4632a3871b99af40
---
M bsc-nat/gen_links.sh
M bsc/gen_links.sh
M deps/Makefile
M msc/gen_links.sh
M selftest/gen_links.sh
5 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh
index 16e32b7..7b7f928 100755
--- a/bsc-nat/gen_links.sh
+++ b/bsc-nat/gen_links.sh
@@ -29,7 +29,7 @@
 FILES="SCCP_Emulation.ttcn  SCCP_EncDec.cc  SCCP_Mapping.ttcnpp  SCCP_Types.ttcn  SCCPasp_Types.ttcn"
 gen_links $DIR $FILES
 
-DIR=$BASEDIR/titan.ProtocolModules.BSSMAP_v11.2.0/src
+DIR=$BASEDIR/titan.ProtocolModules.BSSMAP/src
 FILES="BSSAP_Types.ttcn"
 gen_links $DIR $FILES
 
diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh
index a4f09f4..c71b31a 100755
--- a/bsc/gen_links.sh
+++ b/bsc/gen_links.sh
@@ -45,7 +45,7 @@
 FILES="SCCP_Emulation.ttcn  SCCP_Mapping.ttcnpp  SCCP_Types.ttcn  SCCPasp_Types.ttcn"
 gen_links $DIR $FILES
 
-DIR=$BASEDIR/titan.ProtocolModules.BSSMAP_v11.2.0/src
+DIR=$BASEDIR/titan.ProtocolModules.BSSMAP/src
 FILES="BSSAP_Types.ttcn"
 gen_links $DIR $FILES
 
diff --git a/deps/Makefile b/deps/Makefile
index 6b19cf3..23f7b64 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -33,7 +33,6 @@
 			titan.TestPorts.GPIO \
 			titan.ProtocolModules.BSSAPP_v7.3.0 \
 			titan.ProtocolModules.BSSGP_v13.0.0 \
-			titan.ProtocolModules.BSSMAP_v11.2.0 \
 			titan.ProtocolModules.GTP_v13.5.0 \
 			titan.ProtocolModules.GTPv2_v13.7.0 \
 			titan.ProtocolModules.ISUP_Q.762 \
@@ -48,7 +47,8 @@
 			titan.TestPorts.MTP3asp \
 			titan.ProtocolEmulations.M3UA
 
-OSMOGIT_REPOS=		titan.ProtocolModules.MAP
+OSMOGIT_REPOS=		titan.ProtocolModules.MAP \
+			titan.ProtocolModules.BSSMAP
 
 ALL_REPOS=$(ECLIPSEGIT_REPOS) $(ECLIPSEGIT2_REPOS) $(OSMOGITHUB_REPOS) $(OSMOGIT_REPOS)
 
@@ -60,7 +60,7 @@
 titan.ProtocolEmulations.SCCP_commit=	 	R.7.A-2-g724c83f
 titan.ProtocolModules.BSSAPP_v7.3.0_commit=	R.2.A
 titan.ProtocolModules.BSSGP_v13.0.0_commit=	R.2.A
-titan.ProtocolModules.BSSMAP_v11.2.0_commit=	R.2.A
+titan.ProtocolModules.BSSMAP_commit=		master
 titan.ProtocolModules.GRE_commit=		R.2.A
 titan.ProtocolModules.GTP_v13.5.0_commit=	R.2.A
 titan.ProtocolModules.GTPv2_v13.7.0_commit=	R.2.A
diff --git a/msc/gen_links.sh b/msc/gen_links.sh
index 7ba190a..7aaba2b 100755
--- a/msc/gen_links.sh
+++ b/msc/gen_links.sh
@@ -46,7 +46,7 @@
 FILES="SCCP_Emulation.ttcn  SCCP_EncDec.cc  SCCP_Mapping.ttcnpp  SCCP_Types.ttcn  SCCPasp_Types.ttcn"
 gen_links $DIR $FILES
 
-DIR=$BASEDIR/titan.ProtocolModules.BSSMAP_v11.2.0/src
+DIR=$BASEDIR/titan.ProtocolModules.BSSMAP/src
 FILES="BSSAP_Types.ttcn"
 gen_links $DIR $FILES
 
diff --git a/selftest/gen_links.sh b/selftest/gen_links.sh
index 09d2f26..c590de6 100755
--- a/selftest/gen_links.sh
+++ b/selftest/gen_links.sh
@@ -30,7 +30,7 @@
 FILES="SCCP_Emulation.ttcn  SCCP_Mapping.ttcnpp  SCCP_Types.ttcn  SCCPasp_Types.ttcn"
 gen_links $DIR $FILES
 
-DIR=$BASEDIR/titan.ProtocolModules.BSSMAP_v11.2.0/src
+DIR=$BASEDIR/titan.ProtocolModules.BSSMAP/src
 FILES="BSSAP_Types.ttcn"
 gen_links $DIR $FILES
 

-- 
To view, visit https://gerrit.osmocom.org/14104
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8debe5f3ffe8e1d4258fa6b4632a3871b99af40
Gerrit-Change-Number: 14104
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190521/24b6523c/attachment.html>


More information about the gerrit-log mailing list