From 816c302082d790645823c0a19a56d5caafd16004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?=
 <coadde@parabola.nu>
Date: Tue, 25 Aug 2015 21:16:27 -0300
Subject: fix to support DERIVATIVE_PLATFORMS and MULTILIB_ARCHES

---
 abslibre                      |  2 +-
 any-to-ours                   | 10 +++++-----
 config_abslibre_gnu+hurd      |  8 ++++----
 config_abslibre_gnu+linux     |  8 ++++----
 config_abslibre_gnu+linux_arm |  8 ++++----
 config_gnu+hurd               |  8 ++++----
 config_gnu+linux              |  8 ++++----
 config_platforms              |  4 +++-
 8 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/abslibre b/abslibre
index 05d415c..e40865a 100755
--- a/abslibre
+++ b/abslibre
@@ -10,7 +10,7 @@ set -e
 
 source "$(dirname "$(readlink -e "$0")")/config_platforms"
 
-for 'platform' in "${PLATFORMS[@]}"; do
+for 'platform' in "${DERIVATIVE_PLATFORMS[@]}"; do
 
 	source "$(dirname "$(readlink -e "$0")")/config_${platform}"
 
diff --git a/any-to-ours b/any-to-ours
index 87a40cd..7ca2878 100755
--- a/any-to-ours
+++ b/any-to-ours
@@ -17,7 +17,7 @@ trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT
 trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
 trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
 
-for 'platform' in "${PLATFORMS[@]}"; do
+for 'platform' in "${DERIVATIVE_PLATFORMS[@]}"; do
 
 	source "$(dirname "$(readlink -e "$0")")/config_${platform}"
 
@@ -69,13 +69,13 @@ for 'platform' in "${PLATFORMS[@]}"; do
 			# Avoid mixups
 			unset 'SYNCED' 'PKGS'
 		done
-		if [ -n "${MULTILIB}" ]; then
+		if [ -n "${MULTILIB_ARCHES}" ]; then
 			for '_repo_multilib' in "${MULTILIB_REPOS[@]}"; do
 				msg "Processing %s..." "${_repo}" '(multilib)'
 
 				# Find 'any' packages
 				# This is hardcoded but it could release other arches...
-				PKGS_MULTILIB=($(find "${REPO_DIR}/${_repo_multilib}/os/${MULTILIB[0]}/" \
+				PKGS_MULTILIB=($(find "${REPO_DIR}/${_repo_multilib}/os/${MULTILIB_ARCHES[0]}/" \
 				                      -iname '*-any.pkg.tar.?z' \
 				                      -printf "%f "))
 
@@ -84,7 +84,7 @@ for 'platform' in "${PLATFORMS[@]}"; do
 					continue
 				fi
 
-				for '_arch_multilib' in "${MULTILIB[@]}"; do
+				for '_arch_multilib' in "${MULTILIB_ARCHES[@]}"; do
 					msg2 "Syncing %s..." "${_arch_multilib}" '(multilib)'
 
 					# Sync 'any' only and extract the synced packages
@@ -93,7 +93,7 @@ for 'platform' in "${PLATFORMS[@]}"; do
 								--include='*-any.pkg.tar.?z' \
 								--include='*-any.pkg.tar.?z.sig' \
 								--exclude='*' \
-								"${REPO_DIR}/${_repo_multilib}/os/${MULTILIB[0]}/" \
+								"${REPO_DIR}/${_repo_multilib}/os/${MULTILIB_ARCHES[0]}/" \
 								"${REPO_DIR}/${_repo_multilib}/os/${_arch_multilib}/" 2>&1 | \
 								grep 'any\.pkg\.tar\..z$' | \
 								cut -d ' ' -f 1 ))
diff --git a/config_abslibre_gnu+hurd b/config_abslibre_gnu+hurd
index e0559e3..1523335 100644
--- a/config_abslibre_gnu+hurd
+++ b/config_abslibre_gnu+hurd
@@ -7,11 +7,11 @@ PLATFORM_NAME='GNU/Hurd'
 PLATFORM='gnu+hurd'
 DERIVATION='true'
 
-# Archictectures
-ARCHES=('i686')
+# Multilib Support Archictectures
+MULTILIB_ARCHES=()
 
