From 1989b886f5c2de8ffd6a90f5bfe84685cfaaa4d3 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sun, 2 Jun 2019 09:34:31 +0200
Subject: [PATCH] Reflect restructuralization in build-all.sh

---
 _build/build-all.sh    | 19 ++++++++++++-------
 _build/etc/abuild.conf |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/_build/build-all.sh b/_build/build-all.sh
index b7f2ac5..93ce714 100755
--- a/_build/build-all.sh
+++ b/_build/build-all.sh
@@ -1,24 +1,24 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))
+ROOT=$(dirname $(dirname $(realpath "${0}")))
 
 # Build documentation
-cd ../_doc
+cd ${ROOT}/_doc
 make html
 
 # Build basic.tar
-cd ../_vm
+cd ${ROOT}/_vm
 tar cpf /srv/build/_vm.tar *
 
 # Build native apps
-cd ../acme-sh
+cd ${ROOT}/apk/acme-sh
 abuild -F
-cd ../vmmgr
+cd ${ROOT}/apk/vmmgr
 abuild -F
-cd ..
 
-# Build runtimes
+# Build apd pack runtimes
+cd ${ROOT}/lxc-shared
 lxc-build alpine3.8
 lxc-build alpine3.8-php5.6
 lxc-build alpine3.8-nodejs8
@@ -34,6 +34,7 @@ lxc-build alpine3.9-tomcat7
 lxc-build alpine3.9-tomcat8.5
 
 # Build services
+cd ${ROOT}/lxc-services
 lxc-build activemq
 lxc-build mariadb
 lxc-build postgres
@@ -42,6 +43,7 @@ lxc-build redis
 lxc-build solr
 
 # Build applications
+cd ${ROOT}/lxc-apps
 lxc-build ckan-datapusher
 lxc-build ckan
 lxc-build crisiscleanup
@@ -66,6 +68,7 @@ lxc-build sigmah
 lxc-build ushahidi
 
 # Pack runtimes
+cd ${ROOT}/lxc-shared
 lxc-pack alpine3.8
 lxc-pack alpine3.8-php5.6
 lxc-pack alpine3.8-nodejs8
@@ -81,6 +84,7 @@ lxc-pack alpine3.9-tomcat7
 lxc-pack alpine3.9-tomcat8.5
 
 # Pack services
+cd ${ROOT}/lxc-services
 lxc-pack activemq
 lxc-pack mariadb
 lxc-pack postgres
@@ -89,6 +93,7 @@ lxc-pack redis
 lxc-pack solr
 
 # Pack applications
+cd ${ROOT}/lxc-apps
 lxc-pack ckan-datapusher
 lxc-pack ckan
 lxc-pack crisiscleanup
diff --git a/_build/etc/abuild.conf b/_build/etc/abuild.conf
index 7ed3b87..55a62cf 100644
--- a/_build/etc/abuild.conf
+++ b/_build/etc/abuild.conf
@@ -14,7 +14,7 @@ SRCDEST=/var/cache/distfiles
 # uncomment line below to store built packages in other location
 # The package will be stored as $REPODEST/$repo/$pkgname-$pkgver-r$pkgrel.apk
 # where $repo is the name of the parent directory of $startdir.
-REPODEST=/srv/build/packages/
+REPODEST=/srv/build
 
 # PACKAGER and MAINTAINER are used by newapkbuild when creating new aports for
 # the APKBUILD's "Contributor:" and "Maintainer:" comments, respectively.