July 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-bsc[master]: ctrl: Support adding si2quater earfcn neighbor
by matanp 14 Jul '23

14 Jul '23

matanp has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33750 ) Change subject: ctrl: Support adding si2quater earfcn neighbor ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifd2740ee54db66742785437a278cb9244e1f76d0 Gerrit-Change-Number: 33750 Gerrit-PatchSet: 3 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 14 Jul 2023 11:02:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: ctrl: Support adding si2quater earfcn neighbor
by matanp 14 Jul '23

14 Jul '23

matanp has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bsc/+/33750 ) Change subject: ctrl: Support adding si2quater earfcn neighbor ...................................................................... ctrl: Support adding si2quater earfcn neighbor Change-Id: Ifd2740ee54db66742785437a278cb9244e1f76d0 --- A .vscode/settings.json M src/osmo-bsc/bts_ctrl.c 2 files changed, 159 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/33750/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifd2740ee54db66742785437a278cb9244e1f76d0 Gerrit-Change-Number: 33750 Gerrit-PatchSet: 2 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bsc[master]: ctrl: Support adding si2quater earfcn neighbor
by Jenkins Builder 14 Jul '23

14 Jul '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33750 ) Change subject: ctrl: Support adding si2quater earfcn neighbor ...................................................................... Patch Set 1: (2 comments) File src/osmo-bsc/bts_ctrl.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9645): https://gerrit.osmocom.org/c/osmo-bsc/+/33750/comment/20bb1563_9d944694 PS1, Line 896: if (!cmd->reply) { braces {} are not necessary for single statement blocks Robot Comment from checkpatch (run ID jenkins-gerrit-lint-9645): https://gerrit.osmocom.org/c/osmo-bsc/+/33750/comment/b719546e_a983df1b PS1, Line 914: if (!cmd->reply) { braces {} are not necessary for single statement blocks -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifd2740ee54db66742785437a278cb9244e1f76d0 Gerrit-Change-Number: 33750 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 14 Jul 2023 10:58:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: ctrl: Support adding si2quater earfcn neighbor
by matanp 14 Jul '23

14 Jul '23

matanp has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33750 ) Change subject: ctrl: Support adding si2quater earfcn neighbor ...................................................................... ctrl: Support adding si2quater earfcn neighbor Change-Id: Ifd2740ee54db66742785437a278cb9244e1f76d0 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 156 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/33750/1 diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 9415b89..fdee80a 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -778,7 +778,152 @@ CTRL_CMD_DEFINE_WO_NOVRF(bts_si2quater_neighbor_list_del_uarfcn, "si2quater-neighbor-list del uarfcn"); -/* TODO: si2quater neighbor management: add EARFCN */ +static int verify_bts_si2quater_neighbor_list_add_earfcn(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + char *earfcn_str, *thresh_hi_str, *thresh_lo_str, *prio_str, *qrxlv_str, *meas_str, *saveptr, *tmp; + int earfcn, thresh_hi, thresh_lo, prio, qrxlv, meas; + + tmp = talloc_strdup(cmd, value); + if (!tmp) + return 1; + + earfcn_str = strtok_r(tmp, ",", &saveptr); + thresh_hi_str = strtok_r(NULL, ",", &saveptr); + thresh_lo_str = strtok_r(NULL, ",", &saveptr); + prio_str = strtok_r(NULL, ",", &saveptr); + qrxlv_str = strtok_r(NULL, ",", &saveptr); + meas_str = strtok_r(NULL, "\0", &saveptr); + + + if (!earfcn_str || osmo_str_to_int(&earfcn, earfcn_str, 10, 0, 65535) < 0) { + cmd->reply = "Failed to parse neighbor EARFCN value"; + return 1; + } + + if (!thresh_hi_str || osmo_str_to_int(&thresh_hi, thresh_hi_str, 10, 0, 31) < 0) { + cmd->reply = "Failed to parse neighbor threshold high bits value"; + return 1; + } + + if (!thresh_lo_str || osmo_str_to_int(&thresh_lo, thresh_lo_str, 10, 0, 32) < 0) { + cmd->reply = "Failed to parse neighbor threshold low bits value"; + return 1; + } + + if (!prio_str || osmo_str_to_int(&prio, prio_str, 10, 0, 8) < 0) { + cmd->reply = "Failed to parse neighbor priority value"; + return 1; + } + + if (!qrxlv_str || osmo_str_to_int(&qrxlv, qrxlv_str, 10, 0, 32) < 0) { + cmd->reply = "Failed to parse neighbor QRXLEVMIN value"; + return 1; + } + + if (!meas_str || osmo_str_to_int(&meas, meas_str, 10, 0, 8) < 0) { + cmd->reply = "Failed to parse neighbor measurement bandwidth"; + return 1; + } + + return 0; +} + +/* si2quater neighbor management: add an EARFCN + * Format: bts.<0-255>.si2quater-neighbor-list.add.earfcn <EARFCN>,<thresh-hi>,<thresh-lo>,<priority>,<QRXLEVMIN>,<measurement bandwidth> + * EARFCN is in range 0..65535, thresh-hi is in range 0..31, thresh-hi is in range 0..32, + * priority is in range 0..8, QRXLEVMIN is in range 0..32, measurement bandwidth is in range 0..8 */ +static int set_bts_si2quater_neighbor_list_add_earfcn(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = (struct gsm_bts *)cmd->node; + struct osmo_earfcn_si2q *neighbors = &bts->si_common.si2quater_neigh_list; + char *earfcn_str, *thresh_hi_str, *thresh_lo_str, *prio_str, *qrxlv_str, *meas_str, *saveptr, *tmp; + int earfcn, thresh_hi, thresh_lo, prio, qrxlv, meas, result; + + tmp = talloc_strdup(cmd, cmd->value); + if (!tmp) { + cmd->reply = "OOM"; + return CTRL_CMD_ERROR; + } + + earfcn_str = strtok_r(tmp, ",", &saveptr); + thresh_hi_str = strtok_r(NULL, ",", &saveptr); + thresh_lo_str = strtok_r(NULL, ",", &saveptr); + prio_str = strtok_r(NULL, ",", &saveptr); + qrxlv_str = strtok_r(NULL, ",", &saveptr); + meas_str = strtok_r(NULL, "\0", &saveptr); + + + if (!earfcn_str || osmo_str_to_int(&earfcn, earfcn_str, 10, 0, 65535) < 0) { + cmd->reply = "Failed to parse neighbor EARFCN value"; + return CTRL_CMD_ERROR; + } + + if (!thresh_hi_str || osmo_str_to_int(&thresh_hi, thresh_hi_str, 10, 0, 31) < 0) { + cmd->reply = "Failed to parse neighbor threshold high bits value"; + return CTRL_CMD_ERROR; + } + + if (!thresh_lo_str || osmo_str_to_int(&thresh_lo, thresh_lo_str, 10, 0, 32) < 0) { + cmd->reply = "Failed to parse neighbor threshold low bits value"; + return CTRL_CMD_ERROR; + } + + if (!prio_str || osmo_str_to_int(&prio, prio_str, 10, 0, 8) < 0) { + cmd->reply = "Failed to parse neighbor priority value"; + return CTRL_CMD_ERROR; + } + + if (!qrxlv_str || osmo_str_to_int(&qrxlv, qrxlv_str, 10, 0, 32) < 0) { + cmd->reply = "Failed to parse neighbor QRXLEVMIN value"; + return CTRL_CMD_ERROR; + } + + if (!meas_str || osmo_str_to_int(&meas, meas_str, 10, 0, 8) < 0) { + cmd->reply = "Failed to parse neighbor measurement bandwidth"; + return CTRL_CMD_ERROR; + } + + result = bts_earfcn_add(bts, earfcn, thresh_hi, thresh_lo, prio, qrxlv, meas); + + if ((0 == result) && (si2q_num(bts) <= SI2Q_MAX_NUM)) { + cmd->reply = "OK"; + return CTRL_CMD_REPLY; + } + + switch (result) { + case 0: + cmd->reply = talloc_asprintf(cmd, "Not enough space in SI2quater (%u/%u used)", bts->si2q_count, SI2Q_MAX_NUM); + if (!cmd->reply) { + cmd->reply = "OOM"; + } + break; + case 1: + cmd->reply = "Multiple threshold-high are not supported"; + break; + case EARFCN_THRESH_LOW_INVALID: + cmd->reply = "Multiple threshold-low are not supported"; + break; + case EARFCN_QRXLV_INVALID + 1: + cmd->reply = "Multiple QRXLEVMIN are not supported"; + break; + case EARFCN_PRIO_INVALID: + cmd->reply = "Multiple priorities are not supported"; + break; + default: + cmd->reply = talloc_asprintf(cmd, "Unable to add EARFCN: %s", strerror(-result)); + if (!cmd->reply) { + cmd->reply = "OOM"; + } + } + + if (osmo_earfcn_del(neighbors, earfcn) != 0) + cmd->reply = "Failed to roll-back adding EARFCN"; + + return CTRL_CMD_ERROR; +} + +CTRL_CMD_DEFINE_WO(bts_si2quater_neighbor_list_add_earfcn, + "si2quater-neighbor-list add earfcn"); static int verify_bts_si2quater_neighbor_list_add_uarfcn(struct ctrl_cmd *cmd, const char *value, void *_data) { @@ -1215,6 +1360,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_mode); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si2quater_neighbor_list_del_earfcn); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si2quater_neighbor_list_del_uarfcn); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si2quater_neighbor_list_add_earfcn); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si2quater_neighbor_list_add_uarfcn); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_offset); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_cell_reselection_penalty_time); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifd2740ee54db66742785437a278cb9244e1f76d0 Gerrit-Change-Number: 33750 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-gbproxy[master]: gbprox_rx_ptp_from_bss: fix dangling pointer
by daniel 14 Jul '23

