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/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHarald Welte has submitted this change and it was merged. Change subject: Use generic L1 headers helper ...................................................................... Use generic L1 headers helper Change-Id: I2253df3509595d7393ec6631ef846dbebae73ca4 --- M contrib/jenkins_lc15.sh M contrib/jenkins_oct.sh M contrib/jenkins_oct_and_bts_trx.sh M contrib/jenkins_sysmobts.sh 4 files changed, 10 insertions(+), 55 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins_lc15.sh b/contrib/jenkins_lc15.sh index a0eef43..c9173bf 100644 --- a/contrib/jenkins_lc15.sh +++ b/contrib/jenkins_lc15.sh @@ -11,15 +11,7 @@ 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 @@ 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 0f926c9..6ad5358 100755 --- a/contrib/jenkins_oct.sh +++ b/contrib/jenkins_oct.sh @@ -11,20 +11,7 @@ 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 @@ 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 132c2e0..a8a8004 100755 --- a/contrib/jenkins_oct_and_bts_trx.sh +++ b/contrib/jenkins_oct_and_bts_trx.sh @@ -15,18 +15,7 @@ # 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 @@ 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 bce0690..227f249 100755 --- a/contrib/jenkins_sysmobts.sh +++ b/contrib/jenkins_sysmobts.sh @@ -11,22 +11,9 @@ 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 -- To view, visit https://gerrit.osmocom.org/2974 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2253df3509595d7393ec6631ef846dbebae73ca4 Gerrit-PatchSet: 6 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max <msuraev at sysmocom.de> Gerrit-Reviewer: André Boddenberg <dr.blobb at gmail.com> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>