add better configs

6 files changed, 57 insertions, 55 deletions

diff --git a/any-to-ours b/any-to-ours
index cbdacad..553e809 100755
--- a/any-to-ours
+++ b/any-to-ours
@@ -21,7 +21,7 @@ trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
 BASEARCH='x86_64'
 
 # Traverse all Arch repos
-for _repo in "${derivative_repositories[@]}"; do
+for _repo in "${derivative_native_repositories[@]}"; do
 	msg "Processing %s..." "${_repo}"
 
 	# Find 'any' packages
diff --git a/db-check-nonfree b/db-check-nonfree
index e6eecb4..0da62cb 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -17,7 +17,7 @@ done
 
 msg "Check nonfree in repo:"
 nonfree=($(cut -d: -f1 "${blacklist_file}" | sort -u))
-for repo in "${derivative_repositories[@]}"; do
+for repo in "${derivative_native_repositories[@]}"; do
 	for pkgarch in "${architectures[@]}"; do
 		msg2 "%s %s" "$repo" "$pkgarch"
 		if [ ! -f "${root_dir}/${repo}/os/${pkgarch}/${repo}${database_extension_suffixfile}" ]; then
diff --git a/db-sync b/db-sync
index a8ef950..d80e480 100755
--- a/db-sync
+++ b/db-sync
@@ -69,7 +69,7 @@ init() {
 	get_repos
 
 	# Traverse all repo-arch pairs
-	for _repo in "${derivative_repositories[@]}"; do
+	for _repo in "${derivative_native_repositories[@]}"; do
 		for _arch in "${derivative_architectures[@]}"; do
 			msg "Processing %s-%s" "${_repo}-${_arch}"
 
diff --git a/etc/dbscripts.d/gnu+linux.cfg b/etc/dbscripts.d/gnu+linux.cfg
index a1ea5fd..f03e0f4 100644
--- a/etc/dbscripts.d/gnu+linux.cfg
+++ b/etc/dbscripts.d/gnu+linux.cfg
@@ -1,37 +1,37 @@
 #!/hint/bash
 
 # Main repositories
-main_multilib_repositories=('multilib' 'multilib-testing')
-main_repositories=('core' 'extra' 'testing')
+main_multilib_repositories=('multilib' 'multilib-testing'
+                            'pcr-multilib')
+main_native_repositories=('nonprism' 'nonprism-testing'
+                          'nonsystemd' 'nonsystemd-testing'
+                          'core' 'extra' 'testing'
+                          'kernels' 'cross' 'java'
+                          'pcr' '~aurelien' '~brendan' '~coadde' '~drtan' '~emulatorman' '~jorginho' '~lukeshu' '~smv' '~xihh')
 # Derivative repositories
 derivative_multilib_repositories=()
-derivative_repositories=()
-# OS repositories
-os_repositories=('nonsystemd' 'nonsystemd-testing')
-# Community repositories
-community_repositories=('pcr' '~aurelien' '~brendan' '~coadde' '~drtan' '~emulatorman' '~jorginho' '~lukeshu' '~smv' '~xihh')
-# Extra repositories
-extra_repositories=('nonprism' 'nonprism-testing' 'kernels' 'cross' 'java')
+derivative_native_repositories=()
 # Remote repositories
 multilib_repositories=("${main_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}")
-repositories=("${extra_repositories[@]}" "${os_repositories[@]}" "${main_repositories[@]}" "${derivative_repositories[@]}" "${community_repositories[@]}")
-packages_pool='pool/parabola_gnu+linux'
-sources_pool='sources/parabola_gnu+linux'
+main_repositories=("${main_native_repositories[@]}" "${derivative_native_repositories[@]}")
+repositories=("${main_repositories[@]}") # legacy
+packages_pool='pool/parabola_gnu+linux' # legacy
+sources_pool='sources/parabola_gnu+linux' # legacy
 
 # Directories where packages are shared between repos
 # *relative to root_dir*
 native_packages_pools=(pool/parabola_gnu+linux)
 derivative_packages_pools=()
-packages_pools=(${native_packages_pools[@]} ${derivative_packages_pools[@]})
+packages_pools=(${native_packages_pools[@]} ${derivative_packages_pools[@]}) # legacy
 # Directories where sources are stored
-native_packages_pools=(sources/parabola_gnu+linux)
+native_sources_pools=(sources/parabola_gnu+linux)
 derivative_sources_pools=()
-sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]})
+sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]}) # legacy
 
 multilib_architectures=()
-architectures=('mips64el' "${multilib_architectures}")
-native_architectures=("${architectures}")
-derivative_architectures=()
+native_architectures=('mips64el')
+derivative_architectures=() # deprecated
+architectures=("${native_architectures[@]}" "${multilib_architectures[@]}") # legacy
 
 # sync for derivative distribution (db-sync)
 sync_domain=
diff --git a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
index bbe26e9..3619444 100644
--- a/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
+++ b/etc/dbscripts.d/gnu+linux_arm_arch_legacy.cfg
@@ -1,37 +1,37 @@
 #!/hint/bash
 
 # Main repositories
-main_multilib_repositories=('libre-multilib' 'libre-multilib-testing')
-main_repositories=('libre' 'libre-testing')
+main_multilib_repositories=('libre-multilib' 'libre-multilib-testing'
+                            'pcr-multilib')
+main_native_repositories=('nonprism' 'nonprism-testing'
+                          'nonsystemd' 'nonsystemd-testing'
+                          'libre' 'libre-testing'
+                          'kernels' 'cross' 'java'
+                          'pcr' '~aurelien' '~brendan' '~coadde' '~drtan' '~emulatorman' '~jorginho' '~lukeshu' '~smv' '~xihh')
 # Derivative repositories from Arch arm
 derivative_multilib_repositories=()
-derivative_repositories=('core' 'extra' 'community' 'aur' 'alarm')
-# OS repositories
-os_repositories=('nonsystemd' 'nonsystemd-testing')
-# Community repositories
-community_repositories=('pcr' '~aurelien' '~brendan' '~coadde' '~drtan' '~emulatorman' '~jorginho' '~lukeshu' '~smv' '~xihh')
-# Extra repositories
-extra_repositories=("${os_repositories[@]}" 'nonprism' 'nonprism-testing' 'kernels' 'cross' 'java')
+derivative_native_repositories=('core' 'extra' 'community' 'aur' 'alarm')
 # Remote repositories
 multilib_repositories=("${main_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}")
-repositories=("${extra_repositories[@]}" "${main_repositories[@]}" "${derivative_repositories[@]}" "${community_repositories[@]}")
-packages_pool='pool/parabola'
-sources_pool='sources/parabola'
+main_repositories=("${main_native_repositories[@]}" "${derivative_native_repositories[@]}")
+repositories=("${main_repositories[@]}") # legacy
+packages_pool='pool/parabola' # legacy
+sources_pool='sources/parabola' # legacy
 
 # Directories where packages are shared between repos
 # *relative to root_dir*
 native_packages_pools=(pool/parabola)
 derivative_packages_pools=(pool/arch_gnu+linux-arm_main)
-packages_pools=(${native_packages_pools[@]} ${derivative_packages_pools[@]})
+packages_pools=(${native_packages_pools[@]} ${derivative_packages_pools[@]}) # legacy
 # Directories where sources are stored
-native_packages_pools=(sources/parabola)
+native_sources_pools=(sources/parabola)
 derivative_sources_pools=(sources/arch_gnu+linux-arm_main)
-sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]})
+sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]}) # legacy
 
 multilib_architectures=()
-architectures=('arm' 'armv6h' 'armv7h' 'aarch64' "${multilib_architectures}")
 native_architectures=()
-derivative_architectures=("${architectures}")
+derivative_architectures=('arm' 'armv6h' 'armv7h' 'aarch64') # legacy
+architectures=("${derivative_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 289acb3..3804c54 100644
--- a/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
+++ b/etc/dbscripts.d/gnu+linux_x86_arch_legacy.cfg
@@ -1,37 +1,39 @@
 #!/hint/bash
 
 # Main repositories
-main_multilib_repositories=('libre-multilib' 'libre-multilib-testing')
-main_repositories=('libre' 'libre-testing' "${main_multilib_repositories[@]}")
+main_multilib_repositories=('libre-multilib' 'libre-multilib-testing'
+                            'pcr-multilib')
+main_native_repositories=('nonprism' 'nonprism-testing'
+                          'nonsystemd' 'nonsystemd-testing'
+                          'libre' 'libre-testing'
+                          'kernels' 'cross' 'java'
+                          'pcr' '~aurelien' '~brendan' '~coadde' '~drtan' '~emulatorman' '~jorginho' '~lukeshu' '~smv' '~xihh'
+                          "${main_multilib_repositories[@]}") # legacy (multilib only)
 # Derivative repositories from Arch x86
 derivative_multilib_repositories=('multilib' 'multilib-testing')
-derivative_repositories=('core' 'extra' 'testing' 'community' "${derivative_multilib_repositories[@]}")
-# OS repositories
-os_repositories=('nonsystemd' 'nonsystemd-testing')
-# Community repositories
-community_repositories=('pcr' '~aurelien' '~brendan' '~coadde' '~drtan' '~emulatorman' '~jorginho' '~lukeshu' '~smv' '~xihh')
-# Extra repositories
-extra_repositories=("${os_repositories[@]}" 'nonprism' 'nonprism-testing' 'kernels' 'cross' 'java')
+derivative_native_repositories=('core' 'extra' 'testing' 'community'
+                                "${derivative_multilib_repositories[@]}") # legacy (multilib only)
 # Remote repositories
 multilib_repositories=("${main_multilib_repositories[@]}" "${derivative_multilib_repositories[@]}")
-repositories=("${extra_repositories[@]}" "${main_repositories[@]}" "${derivative_repositories[@]}" "${community_repositories[@]}")
-packages_pool='pool/parabola'
-sources_pool='sources/parabola'
+main_repositories=("${main_native_repositories[@]}" "${derivative_native_repositories[@]}")
+repositories=("${main_repositories[@]}") # legacy
+packages_pool='pool/parabola' # legacy
+sources_pool='sources/parabola' # legacy
 
 # Directories where packages are shared between repos
 # *relative to root_dir*
 native_packages_pools=(pool/parabola)
 derivative_packages_pools=(pool/{packages,community})
-packages_pools=(${native_packages_pools[@]} ${derivative_packages_pools[@]})
+packages_pools=(${native_packages_pools[@]} ${derivative_packages_pools[@]}) # legacy
 # Directories where sources are stored
-native_packages_pools=(sources/parabola)
+native_sources_pools=(sources/parabola)
 derivative_sources_pools=(sources/{packages,community})
-sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]})
+sources_pools=(${native_sources_pools[@]} ${derivative_sources_pools[@]}) # legacy
 
 multilib_architectures=('x86_64')
-architectures=('i686' "${multilib_architectures}")
 native_architectures=()
-derivative_architectures=("${architectures}")
+derivative_architectures=('i686' "${multilib_architectures[@]}") # legacy
+architectures=("${native_architectures[@]}" "${derivative_architectures[@]}") # legacy
 
 # sync for derivative distribution (db-sync)
 #sync_domain="sync_domains.kernel.org"