14 Jul '23

Attention is currently required from: osmith, fixeria, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/33738 ) Change subject: gbprox_rx_ptp_from_bss: fix dangling pointer ...................................................................... Patch Set 2: Code-Review+1 (3 comments) Patchset: PS1: > > Maybe it helps to set msgb_bcid() to 0 before returning from these functions? […] make distcheck also runs through for me.. Patchset: PS2: Interesting that it's only this one occurrence. File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/33738/comment/f98b54d4_990dbe8a PS2, Line 535: msgb_bcid(msg) = 0; Better explain this in a comment -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/33738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie51e37572993cb5dc24ecf13bc300225f09cb744 Gerrit-Change-Number: 33738 Gerrit-PatchSet: 2 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Jul 2023 09:51:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-gbproxy[master]: gbprox_rx_ptp_from_bss: fix dangling pointer
by osmith 14 Jul '23

14 Jul '23

Attention is currently required from: fixeria, pespin, daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/33738 ) Change subject: gbprox_rx_ptp_from_bss: fix dangling pointer ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > > Maybe it helps to set msgb_bcid() to 0 before returning from these functions? […] See https://jenkins.osmocom.org/jenkins/job/master-osmo-gbproxy/a1=default,a2=d… -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/33738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie51e37572993cb5dc24ecf13bc300225f09cb744 Gerrit-Change-Number: 33738 Gerrit-PatchSet: 2 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Jul 2023 09:47:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-gbproxy[master]: gbprox_rx_ptp_from_bss: fix dangling pointer
by osmith 14 Jul '23

14 Jul '23

Attention is currently required from: fixeria, pespin, daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/33738 ) Change subject: gbprox_rx_ptp_from_bss: fix dangling pointer ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Maybe it helps to set msgb_bcid() to 0 before returning from these functions? Done, this fixes it. > Also, I'm not able to reproduce this with "gcc version 12.3.0 (Debian 12.3.0-6)" The docker container currently has gcc (Debian 12.2.0-14) 12.2.0. On closer look, it actually passes the build initially without this patch but then fails later on during "make distcheck". -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/33738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie51e37572993cb5dc24ecf13bc300225f09cb744 Gerrit-Change-Number: 33738 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Jul 2023 09:46:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-gbproxy[master]: gbprox_rx_ptp_from_bss: fix dangling pointer
by osmith 14 Jul '23

14 Jul '23

