update db-init and fix POOLS variables

6 files changed, 36 insertions, 12 deletions

diff --git a/src/etc/dbscripts.d/gnu+hurd_add.cfg b/src/etc/dbscripts.d/gnu+hurd_add.cfg
index cabe881..58be117 100644
--- a/src/etc/dbscripts.d/gnu+hurd_add.cfg
+++ b/src/etc/dbscripts.d/gnu+hurd_add.cfg
@@ -35,10 +35,14 @@ PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
 # Directories where packages are shared between repos
 # *relative to REPO_DIR*
-PKG_POOL="${PKG_POOL_DIR}/abslibre_${PLATFORM}"
+PKG_MAIN_POOLS=("${PKG_POOL_DIR}/abslibre_${PLATFORM}")
+PKG_DD_POOLS=("${PKG_POOL_DIR}/abs_${PLATFORM}")
+PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_POOL="${SRC_POOL_DIR}/abslibre_${PLATFORM}"
+SRC_MAIN_POOLS=("${SRC_POOL_DIR}/abslibre_${PLATFORM}")
+SRC_DD_POOLS=("${SRC_POOL_DIR}/abs_${PLATFORM}")
+SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
 BS_MAIN_NAME="abslibre_${PLATFORM}"
diff --git a/src/etc/dbscripts.d/gnu+hurd_native.cfg b/src/etc/dbscripts.d/gnu+hurd_native.cfg
index 168a4f9..b6feb28 100644
--- a/src/etc/dbscripts.d/gnu+hurd_native.cfg
+++ b/src/etc/dbscripts.d/gnu+hurd_native.cfg
@@ -35,10 +35,14 @@ PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
 # Directories where packages are shared between repos
 # *relative to REPO_DIR*
-PKG_POOL="${PKG_POOL_DIR}/${PLATFORM}"
+PKG_MAIN_POOLS=("${PKG_POOL_DIR}/${PLATFORM}")
+PKG_DD_POOLS=()
+PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_POOL="${SRC_POOL_DIR}/${PLATFORM}"
+SRC_MAIN_POOLS=("${SRC_POOL_DIR}/${PLATFORM}")
+SRC_DD_POOLS=()
+SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
 BS_MAIN_NAME="pbs_${PLATFORM}"
diff --git a/src/etc/dbscripts.d/gnu+linux_add.cfg b/src/etc/dbscripts.d/gnu+linux_add.cfg
index eb014f5..2cff8f4 100644
--- a/src/etc/dbscripts.d/gnu+linux_add.cfg
+++ b/src/etc/dbscripts.d/gnu+linux_add.cfg
@@ -35,10 +35,14 @@ PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
 # Directories where packages are shared between repos
 # *relative to REPO_DIR*
-PKG_POOL="${PKG_POOL_DIR}/abslibre_${PLATFORM}"
+PKG_MAIN_POOLS=("${PKG_POOL_DIR}/abslibre_${PLATFORM}")
+PKG_DD_POOLS=("${PKG_POOL_DIR}"/abs_{packages,community}_"${PLATFORM}")
+PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_POOL="${SRC_POOL_DIR}/abslibre_${PLATFORM}"
+SRC_MAIN_POOLS=("${SRC_POOL_DIR}/abslibre_${PLATFORM}")
+SRC_DD_POOLS=("${SRC_POOL_DIR}"/abs_{packages,community}_"${PLATFORM}")
+SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
 BS_MAIN_NAME="abslibre_${PLATFORM}"
diff --git a/src/etc/dbscripts.d/gnu+linux_add_arm.cfg b/src/etc/dbscripts.d/gnu+linux_add_arm.cfg
index c00525d..3b8a9fb 100644
--- a/src/etc/dbscripts.d/gnu+linux_add_arm.cfg
+++ b/src/etc/dbscripts.d/gnu+linux_add_arm.cfg
@@ -35,10 +35,14 @@ PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
 # Directories where packages are shared between repos
 # *relative to REPO_DIR*
-PKG_POOL="${PKG_POOL_DIR}/abslibre_${PLATFORM}_arm"
+PKG_MAIN_POOLS=("${PKG_POOL_DIR}/abslibre_${PLATFORM}_arm")
+PKG_DD_POOLS=("${PKG_POOL_DIR}/abs_${PLATFORM}_arm")
+PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_POOL="${SRC_POOL_DIR}/abslibre_${PLATFORM}_arm"
+SRC_MAIN_POOLS=("${SRC_POOL_DIR}/abslibre_${PLATFORM}_arm")
+SRC_DD_POOLS=("${SRC_POOL_DIR}/abs_${PLATFORM}_arm")
+SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
 BS_MAIN_NAME="abslibre_${PLATFORM}_arm"
diff --git a/src/etc/dbscripts.d/gnu+linux_add_legacy.cfg b/src/etc/dbscripts.d/gnu+linux_add_legacy.cfg
index 6f6d93e..4398a30 100644
--- a/src/etc/dbscripts.d/gnu+linux_add_legacy.cfg
+++ b/src/etc/dbscripts.d/gnu+linux_add_legacy.cfg
@@ -35,10 +35,14 @@ PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
 # Directories where packages are shared between repos
 # *relative to REPO_DIR*
-PKG_POOL="pool/parabola"
+PKG_MAIN_POOLS=('pool/parabola')
+PKG_DD_POOLS=('pool'/{packages,community})
+PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_POOL="sources/parabola"
+SRC_MAIN_POOLS=('sources/parabola')
+SRC_DD_POOLS=('sources'/{packages,community})
+SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
 BS_MAIN_NAME="abslibre"
diff --git a/src/etc/dbscripts.d/gnu+linux_native.cfg b/src/etc/dbscripts.d/gnu+linux_native.cfg
index 697b68e..80be453 100644
--- a/src/etc/dbscripts.d/gnu+linux_native.cfg
+++ b/src/etc/dbscripts.d/gnu+linux_native.cfg
@@ -35,10 +35,14 @@ PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
 # Directories where packages are shared between repos
 # *relative to REPO_DIR*
-PKG_POOL="${PKG_POOL_DIR}/${PLATFORM}"
+PKG_MAIN_POOLS=("${PKG_POOL_DIR}/${PLATFORM}")
+PKG_DD_POOLS=()
+PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_POOL="${SRC_POOL_DIR}/${PLATFORM}"
+SRC_MAIN_POOLS=("${SRC_POOL_DIR}/${PLATFORM}")
+SRC_DD_POOLS=()
+SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
 BS_MAIN_NAME="pbs_${PLATFORM}"