From 112c79b6132530a28741efb942be2e2286769362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?=
 <coadde@parabola.nu>
Date: Wed, 26 Aug 2015 20:39:19 -0300
Subject: fix pools, paths and variables

---
 src/etc/xbs.d/gnu+linux_dd.cfg | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'src/etc/xbs.d/gnu+linux_dd.cfg')

diff --git a/src/etc/xbs.d/gnu+linux_dd.cfg b/src/etc/xbs.d/gnu+linux_dd.cfg
index 2cff8f4..3a3fdef 100644
--- a/src/etc/xbs.d/gnu+linux_dd.cfg
+++ b/src/etc/xbs.d/gnu+linux_dd.cfg
@@ -33,39 +33,37 @@ PLATFORM_REPOS=('nonsystemd' 'nonsystemd-testing')
 PKG_REPOS=("${EXTRA_REPOS[@]}" "${PLATFORM_REPOS[@]}" "${MAIN_REPOS[@]}" "${DD_REPOS[@]}" "${COMMUNITY_REPOS[@]}")
 PKG_MULTILIB_REPOS=("${MAIN_MULTILIB_REPOS[@]}" "${DD_MULTILIB_REPOS[@]}")
 
+# Base Repository
+REPO_DIR="${ROOT_DIR}/${PLATFORM}_dd"
+
 # Directories where packages are shared between repos
-# *relative to REPO_DIR*
-PKG_MAIN_POOLS=("${PKG_POOL_DIR}/abslibre_${PLATFORM}")
-PKG_DD_POOLS=("${PKG_POOL_DIR}"/abs_{packages,community}_"${PLATFORM}")
+PKG_MAIN_POOLS=("${REPO_DIR}/pools/parabola")
+PKG_DD_POOLS=("${REPO_DIR}/pools/arch_"{main,community}"_${PLATFORM}")
 PKG_POOLS=("${PKG_MAIN_POOLS[@]}" "${PKG_DD_POOLS[@]}")
 
 # Directories where sources are stored
-SRC_MAIN_POOLS=("${SRC_POOL_DIR}/abslibre_${PLATFORM}")
-SRC_DD_POOLS=("${SRC_POOL_DIR}"/abs_{packages,community}_"${PLATFORM}")
+SRC_MAIN_POOLS=("${REPO_DIR}/sources/parabola")
+SRC_DD_POOLS=("${REPO_DIR}/sources/arch_"{main,community}"_${PLATFORM}")
 SRC_POOLS=("${SRC_MAIN_POOLS[@]}" "${SRC_DD_POOLS[@]}")
 
 # Build System and Repository scripts
-BS_MAIN_NAME="abslibre_${PLATFORM}"
-BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}"
-BS_DD_NAME="abs_${PLATFORM}"
-BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}"
-BS_GIT="${GIT_BASE}/abslibre/${BS_MAIN_NAME}.git"
-# BS_GIT='http://projects.parabola.gnu/abslibre/${BS_MAIN_NAME}.git'
+BS_MAIN_NAME="abslibre"
+BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}_${PLATFORM}"
+BS_DD_NAME="abs"
+BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}_${PLATFORM}"
+BS_GIT="${GIT_DIR}/${BS_MAIN_NAME}/${BS_MAIN_NAME}_${PLATFORM}.git" # [ ${GIT_BASE} || http://projects.parabola.gnu ]
 BS_GIT_TMP="${TMP_DIR}/${BS_MAIN_NAME}"
 BLACKLIST_NAME="blacklist_${PLATFORM}.txt"
 BLACKLIST_FILE="${HOME}/blacklist/${BLACKLIST_NAME}.txt"
 BLACKLIST_TMP="${TMP_DIR}/${BLACKLIST_NAME}.txt"
 SYNC_DD_SERVER='rsync.archlinux.org'
 
-# Base Repository
-REPO_DIR="${SRV_DIR}/repo/main"
-
-CLEANUP_DESTDIR="${REPO_DIR}/old/packages_${PLATFORM}_dd"
+CLEANUP_DESTDIR="${REPO_DIR}/old/packages"
 CLEANUP_DRYRUN='false'
 # Time in days to keep moved packages
 CLEANUP_KEEP='30'
 
-SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources_${PLATFORM}_dd"
+SOURCE_CLEANUP_DESTDIR="${REPO_DIR}/old/sources"
 SOURCE_CLEANUP_DRYRUN='true'
 # Time in days to keep moved sourcepackages
 SOURCE_CLEANUP_KEEP='30'
-- 
cgit v1.2.3-2-g168b