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

Change in osmo-trx[master]: configure.ac: check if LIBTRXCON_DIR (submodule) exists

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30795 ) Change subject: configure.ac: check if LIBTRXCON_DIR (submodule) exists ...................................................................... configure.ac: check if LIBTRXCON_DIR (submodule) exists Fail during the configure stage if the submodule is not fetched. Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Related: OS#5599 --- M configure.ac 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/95/30795/1 diff --git a/configure.ac b/configure.ac index 2c4bb28..5d45c27 100644 --- a/configure.ac +++ b/configure.ac @@ -212,7 +212,12 @@ AC_MSG_CHECKING([whether to enable building MS TRX]) AS_IF([test "x$with_mstrx" = "xyes"], [ AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) - AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon") + LIBTRXCON_DIR="osmocom-bb/src/host/trxcon" + if ! test -d "$LIBTRXCON_DIR"; then + AC_MSG_RESULT([no]) + AC_MSG_ERROR([$LIBTRXCON_DIR does not exist]) + fi + AC_SUBST(LIBTRXCON_DIR) AC_MSG_RESULT([yes]) ], [ # Despite LIBTRXCON_DIR is added to SUBDIRS conditionally, -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Gerrit-Change-Number: 30795 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30794 ) Change subject: configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT ...................................................................... configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT Always log whether the MS TRX is going to be built, event if it's not. Change-Id: I1c5648b8090ba2b6638b71f2d3332dfae87b2772 Related: OS#5599 --- M configure.ac 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/94/30794/1 diff --git a/configure.ac b/configure.ac index fd8d577..2c4bb28 100644 --- a/configure.ac +++ b/configure.ac @@ -209,16 +209,18 @@ PKG_CHECK_MODULES(BLADE, libbladeRF >= 2.0) ]) +AC_MSG_CHECKING([whether to enable building MS TRX]) AS_IF([test "x$with_mstrx" = "xyes"], [ - AC_MSG_NOTICE(["Enabling ms-trx..."]) AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon") + AC_MSG_RESULT([yes]) ], [ # Despite LIBTRXCON_DIR is added to SUBDIRS conditionally, # autoconf/automake still requires the directory to be present # and thus the submodule to be fetched (even if MS TRX is not needed). # Work this around by pointing it to an empty dir. AC_SUBST(LIBTRXCON_DIR, "osmocom-bb") + AC_MSG_RESULT([no]) ]) AS_IF([test "x$with_singledb" = "xyes"], [ -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1c5648b8090ba2b6638b71f2d3332dfae87b2772 Gerrit-Change-Number: 30794 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: allow building without cloning submodules

by fixeria

fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-trx/+/30792 ) Change subject: configure.ac: allow building without cloning submodules ...................................................................... configure.ac: allow building without cloning submodules The MS TRX was intentionally added [1] as an optional feature, which requires a git submodule to be present in order to build libtrxcon. This feature can be enabled by passing --with-mstrx to the configure. But autoconf/automake is a mess. Despite in the root Makefile.am we are adding full submodule path to the SUBDIRS *conditionally*, the configure script would still fail if the submodule is not fetched: Makefile.am:32: error: required directory ./osmocom-bb/src/host/trxcon does not exist It would not even enter that directory if it's present, but somehow it's still required to exist. For the end user this means that cloning the submodule becomes a *necessary* step in order to build osmo-trx from source, even when the MS TRX is not really needed. The fact that we're unconditionally requiring the submodule, which is meant to be used by an optional feature feels wrong to me. It's also unusual for osmocom projects to require submodules, so it may (and already did) cause build failures when cloning as usual. Let's work this problem around by defining LIBTRXCON_DIR variable in configure.ac and using it in the root Makefile.am. If the MS TRX is not enabled explicitly, make autoconf/automake happy by assigning LIBTRXCON_DIR the submodule's root directory, which is always present but empty if the submodule is not fetched. Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968 Related: [1] b7253c6fdc88a3e2e0c8b441dc3c34dfb1c15d24 Related: OS#5599, OS#5846 --- M Makefile.am M configure.ac 2 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/92/30792/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968 Gerrit-Change-Number: 30792 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: allow building without cloning submodules

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30792 ) Change subject: configure.ac: allow building without cloning submodules ...................................................................... configure.ac: allow building without cloning submodules The MS TRX was intentionally added [1] as an optional feature, which requires a git submodule to be present in order to build libtrxcon. This feature can be enabled by passing --with-mstrx to the configure. But autoconf/automake is a mess. Despite in the root Makefile.am we are adding full submodule path to the SUBDIRS *conditionally*, the configure script would still fail if the submodule is not fetched: Makefile.am:32: error: required directory ./osmocom-bb/src/host/trxcon does not exist It would not even enter that directory if it's present, but somehow it's still required to exist. For the end user this means that cloning the submodule becomes a *necessary* step in order to build osmo-trx from source, even when the MS TRX is not really needed. The fact that we're unconditionally requiring the submodule, which is meant to be used by an optional feature feels wrong to me. It's also unusual for osmocom projects to require submodules, so it may (and already did) cause build failures when cloning as usual. Let's work this problem around by defining LIBTRXCON_DIR variable in configure.ac and using it in the root Makefile.am. If the MS TRX is not enabled explicitly, make autoconf/automake happy by assigning LIBTRXCON_DIR the submodule's root directory, which is always present but empty if the submodule is not fetched. Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968 Related: [1] b7253c6fdc88a3e2e0c8b441dc3c34dfb1c15d24 Related: OS#5599, OS#5846 --- M Makefile.am M configure.ac 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/92/30792/1 diff --git a/Makefile.am b/Makefile.am index 580544b..7b2198c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ SUBDIRS = if ENABLE_MS_TRX -SUBDIRS += osmocom-bb/src/host/trxcon +SUBDIRS += $(LIBTRXCON_DIR) endif # Order must be preserved diff --git a/configure.ac b/configure.ac index ff1ae8b..afbc193 100644 --- a/configure.ac +++ b/configure.ac @@ -337,6 +337,9 @@ if test "x$with_mstrx" = "xyes"; then AC_MSG_NOTICE(["Enabling ms-trx..."]) AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) + AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon") +else + AC_SUBST(LIBTRXCON_DIR, "osmocom-bb") fi -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I02ae2b37c82ae2f55e7d9bd92e226f2b8b023968 Gerrit-Change-Number: 30792 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: coverity: add mstrx

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30790 ) Change subject: coverity: add mstrx ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie8f01e61905120c0e9b5db66c1b60b56d777657e Gerrit-Change-Number: 30790 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Dec 2022 21:25:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30791 ) Change subject: coverity: git pull --recursive / update submodules ...................................................................... Patch Set 1: (1 comment) File coverity/prepare_source_Osmocom.sh: https://gerrit.osmocom.org/c/osmo-ci/+/30791/comment/4c287e0b_c47620ca PS1, Line 55: && git submodule update --recursive --remote I'm not certain that this will always make sure that the submodule is properly updated. This is something hoernchen/fixeria have to comment on. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 Dec 2022 17:20:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by laforge

Attention is currently required from: Hoernchen, laforge. Hello Jenkins Builder, Hoernchen, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 to look at the new patch set (#2). Change subject: coverity: git pull --recursive / update submodules ...................................................................... coverity: git pull --recursive / update submodules osmo-trx has just started to use submodules, so let's add the related git commands here. Closes: OS#5846 Related: osmo-trx.git Change-Id I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e --- M coverity/prepare_source_Osmocom.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/30791/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by fixeria

Attention is currently required from: Hoernchen, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30791 ) Change subject: coverity: git pull --recursive / update submodules ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 27 Dec 2022 17:16:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: coverity: git pull --recursive / update submodules

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30791 ) Change subject: coverity: git pull --recursive / update submodules ...................................................................... coverity: git pull --recursive / update submodules osmo-trx has just started to use submodules, so let's add the related git commands here. Related: osmo-trx.git Change-Id I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e --- M coverity/prepare_source_Osmocom.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/30791/1 diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh index 526e9d3..0ea829f 100755 --- a/coverity/prepare_source_Osmocom.sh +++ b/coverity/prepare_source_Osmocom.sh @@ -52,13 +52,13 @@ for proj in $PROJECTS $PROJECTS_DONT_BUILD_TEST; do if [ -d $proj ]; then if [ -z "$SRC_SKIP_FETCH" ]; then - (cd $proj && git fetch && git checkout -f -B master origin/master) + (cd $proj && git fetch && git checkout -f -B master origin/master && git submodule update --recursive --remote) fi if [ -n "$SRC_CLEAN" ]; then git -C "$proj" clean -ffxd fi else - git clone "$(osmo_git_clone_url "$proj")" + git clone --recursive "$(osmo_git_clone_url "$proj")" fi done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I876fa0152268bd7a43ca4c452d75c26ebadf7a6e Gerrit-Change-Number: 30791 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in libosmo-gprs[master]: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 ) Change subject: osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI ...................................................................... osmo_gprs_llc_bssgp_prim: cell_id is always RAI + CI As per what's specified in 3GPP TS 48.018 section 11.3.9 Cell Identifier. Change-Id: I1efcdbe3e42be35e191bcb1ae513c768d63096aa --- M include/osmocom/gprs/llc/llc_prim.h M tests/llc/llc_prim_test.c 2 files changed, 15 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index 4f359d8..23b41cf 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -7,7 +7,7 @@ #include <osmocom/core/prim.h> #include <osmocom/core/utils.h> -#include <osmocom/gsm/gsm0808_utils.h> +#include <osmocom/gsm/gsm48.h> #include <osmocom/gprs/llc/llc.h> /* Section 7.1.0 */ @@ -214,6 +214,11 @@ }; }; +struct osmo_gprs_llc_bssgp_prim_cell_id { + struct gprs_ra_id rai; + uint16_t ci; +}; + /* Parameters for OSMO_GPRS_LLC_BSSGP_* prims */ struct osmo_gprs_llc_bssgp_prim { /* Common fields */ @@ -236,7 +241,7 @@ } dl_unitdata_req; /* OSMO_GPRS_LLC_BSSGP_UL_UNITDATA | Ind */ struct { - struct gsm0808_cell_id cell_id; + struct osmo_gprs_llc_bssgp_prim_cell_id cell_id; /* TODO: MOCN specific parameters: * - Redirect attempt * - IMSI diff --git a/tests/llc/llc_prim_test.c b/tests/llc/llc_prim_test.c index 63f99aa..ab3bf65 100644 --- a/tests/llc/llc_prim_test.c +++ b/tests/llc/llc_prim_test.c @@ -144,14 +144,15 @@ struct osmo_gprs_llc_prim *llc_prim; const uint32_t tlli = 0xe1c5d364; int rc; - struct gsm0808_cell_id cell_id = { - .id_discr = CELL_IDENT_LAC_AND_CI, - .id = { - .lac_and_ci = { - .lac = 0x0304, - .ci = 0x9876, - }, + struct osmo_gprs_llc_bssgp_prim_cell_id cell_id = { + .rai = { + .mcc = 901, + .mnc = 70, + .mnc_3_digits = false, + .lac = 0x0304, + .rac = 0x01, }, + .ci = 0x9876, }; printf("==== %s() [start] ====\n", __func__); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/30787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I1efcdbe3e42be35e191bcb1ae513c768d63096aa Gerrit-Change-Number: 30787 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-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022