From b2a6a10a14459715cee3d2cd49db9244c40bf969 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, 23 Sep 2015 23:13:53 -0300
Subject: remove deprecated derivative_architectures

---
 db-sync                                       | 2 +-
 etc/dbscripts.d/gnu+linux.cfg                 | 1 -
 etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg | 5 ++---
 etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/db-sync b/db-sync
index d80e480..dd0603b 100755
--- a/db-sync
+++ b/db-sync
@@ -70,7 +70,7 @@ init() {
 
 	# Traverse all repo-arch pairs
 	for _repo in "${derivative_native_repositories[@]}"; do
-		for _arch in "${derivative_architectures[@]}"; do
+		for _arch in "${native_architectures[@]}"; do
 			msg "Processing %s-%s" "${_repo}-${_arch}"
 
 			db_file=$(get_repo_file "${_repo}" "${_arch}")${database_extension_suffixfile}
diff --git a/etc/dbscripts.d/gnu+linux.cfg b/etc/dbscripts.d/gnu+linux.cfg
index f03e0f4..491ffab 100644
--- a/etc/dbscripts.d/gnu+linux.cfg
+++ b/etc/dbscripts.d/gnu+linux.cfg
@@ -30,7 +30,6 @@ sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]}) # lega
 
 multilib_architectures=()
 native_architectures=('mips64el')
-derivative_architectures=() # deprecated
 architectures=("${native_architectures[@]}" "${multilib_architectures[@]}") # legacy
 
 # sync for derivative distribution (db-sync)
diff --git a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
index 3619444..cc2c2d7 100644
--- a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
+++ b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
@@ -29,9 +29,8 @@ derivative_sources_pools=(sources/arch_gnu+linux-arm_main)
 sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]}) # legacy
 
 multilib_architectures=()
-native_architectures=()
-derivative_architectures=('arm' 'armv6h' 'armv7h' 'aarch64') # legacy
-architectures=("${derivative_architectures[@]}" "${multilib_architectures[@]}") # legacy
+native_architectures=('arm' 'armv6h' 'armv7h' 'aarch64')
+architectures=("${native_architectures[@]}" "${multilib_architectures[@]}") # legacy
 
 # sync for derivative distribution (db-sync)
 sync_domain="ftp.halifax.rwth-aachen.de"
diff --git a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
index 3804c54..b75c979 100644
--- a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
+++ b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
@@ -31,9 +31,9 @@ derivative_sources_pools=(sources/{packages,community})
 sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]}) # legacy
 
 multilib_architectures=('x86_64')
-native_architectures=()
-derivative_architectures=('i686' "${multilib_architectures[@]}") # legacy
-architectures=("${native_architectures[@]}" "${derivative_architectures[@]}") # legacy
+native_architectures=('i686'
+                      "${multilib_architectures[@]}") # legacy (multilib only)
+architectures=("${native_architectures[@]}" "${native_architectures[@]}") # legacy
 
 # sync for derivative distribution (db-sync)
 #sync_domain="sync_domains.kernel.org"
-- 
cgit v1.2.3