osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email ) Change subject: ttcn3.sh: bts: fix missing trxcon dependency ...................................................................... ttcn3.sh: bts: fix missing trxcon dependency Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359 --- M all.deps M gen_makefile.py M ttcn3/ttcn3.sh 3 files changed, 23 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/all.deps b/all.deps index 5a1191a..398ebec 100644 --- a/all.deps +++ b/all.deps @@ -48,4 +48,5 @@ # configure.ac not in topdir of repository osmocom-bb_layer23 libosmocore osmocom-bb_virtphy libosmocore +osmocom-bb_trxcon libosmocore simtrace2_host libosmocore diff --git a/gen_makefile.py b/gen_makefile.py index 3f6a994..9b896b2 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -188,6 +188,14 @@ touch $@ ''' + if proj == "osmocom-bb_trxcon": + return f''' +.make.{proj}.clone: .make.osmocom-bb.clone + @echo -e "\\n\\n\\n===== $@\\n" + test -L {src_proj} || ln -s osmocom-bb/src/host/trxcon {src_proj} + touch $@ + ''' + if proj == "simtrace2_host": return f''' .make.{proj}.clone: .make.simtrace2.clone @@ -512,6 +520,9 @@ .PHONY: virtphy virtphy: osmocom-bb_virtphy +.PHONY: trxcon +trxcon: osmocom-bb_trxcon + # # Other convenience targets # diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 780a4ba..a458f5b 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -195,7 +195,7 @@ # Osmocom bsc|bsc-*) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;; - bts) echo "osmo-bsc osmo-bts-trx" ;; + bts) echo "osmo-bsc osmo-bts-trx trxcon" ;; msc) echo "osmo-stp osmo-msc" ;; pcu-sns) echo "osmo-pcu" ;; pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;; @@ -213,6 +213,7 @@ osmo-pcap-*) echo "osmo-pcap" ;; osmo-stp) echo "libosmo-sccp" ;; osmo-uecups-*) echo "osmo-uecups" ;; + trxcon) echo "osmocom-bb_trxcon" ;; *) echo "$1" ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359 Gerrit-Change-Number: 36767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged