DEB/UBU build scripts.

1) added support for Devuan distros
2) added more command line options for update_repositories.sh
3) bug fixes and improved user feedback
4) added link inside ubuntu distro

Signed-off-by: Michele Calgaro <[email protected]>

4 files changed, 57 insertions, 32 deletions

diff --git a/debian/_buildscripts/local/internals/_build_common.sh b/debian/_buildscripts/local/internals/_build_common.sh
index 5e4ba67fe..8b048a635 100755
--- a/debian/_buildscripts/local/internals/_build_common.sh
+++ b/debian/_buildscripts/local/internals/_build_common.sh
@@ -50,7 +50,7 @@ function echo_and_tee()
 }
 
 #----------------------------
-function _set_path_varables()
+function _set_path_variables()
 {
 	# Set useful path variables
 	set -a
@@ -91,7 +91,7 @@ function init_common()
 	CFG_FILE=$SCRIPT_DIR/_config.sh
 	if [ -f "$CFG_FILE" ]; then
 		. "$CFG_FILE"
-		_set_path_varables
+		_set_path_variables
 	else
 		echo -e "${CLightRed}  --- NOTE ---${CNone}"
 		echo -e "Creating TDE build configuration file from template as ${CLightPurple}$CFG_FILE${CNone}."
@@ -111,11 +111,16 @@ function init_common()
 	# -- Need to use a "here string" otherwise if the DISTRO_FOUND value is modified
 	# -- inside the while loop, this would not remember after the loop.
 	DISTRO_FOUND="n"
-	while read l_distro l_version l_name l_rel_suffix; do	
+	while read l_distro l_version l_name l_rel_suffix l_packaging_path; do
 		if [ "$l_distro" = "$DISTRO" -a "$l_name" = "$DISTRO_NAME" ]; then
 			DISTRO_FOUND="y"
+			l_rel_suffix=`echo "$l_rel_suffix" | perl -pe "s|^[\"']?(.*?)[\"']?$|\1|g"`
+			l_packaging_path=`echo "$l_packaging_path" | perl -pe "s|^[\"']?(.*?)[\"']?$|\1|g"`
 			export DISTRO_VERSION="$l_version"
 			export REL_SUFFIX="$l_rel_suffix"
+			if [[ ! -z "$l_packaging_path" ]]; then
+				REPO_TDE_PACKAGING="$TDE_DIR/$CFG_GIT_DIR/tde-packaging/$l_packaging_path"
+			fi
 			break
 		fi
 	done <<< $(cat $DISTS_FILE | grep -E "^(\s*[^#\s]+\s+[^\s]+.*)$")
@@ -163,6 +168,7 @@ function init_common()
 	
 	# Check branch configuration
 	# - branch existance
+	UPDATE_BRANCHES="${OVERRIDE_UPDATE_BRANCHES:-$UPDATE_BRANCHES}"
 	cd "$REPO_TDE"
 	BRANCHES=()
 	REMOTE_BRANCHES=(`git branch --remote | grep -v "HEAD" | sed "s|origin/||g"`)
diff --git a/debian/_buildscripts/local/internals/_config_template.sh b/debian/_buildscripts/local/internals/_config_template.sh
index be992d297..00d25e315 100644
--- a/debian/_buildscripts/local/internals/_config_template.sh
+++ b/debian/_buildscripts/local/internals/_config_template.sh
@@ -28,7 +28,7 @@ CFG_SCRIPT_LOG_DIR="0_logs"
 CFG_GIT_DIR="1_git"
 CFG_BUILD_DIR="2_build"
 CFG_REPO_DIR="3_repo"
-CFG_EXTRA_DEPS_DIR="edeps"			  # Relative to CFG_GIT_DIR folder
+CFG_EXTRA_DEPS_DIR="edeps"			  # Relative to CFG_GIT_DIR folder. Only required if USE_PREBUILD_EXTRA_DEPS != "y"
 CFG_HOOKS_DIR="hooks"     			  # Relative to CFG_GIT_DIR folder
 
 set +a
diff --git a/debian/_buildscripts/local/internals/distro_list.txt b/debian/_buildscripts/local/internals/distro_list.txt
index 0ca037eb0..9d2707e7b 100644
--- a/debian/_buildscripts/local/internals/distro_list.txt
+++ b/debian/_buildscripts/local/internals/distro_list.txt
@@ -1,31 +1,48 @@
 #!/bin/bash
 
 # List of supported distributions
+#
+# Format:
+#  distro name
+#  distro version number
+#  distro version name
+#  package suffix if required
+#  tde-packaging corresponding path if required
+#
 DISTROS="
-  debian     5.0    lenny    
-  debian     6.0    squeeze    
-  debian     7.0    wheezy    
-  debian     8.0    jessie    
-  debian     9.0    stretch    
-  debian    10.0    buster            ~a
-  debian    10.0    sid               ~b
-  raspbian   7.0    raspbian-wheezy  
-  raspbian   8.0    raspbian-jessie  
-  ubuntu    10.04   lucid    
-  ubuntu    10.10   maverick  
-  ubuntu    11.04   natty    
-  ubuntu    11.10   oneiric    
-  ubuntu    12.04   precise    
-  ubuntu    12.10   quantal    
-  ubuntu    13.04   raring    
-  ubuntu    13.10   saucy    
-  ubuntu    14.04   trusty    
-  ubuntu    14.10   utopic    
-  ubuntu    15.04   vivid    
-  ubuntu    15.10   wily    
-  ubuntu    16.04   xenial    
-  ubuntu    16.10   yakkety    
-  ubuntu    17.04   zesty    
-  ubuntu    17.10   artful    
-  ubuntu    18.04   bionic            ~a
+	# -- debian --
+  debian     5.0    lenny             ''  ''
+  debian     6.0    squeeze           ''  ''
+  debian     7.0    wheezy            ''  ''
+  debian     8.0    jessie            ''  ''
+  debian     9.0    stretch           ''  ''
+  debian    10.0    buster            ~a  ''
+  debian    11.0    sid               ~b  ''
+	# -- devuan --                                                 
+  devuan     1.0    jessie            ''  debian/jessie
+  devuan     2.0    ascii             ''  debian/stretch
+  devuan     3.0    beowulf           ~a  debian/buster
+  devuan     4.0    ceres             ~b  debian/sid
+	# -- raspbian --                                  
+  raspbian   7.0    raspbian-wheezy   ''  ''
+  raspbian   8.0    raspbian-jessie   ''  ''
+  raspbian   9.0    raspbian-stretch  ''  ''
+	# -- ubuntu --                      
+  ubuntu    10.04   lucid             ''  ''
+  ubuntu    10.10   maverick          ''  ''
+  ubuntu    11.04   natty             ''  ''
+  ubuntu    11.10   oneiric           ''  ''
+  ubuntu    12.04   precise           ''  ''
+  ubuntu    12.10   quantal           ''  ''
+  ubuntu    13.04   raring            ''  ''
+  ubuntu    13.10   saucy             ''  ''
+  ubuntu    14.04   trusty            ''  ''
+  ubuntu    14.10   utopic            ''  ''
+  ubuntu    15.04   vivid             ''  ''
+  ubuntu    15.10   wily              ''  ''
+  ubuntu    16.04   xenial            ''  ''
+  ubuntu    16.10   yakkety           ''  ''
+  ubuntu    17.04   zesty             ''  ''
+  ubuntu    17.10   artful            ''  ''
+  ubuntu    18.04   bionic            ~a  ''
 "
diff --git a/debian/_buildscripts/local/internals/extra_deps.txt b/debian/_buildscripts/local/internals/extra_deps.txt
index 12cd3b395..0a764d9bc 100644
--- a/debian/_buildscripts/local/internals/extra_deps.txt
+++ b/debian/_buildscripts/local/internals/extra_deps.txt
@@ -2,6 +2,8 @@
 
 # List of repositories for extra dependency packages
 EDEPS_REPO="
-	master   http://mirror.xcer.cz/trinity-tb  deps
-	r14.0.x  http://mirror.xcer.cz/trinity-sb  deps-r14
+# - For the time being use stable builds for extra dependencies
+#	master   http://mirror.ppa.trinitydesktop.org/trinity-testing deps
+	master   http://mirror.ppa.trinitydesktop.org/trinity-sb      deps-r14
+	r14.0.x  http://mirror.ppa.trinitydesktop.org/trinity-sb      deps-r14
 "