From c1b67b867dfc95c5f620dfe44d90887823296170 Mon Sep 17 00:00:00 2001
From: "alexandr.kravchenko" <alexander.kravchenko@demlabs.net>
Date: Tue, 25 Feb 2020 20:12:50 +0500
Subject: [PATCH] added new dependency. added error on failure
---
prod_build/general/chroot_wrap.sh | 5 +++--
prod_build/linux/debian/conf/dependencies | 2 +-
prod_build/linux/debian/conf/publish | 4 ++--
prod_build/linux/debian/conf/version_info | 3 ---
prod_build/linux/ubuntu/conf/dependencies | 2 +-
5 files changed, 7 insertions(+), 9 deletions(-)
delete mode 100644 prod_build/linux/debian/conf/version_info
diff --git a/prod_build/general/chroot_wrap.sh b/prod_build/general/chroot_wrap.sh
index 991f4d827..36dddf2c7 100755
--- a/prod_build/general/chroot_wrap.sh
+++ b/prod_build/general/chroot_wrap.sh
@@ -33,7 +33,7 @@ for platform in $PLATFORMS; do
for distr in $HOST_DISTR_VERSIONS; do
for arch in $HOST_ARCH_VERSIONS; do
if [ -e $CHROOTS_PATH/$CHROOT_PREFIX-$distr-$arch ]; then
- schroot -c $CHROOT_PREFIX-$distr-$arch -- launcher.sh prod_build/$platform/scripts/$JOB.sh $PKG_TYPE || errcode=$?
+ schroot -c $CHROOT_PREFIX-$distr-$arch -- launcher.sh prod_build/$platform/scripts/$JOB.sh $PKG_TYPE || { errcode=$? && unexport_variables "./prod_build/$platform/conf/*"; exit $errcode; }
# echo "schroot stub $PKG_TYPE"
else
echo "chroot $CHROOT_PREFIX-$distr-$arch not found. You should install it first"
@@ -41,10 +41,11 @@ for platform in $PLATFORMS; do
done
done
echo "workdir before postinstall is $(pwd)"
- [ -e prod_build/$platform/scripts/post-build.sh ] && prod_build/$platform/scripts/post-build.sh #For post-build actions not in chroot (global publish)
+ [ -e prod_build/$platform/scripts/post-build.sh ] && prod_build/$platform/scripts/post-build.sh errcode=$? #For post-build actions not in chroot (global publish)
PKG_FORMAT=$(echo $PKG_FORMAT | cut -d ' ' -f2-)
unexport_variables "./prod_build/$platform/conf/*"
done
#[ $(mount | grep "/run/schroot/mount") ] && sudo umount -l /run/schroot/mount && sudo rm -r /run/schroot/mount/* #Removing mountpoint odds.
cd $wd
+exit $errcode
diff --git a/prod_build/linux/debian/conf/dependencies b/prod_build/linux/debian/conf/dependencies
index dc39e2983..48c4e2888 100644
--- a/prod_build/linux/debian/conf/dependencies
+++ b/prod_build/linux/debian/conf/dependencies
@@ -1 +1 @@
-PKG_DEPS="libjson-c-dev libsqlite3-dev libmemcached-dev libev-dev libmagic-dev libcurl4-gnutls-dev libldb-dev libtalloc-dev libtevent-dev"
+PKG_DEPS="libjson-c-dev libsqlite3-dev libmemcached-dev libev-dev libmagic-dev libcurl4-gnutls-dev libldb-dev libtalloc-dev libtevent-dev traceroute"
diff --git a/prod_build/linux/debian/conf/publish b/prod_build/linux/debian/conf/publish
index 4aaf32d32..93c64d60c 100644
--- a/prod_build/linux/debian/conf/publish
+++ b/prod_build/linux/debian/conf/publish
@@ -1,8 +1,8 @@
-HOST_DISTR_VERSIONS="buster"
+HOST_DISTR_VERSIONS="stretch buster"
HOST_ARCH_VERSIONS="amd64"
PACKAGE_PATH=builds/deb/
REPO_DIR_SRC=/var/tmp/repository
-DISTR_CODENAME="buster"
+DISTR_CODENAME="stretch buster"
REPO_ADDR=debian.pub.demlabs.net
REPO_DIR=/var/www/html/debian.pub.demlabs.net
DISTR_COMPONENT=main
diff --git a/prod_build/linux/debian/conf/version_info b/prod_build/linux/debian/conf/version_info
deleted file mode 100644
index 288cd5c83..000000000
--- a/prod_build/linux/debian/conf/version_info
+++ /dev/null
@@ -1,3 +0,0 @@
-VERSION_FILE=config.pri
-VERSION_ENTRIES="VER_MAJ VER_MIN VER_PAT VER_CODE"
-VERSION_FORMAT="VER_MAJ.VER_MIN-VER_PAT"
diff --git a/prod_build/linux/ubuntu/conf/dependencies b/prod_build/linux/ubuntu/conf/dependencies
index 1f99bdcdd..7282350d9 100644
--- a/prod_build/linux/ubuntu/conf/dependencies
+++ b/prod_build/linux/ubuntu/conf/dependencies
@@ -1 +1 @@
-PKG_DEPS="cmake libjson-c-dev libsqlite3-dev libmemcached-dev libev-dev libmagic-dev libcurl4-gnutls-dev libldb-dev libtalloc-dev libtevent-dev"
+PKG_DEPS="cmake libjson-c-dev libsqlite3-dev libmemcached-dev libev-dev libmagic-dev libcurl4-gnutls-dev libldb-dev libtalloc-dev libtevent-dev traceroute"
--
GitLab