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

[M] Change in osmo-ttcn3-hacks[master]: stp: define PC for IPA ASP peers

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41114?usp=email ) Change subject: stp: define PC for IPA ASP peers ...................................................................... stp: define PC for IPA ASP peers This allows explicitly matching what's configured in osmo-stp's "routing-key" & "point-code override dpc" VTY configs for each AS. This in turn makes the osmo-stp cfg file easy to understand by looking at the peer's (TTCN3) configuration. There's no need to configure "point-code override opc" in the osmo-stp since by default the PC declared in the routing-key is used to apply an OPC on incoming messages over an IPA ASP. Once we have the PC available in the TTCN3 config file, we can use it inside IPA<->M3UA test to put the value in generated M3UA messages (there's no visible changes in IPA ones because ofc the IPA signalling doesn't include the PC in the messages). Change-Id: I9cca2f4dd38e03ab1d259ffafd904b8890778883 --- M stp/STP_Tests_IPA.cfg M stp/STP_Tests_IPA.ttcn M stp/STP_Tests_IPA_M3UA.cfg M stp/STP_Tests_IPA_M3UA.ttcn M stp/osmo-stp-ipa.confmerge 5 files changed, 39 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/41114/1 diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg index 8f6c24a..d8b962e 100644 --- a/stp/STP_Tests_IPA.cfg +++ b/stp/STP_Tests_IPA.cfg @@ -17,70 +17,80 @@ as_name := "ipa-as-loadshare-sender", is_server := false, remote_port := 5000, - local_port := 20000 + local_port := 20000, + point_code := 30 }, { asp_name := "ipa-asp-loadshare-sender1", as_name := "ipa-as-loadshare-sender", is_server := false, remote_port := 5000, - local_port := 20001 + local_port := 20001, + point_code := 30 }, { asp_name := "ipa-asp-loadshare-receiver0", as_name := "ipa-as-loadshare-receiver", is_server := false, remote_port := 5000, - local_port := 20002 + local_port := 20002, + point_code := 31 }, { asp_name := "ipa-asp-loadshare-receiver1", as_name := "ipa-as-loadshare-receiver", is_server := false, remote_port := 5000, - local_port := 20003 + local_port := 20003, + point_code := 31 }, { asp_name := "ipa-asp-override-sender", as_name := "ipa-as-override-sender", is_server := false, remote_port := 5000, - local_port := 20005 + local_port := 20005, + point_code := 33 }, { asp_name := "ipa-asp-override-receiver0", as_name := "ipa-as-override-receiver", is_server := false, remote_port := 5000, - local_port := 20006 + local_port := 20006, + point_code := 33 }, { asp_name := "ipa-asp-override-receiver1", as_name := "ipa-as-override-receiver", is_server := false, remote_port := 5000, - local_port := 20007 + local_port := 20007, + point_code := 33 }, { asp_name := "ipa-asp-LS0-0-0", as_name := "ipa-as-LS0-0", is_server := false, remote_port := 5000, - local_port := 20010 + local_port := 20010, + point_code := 32 }, { asp_name := "ipa-asp-LS0-1-0", as_name := "ipa-as-LS0-1", is_server := false, remote_port := 5000, - local_port := 20011 + local_port := 20011, + point_code := 32 }, { asp_name := "ipa-asp-client0", as_name := "ipa-as-client0", is_server := true, remote_port := 7001, - local_port := 6001 + local_port := 6001, + point_code := 35 } } diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index b34297e..b110228 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -59,7 +59,9 @@ /* STP-side SCTP (or TCP) port for M3UA */ integer remote_port, /* local M3UA base port on TTCN3 side */ - integer local_port + integer local_port, + /* point code routed via this M3U */ + integer point_code }; type record of IpaConfig IpaConfigs; diff --git a/stp/STP_Tests_IPA_M3UA.cfg b/stp/STP_Tests_IPA_M3UA.cfg index 7849d3a..5870747 100644 --- a/stp/STP_Tests_IPA_M3UA.cfg +++ b/stp/STP_Tests_IPA_M3UA.cfg @@ -17,7 +17,8 @@ as_name := "ipa-as-dynamic-asp", is_server := false, remote_port := 5000, - local_port := 40000 + local_port := 40000, + point_code := 5 } }; diff --git a/stp/STP_Tests_IPA_M3UA.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn index 3ad00c7..1e7189d 100644 --- a/stp/STP_Tests_IPA_M3UA.ttcn +++ b/stp/STP_Tests_IPA_M3UA.ttcn @@ -45,14 +45,16 @@ /* Test routing of SCCP between an M3UA and an IPA ASP */ testcase TC_m3ua_to_ipa() runs on IPA_M3UA_CT { + var Misc_Helpers.ro_charstring ipa_asps := { "ipa-asp-dynamic-unknown" }; + var IpaConfigs ipa_configs := ipa_build_configs(ipa_asps); var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps); var OCT4 rctx_sender := int2oct(m3ua_configs[0].routing_ctx, 4); var OCT4 pc_sender := int2oct(m3ua_configs[0].point_code, 4); - var OCT4 pc_receiver := int2oct(5, 4); + var OCT4 pc_receiver := int2oct(ipa_configs[0].point_code, 4); f_init_m3ua(m3ua_configs := m3ua_configs); - f_init_ipa(); + f_init_ipa(ipa_configs := ipa_configs); f_connect_ipa(0); /* exp_duna_after_act = false: There's no other unavailable AS configured at the STP at this point. */ @@ -76,7 +78,7 @@ var IpaConfigs ipa_configs := ipa_build_configs(ipa_asps); var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps); - var OCT4 pc_sender := int2oct(5, 4); + var OCT4 pc_sender := int2oct(ipa_configs[0].point_code, 4); var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); @@ -108,7 +110,7 @@ var IpaConfigs ipa_configs := ipa_build_configs(ipa_asps); var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps); - var OCT4 pc_sender := int2oct(5, 4); + var OCT4 pc_sender := int2oct(ipa_configs[0].point_code, 4); var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); @@ -143,7 +145,7 @@ var IpaConfigs ipa_configs := ipa_build_configs(ipa_asps); var Misc_Helpers.ro_charstring m3ua_asps := { "asp-sender" }; var M3uaConfigs m3ua_configs := m3ua_build_configs(m3ua_asps); - var OCT4 pc_sender := int2oct(5, 4); + var OCT4 pc_sender := int2oct(ipa_configs[0].point_code, 4); var OCT4 rctx_receiver := int2oct(m3ua_configs[0].routing_ctx, 4); var OCT4 pc_receiver := int2oct(m3ua_configs[0].point_code, 4); diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge index ef95384..9ef997d 100644 --- a/stp/osmo-stp-ipa.confmerge +++ b/stp/osmo-stp-ipa.confmerge @@ -9,7 +9,7 @@ local-ip 127.0.0.1 remote-ip 127.0.0.1 as ipa-as-loadshare-sender ipa - routing-key 0 6 + routing-key 0 30 point-code override dpc 31 asp ipa-asp-loadshare-sender0 asp ipa-asp-loadshare-sender1 @@ -25,7 +25,7 @@ transport-role server as ipa-as-loadshare-receiver ipa traffic-mode loadshare - routing-key 0 7 + routing-key 0 31 point-code override dpc 32 asp ipa-asp-loadshare-receiver0 asp ipa-asp-loadshare-receiver1 @@ -34,7 +34,7 @@ local-ip 127.0.0.1 remote-ip 127.0.0.1 as ipa-as-override-sender ipa - routing-key 0 6 + routing-key 0 34 point-code override dpc 33 asp ipa-asp-override-sender asp ipa-asp-override-receiver0 20006 5000 ipa @@ -49,7 +49,7 @@ transport-role server as ipa-as-override-receiver ipa traffic-mode override - routing-key 0 8 + routing-key 0 33 point-code override dpc 34 asp ipa-asp-override-receiver0 asp ipa-asp-override-receiver1 @@ -66,11 +66,11 @@ sctp-role server as ipa-as-LS0-0 ipa point-code override dpc 38 - routing-key 0 44 + routing-key 0 32 asp ipa-asp-LS0-0-0 as ipa-as-LS0-1 ipa point-code override dpc 39 - routing-key 0 45 + routing-key 0 32 asp ipa-asp-LS0-1-0 ! CLIENT asp ipa-asp-client0 6001 7001 ipa @@ -80,7 +80,7 @@ transport-role client as ipa-as-client ipa traffic-mode override - routing-key 0 9 + routing-key 0 35 point-code override dpc 35 asp ipa-asp-client0 ! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41114?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9cca2f4dd38e03ab1d259ffafd904b8890778883 Gerrit-Change-Number: 41114 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 days, 3 hours

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/master-builds: add libosmo-asn1-tcap

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/41113?usp=email ) Change subject: jobs/master-builds: add libosmo-asn1-tcap ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41113?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If83114f1dfadc2c649ffa9ccb411dbe20c174a30 Gerrit-Change-Number: 41113 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 Sep 2025 15:21:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 days, 4 hours

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/gerrit-verifications: add libosmo-asn1-tcap

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/41028?usp=email ) Change subject: jobs/gerrit-verifications: add libosmo-asn1-tcap ...................................................................... jobs/gerrit-verifications: add libosmo-asn1-tcap Related: OS#6849 Change-Id: Ib67057469e3848fe72b5a03147c3f6d4b62c33c2 --- M jobs/gerrit-verifications.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index f91cbb8..5dcc36e 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -144,6 +144,7 @@ - libasn1c - libgtpnl - libosmo-abis + - libosmo-asn1-tcap - libosmo-gprs - libosmo-netif: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41028?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib67057469e3848fe72b5a03147c3f6d4b62c33c2 Gerrit-Change-Number: 41028 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 days, 5 hours

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: build libosmo-asn1-tcap

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/41112?usp=email ) Change subject: OBS: build libosmo-asn1-tcap ...................................................................... OBS: build libosmo-asn1-tcap Change-Id: I1b2f0a3ced424977f44f97ca4695132d4f57768c --- M scripts/obs/lib/config.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 7d6b9e0..92a3310 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -60,6 +60,7 @@ "libosmo-gprs", "libosmo-netif", "libosmo-pfcp", + "libosmo-asn1-tcap", "libosmo-sigtran", "libosmocore", "libsmpp34", -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41112?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1b2f0a3ced424977f44f97ca4695132d4f57768c Gerrit-Change-Number: 41112 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

