Update

drone.yml

@@ -51,36 +51,30 @@ steps:
     event: [ push, tag ]
   depends_on: [ clone, prepare ]
   environment:
-    MAKEFLAGS: -j 1
+    MAKEFLAGS: -j 4
     # https://wiki.debian.org/CrossCompiling#Building_with_dpkg-buildpackage
+    # addr2line ar as c++filt cpp cpp-6 dwp elfedit g++ g++-6 gcc gcc-6 gcc-ar gcc-ar-6 gcc-nm gcc-nm-6 gcc-ranlib gcc-ranlib-6 gcov gcov-6 gcov-dump gcov-dump-6 gcov-tool gcov-tool-6 gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip 
     BUILD_ARCH: amd64 armhf # amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64el s390x
   commands:
-    # DEB_BUILD_ARCH DEB_HOST_ARCH TARGET=armhf
-    # addr2line ar as c++filt cpp cpp-6 dwp elfedit g++ g++-6 gcc gcc-6 gcc-ar gcc-ar-6 gcc-nm gcc-nm-6 gcc-ranlib gcc-ranlib-6 gcov gcov-6 gcov-dump gcov-dump-6 gcov-tool gcov-tool-6 gprof ld ld.bfd ld.gold nm objcopy objdump ranlib readelf size strings strip 
-    - PKG_NAME="${DRONE_REPO_NAME}" &&
-      PKG_VERSION="$(git describe --always)" &&
-      echo git fetch --tags && echo PKG_VERSION="$(git for-each-ref --merged='master' --sort='-*creatordate' --format='%(refname:short)' 'refs/tags' | head -1 | sed 's/[^0-9.]//g')" &&
-      if test -d "debian" ; then PKG_VERSION=$(dpkg-parsechangelog -SVersion | sed 's/-.*//') ; fi &&      
-      PKG_BUILDHOST_ARCH="amd64" &&
-      PKG_SRC_ROOT="$(pwd)" &&
-      PKG_RELEASE_DIR="$${PKG_SRC_ROOT}/release" &&
-      PKG_DIST_DIR="dist" &&
-      mkdir -p "$${PKG_RELEASE_DIR}" &&
-      PKG_DEB_ARCHIVE="$${PKG_NAME}_$${PKG_VERSION}.orig.tar.xz" &&
-      PKG_DEB_ARCHIVE_ROOT="$${PKG_NAME}-$${PKG_VERSION}" &&
-      tar --exclude='./.*' --exclude='debian' --exclude="$${PKG_RELEASE_DIR}"
-        --exclude="$${PKG_DEB_ARCHIVE}" 
-        --transform "s/\./$${PKG_DEB_ARCHIVE_ROOT}/" 
-        -cJf "$${PKG_RELEASE_DIR}/$${PKG_DEB_ARCHIVE}" . &&
-      for PKG_ARCH in $${BUILD_ARCH} ; do cd "$${PKG_SRC_ROOT}" && 
-        echo " ░▒▓█ BUILDING FOR $${PKG_ARCH} █▓▒░ " &&
-        PKG_RELEASE_ARCHIVE="$${PKG_NAME}_$${PKG_VERSION}_$${PKG_ARCH}.tar.xz" &&
-        PKG_RELEASE_ARCHIVE_ROOT="$${PKG_NAME}-$${PKG_VERSION}" &&
-        PKG_BUILD_DIR="$${PKG_SRC_ROOT}/build/$${PKG_ARCH}/$${PKG_RELEASE_ARCHIVE_ROOT}" &&
-        mkdir -p "$${PKG_BUILD_DIR}" &&
-        tar -xf "$${PKG_RELEASE_DIR}/$${PKG_DEB_ARCHIVE}" -C "$${PKG_BUILD_DIR}" --strip 1 &&
-        cd "$${PKG_BUILD_DIR}" &&
-        case "$${PKG_ARCH}" in 
+    - HOST_ARCH="amd64" ;
+      NAME="${DRONE_REPO_NAME}" ;
+      VERSION="$(git describe --always)" ;
+      if test -d "debian" ; then
+        VERSION=$(dpkg-parsechangelog -SVersion | sed 's/-.*//') ;
+      fi ;
+      DESTDIR="dist" ;
+      RELEASE_DIR="release" ;
+      SRC_DIR="$(pwd)" ;
+      ARCHIVE_NAME="$${NAME}_$${VERSION}" ;
+      ARCHIVE_ROOT="$${NAME}-$${VERSION}" ;
+    - mkdir -p "$${RELEASE_DIR}" &&
+      tar --exclude='./.*' --exclude='debian' --exclude="$${RELEASE_DIR}"
+        --transform "s/\./$${ARCHIVE_ROOT}/" 
+        -cJf "$${SRC_DIR}/$${RELEASE_DIR}/$${ARCHIVE_NAME}.orig.tar.xz" .
+    - for ARCH in $${BUILD_ARCH} ; do set -e
+        echo " ░▒▓█ Building for $${ARCH} █▓▒░ " ;
+		BUILD_DIR="$${SRC_DIR}/build/$${ARCH}/$${ARCHIVE_ROOT}" ;
+        case "$${ARCH}" in 
           amd64)    PREFIX="x86_64-linux-gnu-"        ;;
           arm64)    PREFIX="aarch64-linux-gnu-"       ;;
           armel)    PREFIX="arm-linux-gnueabi-"       ;;
