summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-05-24 18:17:01 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-05-28 22:26:23 +0000
commit445ff9b0f57b6cad356cc98c9c19598bde02d831 (patch)
tree1604b31ba675b1c9a221e9863dbb41d82e634366 /contrib
parent0e8b900a0fc8ffa01725e3a49a8e74eaf35d78f5 (diff)
contrib/jenkins: cosmetic: add some spacing in log output
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/jenkins-build-osmo-bts-sysmo.sh13
-rwxr-xr-xcontrib/jenkins-build-osmo-bts-trx.sh9
-rwxr-xr-xcontrib/jenkins-build-osmo-nitb.sh9
3 files changed, 30 insertions, 1 deletions
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