6 days, 5 hours

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/master-builds: add libosmo-asn1-tcap

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/41113?usp=email ) Change subject: jobs/master-builds: add libosmo-asn1-tcap ...................................................................... jobs/master-builds: add libosmo-asn1-tcap Related: OS#6849 Change-Id: If83114f1dfadc2c649ffa9ccb411dbe20c174a30 --- M jobs/master-builds.yml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/13/41113/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index b522774..1ed04f2 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -143,6 +143,8 @@ master-osmo-mgw, master-osmo-sgsn + - libosmo-asn1-tcap + - libosmo-dsp: repos_url: '{gitea_url}/sdr/{repos}' cmd: | -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41113?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If83114f1dfadc2c649ffa9ccb411dbe20c174a30 Gerrit-Change-Number: 41113 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

6 days, 5 hours

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: build libosmo-asn1-tcap

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/41112?usp=email ) Change subject: OBS: build libosmo-asn1-tcap ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41112?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1b2f0a3ced424977f44f97ca4695132d4f57768c Gerrit-Change-Number: 41112 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 Sep 2025 14:25:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 days, 5 hours

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/gerrit-verifications: add libosmo-asn1-tcap

by fixeria

Attention is currently required from: daniel, osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/41028?usp=email ) Change subject: jobs/gerrit-verifications: add libosmo-asn1-tcap ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41028?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib67057469e3848fe72b5a03147c3f6d4b62c33c2 Gerrit-Change-Number: 41028 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 15 Sep 2025 14:25:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 days, 5 hours

