diff options
| author | Max <msuraev@sysmocom.de> | 2017-06-21 14:20:03 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-06-21 20:25:28 +0000 |
| commit | d4806db1e59a9e205e323a3fe5aa8a39379ee13d (patch) | |
| tree | 80d284a741a2c8af74bf90b9935b18dd51f4b32b /contrib/jenkins_oct.sh | |
| parent | 71ad40c647c09e232e94eb4b2accd68db441d95a (diff) | |
Use generic L1 headers helper
Change-Id: I2253df3509595d7393ec6631ef846dbebae73ca4
Diffstat (limited to 'contrib/jenkins_oct.sh')
| -rwxr-xr-x | contrib/jenkins_oct.sh | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/contrib/jenkins_oct.sh b/contrib/jenkins_oct.sh index 0f926c96..6ad53586 100755 --- a/contrib/jenkins_oct.sh +++ b/contrib/jenkins_oct.sh @@ -11,20 +11,7 @@ export LD_LIBRARY_PATH="$inst/lib" osmo-build-dep.sh libosmo-abis cd "$deps" -if ! test -d layer1-api; -then - git clone git://git.osmocom.org/octphy-2g-headers layer1-api -fi - -cd layer1-api -git fetch origin -if [ $FIRMWARE_VERSION = "master" ]; -then -git reset --hard origin/master -else -git reset --hard $FIRMWARE_VERSION -fi - +osmo-layer1-headers.sh oct "$FIRMWARE_VERSION" cd "$base" set +x @@ -36,10 +23,10 @@ echo set -x autoreconf --install --force -./configure --with-openbsc="$deps/openbsc/openbsc/include" --with-octsdr-2g="$deps/layer1-api/" --enable-octphy +./configure --with-openbsc="$deps/openbsc/openbsc/include" --with-octsdr-2g="$deps/layer1-headers/" --enable-octphy $MAKE $PARALLEL_MAKE $MAKE check \ || cat-testlogs.sh -DISTCHECK_CONFIGURE_FLAGS="--with-octsdr-2g=$deps/layer1-api/ --with-openbsc=$deps/openbsc/openbsc/include --enable-octphy" \ +DISTCHECK_CONFIGURE_FLAGS="--with-octsdr-2g=$deps/layer1-headers/ --with-openbsc=$deps/openbsc/openbsc/include --enable-octphy" \ $MAKE distcheck \ || cat-testlogs.sh |