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

[S] Change in osmo-bsc[master]: E1 BTS: direct MGW to 8k subslots for TCH/H

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39752?usp=email ) Change subject: E1 BTS: direct MGW to 8k subslots for TCH/H ...................................................................... E1 BTS: direct MGW to 8k subslots for TCH/H If the design of an E1 BTS allocates a 16 kbit/s subslot on Abis for each GSM timeslot, then if that GSM ts is configured to operate as two TCH/H lchans instead of a single TCH/F lchan, that BTS has to use the 8 kbit/s TRAU frame format of GSM 08.61 and not the 16 kbit/s format for each TCH/H lchan. Nokia E1 BTS and their associated BSC and TCSM (TRAU) equipment are known to use this arrangement; the present author does not know of any GSM BSS vendor who used the 16 kbit/s format of GSM 08.61 - it might be a paper-only spec. Prior to the present change OsmoBSC always selected a 16k subslot endpoint at the MGW, thus precluding possibility of working TCH/H on otherwise supported E1 BTS. Change it to select 8k subslot endpoints when operating on TCH/H lchans. It may seem that this change breaks support for those E1 BTS that do use 16 kbit/s TRAU frame format for TCH/H, whatever they may be - but in reality, said support was already broken. Prior to the present change OsmoBSC would smoosh both TCH/H lchans of a given GSM ts onto the same MGW endpoint - which cannot work because they are two different lchans carrying unrelated traffic. Change-Id: If6141a55434ce08f8fdd1c69b6fc9a97d6c726a7 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 8 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index f1f48bc..a2a1eb7 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -746,15 +746,20 @@ /* use dynamic RTPBRIDGE endpoint allocation in MGW */ epname = mgcp_client_rtpbridge_wildcard(mgcp_client); else { - uint8_t i460_bit_offs; + uint8_t i460_bit_offs, i460_rate = 16; if (for_lchan->ts->e1_link.e1_ts_ss == E1_SUBSLOT_FULL) i460_bit_offs = 0; else i460_bit_offs = for_lchan->ts->e1_link.e1_ts_ss * 2; + if (for_lchan->type == GSM_LCHAN_TCH_H) { + i460_rate = 8; + i460_bit_offs += for_lchan->nr; + } + epname = mgcp_client_e1_epname(conn, mgcp_client, for_lchan->ts->e1_link.e1_nr, - for_lchan->ts->e1_link.e1_ts, 16, - i460_bit_offs); + for_lchan->ts->e1_link.e1_ts, + i460_rate, i460_bit_offs); } conn->user_plane.mgw_endpoint = -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39752?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If6141a55434ce08f8fdd1c69b6fc9a97d6c726a7 Gerrit-Change-Number: 39752 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: E1 BTS: direct MGW to 8k subslots for TCH/H

by laforge

Attention is currently required from: dexter, falconia, neels. laforge has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bsc/+/39752?usp=email ) Change subject: E1 BTS: direct MGW to 8k subslots for TCH/H ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > This patch has CR+2 now, but there are two additional reviewers listed who haven't said anything yet […] just go ahead if it's +2. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/39752?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If6141a55434ce08f8fdd1c69b6fc9a97d6c726a7 Gerrit-Change-Number: 39752 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Mar 2025 14:26:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>

3 months, 2 weeks

1
0
0 0

[XS] Change in osmocom-bb[master]: fake_trx: Remove unneeded field assignment

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39825?usp=email ) Change subject: fake_trx: Remove unneeded field assignment ...................................................................... fake_trx: Remove unneeded field assignment The assignment is not really needed, since worker can already access the field anyway. Fixes: 6f45d36e936c9209a18e02b6a8c3a04eb1ff9fd9 Change-Id: Ib8808f8bf8f3ef084334debac47ca48a48aa0cea --- M src/target/trx_toolkit/clck_gen.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/src/target/trx_toolkit/clck_gen.py b/src/target/trx_toolkit/clck_gen.py index f73ac16..ae7a899 100755 --- a/src/target/trx_toolkit/clck_gen.py +++ b/src/target/trx_toolkit/clck_gen.py @@ -70,7 +70,6 @@ # Initialize and start a new thread self._thread = threading.Thread(target = self._worker) self._thread.daemon = True - self._thread.sched_rr_prio = self.sched_rr_prio self._thread.start() def stop(self): -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39825?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib8808f8bf8f3ef084334debac47ca48a48aa0cea Gerrit-Change-Number: 39825 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

3 months, 2 weeks

1
0
0 0

[XS] Change in osmocom-bb[master]: fake_trx: Remove unneeded field assignment

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmocom-bb/+/39825?usp=email ) Change subject: fake_trx: Remove unneeded field assignment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/39825?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib8808f8bf8f3ef084334debac47ca48a48aa0cea Gerrit-Change-Number: 39825 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Mar 2025 14:26:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Rework test TC_ims_call_mo_after_tcp_conn_closed with new e...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39824?usp=email ) Change subject: asterisk: Rework test TC_ims_call_mo_after_tcp_conn_closed with new expectancies ...................................................................... asterisk: Rework test TC_ims_call_mo_after_tcp_conn_closed with new expectancies Previous expected behavior (and Asterisk-UE implementation) was wrong. Since recently, Asterisk behaves better, that is, whenever the TCP conn is dropped by the peer, it will attempt re-connecting and re-registering. Related: SYS#7398 Change-Id: I7ec1e8e30c4d72be96c8e300e0d038e63ba0e600 --- M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn 2 files changed, 65 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve jolly: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index dccf9fa..84ccb76 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -870,8 +870,7 @@ IMS_COORD.receive(IMS_COORD_CMD_CALL_REJECTED); } -private function f_TC_ims_call_mo(boolean close_tcp_after_registration := false, - boolean use_precondition_ext := true, +private function f_TC_ims_call_mo(boolean use_precondition_ext := true, boolean use_session_timer := false, call_established_fn call_established_cb := refers(call_established_fn_sleep1), void_fn sip_fn := refers(f_TC_internal_call_mo), @@ -885,7 +884,6 @@ sip_pars := f_init_ConnHdlrPars(idx := 1); ims_pars := f_init_IMS_ConnHdlrPars(); - ims_pars.subscr.close_tcp_after_registration := close_tcp_after_registration; f_ims_call_mo_configure(sip_pars, ims_pars); ims_pars.subscr.cp.support_precondition_ext := use_precondition_ext; @@ -947,13 +945,6 @@ f_TC_ims_call_mo(sip_fn := refers(f_TC_internal_call_mo_with_holdresume), ims_fn := refers(f_TC_ims_call_mo_IMS_ConnHdlr_with_holdresume)); } -/* TC_ims_call_mo, but IMS server closes the TCP conn used during 2nd register after ACKing it. - * Asterisk should consider it is still registered even if that TCP conn was closed, - * and MO call should work the same. - */ -testcase TC_ims_call_mo_after_tcp_conn_closed() runs on test_CT { - f_TC_ims_call_mo(close_tcp_after_registration := true); -} /* Test a 2nd call initiated from a local SIP UA towards IMS after having HOLD the 1st one. */ private function call_established_fn_holdswitchresume(SIPConnHdlrPars sip_pars, IMS_ConnHdlrPars ims_pars) runs on test_CT { @@ -1019,6 +1010,70 @@ ims_fn := refers(f_TC_ims_call_mo_IMS_ConnHdlr_2nd_mt_rejected)); } +/* TC_ims_call_mo, but IMS server closes the TCP conn used during 2nd register after ACKing it. + * Asterisk should then re-connect and re-register before placing a call towards IMS. */ +private function f_TC_ims_call_mo_after_tcp_conn_closed_IMS_ConnHdlr(charstring id) runs on IMS_ConnHdlr { + f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); + /* First full register at the IMS: */ + as_IMS_register(); + f_sleep(1.0); + /* IMS closes TCP conn (TCP FIN/ACK): */ + f_IMS_tcp_close(); + /* Proceed similar to TC_ims_call_mo: expect new full register + MO call: */ + f_TC_ims_call_mo_IMS_ConnHdlr(id); +} +testcase TC_ims_call_mo_after_tcp_conn_closed() runs on test_CT { + var SIPConnHdlrPars sip_pars; + var IMS_ConnHdlrPars ims_pars; + var SIPConnHdlr vc_conn_sip; + var IMS_ConnHdlr vc_conn_ims; + + f_init(); + + sip_pars := f_init_ConnHdlrPars(idx := 1); + ims_pars := f_init_IMS_ConnHdlrPars(); + + f_ims_call_mo_configure(sip_pars, ims_pars); + ims_pars.subscr.cp.support_precondition_ext := true; + ims_pars.subscr.cp.require_precondition_ext := true; + ims_pars.subscr.cp.mo.tx_coord_cmd_invite_trying := true; + ims_pars.subscr.cp.mo.support_timer_enable := false; + + vc_conn_ims := f_start_handler_IMS(refers(f_TC_ims_call_mo_after_tcp_conn_closed_IMS_ConnHdlr), ims_pars); + vc_conn_sip := f_start_handler(refers(f_TC_internal_call_mo), sip_pars); + + COORD.receive(COORD_CMD_REGISTERED) from vc_conn_sip; + + f_AMI_IMS_register(ims_pars); + /* Here IMS_ConnHdlr will have dropped the TCP conn from IMS. */ + as_AMI_IMS_register_Auth(ims_pars); + + f_ims_call_mo_establish(vc_conn_sip, vc_conn_ims); + + /* Call on-going */ + var call_established_fn call_established_cb := refers(call_established_fn_sleep1); + call_established_cb.apply(sip_pars, ims_pars); + + COORD.send(COORD_CMD_HANGUP) to vc_conn_sip; + IMS_COORD.receive(IMS_COORD_CMD_CALL_FINISHED) from vc_conn_ims; + + /* Notify network released dedicated bearer: */ + AMI_CLIENT.clear; + f_ami_action_DedicatedBearerStatus(AMI_CLIENT, + g_asterisk_chan_name, + "Down", fail_others := false); + + /* Trigger unregistration: */ + f_sleep(1.0); + COORD.send(COORD_CMD_UNREGISTER) to vc_conn_sip; + AMI_CLIENT.clear; + f_AMI_IMS_unregister(ims_pars); + + vc_conn_sip.done; + vc_conn_ims.done; + f_shutdown(); +} + /* Test MT call initiated by IMS */ private function f_TC_ims_call_mt_IMS_ConnHdlr(charstring id) runs on IMS_ConnHdlr { f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 39abc59..2f4168a 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -84,7 +84,6 @@ charstring msisdn, boolean support_video, boolean support_smsip, - boolean close_tcp_after_registration, /* Expected User-Location-Info in P-Access-Network-Info */ charstring uli_str, IMS_AuthVector auth, @@ -211,7 +210,6 @@ msisdn := msisdn, support_video := false, support_smsip := false, - close_tcp_after_registration := false, uli_str := "2380100010000101", auth := { /* The Nonce field is the Base64 encoded version of the RAND value and concatenated with the AUTN: */ @@ -1022,9 +1020,6 @@ supported := supported, userAgent := omit); SIP.send(tx_resp); - if (g_pars.subscr.close_tcp_after_registration) { - f_IMS_tcp_close(); - } } [fail_others] as_SIP_fail_resp(sip_expect_str); [fail_others] as_SIP_fail_req(sip_expect_str); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39824?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7ec1e8e30c4d72be96c8e300e0d038e63ba0e600 Gerrit-Change-Number: 39824 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