1
0
0 0

[XS] Change in osmo-ci[master]: OBS: build libosmo-asn1-tcap

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/41112?usp=email ) Change subject: OBS: build libosmo-asn1-tcap ...................................................................... OBS: build libosmo-asn1-tcap Change-Id: I1b2f0a3ced424977f44f97ca4695132d4f57768c --- M scripts/obs/lib/config.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/12/41112/1 diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 7d6b9e0..92a3310 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -60,6 +60,7 @@ "libosmo-gprs", "libosmo-netif", "libosmo-pfcp", + "libosmo-asn1-tcap", "libosmo-sigtran", "libosmocore", "libsmpp34", -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/41112?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1b2f0a3ced424977f44f97ca4695132d4f57768c Gerrit-Change-Number: 41112 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

6 days, 5 hours

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: debian: add osmo-s1gw.install

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41110?usp=email ) Change subject: debian: add osmo-s1gw.install ...................................................................... debian: add osmo-s1gw.install The `*.install` files give precise control over what gets packaged, allowing to exclude files and/or include additional ones. This will be needed in a follow-up patches adding misc files. Change-Id: Ia396351a73b665cbb9927b525e01ab451a6b0f78 --- A debian/osmo-s1gw.install M debian/rules 2 files changed, 8 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/debian/osmo-s1gw.install b/debian/osmo-s1gw.install new file mode 100644 index 0000000..b52efe2 --- /dev/null +++ b/debian/osmo-s1gw.install @@ -0,0 +1,4 @@ +usr/bin/osmo-s1gw +usr/lib/osmo-s1gw +etc/osmocom/osmo-s1gw.config +lib/systemd/system/osmo-s1gw.service diff --git a/debian/rules b/debian/rules index ffd896c..64f526e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,5 @@ #!/usr/bin/make -f + export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS = hardening=+all include /usr/share/dpkg/default.mk @@ -10,3 +11,6 @@ override_dh_auto_build: if [ -e build_dep.tar.gz ] ; then tar xzf ./build_dep.tar.gz ; fi dh_auto_build + +override_dh_auto_install: + dh_auto_install --destdir=$(CURDIR)/debian/tmp -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41110?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ia396351a73b665cbb9927b525e01ab451a6b0f78 Gerrit-Change-Number: 41110 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

