March 2022 - gerrit-log - lists.osmocom.org

Change in osmo-dev[master]: net: add mgw for osmo-bsc-nat

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27455 ) Change subject: net: add mgw for osmo-bsc-nat ...................................................................... net: add mgw for osmo-bsc-nat Start the OsmoBSCNAT's own instance of OsmoMGW. Launch it on a separate IP, such as the other MGWs, so it's easy to differentiate in wireshark which traffic relates to which MGW. Related: https://osmocom.org/projects/osmo-bscnat/wiki/Ladder_diagrams_for_key_proce… Change-Id: Iaeebb693c81d3aa4b1a46d2543c9872bd49b87c3 --- M net/config_2g3g A net/templates/osmo-mgw-for-bsc-nat.cfg M net/templates/run.sh 3 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/55/27455/1 diff --git a/net/config_2g3g b/net/config_2g3g index 379f505..6111b24 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -96,6 +96,10 @@ MGW4BSC1_PORT="2427" MGW4BSC1_VTY_IP="127.0.0.11" +MGW4BSCNAT_IP="127.0.0.14" +MGW4BSCNAT_PORT="2427" +MGW4BSCNAT_VTY_IP="127.0.0.14" + BSC_COUNT=1 BSC0_IP="${TO_RAN_IP}" diff --git a/net/templates/osmo-mgw-for-bsc-nat.cfg b/net/templates/osmo-mgw-for-bsc-nat.cfg new file mode 100644 index 0000000..d0ef957 --- /dev/null +++ b/net/templates/osmo-mgw-for-bsc-nat.cfg @@ -0,0 +1,16 @@ +${include(common_template_warning)} +mgcp + domain bscnat + bind ip ${MGW4BSCNAT_IP} + bind port ${MGW4BSCNAT_PORT} + rtp net-range 50004 60000 + number endpoints 1024 +line vty + bind ${MGW4BSCNAT_VTY_IP} + +${foreach(LOG_OUTPUT)} +log ${LOG_OUTPUTn_TYPE} +${include(common_logging)} + logging level rtp info + logging level lmgcp info +${foreach_end} diff --git a/net/templates/run.sh b/net/templates/run.sh index 29e5347..3165f53 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -244,6 +244,7 @@ else term "$stp4cn" STP4CN term "$stp4ran" STP4RAN + term "$mgw -c osmo-mgw-for-bsc-nat.cfg" MGW4BSCNAT term "$bscnat" BSCNAT fi -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27455 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iaeebb693c81d3aa4b1a46d2543c9872bd49b87c3 Gerrit-Change-Number: 27455 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run.sh: proper iptables -> /dev/null

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27452 ) Change subject: net/templates/run.sh: proper iptables -> /dev/null ...................................................................... net/templates/run.sh: proper iptables -> /dev/null Fix displaying unrelated message from iptables by redirecting both stdout and stderr to /dev/null. Change-Id: Ibe031725cbb68ec55664dd025b1ffc247db08148 --- M net/templates/run.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/52/27452/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index e4e8356..c19c081 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -21,7 +21,7 @@ sudo true || exit 1 -if ! sudo iptables -t nat -C POSTROUTING -s ${GGSN_NET} -o $dev -j MASQUERADE 2>/dev/null; then +if ! sudo iptables -t nat -C POSTROUTING -s ${GGSN_NET} -o $dev -j MASQUERADE >/dev/null 2>&1; then echo "Adding iptables rule for masquerade" sudo iptables -t nat -I POSTROUTING -s ${GGSN_NET} -o $dev -j MASQUERADE fi -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ibe031725cbb68ec55664dd025b1ffc247db08148 Gerrit-Change-Number: 27452 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates: use codec fr2 for bts1

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27453 ) Change subject: net/templates: use codec fr2 for bts1 ...................................................................... net/templates: use codec fr2 for bts1 Fix establishing a call to virtual mobile, which wouldn't work for me if using anything but FR2 (EFR) as codec. Change-Id: I6a8706923b651c790798a50aad93492de17dd1a5 --- M net/config_2g3g M net/templates/common_osmo_bsc 2 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/53/27453/1 diff --git a/net/config_2g3g b/net/config_2g3g index bd27cf7..379f505 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -15,11 +15,12 @@ MNC=01 TCH_TYPE=TCH/H +TCH_TYPE2=TCH/F BTS_BAND=GSM-1800 BTS_LAC=23 BTS_MAX_POWER_RED=22 -BTS_CODEC_SUPPORT=fr amr +BTS_CODEC_SUPPORT=fr amr efr BTS_200mW=23 BTS0_DESCRIPTION="my test BTS 0" @@ -104,7 +105,7 @@ # Enabled only when BSC_COUNT=2 BSC1_IP="127.0.0.10" BSC1_PC="0.23.4" -BSC1_CODEC_LIST="hr3" +BSC1_CODEC_LIST="fr2" HNBGW_PC="0.3.0" HNBGW_IP="${TO_RAN_IP}" diff --git a/net/templates/common_osmo_bsc b/net/templates/common_osmo_bsc index ad229ed..0e88b80 100644 --- a/net/templates/common_osmo_bsc +++ b/net/templates/common_osmo_bsc @@ -75,9 +75,9 @@ timeslot 4 phys_chan_config ${TCH_TYPE} timeslot 5 - phys_chan_config ${TCH_TYPE} + phys_chan_config ${TCH_TYPE2} timeslot 6 - phys_chan_config ${TCH_TYPE} + phys_chan_config ${TCH_TYPE2} timeslot 7 phys_chan_config PDCH ${foreach_end} -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I6a8706923b651c790798a50aad93492de17dd1a5 Gerrit-Change-Number: 27453 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: make: add convenience target cn-bsc-nat

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27450 ) Change subject: make: add convenience target cn-bsc-nat ...................................................................... make: add convenience target cn-bsc-nat Change-Id: Ia2bdc8df3cbe9de305aba4f7592a2362f3802303 --- M gen_makefile.py 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/50/27450/1 diff --git a/gen_makefile.py b/gen_makefile.py index a87a289..6527371 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -349,6 +349,16 @@ osmo-bsc \ $(NULL) +.PHONY: cn-bsc-nat +cn-bsc-nat: \ + cn \ + mobile \ + osmo-bsc \ + osmo-bsc-nat \ + osmo-bts \ + virtphy \ + $(NULL) + .PHONY: usrp usrp: \ cn-bsc \ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27450 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia2bdc8df3cbe9de305aba4f7592a2362f3802303 Gerrit-Change-Number: 27450 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net: virtphy, osmo-bts-virtual: use loopback-dev

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27451 ) Change subject: net: virtphy, osmo-bts-virtual: use loopback-dev ...................................................................... net: virtphy, osmo-bts-virtual: use loopback-dev Use the loopback device for virtual Um traffic, so it doesn't slow down other net devs. Change-Id: Ibc7ff3aaaca4872f4105825167eb33b66bc23342 --- M net/templates/common_osmo_bts M net/templates/run.sh 2 files changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/51/27451/1 diff --git a/net/templates/common_osmo_bts b/net/templates/common_osmo_bts index 4244e34..06bd439 100644 --- a/net/templates/common_osmo_bts +++ b/net/templates/common_osmo_bts @@ -3,6 +3,7 @@ phy 0 instance 0 + virtual-um net-device lo bts 0 band ${BTS_BAND} diff --git a/net/templates/run.sh b/net/templates/run.sh index a5a8720..e4e8356 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -46,6 +46,18 @@ sudo ip addr add ${TO_RAN_IU_IP}/32 dev $dev fi +# Enable multicast on lo for virtual MS +if [ "${MS_RUN_IN_OSMO_DEV}" = 1 ]; then + if [ -z "$(ip link show lo | grep MULTICAST)" ]; then + echo "Loopback device doesn't have multicast enabled! Hit enter to enable it" + read enter_to_continue + sudo ip link set lo multicast on + fi + if [ -z "$(ip route show dev lo | grep '224\.0\.0\.0/4')" ]; then + sudo ip route add 224.0.0.0/4 dev lo + fi +fi + logdir="current_log" piddir="run/pids" launcherdir="run/launchers" @@ -183,7 +195,7 @@ bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc" bscnat="osmo-bsc-nat" bts="osmo-bts-virtual" -virtphy="virtphy" +virtphy="virtphy -D lo" ms="mobile -c mobile.cfg" if [ "x${MSC_MNCC}" != "xinternal" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ibc7ff3aaaca4872f4105825167eb33b66bc23342 Gerrit-Change-Number: 27451 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates: support running MS

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27448 ) Change subject: net/templates: support running MS ...................................................................... net/templates: support running MS New config variables: * MS_RUN_IN_OSMO_DEV * MS_SUBSCR_ID * MS_IMSI * MS_KI * MS_MSISDN Change-Id: I377ca41d18ee6b057559cadb0f0bb44f85643eb6 --- M net/config_2g3g A net/templates/hlr_db_add_ms.sql A net/templates/mobile.cfg M net/templates/run.sh 4 files changed, 85 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/48/27448/1 diff --git a/net/config_2g3g b/net/config_2g3g index bc0ced3..2149c39 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -142,6 +142,13 @@ BSCNAT_RAN_PC="${MSC_PC}" BSCNAT_RAN_IP="127.0.0.4" +# Set to 1 to have osmo-dev run mobile and virtphy from osmocom-bb +MS_RUN_IN_OSMO_DEV=0 +MS_SUBSCR_ID="1337" +MS_IMSI="001010000000000" +MS_KI="00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" +MS_MSISDN="555" + # PBX_SERVER: # "kamailio" -- launch kamailio # "freeswitch" -- launch freeswitch diff --git a/net/templates/hlr_db_add_ms.sql b/net/templates/hlr_db_add_ms.sql new file mode 100644 index 0000000..54fda4b --- /dev/null +++ b/net/templates/hlr_db_add_ms.sql @@ -0,0 +1,10 @@ +/* Use this file to add the subscriber for MS_RUN_IN_OSMO_DEV=1 to your hlr.db: + * sqlite3 -batch hlr.db < hlr_db_add_ms.sql + */ + +INSERT INTO subscriber (id, imsi, msisdn) +VALUES (${MS_SUBSCR_ID}, "${MS_IMSI}", "${MS_MSISDN}"); + +INSERT INTO auc_2g (subscriber_id, algo_id_2g, ki) +VALUES (${MS_SUBSCR_ID}, 1 /* OSMO_AUTH_ALG_COMP128v1 */, + REPLACE("${MS_KI}", " ", "")); diff --git a/net/templates/mobile.cfg b/net/templates/mobile.cfg new file mode 100644 index 0000000..a9fcb3f --- /dev/null +++ b/net/templates/mobile.cfg @@ -0,0 +1,62 @@ +${include(common_template_warning)} +line vty + no login + +no gps enable + +no hide-default + +ms 1 + layer2-socket /tmp/osmocom_l2 + sap-socket /tmp/osmocom_sap + sim test + network-selection-mode auto + imei 000000000000000 0 + imei-fixed + no emergency-imsi + no sms-service-center + no call-waiting + auto-answer + no force-rekey + no clip + no clir + tx-power auto + no simulated-delay + no stick + location-updating + neighbour-measurement + codec full-speed prefer + no abbrev + support + sms + a5/1 + a5/2 + p-gsm + e-gsm + r-gsm + no gsm-850 + dcs + no pcs + class-900 4 + class-850 4 + class-dcs 1 + class-pcs 1 + channel-capability sdcch+tchf+tchh + full-speech-v1 + full-speech-v2 + min-rxlev -106 + dsc-max 90 + no skip-max-per-band + test-sim + imsi ${MS_IMSI} + ki comp128 ${MS_KI} + no barred-access + rplmn ${MCC} ${MNC} + audio + io-handler loopback + no shutdown + +${foreach(LOG_OUTPUT)} +log ${LOG_OUTPUTn_TYPE} +${include(common_logging)} +${foreach_end} diff --git a/net/templates/run.sh b/net/templates/run.sh index cda7fc0..e1cf226 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -183,6 +183,8 @@ bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc" bscnat="osmo-bsc-nat" bts="osmo-bts-virtual" +virtphy="virtphy" +ms="mobile -c mobile.cfg" if [ "x${MSC_MNCC}" != "xinternal" ]; then sipcon="osmo-sip-connector -c osmo-sip-connector.cfg" @@ -258,6 +260,10 @@ fi ${foreach_end} +if [ "${MS_RUN_IN_OSMO_DEV}" = 1 ]; then + term "$virtphy" VIRTPHY + term "$ms" MS +fi if [ "x${MSC_MNCC}" != "xinternal" ]; then term "$sipcon" SIPCON -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I377ca41d18ee6b057559cadb0f0bb44f85643eb6 Gerrit-Change-Number: 27448 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net: don't run osmo-gbproxy by default

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27449 ) Change subject: net: don't run osmo-gbproxy by default ...................................................................... net: don't run osmo-gbproxy by default osmo-gbproxy is not part of any of the convenience make targets in gen_makefile.py (cn, cn-bsc, usrp). When using the typical workflow of building one of these convenience targets first, then attempting to run the network, the osmo-gbproxy window just says command not found. With the default config_2g3g, it is not needed when only using one BTS, so add a new config variable GBPROXY_RUN_IN_OSMO_DEV=0 and use it in run.sh. Change-Id: Ib1349809997ea6062ec3c43df92abab9fbfad1ea --- M net/config_2g3g M net/templates/run.sh 2 files changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/49/27449/1 diff --git a/net/config_2g3g b/net/config_2g3g index 2149c39..bd27cf7 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -79,6 +79,7 @@ GBPROXY_IP="${TO_RAN_IP}" GBPROXY_GB_PORT=7777 +GBPROXY_RUN_IN_OSMO_DEV=0 PCU_GB_LOCAL_PORT=23000 diff --git a/net/templates/run.sh b/net/templates/run.sh index e1cf226..a5a8720 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -238,7 +238,11 @@ term "$hlr" HLR term "$sgsn" SGSN -term "$gbproxy" GBPROXY + +if [ "${GBPROXY_RUN_IN_OSMO_DEV}" = 1 ]; then + term "$gbproxy" GBPROXY +fi + term "$mgw4msc" MGW4MSC term "$msc" MSC term "$hnbgw" HNBGW -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ib1349809997ea6062ec3c43df92abab9fbfad1ea Gerrit-Change-Number: 27449 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: make: add support for "mobile" from osmocom-bb

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27446 ) Change subject: make: add support for "mobile" from osmocom-bb ...................................................................... make: add support for "mobile" from osmocom-bb Allow building and installing the "mobile" application from osmocom-bb.git's src/host/layer23 dir. Change-Id: Ic75cca703e317eaee593b4d6c78784309c056f17 --- M all.deps M gen_makefile.py 2 files changed, 43 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/46/27446/1 diff --git a/all.deps b/all.deps index 20972a8..85b8d34 100644 --- a/all.deps +++ b/all.deps @@ -30,3 +30,7 @@ # can only clone these docker-playground osmo-ttcn3-hacks +osmocom-bb + +# configure.ac not in topdir of repository +osmocom-bb_layer23 libosmocore diff --git a/gen_makefile.py b/gen_makefile.py index 2e9cc24..d574565 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -154,16 +154,35 @@ return {} return dict(read_projects_deps(path)) +def gen_makefile_clone(proj, src, src_proj, url, push_url): + if proj == "osmocom-bb_layer23": + 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/layer23 {src_proj} + touch $@ + ''' + + return f''' +.make.{proj}.clone: + @echo -e "\\n\\n\\n===== $@\\n" + test -d {src} || mkdir -p {src} + test -d {src_proj} || ( git -C {src} clone "{url}/{proj}" "{proj}" && git -C "{src}/{proj}" remote set-url --push origin "{push_url}/{proj}" ) + sync + touch $@ + ''' + def gen_make(proj, deps, configure_opts, jobs, make_dir, src_dir, build_dir, url, push_url, sudo_make_install, no_ldconfig, ldconfig_without_sudo, make_check): src_proj = os.path.join(src_dir, proj) if proj == 'openbsc': src_proj = os.path.join(src_proj, 'openbsc') build_proj = os.path.join(build_dir, proj) - make_to_src = os.path.relpath(src_dir, make_dir) - make_to_src_proj = os.path.relpath(src_proj, make_dir) + src = os.path.relpath(src_dir, make_dir) + src_proj = os.path.relpath(src_proj, make_dir) make_to_build_proj = os.path.relpath(build_proj, make_dir) build_to_src = os.path.relpath(src_proj, build_proj) + push_url = push_url or url if configure_opts: configure_opts_str = ' '.join(configure_opts) @@ -188,12 +207,7 @@ \) \ -and -not -name "config.h" 2>/dev/null) -.make.{proj}.clone: - @echo -e "\n\n\n===== $@\n" - test -d {src} || mkdir -p {src} - test -d {src_proj} || ( git -C {src} clone "{url}/{proj}" "{proj}" && git -C "{src}/{proj}" remote set-url --push origin "{push_url}/{proj}" ) - sync - touch $@ +{clone_rule} .make.{proj}.autoconf: .make.{proj}.clone {src_proj}/configure.ac if {distclean_cond}; then $(MAKE) {proj}-distclean; fi @@ -248,13 +262,14 @@ '''.format( url=url, - push_url=push_url or url, + push_url=push_url, proj=proj, jobs=jobs, - src=make_to_src, - src_proj=make_to_src_proj, + src=src, + src_proj=src_proj, build_proj=make_to_build_proj, build_to_src=build_to_src, + clone_rule=gen_makefile_clone(proj, src, src_proj, url, push_url), deps_installed=' '.join(['.make.%s.install' % d for d in deps]), deps_reinstall=' '.join(['%s-reinstall' %d for d in deps]), configure_opts=configure_opts_str, @@ -264,7 +279,7 @@ check='check' if make_check else '', docker_cmd=f'{args.docker_cmd} ' if args.docker_cmd else '', cflags='CFLAGS=-g ' if args.build_debug else '', - distclean_cond=f'[ -e {make_to_src_proj}/config.status ]' if args.auto_distclean else 'false' + distclean_cond=f'[ -e {src_proj}/config.status ]' if args.auto_distclean else 'false' ) @@ -305,6 +320,9 @@ out.write(r''' default: usrp +# +# Convenience targets for whole networks +# .PHONY: cn cn: \ osmo-ggsn \ @@ -330,6 +348,15 @@ osmo-trx \ $(NULL) +# +# Convenience targets for components in subdirs of repositories +# +.PHONY: mobile +mobile: osmocom-bb_layer23 + +# +# Other convenience targets +# .PHONY: all_debug all_debug: $(MAKE) --dry-run -d all | grep "is newer than target" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27446 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ic75cca703e317eaee593b4d6c78784309c056f17 Gerrit-Change-Number: 27446 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: make: add support for "virtphy" from osmocom-bb

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27447 ) Change subject: make: add support for "virtphy" from osmocom-bb ...................................................................... make: add support for "virtphy" from osmocom-bb Change-Id: Id4e7a9d948332c03d56e2637badeef78c78e5aa7 --- M all.deps M gen_makefile.py 2 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/47/27447/1 diff --git a/all.deps b/all.deps index 85b8d34..75c2b96 100644 --- a/all.deps +++ b/all.deps @@ -34,3 +34,4 @@ # configure.ac not in topdir of repository osmocom-bb_layer23 libosmocore +osmocom-bb_virtphy libosmocore diff --git a/gen_makefile.py b/gen_makefile.py index d574565..a87a289 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -163,6 +163,14 @@ touch $@ ''' + if proj == "osmocom-bb_virtphy": + 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/virt_phy {src_proj} + touch $@ + ''' + return f''' .make.{proj}.clone: @echo -e "\\n\\n\\n===== $@\\n" @@ -354,6 +362,9 @@ .PHONY: mobile mobile: osmocom-bb_layer23 +.PHONY: virtphy +virtphy: osmocom-bb_virtphy + # # Other convenience targets # -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Id4e7a9d948332c03d56e2637badeef78c78e5aa7 Gerrit-Change-Number: 27447 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-dev[master]: gen_makefile.py: mark convenience targets as phony

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/27444 ) Change subject: gen_makefile.py: mark convenience targets as phony ...................................................................... gen_makefile.py: mark convenience targets as phony Change-Id: Idd7e485e17b178f1bf6feef5d30db57e6467267e --- M gen_makefile.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/44/27444/1 diff --git a/gen_makefile.py b/gen_makefile.py index 9eb2d94..03523df 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -305,6 +305,7 @@ out.write(r''' default: usrp +.PHONY: cn cn: \ osmo-ggsn \ osmo-hlr \ @@ -316,11 +317,13 @@ osmo-smlc \ $(NULL) +.PHONY: cn-bsc cn-bsc: \ cn \ osmo-bsc \ $(NULL) +.PHONY: usrp usrp: \ cn-bsc \ osmo-bts \ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27444 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Idd7e485e17b178f1bf6feef5d30db57e6467267e Gerrit-Change-Number: 27444 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022