summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2020-09-13 11:29:21 +0200
committerHarald Welte <laforge@osmocom.org>2020-09-13 11:34:28 +0200
commit501e070d6e8ee068e6de027d39b230ed8c7aa256 (patch)
treeaa5d707c6aaf1d256c6e6eb48a49174006605285
parent93331e736bbe9181ca2337bd031a525ace532f54 (diff)
deps: switch TELNETasp and M3UA back to upstream
the respective changes we had have long been merged upstream, so let's switch back from our own forks to upstream Change-Id: I52bdac20745bc3f5ce618ea804686781483a6f4c
-rw-r--r--deps/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/deps/Makefile b/deps/Makefile
index b808dcc..77e469d 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -39,10 +39,12 @@ ECLIPSEGITHUB_REPOS= titan.Libraries.TCCUsefulFunctions \
titan.TestPorts.PCAPasp \
titan.TestPorts.PIPEasp \
titan.TestPorts.SIPmsg \
+ titan.TestPorts.TELNETasp \
titan.TestPorts.TCPasp \
titan.TestPorts.UNIX_DOMAIN_SOCKETasp
-ECLIPSEGIT2_REPOS= titan.ProtocolModules.GRE \
+ECLIPSEGIT2_REPOS= titan.ProtocolEmulations.M3UA \
+ titan.ProtocolModules.GRE \
titan.ProtocolModules.M2PA \
titan.ProtocolModules.ROSE \
titan.ProtocolModules.SCTP \
@@ -63,8 +65,6 @@ ECLIPSEGIT2_REPOS= titan.ProtocolModules.GRE \
OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \
titan.TestPorts.MTP3asp \
titan.TestPorts.UDPasp \
- titan.TestPorts.TELNETasp \
- titan.ProtocolEmulations.M3UA \
titan.ProtocolEmulations.SCCP
OSMOGIT_REPOS= titan.ProtocolModules.MAP \
@@ -122,7 +122,7 @@ titan.TestPorts.PIPEasp_commit= R.7.D-3-g8b01154
titan.TestPorts.SCTPasp_commit= R.11.A-2-g2faa9cf
titan.TestPorts.SIPmsg_commit= R.15.A-1-ge4f9dd0
titan.TestPorts.TCPasp_commit= R.9.A-5-g2c91bc6
-titan.TestPorts.TELNETasp_commit= R.9.A-5-g7a07a97
+titan.TestPorts.TELNETasp_commit= 873fe539642542cd9a901c208f1ec11c6d2f5387
titan.TestPorts.UDPasp_commit= c20d77a34f288dd70dd4aaa30e520778876e9336
titan.TestPorts.UNIX_DOMAIN_SOCKETasp_commit= R.2.A-8-g7ec4fe0
titan.TestPorts.USB_commit= master