Depend on libosmocore
Change-Id: If345c89293fcd7d1ad4f17214eea339951f25a5d
This commit is contained in:
parent
c92dad32dd
commit
8b843e5bed
|
@ -22,7 +22,7 @@
|
||||||
include $(top_srcdir)/Makefile.common
|
include $(top_srcdir)/Makefile.common
|
||||||
|
|
||||||
AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
|
AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/common
|
||||||
AM_CXXFLAGS = -lpthread
|
AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
|
||||||
|
|
||||||
SUBDIRS = arm x86
|
SUBDIRS = arm x86
|
||||||
|
|
||||||
|
@ -92,7 +92,8 @@ osmo_trx_LDADD = \
|
||||||
$(ARCH_LA) \
|
$(ARCH_LA) \
|
||||||
$(GSM_LA) \
|
$(GSM_LA) \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
$(FFTWF_LIBS)
|
$(FFTWF_LIBS) \
|
||||||
|
$(LIBOSMOCORE_LIBS)
|
||||||
|
|
||||||
if USRP1
|
if USRP1
|
||||||
libtransceiver_la_SOURCES += USRPDevice.cpp
|
libtransceiver_la_SOURCES += USRPDevice.cpp
|
||||||
|
|
|
@ -73,6 +73,8 @@ AC_TYPE_SIZE_T
|
||||||
AC_HEADER_TIME
|
AC_HEADER_TIME
|
||||||
AC_C_BIGENDIAN
|
AC_C_BIGENDIAN
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.10.0)
|
||||||
|
|
||||||
AC_ARG_WITH(usrp1, [
|
AC_ARG_WITH(usrp1, [
|
||||||
AS_HELP_STRING([--with-usrp1],
|
AS_HELP_STRING([--with-usrp1],
|
||||||
[enable USRP1 gnuradio based transceiver])
|
[enable USRP1 gnuradio based transceiver])
|
||||||
|
|
|
@ -15,6 +15,11 @@ mychroot() {
|
||||||
mychroot_nocwd -w / "$@"
|
mychroot_nocwd -w / "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
base="$PWD"
|
||||||
|
deps="$base/deps"
|
||||||
|
inst="$deps/install"
|
||||||
|
export deps inst
|
||||||
|
|
||||||
if [ -z "${INSIDE_CHROOT}" ]; then
|
if [ -z "${INSIDE_CHROOT}" ]; then
|
||||||
|
|
||||||
osmo-clean-workspace.sh
|
osmo-clean-workspace.sh
|
||||||
|
@ -41,16 +46,36 @@ if [ -z "${INSIDE_CHROOT}" ]; then
|
||||||
echo "nameserver 8.8.8.8" > "$ROOTFS/etc/resolv.conf"
|
echo "nameserver 8.8.8.8" > "$ROOTFS/etc/resolv.conf"
|
||||||
fi
|
fi
|
||||||
mychroot -b /dev apt-get update
|
mychroot -b /dev apt-get update
|
||||||
mychroot apt-get -y install build-essential dh-autoreconf pkg-config libuhd-dev libusb-1.0-0-dev libusb-dev git
|
mychroot apt-get -y install build-essential dh-autoreconf pkg-config libuhd-dev libusb-1.0-0-dev libusb-dev git libtalloc-dev libgnutls28-dev stow
|
||||||
fi
|
fi
|
||||||
# Run jenkins.sh inside the chroot:
|
# Run jenkins.sh inside the chroot:
|
||||||
INSIDE_CHROOT=1 mychroot_nocwd -w /osmo-trx -b "$OSMOTRX_DIR:/osmo-trx" -b "$(which osmo-clean-workspace.sh):/usr/bin/osmo-clean-workspace.sh" ./contrib/jenkins.sh
|
INSIDE_CHROOT=1 mychroot_nocwd \
|
||||||
|
-w /osmo-trx \
|
||||||
|
-b "$OSMOTRX_DIR:/osmo-trx" \
|
||||||
|
-b "$(which osmo-clean-workspace.sh):/usr/bin/osmo-clean-workspace.sh" \
|
||||||
|
-b "$(which osmo-build-dep.sh):/usr/bin/osmo-build-dep.sh" \
|
||||||
|
-b "$(which osmo-deps.sh):/usr/bin/osmo-deps.sh" \
|
||||||
|
./contrib/jenkins.sh
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
### BUILD osmo-trx
|
mkdir "$deps" || true
|
||||||
|
|
||||||
|
osmo-build-dep.sh libosmocore "" "--disable-doxygen --disable-pcsc"
|
||||||
|
|
||||||
|
export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||||
|
export LD_LIBRARY_PATH="$inst/lib"
|
||||||
|
|
||||||
|
set +x
|
||||||
|
echo
|
||||||
|
echo
|
||||||
|
echo
|
||||||
|
echo " =============================== osmo-trx ==============================="
|
||||||
|
echo
|
||||||
|
set -x
|
||||||
|
|
||||||
|
cd "$base"
|
||||||
autoreconf --install --force
|
autoreconf --install --force
|
||||||
./configure $INSTR
|
./configure $INSTR
|
||||||
$MAKE $PARALLEL_MAKE
|
$MAKE $PARALLEL_MAKE
|
||||||
|
|
Loading…
Reference in New Issue