6 days, 6 hours

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: contrib/generate_build_dep.sh: pass '-n' to mv

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41109?usp=email ) Change subject: contrib/generate_build_dep.sh: pass '-n' to mv ...................................................................... contrib/generate_build_dep.sh: pass '-n' to mv It may happen that the same directory is present in both `_build/default/lib` and `_build/default/plugins` directories. In this case the `mv` command will fail, and this is exactly what happens when adding a new dependency in a follow-up patch: mv: cannot move './_build/default/plugins/ncalendar' to '_checkouts/ncalendar': Directory not empty mv: cannot move './_build/default/plugins/ndto' to '_checkouts/ndto': Directory not empty mv: cannot move './_build/default/plugins/njson' to '_checkouts/njson': Directory not empty Pass `-n` to skip already existing checkouts. Change-Id: I9a95afcac54dec9684f34224a912574bb387e96c --- M contrib/generate_build_dep.sh 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/contrib/generate_build_dep.sh b/contrib/generate_build_dep.sh index 08efac9..dd94d4c 100755 --- a/contrib/generate_build_dep.sh +++ b/contrib/generate_build_dep.sh @@ -13,9 +13,9 @@ REBAR_PROFILE=default rebar3 get-deps REBAR_PROFILE=test rebar3 get-deps mkdir _checkouts -mv ./_build/default/lib/* _checkouts/ -mv ./_build/default/plugins/* _checkouts/ -mv ./_build/test/lib/meck _checkouts/ +mv -n ./_build/default/lib/* _checkouts/ +mv -n ./_build/default/plugins/* _checkouts/ +mv -n ./_build/test/lib/meck _checkouts/ # delete erlang bytecode find _checkouts/ -iname '*beam' -delete tar czf build_dep.tar.gz ./_checkouts -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41109?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I9a95afcac54dec9684f34224a912574bb387e96c Gerrit-Change-Number: 41109 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

6 days, 6 hours

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2025