add initial multidistro support

5 files changed, 89 insertions, 38 deletions

diff --git a/config b/config
index be502cb..d55796d 100644
--- a/config
+++ b/config
@@ -2,28 +2,13 @@
 
 FTP_BASE="/srv/repo/main"
 
-# Repos from Arch
-ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing')
-# Official Parabola repos
-OURREPOS=('libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing')
-# User repos
-USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan')
-# Community project repos
-PROJREPOS=('nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java')
-# Remote repos
-PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}")
-PKGPOOL='pool/parabola'
-SRCPOOL='sources/parabola'
-
-# Directories where packages are shared between repos
-# *relative to FTP_BASE*
-ARCHPKGPOOLS=(pool/{packages,community})
-OURPKGPOOLS=(pool/parabola)
-PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]})
-# Directories where sources are stored
-ARCHSRCPOOLS=(sources/{packages,community})
-OURPKGPOOLS=(sources/parabola)
-SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]})
+NONFREE_DISTROS=('gnu+linux_x86_arch_legacy' 'gnu+linux_arm_arch_legacy')
+DISTROS=("${NONFREE_DISTROS}")
+
+# add compability support
+source "$(dirname "$(readlink -e "$0")")/config.d/gnu+linux_x86_arch_legacy
+
+[ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging"
 
 CLEANUP_DESTDIR="$FTP_BASE/old/packages"
 CLEANUP_DRYRUN=false
@@ -40,11 +25,7 @@ REQUIRE_SIGNATURE=true
 LOCK_DELAY=10
 LOCK_TIMEOUT=300
 
-[ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging"
 TMPDIR="/tmp"
-ARCHARCHES=(i686 x86_64)
-OURARCHES=(armv7h)
-ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]})
 DBEXT=".db.tar.gz"
 FILESEXT=".files.tar.gz"
 PKGEXT=".pkg.tar.?z"
diff --git a/config.d/gnu+linux_arm_arch_legacy b/config.d/gnu+linux_arm_arch_legacy
new file mode 100644
index 0000000..1a470db
--- /dev/null
+++ b/config.d/gnu+linux_arm_arch_legacy
@@ -0,0 +1,41 @@
+#!/hint/bash
+
+# Repos from Arch arm
+ARCHREPOS=('core' 'extra' 'community' 'aur' 'alarm')
+# Official Parabola repos
+OURREPOS=('libre' 'libre-testing')
+# User repos
+USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan')
+# Community project repos
+PROJREPOS=('nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java')
+# Remote repos
+PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}")
+PKGPOOL='pool/parabola'
+SRCPOOL='sources/parabola'
+
+# Directories where packages are shared between repos
+# *relative to FTP_BASE*
+ARCHPKGPOOLS=(pool/arch_gnu+linux-arm_main)
+OURPKGPOOLS=(pool/parabola)
+PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]})
+# Directories where sources are stored
+ARCHSRCPOOLS=(sources/arch_gnu+linux-arm_main)
+OURPKGPOOLS=(sources/parabola)
+SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]})
+
+ARCHARCHES=('arm' 'armv6h' 'armv7h' 'aarch64')
+OURARCHES=()
+ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]})
+
+# db-sync
+#mirror="mirrors.kernel.org"
+mirror="mirrors.niyawe.de"
+
+## mirrors without sources folder
+#mirror="mirror.nl.leaseweb.net"
+#mirror="mirror.one.com"
+#mirror="mirror.us.leaseweb.net"
+#mirror="mirror.bytemark.co.uk"
+#mirror="mirror.de.leaseweb.net"
+
+mirrorpath="archlinux"
diff --git a/config.d/gnu+linux_x86_arch_legacy b/config.d/gnu+linux_x86_arch_legacy
new file mode 100644
index 0000000..186eca9
--- /dev/null
+++ b/config.d/gnu+linux_x86_arch_legacy
@@ -0,0 +1,41 @@
+#!/hint/bash
+
+# Repos from Arch x86
+ARCHREPOS=('core' 'extra' 'testing' 'community' 'multilib' 'multilib-testing')
+# Official Parabola repos
+OURREPOS=('libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing')
+# User repos
+USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan')
+# Community project repos
+PROJREPOS=('nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java')
+# Remote repos
+PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}")
+PKGPOOL='pool/parabola'
+SRCPOOL='sources/parabola'
+
+# Directories where packages are shared between repos
+# *relative to FTP_BASE*
+ARCHPKGPOOLS=(pool/{packages,community})
+OURPKGPOOLS=(pool/parabola)
+PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]})
+# Directories where sources are stored
+ARCHSRCPOOLS=(sources/{packages,community})
+OURPKGPOOLS=(sources/parabola)
+SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]})
+
+ARCHARCHES=('i686' 'x86_64')
+OURARCHES=()
+ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]})
+
+# db-sync
+#mirror="mirrors.kernel.org"
+mirror="mirrors.niyawe.de"
+
+## mirrors without sources folder
+#mirror="mirror.nl.leaseweb.net"
+#mirror="mirror.one.com"
+#mirror="mirror.us.leaseweb.net"
+#mirror="mirror.bytemark.co.uk"
+#mirror="mirror.de.leaseweb.net"
+
+mirrorpath="archlinux"
diff --git a/db-sync b/db-sync
index 2194fe6..5264296 100755
--- a/db-sync
+++ b/db-sync
@@ -189,7 +189,6 @@ trap_exit() {
 }
 
 source "$(dirname "$(readlink -e "$0")")/config"
-source "$(dirname "$(readlink -e "$0")")/db-sync.conf"
 source "$(dirname "$(readlink -e "$0")")/db-libremessages"
 
 # Check variables presence
diff --git a/db-sync.conf b/db-sync.conf
deleted file mode 100644
index f7748c3..0000000
--- a/db-sync.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#mirror="mirrors.kernel.org"
-mirror="mirrors.niyawe.de"
-
-## mirrors without sources folder
-#mirror="mirror.nl.leaseweb.net"
-#mirror="mirror.one.com"
-#mirror="mirror.us.leaseweb.net"
-#mirror="mirror.bytemark.co.uk"
-#mirror="mirror.de.leaseweb.net"
-
-mirrorpath="archlinux"