@@ -92,70 +86,48 @@ steps:
           powerpc)  PREFIX="powerpc-linux-gnu-"       ;;
           ppc64el)  PREFIX="powerpc64le-linux-gnu-"   ;;
           s390x)    PREFIX="s390x-linux-gnu-"         ;;
-        esac &&
-        if test "$${PKG_ARCH}" = "$${PKG_BUILDHOST_ARCH}" ; then PREFIX="" ; fi &&
-        export CC="$${PREFIX}gcc" &&
-        export LD="$${PREFIX}ld" &&
-        export STRIP="$${PREFIX}strip" &&
-        export MAKEFLAGS="$${MAKEFLAGS}" &&
-        if test -d "$${PKG_SRC_ROOT}/debian" ; then
-          cp -rp "$${PKG_SRC_ROOT}/debian" . &&
-          cp -p "$${PKG_RELEASE_DIR}/$${PKG_DEB_ARCHIVE}" .. &&
-          echo apt-get build-dep -a $${PKG_ARCH} . &&
-          CONFIG_SITE="/etc/dpkg-cross/cross-config.$${PKG_ARCH}"
-          DEB_BUILD_OPTIONS="nocheck"
-          dpkg-buildpackage -us -uc -a "${PKG_ARCH}" &&
-          ls -l .. &&
-          cp ../*.tar.xz ../*.deb ../*.dsc "$${PKG_RELEASE_DIR}/" ;
+          *)        PREFIX=""                         ;;
+        esac ;
+        if test "$${ARCH}" = "$${HOST_ARCH}" ; then
+          PREFIX="" ; 
+        fi ;
+        export CC="$${PREFIX}gcc" ;
+        export LD="$${PREFIX}ld" ;
+        export STRIP="$${PREFIX}strip" ;
+        export MAKEFLAGS="$${MAKEFLAGS}" ;
+        export CONFIG_SITE="/etc/dpkg-cross/cross-config.$${PKG_ARCH}" ;
+        mkdir -p "$${BUILD_DIR}" ;
+        cd "$${BUILD_DIR}" ;
+        tar -xf "$${SRC_DIR}/$${RELEASE_DIR}/$${ARCHIVE_NAME}.orig.tar.xz"
+          -C "$${BUILD_DIR}" --strip 1 ;
+        cp -p "$${SRC_DIR}/$${RELEASE_DIR}/$${ARCHIVE_NAME}.orig.tar.xz"
+              "$${BUILD_DIR}/../" ;
+        if test -d "$${SRC_DIR}/debian" ; then
+          cp -rp "$${SRC_DIR}/debian"
+                 "$${BUILD_DIR}/" ;
+          export DEBIAN_FRONTEND="noninteractive" ;
+          export DEB_BUILD_OPTIONS="nocheck" ;
+          apt-get -qy -o Dpkg::Use-Pty=0 build-dep -a $${ARCH} . ;
+          dpkg-buildpackage -us -uc -a "$${ARCH}" &&
+          cp ../*.tar.xz ../*.deb ../*.dsc "$${RELEASE_DIR}/" &&
+          ls -la .. ;
+          make clean ;
         else
           make &&
           tar --exclude='./.*'
-            --transform "s/\./$${PKG_RELEASE_ARCHIVE_ROOT}/"
-            -C "$${PKG_DIST_DIR}"
-            -cJf "$${PKG_RELEASE_DIR}/$${PKG_RELEASE_ARCHIVE}" . &&
+            --transform "s/\./$${ARCHIVE_ROOT}/"
+            -C "$${DESTDIR}"
+            -cJf "$${RELEASE_DIR}/$${ARCHIVE_NAME}.$${ARCH}.tar.xz" . &&
+          ls -la "$${DESTDIR}" &&
+          ls -la "$${RELEASE_DIR}/$${ARCHIVE_NAME}.$${ARCH}.tar.xz" ;
           make clean ;
         fi ;
-      done &&
-      ls -la "$${PKG_RELEASE_DIR}" &&
-      find "$${PKG_RELEASE_DIR}" -type f -exec md5sum '{}' \;
+      done
+    - ls -la "$${RELEASE_DIR}" &&
+      find "$${RELEASE_DIR}" -type f -exec md5sum '{}' \;
     - exit 0 ; ░▒▓█ BUILD END █▓▒░
 
 
-#        tar --exclude='./.*'
-#          --transform "s/$${PKG_DIST_DIR}/$${PKG_RELEASE_ARCHIVE_ROOT}/"
-#          -cJvf "$${PKG_RELEASE_DIR}/$${PKG_RELEASE_ARCHIVE}" "${PKG_DIST_DIR}" &&
-      
-
-#    - export MAKEFLAGS && make
-#    - CONTENT=${DRONE_REPO_NAME} ;
-#      test -n "${DRONE_TAG}" && 
-#      RELEASE=${DRONE_REPO_NAME}-${DRONE_TAG}-bin || 
-#      RELEASE=${DRONE_REPO_NAME}-bin
-#    - cp -rp dist/. $CONTENT/ ; 
-#      ls -la $CONTENT
-#    - find $CONTENT -type f -exec md5sum '{}' \;
-#    - rm -rf release ; 
-#      mkdir release
-#    # - zip -rpq release/$RELEASE.zip    $CONTENT
-#    - tar -czf release/$RELEASE.tar.gz $CONTENT
-#    # - tar -cJf release/$RELEASE.tar.xz $CONTENT
-#    - make clean ; rm -rf $CONTENT ;
-#      ls -la release
-#    - find release -type f -exec md5sum '{}' \;
-
-
-#    - for ARCH in ${BUILD_ARCH} ; do
-#      apt-get build-dep -a $ARCH . ; 
-#      done
-
-#    - for ARCH in ${BUILD_ARCH} ; do
-#      CONFIG_SITE=/etc/dpkg-cross/cross-config.$ARCH
-#      DEB_BUILD_OPTIONS=nocheck 
-#      dpkg-buildpackage -us -uc -a $ARCH ;
-#      done
-#    - exit 0 ; ░▒▓█ BUILD END █▓▒░
-
-
 - name: sign
   image: plugins/gpgsign
   # http://plugins.drone.io/drone-plugins/drone-gpgsign/