3 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Rework test TC_ims_call_mo_after_tcp_conn_closed with new e...

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39824?usp=email ) Change subject: asterisk: Rework test TC_ims_call_mo_after_tcp_conn_closed with new expectancies ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39824?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7ec1e8e30c4d72be96c8e300e0d038e63ba0e600 Gerrit-Change-Number: 39824 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Mar 2025 10:43:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Rework test TC_ims_call_mo_after_tcp_conn_closed with new e...

by jolly

Attention is currently required from: pespin. jolly has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39824?usp=email ) Change subject: asterisk: Rework test TC_ims_call_mo_after_tcp_conn_closed with new expectancies ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Verified that it working as expected. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39824?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7ec1e8e30c4d72be96c8e300e0d038e63ba0e600 Gerrit-Change-Number: 39824 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Mar 2025 09:28:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

3 months, 2 weeks

1
0
0 0

[S] Change in osmo-dev[master]: src/_update_src_copy: move functions to top

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/39818?usp=email ) Change subject: src/_update_src_copy: move functions to top ...................................................................... src/_update_src_copy: move functions to top Prepare to add a new function in the next patch that gets called early. Change-Id: I9a2b346e8e6d9a33aa4fc55add6bb9124ea2d3ed --- M src/_update_src_copy.sh 1 file changed, 14 insertions(+), 14 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Verified fixeria: Looks good to me, approved diff --git a/src/_update_src_copy.sh b/src/_update_src_copy.sh index d80b5fa..a0ea533 100644 --- a/src/_update_src_copy.sh +++ b/src/_update_src_copy.sh @@ -2,20 +2,6 @@ # Update the src_copy dir with all relevant files from the original git # repository (+ submodules). Used by gen_makefile.py --autoreconf-in-src-copy. -MAKE_DIR="$PWD" -SRC_DIR="$1" -PROJ="$2" -TIME_START="$3" -MARKER="$MAKE_DIR/.make.$PROJ.src_copy" - -# Don't run more than once per "make" call -if [ "$(cat "$MARKER" 2>/dev/null)" = "$TIME_START" ]; then - exit 0 -fi - -DEST_DIR_PROJ="$MAKE_DIR/src_copy/$PROJ" -COPY_LIST="$(mktemp --suffix=-osmo-dev-rsync-copylist)" - update_git_dir() { local src="$1" local dest="$DEST_DIR_PROJ/$(echo "$src" | cut -c 3-)" # cut: remove './' @@ -75,6 +61,20 @@ done } +MAKE_DIR="$PWD" +SRC_DIR="$1" +PROJ="$2" +TIME_START="$3" +MARKER="$MAKE_DIR/.make.$PROJ.src_copy" + +# Don't run more than once per "make" call +if [ "$(cat "$MARKER" 2>/dev/null)" = "$TIME_START" ]; then + exit 0 +fi + +DEST_DIR_PROJ="$MAKE_DIR/src_copy/$PROJ" +COPY_LIST="$(mktemp --suffix=-osmo-dev-rsync-copylist)" + cd "$SRC_DIR/$PROJ" update_git_dirs_all rm "$COPY_LIST" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/39818?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I9a2b346e8e6d9a33aa4fc55add6bb9124ea2d3ed Gerrit-Change-Number: 39818 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[S] Change in osmo-dev[master]: src/_update_src_copy: handle symlink projects

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/39819?usp=email ) Change subject: src/_update_src_copy: handle symlink projects ...................................................................... src/_update_src_copy: handle symlink projects Handle projects that are symlinks to paths in other git repositories, such as osmocom-bb_layer23 -> osmocom-bb/src/host/layer23. Fix for: _update_read_only_src_copy: find failed Change-Id: Icfe701b8a237385597718374be50a8b81c6ac433 --- M src/_update_src_copy.sh 1 file changed, 41 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Verified diff --git a/src/_update_src_copy.sh b/src/_update_src_copy.sh index a0ea533..f13a357 100644 --- a/src/_update_src_copy.sh +++ b/src/_update_src_copy.sh @@ -61,6 +61,45 @@ done } +# Some project are symlinks to a path in another git repository (for example +# osmocom-bb_layer23 -> osmocom-bb/src/host/layer23). For those we need to +# add such a symlink to the src_copy dir and then run _update_src_copy.sh on +# the main project (osmocom-bb in the example). +handle_symlink_proj() { + local linkdest + local git_topdir + local proj_main + local relpath + + if ! [ -L "$SRC_DIR/$PROJ" ]; then + return + fi + + linkdest="$(realpath "$SRC_DIR/$PROJ")" + git_topdir="$(cd "$linkdest" && git rev-parse --show-toplevel)" + + if [ -z "$git_topdir" ]; then + "_update_src_copy: getting git topdir failed: $linkdest" + exit 1 + fi + + proj_main="$(basename "$git_topdir")" + + # Create the symlink in src_copy + if ! [ -L "$DEST_DIR_PROJ" ]; then + relpath="$(realpath -s --relative-to="$git_topdir" "$linkdest")" + if [ -z "$relpath" ]; then + "_update_src_copy: getting relpath failed: $linkdest" + exit 1 + fi + ln -s "$proj_main/$relpath" "$DEST_DIR_PROJ" + fi + + # Copy the original project files to src_copy + exec sh -e "$0" "$SRC_DIR" "$proj_main" "$TIME_START" + # Not continuing below (exec) +} + MAKE_DIR="$PWD" SRC_DIR="$1" PROJ="$2" @@ -73,6 +112,8 @@ fi DEST_DIR_PROJ="$MAKE_DIR/src_copy/$PROJ" +handle_symlink_proj + COPY_LIST="$(mktemp --suffix=-osmo-dev-rsync-copylist)" cd "$SRC_DIR/$PROJ" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/39819?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Icfe701b8a237385597718374be50a8b81c6ac433 Gerrit-Change-Number: 39819 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

[XS] Change in osmo-dev[master]: all.urls: add osmo-gsm-shark

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/39820?usp=email ) Change subject: all.urls: add osmo-gsm-shark ...................................................................... all.urls: add osmo-gsm-shark Let osmo-dev use the proper clone url for osmo-gsm-shark, so cloning and building it via "make all" works as expected. Change-Id: If4e17fac28ebae9a3e937242e3e1a40893496a4d --- M all.urls 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/all.urls b/all.urls index 60b653d..ef1b0ab 100644 --- a/all.urls +++ b/all.urls @@ -4,3 +4,4 @@ nftables https://git.netfilter.org/nftables/ open5gs https://github.com/open5gs/open5gs strongswan-epdg https://gitea.osmocom.org/ims-volte-vowifi/strongswan-epdg +osmo-gsm-shark https://gitea.osmocom.org/nhofmeyr/osmo-gsm-shark -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/39820?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: If4e17fac28ebae9a3e937242e3e1a40893496a4d Gerrit-Change-Number: 39820 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

3 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2025