[CTD-264] create Vyos build (#6)

* CTD-264 updated build.sh to make etch builds, couple other cosmetic changes

* CTD-264 bumped version, modified package dependencies to match Vyos
at Debian 6 level.

* CTD-264 updated changelog

* CTD-264 added section for 32-bit Debian etch to build.sh, seems to have gotten deleted in a
prior code reorganization.

Author: Digital-Larry

connectd/DEBIAN/control

@@ -1,10 +1,10 @@
 Package: connectd
-Version: 2.2.4
+Version: 2.2.5
 Section: non-free/net
 Priority: optional
 Homepage: https://remote.it
 Architecture: armhf
-Depends: libc6 (>= 2.1), mawk (>= 1.0), grep (>= 2.1.6), curl (>= 7.25.0), psmisc (>= 22.19-1)
+Depends: libc6 (>= 2.1), mawk (>= 1.0), grep (>= 2.1.6), curl (>= 7.21.0), psmisc (>= 22.11-1), cron (>= 3.0)
 Maintainer: Gary Worsham <[email protected]>
 Description: remote.it is a cloud service that provides secure connections to 
  your networked devices across the public internet, even those located behind 

connectd/usr/share/doc/connectd/changelog.gz

@@ -4,7 +4,8 @@
 # sorts out Lintian errors/warnings into individual
 # text files
 pkg=connectd
-ver=2.1.1
+ver=2.1.4
+MODIFIED="February 08, 2019"
 pkgFolder="$pkg"
 # set architecture
 controlFilePath="$pkgFolder"/DEBIAN
@@ -102,12 +103,30 @@ sudo chown -R "$user":"$user" "$pkgFolder"
 cwd="$(pwd)/build"
 mkdir -p $cwd
 
+# build() takes 4 parameters: PLATFORM, arch, buildDeb, and tag (optional)
+# PLATFORM indicates the remote.it daemon architecture, e.g. arm-linaro-pi
+# buildDeb=0 means make a tar file.  buildDeb=1 means make a Debian file
+# arch is the Debian architecture, e.g. armhf or amd64
+# not required to pass in "arch" if buildDeb=0
+# tag is an optional string to put in the file name to distinguish Debian packages
+# which have the same "arch" but different "PLATFORM"
+
 build() {
     echo
     echo "========================================"
 
     echo
-
+    PLATFORM=$1
+    buildDeb=$2
+    if [ $buildDeb -eq 1 ]; then
+        arch=$3
+    else
+# give it a default arch, it doesn't matter as we are just building a deb from which to extract the tar file
+        arch="amd64"
+    fi
+    if [ "$4" != "" ]; then
+        tag="$4"
+    fi
     setEnvironment "$arch" "$PLATFORM"
     # put build date into connected_options
     setOption options "BUILDDATE" "\"$(date)\""
@@ -125,6 +144,12 @@ build() {
 
         echo "Building Debian package for architecture: $arch"
         echo "PLATFORM=$PLATFORM"
+        # tag variable was added to allow building different Debian packages with the same architecture
+        # e.g. for Vyos I had to make a package using an older daemon architecture but it's still considered
+        # amd64 or i386 architecture from the dpkg program's point of view
+        if [ "$tag" != "" ]; then
+            echo "tag = $tag"
+        fi
 
         #--------------------------------------------------------
         # for Deb pkg build, remove builddate.txt file
@@ -143,7 +168,7 @@ build() {
         fi
 
         version=$(grep -i version "$controlFile" | awk '{ print $2 }')
-        filename="${pkg}_${version}_$arch".deb
+        filename="${pkg}_${version}_$arch$tag".deb
         mv "$pkgFolder".deb "$cwd/$filename"
     else
         echo "Building tar package for PLATFORM: $PLATFORM"
@@ -158,79 +183,67 @@ build() {
         version=$(grep -i version "$controlFile" | awk '{ print $2 }')
         echo "Extracting contents to tar file"
         ./scripts/extract-scripts.sh "$pkgFolder".deb
-        filename="${pkg}_${version}_$PLATFORM".tar
+        filename="${pkg}_${version}_$PLATFORM$tag".tar
         mv "$pkgFolder".deb.tar "$cwd/$filename"
 
     fi
+    ls -l "$cwd/$filename"
 
 }
 
-buildDeb=0
-arch="armhf"
-PLATFORM=arm-android
 setOption options "mac" '$'"(ip addr | grep ether | tail -n 1 | awk" "'{ print" '$2' "}')"
 setOption options "PSFLAGS" "ax"
-build
+build arm-android 0
 
-buildDeb=0
-arch="armhf"
-PLATFORM=arm-android_static
 setOption options "mac" '$'"(ip addr | grep ether | tail -n 1 | awk" "'{ print" '$2' "}')"
 setOption options "PSFLAGS" "ax"
-build
+build arm-android_static 0
 
-buildDeb=1
 setOption options "PSFLAGS" "ax"
 setOption options "mac" '$'"(ip addr | grep ether | tail -n 1 | awk" "'{ print" '$2' "}')"
-arch="armhf"
-PLATFORM=arm-linaro-pi
 setOption options "BASEDIR" ""
-build
+build arm-linaro-pi 1 armhf
 
-buildDeb=1
 setOption options "PSFLAGS" "ax"
 setOption options "mac" '$'"(ip addr | grep ether | tail -n 1 | awk" "'{ print" '$2' "}')"
-arch="armel"
-PLATFORM=arm-linaro-pi
 setOption options "BASEDIR" ""
-build
+build arm-linaro-pi 1 armel
 
-buildDeb=0
 setOption options "PSFLAGS" "ax"
 setOption options "mac" '$'"(ip addr | grep ether | tail -n 1 | awk" "'{ print" '$2' "}')"
-arch="i386"
-PLATFORM=x86-etch
 setOption options "BASEDIR" ""
-build
+build x86-etch 0
 
-buildDeb=1
-arch="amd64"
 setOption options "mac" '$'"(ip addr | grep ether | tail -n 1 | awk" "'{ print" '$2' "}')"
-PLATFORM=x86_64-ubuntu16.04
 setOption options "BASEDIR" ""
 setOption options "PSFLAGS" "ax"
-build
+build x86_64-ubuntu16.04 1 amd64
 
-buildDeb=0
-arch="armhf"
-PLATFORM=arm-linaro-pi
 setOption options "mac" '$'"(ip addr | grep ether | tail -n 1 | awk" "'{ print" '$2' "}')"
 setOption options "PSFLAGS" "ax"
-build
+build arm-linaro-pi 0
 
-buildDeb=0
-arch="arm-gnueabi"
-PLATFORM=arm-gnueabi
 setOption options "PSFLAGS" "w"
 setOption options "mac" '$'"(ip addr | grep ether | tail -n 1 | awk" "'{ print" '$2' "}')"
-build
+build arm-gnueabi 0
+
+setOption options "mac" '$'"(ip addr | grep ether | tail -n 1 | awk" "'{ print" '$2' "}')"
+setOption options "BASEDIR" ""
+setOption options "PSFLAGS" "ax"
+build x86_64-etch 0
+
+# here we are using the tag "-etch" to create an amd64 Debian architecture package for the older
+# Debian "Etch" architecture that needs to be distinct from the one for Ubuntu 16.04
+setOption options "mac" '$'"(ip addr | grep ether | tail -n 1 | awk" "'{ print" '$2' "}')"
+setOption options "BASEDIR" ""
+setOption options "PSFLAGS" "ax"
+build x86_64-etch 1 amd64 -etch
 
-buildDeb=0
-arch="amd64"
-PLATFORM=x86_64-etch
+# here we are using the tag "-etch" to create an i386 Debian architecture package for the older
+# Debian "Etch" architecture that needs to be distinct from the one for Ubuntu 16.04
 setOption options "mac" '$'"(ip addr | grep ether | tail -n 1 | awk" "'{ print" '$2' "}')"
 setOption options "BASEDIR" ""
 setOption options "PSFLAGS" "ax"
-build
+build x86-etch 1 i386 -etch
 
-ls -l "build/${pkg}"*.*
+echo "======   build.sh $ver completed   =============="