Hello Jenkins Builder, I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/5818 to look at the new patch set (#7). Fix test dependencies The stow-enabled jenkins builds are currently failing like below: In file included from ../../include/osmo-bts/gsm_data.h:136:0, from ../../include/osmo-bts/bts.h:4, from misc_test.c:23: ../../include/osmo-bts/gsm_data_shared.h:21:35: fatal error: osmocom/abis/e1_input.h: No such file or directory #include <osmocom/abis/e1_input.h> Let's make sure that tests have all required CFLAGS/LIBS to build by allowing to specify sysmobts headers location explicitly similar to other BTS models. To propagate dependencies properly, sysmobts-calib was converted to automake. Change-Id: I94ea8bad8b410550f72ee6a0408f42f6bd8b6cac --- M Makefile.am M configure.ac M contrib/jenkins_sysmobts.sh D contrib/sysmobts-calib/Makefile A contrib/sysmobts-calib/Makefile.am M src/osmo-bts-sysmo/Makefile.am M tests/misc/Makefile.am M tests/sysmobts/Makefile.am 8 files changed, 38 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/18/5818/7 diff --git a/Makefile.am b/Makefile.am index 4832c84..89a0eec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,15 +2,14 @@ SUBDIRS = include src tests +if ENABLE_SYSMOBTS_CALIB +SUBDIRS += contrib/sysmobts-calib +endif # package the contrib and doc 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..8604691 100644 --- a/configure.ac +++ b/configure.ac @@ -54,15 +54,32 @@ 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], [enable code for sysmoBTS L1/PHY [default=no]]), [enable_sysmocom_bts="yes"],[enable_sysmocom_bts="no"]) +AC_ARG_WITH([sysmobts], [AS_HELP_STRING([--with-sysmobts=INCLUDE_DIR], [Location of the sysmobts API header files])], + [sysmobts_incdir="$withval"],[sysmobts_incdir="$incdir"]) +AC_SUBST([SYSMOBTS_INCDIR], $sysmobts_incdir) AC_MSG_RESULT([$enable_sysmocom_bts]) AM_CONDITIONAL(ENABLE_SYSMOBTS, test "x$enable_sysmocom_bts" = "xyes") if test "$enable_sysmocom_bts" = "yes"; then + oldCPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$SYSMOBTS_INCDIR -I$srcdir/include $LIBOSMOCORE_CFLAGS" + AC_CHECK_HEADER([sysmocom/femtobts/superfemto.h],[], + [AC_MSG_ERROR([sysmocom/femtobts/superfemto.h can not be found in $sysmobts_incdir])], + [#include <sysmocom/femtobts/superfemto.h>]) PKG_CHECK_MODULES(LIBGPS, libgps) + CPPFLAGS=$oldCPPFLAGS fi AC_MSG_CHECKING([whether to enable support for osmo-trx based L1/PHY support]) @@ -179,6 +196,7 @@ src/osmo-bts-octphy/Makefile include/Makefile include/osmo-bts/Makefile + contrib/sysmobts-calib/Makefile tests/Makefile tests/paging/Makefile tests/agch/Makefile diff --git a/contrib/jenkins_sysmobts.sh b/contrib/jenkins_sysmobts.sh index faeb7c9..88aef3d 100755 --- a/contrib/jenkins_sysmobts.sh +++ b/contrib/jenkins_sysmobts.sh @@ -16,13 +16,13 @@ mkdir -p "$inst/include/sysmocom/femtobts" ln -s $deps/layer1-headers/include/* "$inst/include/sysmocom/femtobts/" -configure_flags="--enable-sysmocom-bts" - -build_bts "osmo-bts-sysmo" "$configure_flags" +configure_flags="--with-sysmobts=$inst/include/ --enable-sysmocom-bts" # 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/contrib/sysmobts-calib/Makefile.am b/contrib/sysmobts-calib/Makefile.am new file mode 100644 index 0000000..26275ab --- /dev/null +++ b/contrib/sysmobts-calib/Makefile.am @@ -0,0 +1,9 @@ +AM_CPPFLAGS = $(all_includes) -I$(SYSMOBTS_INCDIR) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) +LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + +noinst_PROGRAMS = sysmobts-calib +noinst_HEADERS = sysmobts-layer1.h + +sysmobts_calib_test_SOURCES = sysmobts-calib.c sysmobts-layer1.c +sysmobts_calib_test_LDADD = -lrt diff --git a/src/osmo-bts-sysmo/Makefile.am b/src/osmo-bts-sysmo/Makefile.am index c48b77c..667ebdd 100644 --- a/src/osmo-bts-sysmo/Makefile.am +++ b/src/osmo-bts-sysmo/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(SYSMOBTS_INCDIR) AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) $(ORTP_CFLAGS) COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) $(ORTP_LIBS) diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index 6575fe8..2ddb649 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) -LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) +AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) +LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) noinst_PROGRAMS = misc_test EXTRA_DIST = misc_test.ok diff --git a/tests/sysmobts/Makefile.am b/tests/sysmobts/Makefile.am index 654ab5d..2a57b2b 100644 --- a/tests/sysmobts/Makefile.am +++ b/tests/sysmobts/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)/src/osmo-bts-sysmo +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)/src/osmo-bts-sysmo -I$(SYSMOBTS_INCDIR) AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(ORTP_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(ORTP_LIBS) -- To view, visit https://gerrit.osmocom.org/5818 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I94ea8bad8b410550f72ee6a0408f42f6bd8b6cac Gerrit-PatchSet: 7 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max <msur...@sysmocom.de> Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol <pes...@sysmocom.de> Gerrit-Reviewer: lynxis lazus <lyn...@fe80.eu> Gerrit-Reviewer: neels <nhofm...@sysmocom.de>