Attention is currently required from: fixeria.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30794 )
Change subject: configure.ac: make use of AC_MSG_CHECKING and AC_MSG_RESULT
......................................................................
Patch Set 1: Code-Review+1
--
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-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 28 Dec 2022 15:22:37 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30793 )
Change subject: configure.ac: cosmetic: rearrange MS TRX related logic
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30793
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I760b93c1b07989b02c4c38cd20ab40e45650f2c1
Gerrit-Change-Number: 30793
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 28 Dec 2022 15:22:19 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge, fixeria.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30791 )
Change subject: coverity: git pull --recursive / update submodules
......................................................................
Patch Set 2:
(1 comment)
File coverity/prepare_source_Osmocom.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/30791/comment/a472d15f_7c951552
PS1, Line 55: && git submodule update --recursive --remote
> I am not certain either, my experience with git-submodules is extremely limited... […]
As the related commit message states it is only for local testing anyway, I don't know what the user wants to do here, this also applies to the cleaning below, so I'd wouldn't touch it, which is why I didn't modify this part in my own patch that i just abandoned because this patch has more lines and is therefore better.
--
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: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 28 Dec 2022 15:21:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
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 2:
(1 comment)
File coverity/prepare_source_Osmocom.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/30791/comment/fc85dbf8_47ce2007
PS1, Line 55: && git submodule update --recursive --remote
> I'm not certain that this will always make sure that the submodule is properly updated. […]
I am not certain either, my experience with git-submodules is extremely limited... Though, I don't think updating this branch is really important. Jenkins always does clean the workspace, while this (SRC_SKIP_FETCH) was added by Oliver to speed up testing when running these scripts locally.
--
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-Comment-Date: Tue, 27 Dec 2022 22:37:52 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30793 )
Change subject: configure.ac: cosmetic: rearrange MS TRX related logic
......................................................................
configure.ac: cosmetic: rearrange MS TRX related logic
Make it consistent with the existing AS_IF/AM_CONDITIONAL locations.
Change-Id: I760b93c1b07989b02c4c38cd20ab40e45650f2c1
Related: OS#5599
---
M configure.ac
1 file changed, 12 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/93/30793/1
diff --git a/configure.ac b/configure.ac
index eab0e22..fd8d577 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,7 +209,17 @@
PKG_CHECK_MODULES(BLADE, libbladeRF >= 2.0)
])
-AM_CONDITIONAL([ENABLE_MS_TRX], [test "x$with_mstrx" = "xyes"])
+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")
+], [
+ # 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")
+])
AS_IF([test "x$with_singledb" = "xyes"], [
AC_DEFINE(SINGLEDB, 1, Define to 1 for single daughterboard)
@@ -267,6 +277,7 @@
AM_CONDITIONAL(DEVICE_BLADE, [test "x$with_bladerf" = "xyes"])
AM_CONDITIONAL(ARCH_ARM, [test "x$with_neon" = "xyes" || test "x$with_neon_vfpv4" = "xyes"])
AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])
+AM_CONDITIONAL(ENABLE_MS_TRX, [test "x$with_mstrx" = "xyes"])
PKG_CHECK_MODULES(LIBUSB, libusb-1.0)
PKG_CHECK_MODULES(FFTWF, fftw3f)
@@ -334,18 +345,6 @@
AC_MSG_RESULT([CXXFLAGS="$CXXFLAGS"])
AC_MSG_RESULT([LDFLAGS="$LDFLAGS"])
-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
- # 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")
-fi
-
dnl Output files
AC_CONFIG_FILES([\
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30793
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I760b93c1b07989b02c4c38cd20ab40e45650f2c1
Gerrit-Change-Number: 30793
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange