This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Max gerrit-no-reply at lists.osmocom.orgMax has submitted this change and it was merged. Change subject: Move sysmobts-calib into osmo-bts-sysmo ...................................................................... Move sysmobts-calib into osmo-bts-sysmo It's prerequisite for jenkins tests fix after migration to stow. The sysmobts-calib uses hand-coded Makefile instead of automake which makes it hard to properly propagate build flags. Also, make it optional to enable excluding it from certain jenkins tests. Change-Id: I3b54bfa5ef1d89092f6cf13dc27de10874b31b18 --- M .gitignore M Makefile.am M configure.ac M contrib/jenkins_sysmobts.sh D contrib/sysmobts-calib/Makefile M src/osmo-bts-sysmo/Makefile.am R src/osmo-bts-sysmo/misc/sysmobts-calib.c R src/osmo-bts-sysmo/misc/sysmobts-layer1.c R src/osmo-bts-sysmo/misc/sysmobts-layer1.h 9 files changed, 20 insertions(+), 19 deletions(-) Approvals: Max: Looks good to me, but someone else must approve; Verified Neels Hofmeyr: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 2e8c884..1780e1c 100644 --- a/.gitignore +++ b/.gitignore @@ -22,8 +22,7 @@ core core.* -contrib/sysmobts-calib/sysmobts-calib - +src/osmo-bts-sysmo/sysmobts-calib src/osmo-bts-sysmo/l1fwd-proxy src/osmo-bts-sysmo/osmo-bts-sysmo src/osmo-bts-sysmo/osmo-bts-sysmo-remote diff --git a/Makefile.am b/Makefile.am index 4832c84..dc42574 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,10 +7,6 @@ EXTRA_DIST = \ contrib/dump_docs.py contrib/screenrc-l1fwd contrib/osmo-bts-sysmo.service \ contrib/l1fwd.init contrib/screenrc-sysmobts contrib/respawn.sh \ - contrib/sysmobts.init contrib/sysmobts-calib/Makefile \ - contrib/sysmobts-calib/sysmobts-calib.c \ - contrib/sysmobts-calib/sysmobts-layer1.c \ - contrib/sysmobts-calib/sysmobts-layer1.h \ doc/examples/sysmo/osmo-bts.cfg \ doc/examples/sysmo/sysmobts-mgr.cfg \ doc/examples/virtual/openbsc-virtual.cfg \ diff --git a/configure.ac b/configure.ac index 89443d0..2181743 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,14 @@ PKG_CHECK_MODULES(LIBOSMOCODING, libosmocoding >= 0.10.0) PKG_CHECK_MODULES(ORTP, ortp) +AC_MSG_CHECKING([whether to enable support for sysmobts calibration tool]) +AC_ARG_ENABLE(sysmobts-calib, + AC_HELP_STRING([--enable-sysmobts-calib], + [enable code for sysmobts calibration tool [default=no]]), + [enable_sysmobts_calib="yes"],[enable_sysmobts_calib="no"]) +AC_MSG_RESULT([$enable_sysmobts_calib]) +AM_CONDITIONAL(ENABLE_SYSMOBTS_CALIB, test "x$enable_sysmobts_calib" = "xyes") + AC_MSG_CHECKING([whether to enable support for sysmoBTS L1/PHY support]) AC_ARG_ENABLE(sysmocom-bts, AC_HELP_STRING([--enable-sysmocom-bts], diff --git a/contrib/jenkins_sysmobts.sh b/contrib/jenkins_sysmobts.sh index faeb7c9..852542b 100755 --- a/contrib/jenkins_sysmobts.sh +++ b/contrib/jenkins_sysmobts.sh @@ -18,11 +18,11 @@ configure_flags="--enable-sysmocom-bts" -build_bts "osmo-bts-sysmo" "$configure_flags" - # This will not work for the femtobts if [ $FIRMWARE_VERSION != "femtobts_v2.7" ]; then - $MAKE -C contrib/sysmobts-calib + configure_flags="$configure_flags --enable-sysmobts-calib" fi +build_bts "osmo-bts-sysmo" "$configure_flags" + osmo-clean-workspace.sh diff --git a/contrib/sysmobts-calib/Makefile b/contrib/sysmobts-calib/Makefile deleted file mode 100644 index a5d4b99..0000000 --- a/contrib/sysmobts-calib/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -CFLAGS=`pkg-config --cflags libosmocore` -Wall -Werror -LIBS=`pkg-config --libs libosmocore libosmogsm` - -all: sysmobts-calib - -sysmobts-calib: sysmobts-calib.o sysmobts-layer1.o - $(CC) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ -lrt $(LIBS) - -clean: - @rm -f sysmobts-calib *.o diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am index c48b77c..6e917e7 100644 --- a/src/osmo-bts-sysmo/Makefile.am +++ b/src/osmo-bts-sysmo/Makefile.am @@ -4,6 +4,7 @@ EXTRA_DIST = misc/sysmobts_mgr.h misc/sysmobts_misc.h misc/sysmobts_par.h \ misc/sysmobts_eeprom.h misc/sysmobts_nl.h femtobts.h hw_misc.h \ + misc/sysmobts-layer1.h \ l1_fwd.h l1_if.h l1_transp.h eeprom.h utils.h oml_router.h bin_PROGRAMS = osmo-bts-sysmo osmo-bts-sysmo-remote l1fwd-proxy sysmobts-mgr sysmobts-util @@ -20,6 +21,13 @@ l1fwd_proxy_SOURCES = l1_fwd_main.c l1_transp_hw.c l1fwd_proxy_LDADD = $(top_builddir)/src/common/libbts.a $(COMMON_LDADD) +if ENABLE_SYSMOBTS_CALIB +bin_PROGRAMS = sysmobts-calib + +sysmobts_calib_SOURCES = misc/sysmobts-calib.c misc/sysmobts-layer1.c +sysmobts_calib_LDADD = -lrt $(COMMON_LDADD) +endif + sysmobts_mgr_SOURCES = \ misc/sysmobts_mgr.c misc/sysmobts_misc.c \ misc/sysmobts_par.c misc/sysmobts_nl.c \ diff --git a/contrib/sysmobts-calib/sysmobts-calib.c b/src/osmo-bts-sysmo/misc/sysmobts-calib.c similarity index 100% rename from contrib/sysmobts-calib/sysmobts-calib.c rename to src/osmo-bts-sysmo/misc/sysmobts-calib.c diff --git a/contrib/sysmobts-calib/sysmobts-layer1.c b/src/osmo-bts-sysmo/misc/sysmobts-layer1.c similarity index 100% rename from contrib/sysmobts-calib/sysmobts-layer1.c rename to src/osmo-bts-sysmo/misc/sysmobts-layer1.c diff --git a/contrib/sysmobts-calib/sysmobts-layer1.h b/src/osmo-bts-sysmo/misc/sysmobts-layer1.h similarity index 100% rename from contrib/sysmobts-calib/sysmobts-layer1.h rename to src/osmo-bts-sysmo/misc/sysmobts-layer1.h -- To view, visit https://gerrit.osmocom.org/5827 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b54bfa5ef1d89092f6cf13dc27de10874b31b18 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max <msuraev at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Max <msuraev at sysmocom.de> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>