From 445ff9b0f57b6cad356cc98c9c19598bde02d831 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 24 May 2017 18:17:01 +0200 Subject: contrib/jenkins: cosmetic: add some spacing in log output Change-Id: Ie7238d8610f2be3e074f366861782e010d814e94 --- contrib/jenkins-build-osmo-bts-sysmo.sh | 13 ++++++++++++- contrib/jenkins-build-osmo-bts-trx.sh | 9 +++++++++ contrib/jenkins-build-osmo-nitb.sh | 9 +++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh b/contrib/jenkins-build-osmo-bts-sysmo.sh index 3fb5c0b..b8dc841 100755 --- a/contrib/jenkins-build-osmo-bts-sysmo.sh +++ b/contrib/jenkins-build-osmo-bts-sysmo.sh @@ -34,7 +34,7 @@ have_repo openbsc . /opt/poky/1.5.4/environment-setup-armv5te-poky-linux-gnueabi # Cross-compilation: all installations need to be put in the sysmo SDK sysroot -export DESTDIR=/opt/poky/1.5.4/sysroots/armv5te-poky-linux-gnueabi +export DESTDIR="/opt/poky/1.5.4/sysroots/armv5te-poky-linux-gnueabi" prefix_base="/usr/local/jenkins-build" prefix_base_real="$DESTDIR$prefix_base" @@ -47,7 +47,15 @@ mkdir -p "$prefix_real" # Installation in non-system dir, but keep the PKG_CONFIG_PATH from the SDK: export PKG_CONFIG_PATH="$prefix_real/lib/pkgconfig:$PKG_CONFIG_PATH" +env + for dep in $deps; do + set +x; echo " + +====================== $dep + +"; set -x + cd "$base/$dep" rm -rf * git checkout . @@ -62,8 +70,11 @@ for dep in $deps; do 'osmo-bts') config_opts="--enable-sysmocom-bts --with-openbsc=$base/openbsc/openbsc/include" ;; esac + set +x; echo; echo; set -x ./configure --prefix="$prefix" $CONFIGURE_FLAGS $config_opts + set +x; echo; echo; set -x make -j8 + set +x; echo; echo; set -x make install done diff --git a/contrib/jenkins-build-osmo-bts-trx.sh b/contrib/jenkins-build-osmo-bts-trx.sh index b408852..fa00237 100755 --- a/contrib/jenkins-build-osmo-bts-trx.sh +++ b/contrib/jenkins-build-osmo-bts-trx.sh @@ -38,6 +38,12 @@ export PKG_CONFIG_PATH="$prefix/lib/pkgconfig" export LD_LIBRARY_PATH="$prefix/lib" for dep in $deps; do + set +x; echo " + +====================== $dep + +"; set -x + have_repo "$dep" cd "$dep" rm -rf * @@ -54,8 +60,11 @@ for dep in $deps; do 'osmo-trx') config_opts="--without-sse" ;; esac + set +x; echo; echo; set -x ./configure --prefix="$prefix" $config_opts + set +x; echo; echo; set -x make -j8 + set +x; echo; echo; set -x make install done diff --git a/contrib/jenkins-build-osmo-nitb.sh b/contrib/jenkins-build-osmo-nitb.sh index e4e4e32..eb9fc26 100755 --- a/contrib/jenkins-build-osmo-nitb.sh +++ b/contrib/jenkins-build-osmo-nitb.sh @@ -37,6 +37,12 @@ export PKG_CONFIG_PATH="$prefix/lib/pkgconfig" export LD_LIBRARY_PATH="$prefix/lib" for dep in $deps; do + set +x; echo " + +====================== $dep + +"; set -x + have_repo "$dep" cd "$dep" rm -rf * @@ -54,8 +60,11 @@ for dep in $deps; do esac autoreconf -fi + set +x; echo; echo; set -x ./configure --prefix="$prefix" $config_opts + set +x; echo; echo; set -x make -j8 || make # libsmpp34 can't build in parallel + set +x; echo; echo; set -x make install done -- cgit v1.2.3