From d4806db1e59a9e205e323a3fe5aa8a39379ee13d Mon Sep 17 00:00:00 2001
From: Max <msuraev@sysmocom.de>
Date: Wed, 21 Jun 2017 14:20:03 +0200
Subject: [PATCH] Use generic L1 headers helper

Change-Id: I2253df3509595d7393ec6631ef846dbebae73ca4
---
 contrib/jenkins_lc15.sh            | 14 +++-----------
 contrib/jenkins_oct.sh             | 19 +++----------------
 contrib/jenkins_oct_and_bts_trx.sh | 15 ++-------------
 contrib/jenkins_sysmobts.sh        | 17 ++---------------
 4 files changed, 10 insertions(+), 55 deletions(-)

diff --git a/contrib/jenkins_lc15.sh b/contrib/jenkins_lc15.sh
index a0eef43a5..c9173bfd5 100644
--- a/contrib/jenkins_lc15.sh
+++ b/contrib/jenkins_lc15.sh
@@ -11,15 +11,7 @@ export LD_LIBRARY_PATH="$inst/lib"
 osmo-build-dep.sh libosmo-abis
 
 cd "$deps"
-if ! test -d litecell15-fw;
-then
-  git clone https://gitlab.com/nrw_litecell15/litecell15-fw.git
-fi
-
-cd litecell15-fw
-git fetch origin
-git reset --hard origin/$FIRMWARE_VERSION
-
+osmo-layer1-headers.sh lc15 "$FIRMWARE_VERSION"
 cd "$base"
 
 set +x
@@ -31,7 +23,7 @@ echo
 set -x
 
 autoreconf --install --force
-./configure --with-openbsc="$deps/openbsc/openbsc/include" --with-litecell15="$deps/litecell15-fw/" --enable-litecell15
+./configure --with-openbsc="$deps/openbsc/openbsc/include" --with-litecell15="$deps/layer1-headers/" --enable-litecell15
 $MAKE "$PARALLEL_MAKE"
 $MAKE check || cat-testlogs.sh
-DISTCHECK_CONFIGURE_FLAGS="--with-litecell15=$deps/litecell15-fw/ --with-openbsc=$deps/openbsc/openbsc/include --enable-litecell15" $MAKE distcheck || cat-testlogs.sh
+DISTCHECK_CONFIGURE_FLAGS="--with-litecell15=$deps/layer1-headers/ --with-openbsc=$deps/openbsc/openbsc/include --enable-litecell15" $MAKE distcheck || cat-testlogs.sh
diff --git a/contrib/jenkins_oct.sh b/contrib/jenkins_oct.sh
index 0f926c966..6ad535866 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
diff --git a/contrib/jenkins_oct_and_bts_trx.sh b/contrib/jenkins_oct_and_bts_trx.sh
index 132c2e0dd..a8a8004b7 100755
--- a/contrib/jenkins_oct_and_bts_trx.sh
+++ b/contrib/jenkins_oct_and_bts_trx.sh
@@ -15,18 +15,7 @@ cd "$deps"
 # Get osmo-pcu for pcuif_proto.h
 osmo-deps.sh osmo-pcu
 
-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"
 
@@ -42,7 +31,7 @@ autoreconf --install --force
 configure_flags="\
   --with-openbsc=$deps/openbsc/openbsc/include \
   --with-osmo-pcu=$deps/osmo-pcu/include \
-  --with-octsdr-2g=$deps/layer1-api/ \
+  --with-octsdr-2g=$deps/layer1-headers/ \
   --enable-octphy \
   --enable-trx \
   "
diff --git a/contrib/jenkins_sysmobts.sh b/contrib/jenkins_sysmobts.sh
index bce069033..227f249a3 100755
--- a/contrib/jenkins_sysmobts.sh
+++ b/contrib/jenkins_sysmobts.sh
@@ -11,22 +11,9 @@ export LD_LIBRARY_PATH="$inst/lib"
 osmo-build-dep.sh libosmo-abis
 
 cd "$deps"
-if ! test -d layer1-api;
-then
-  git clone git://git.sysmocom.de/sysmo-bts/layer1-api.git 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 sysmo "$FIRMWARE_VERSION"
 mkdir -p "$inst/include/sysmocom/femtobts"
-cp include/*.h "$inst/include/sysmocom/femtobts/"
-
+ln -s $deps/layer1-headers/include/* "$inst/include/sysmocom/femtobts/"
 cd "$base"
 
 set +x