-# Multilib Support
-MULTILIB=()
+# Archictectures
+ARCHES=('i686' "${MULTILIB_ARCHES[@]}")
 
 # Main Repositories from Arch GNU/Hurd
 MAIN_REPOS=('core' 'extra' 'testing' 'staging-core' 'staging-extra')
diff --git a/config_abslibre_gnu+linux b/config_abslibre_gnu+linux
index d6bb708..8d689d1 100644
--- a/config_abslibre_gnu+linux
+++ b/config_abslibre_gnu+linux
@@ -7,11 +7,11 @@ PLATFORM_NAME='GNU/Linux-libre'
 PLATFORM='gnu+linux'
 DERIVATION='true'
 
-# Archictectures
-ARCHES=('i686' 'x86_64')
+# Multilib Support Archictectures
+MULTILIB_ARCHES=('x86_64')
 
-# Multilib Support
-MULTILIB=('x86_64')
+# Archictectures
+ARCHES=('i686' "${MULTILIB_ARCHES[@]}")
 
 # Main Repositories from Arch GNU/Linux
 MAIN_REPOS=('core' 'extra' 'testing' 'community' 'community-testing')
diff --git a/config_abslibre_gnu+linux_arm b/config_abslibre_gnu+linux_arm
index c454868..b9ff080 100644
--- a/config_abslibre_gnu+linux_arm
+++ b/config_abslibre_gnu+linux_arm
@@ -7,11 +7,11 @@ PLATFORM_NAME='GNU/Linux-libre'
 PLATFORM='gnu+linux'
 DERIVATION='true'
 
-# Archictectures
-ARCHES=('arm' 'armv6h' 'armv7h' 'aarch64')
+# Multilib Support Archictectures
+MULTILIB_ARCHES=()
 
-# Multilib Support
-MULTILIB=()
+# Archictectures
+ARCHES=('arm' 'armv6h' 'armv7h' 'aarch64' "${MULTILIB_ARCHES[@]}")
 
 # Main Repositories from Arch GNU/Linux ARM
 MAIN_REPOS=('core' 'extra' 'community' 'aur' 'alarm')
diff --git a/config_gnu+hurd b/config_gnu+hurd
index d39b4ef..bfe8724 100644
--- a/config_gnu+hurd
+++ b/config_gnu+hurd
@@ -7,11 +7,11 @@ PLATFORM_NAME='GNU/Hurd'
 PLATFORM='gnu+hurd'
 DERIVATION='false'
 
-# Archictectures
-ARCHES=('i686')
+# Multilib Support Archictectures
+MULTILIB_ARCHES=()
 
-# Multilib Support
-MULTILIB=()
+# Archictectures
+ARCHES=('i686' "${MULTILIB_ARCHES[@]}")
 
 # Main Repositories
 MAIN_REPOS=('core' 'extra' 'testing')
diff --git a/config_gnu+linux b/config_gnu+linux
index 59e7365..e186ed4 100644
--- a/config_gnu+linux
+++ b/config_gnu+linux
@@ -7,11 +7,11 @@ PLATFORM_NAME='GNU/Linux-libre'
 PLATFORM='gnu+linux'
 DERIVATION='false'
 
-# Archictectures
-ARCHES=('i686' 'x86_64' 'mips64el')
+# Multilib Support Archictectures
+MULTILIB_ARCHES=() # 'x86_64'
 
-# Multilib Support
-MULTILIB=('x86_64')
+# Archictectures
+ARCHES=('mips64el' "${MULTILIB_ARCHES[@]}") # 'i686'
 
 # Main Repositories
 MAIN_REPOS=('core' 'extra' 'testing')
diff --git a/config_platforms b/config_platforms
index 4c8762f..4ef4353 100644
--- a/config_platforms
+++ b/config_platforms
@@ -1,4 +1,6 @@
 #!/hint/bash
 
 # Parabola Platforms
-PLATFORMS=('abslibre_gnu+linux' 'abslibre_gnu+linux_arm') # 'gnu+hurd' 'gnu+linux' 'abslibre_gnu+hurd'
+MAIN_PLATFORMS=('gnu+linux') # 'gnu+hurd'
+DERIVATIVE_PLATFORMS=('abslibre_gnu+linux' 'abslibre_gnu+linux_arm') # 'abslibre_gnu+hurd'
+PLATFORMS=("${MAIN_PLATFORMS[@]}" "${DERIVATIVE_PLATFORMS[@]}")
-- 
cgit v1.2.3