Attention is currently required from: osmith, fixeria, pespin. Hello Jenkins Builder, fixeria, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/33738 to look at the new patch set (#2). Change subject: gbprox_rx_ptp_from_bss: fix dangling pointer ...................................................................... gbprox_rx_ptp_from_bss: fix dangling pointer Building with gcc (Debian 12.2.0-14) 12.2.0 and --enable-werror fails without this during "make distcheck": ../../../src/gb_proxy.c:450:24: error: storing the address of local variable 'tp' in '((struct libgb_msgb_cb *)msg)[2].bssgp_cell_id' [-Werror=dangling-pointer=] 450 | msgb_bcid(msg) = (void *)&tp; Related: OS#6057 Change-Id: Ie51e37572993cb5dc24ecf13bc300225f09cb744 --- M src/gb_proxy.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/38/33738/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/33738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie51e37572993cb5dc24ecf13bc300225f09cb744 Gerrit-Change-Number: 33738 Gerrit-PatchSet: 2 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-gbproxy[master]: gbprox_rx_ptp_from_bss: fix dangling pointer
by daniel 14 Jul '23

14 Jul '23

Attention is currently required from: osmith, fixeria, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/33738 ) Change subject: gbprox_rx_ptp_from_bss: fix dangling pointer ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: I don't think this is the correct solution. tp is used inside the call(s) to osmo_fsm_inst_dispatch() directly and not needed outside of this function. This pattern also exists in other functions: gbprox_rx_{sig,ptp}_from_{bss,sgsn} Maybe it helps to set msgb_bcid() to 0 before returning from these functions? Also, I'm not able to reproduce this with "gcc version 12.3.0 (Debian 12.3.0-6)" ``` gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I.. -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Wall -Wno-trigraphs -Wall -fno-strict-aliasing -I/home/daniel/local/osmo-master/include/ -pthread -I/home/daniel/local/osmo-master/include/ -pthread -I/home/daniel/local/osmo-master/include/ -pthread -I/home/daniel/local/osmo-master/include/ -pthread -I/home/daniel/local/osmo-master/include/ -fno-strict-aliasing -pthread -ggdb3 -Og -fno-omit-frame-pointer -std=gnu11 -fsanitize=address -fsanitize=undefined -Werror -Wno-error=deprecated -Wno-error=deprecated-declarations -Wno-error=cpp -Wall -Wno-trigraphs -MT gb_proxy.o -MD -MP -MF .deps/gb_proxy.Tpo -c -o gb_proxy.o gb_proxy.c ``` -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/33738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ie51e37572993cb5dc24ecf13bc300225f09cb744 Gerrit-Change-Number: 33738 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Jul 2023 09:28:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-dev[master]: all.deps: add osmo-remsim and simtrace2
by osmith 14 Jul '23

14 Jul '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/33734 ) Change subject: all.deps: add osmo-remsim and simtrace2 ...................................................................... all.deps: add osmo-remsim and simtrace2 Change-Id: I58324ad5ed6c77a53e697d5b4b07ff9353859556 --- M all.deps M gen_makefile.py M werror.opts 3 files changed, 22 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved; Verified diff --git a/all.deps b/all.deps index d9359bd..4769d02 100644 --- a/all.deps +++ b/all.deps @@ -34,12 +34,15 @@ osmo-hnodeb osmo-iuh osmo-hnbgw osmo-iuh osmo-mgw libosmo-pfcp osmo-e1d libosmocore +osmo-remsim simtrace2_host libosmo-netif # can only clone these docker-playground osmo-ttcn3-hacks osmocom-bb +simtrace2 # configure.ac not in topdir of repository osmocom-bb_layer23 libosmocore osmocom-bb_virtphy libosmocore +simtrace2_host libosmocore diff --git a/gen_makefile.py b/gen_makefile.py index d45e5e8..34f8c96 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -171,6 +171,14 @@ touch $@ ''' + if proj == "simtrace2_host": + return f''' +.make.{proj}.clone: .make.simtrace2.clone + @echo -e "\\n\\n\\n===== $@\\n" + test -L {src_proj} || ln -s simtrace2/host {src_proj} + touch $@ + ''' + if proj in ("libgtpnl", "libnftnl", "nftables"): url = "git://git.netfilter.org" diff --git a/werror.opts b/werror.opts index 7252af9..312b97b 100644 --- a/werror.opts +++ b/werror.opts @@ -19,3 +19,5 @@ osmo-cbc --enable-werror osmo-hnodeb --enable-werror osmo-hnbgw --enable-werror +simtrace2_host --enable-werror +osmo-remsim --enable-werror -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/33734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I58324ad5ed6c77a53e697d5b4b07ff9353859556 Gerrit-Change-Number: 33734 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0