From 0af2e33b4e5c41bf88022fa1127cad1637369963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Thu, 20 Aug 2015 13:56:54 -0300 Subject: add armv7h architecture on OURARCHES --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 287f5b0..be502cb 100644 --- a/config +++ b/config @@ -43,7 +43,7 @@ LOCK_TIMEOUT=300 [ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging" TMPDIR="/tmp" ARCHARCHES=(i686 x86_64) -OURARCHES=() +OURARCHES=(armv7h) ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]}) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" -- cgit v1.2.3-2-g168b From 3a2360afd7c530370501038fb7f4d6088b96f8c6 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 25 Sep 2015 14:43:15 -0500 Subject: Adding db-sync-arm untested --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index be502cb..6899db4 100644 --- a/config +++ b/config @@ -4,6 +4,7 @@ FTP_BASE="/srv/repo/main" # Repos from Arch ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing') +ARMREPOS=('core' 'extra' 'community') # Official Parabola repos OURREPOS=('libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing') # User repos -- cgit v1.2.3-2-g168b From 5c153b813718f34b12a2bdc3b226ce573365a8e2 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Mon, 28 Sep 2015 01:45:32 -0500 Subject: Modify pool to arm packages --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index 6899db4..8171ae1 100644 --- a/config +++ b/config @@ -14,6 +14,7 @@ PROJREPOS=('nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' # Remote repos PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}") PKGPOOL='pool/parabola' +PKGPOOLARM='pool/arch_gnu+linux_arm' SRCPOOL='sources/parabola' # Directories where packages are shared between repos -- cgit v1.2.3-2-g168b From e62bfa20ada102246056ea12405049dbc6a825d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Mon, 28 Sep 2015 04:32:46 -0300 Subject: update *POOL*, *CLEANUP_DESTDIR and WEB_DIR --- config | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'config') diff --git a/config b/config index 8171ae1..8a38b71 100644 --- a/config +++ b/config @@ -13,26 +13,26 @@ USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jor PROJREPOS=('nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java') # Remote repos PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}") -PKGPOOL='pool/parabola' +PKGPOOL='pool/parabola_gnu+linux' PKGPOOLARM='pool/arch_gnu+linux_arm' -SRCPOOL='sources/parabola' +SRCPOOL='src/parabola_gnu+linux' # Directories where packages are shared between repos # *relative to FTP_BASE* -ARCHPKGPOOLS=(pool/{packages,community}) -OURPKGPOOLS=(pool/parabola) +ARCHPKGPOOLS=(pool/arch_gnu+linux_x86{,_community}) +OURPKGPOOLS=(pool/parabola_gnu+linux) PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]}) # Directories where sources are stored -ARCHSRCPOOLS=(sources/{packages,community}) -OURPKGPOOLS=(sources/parabola) +ARCHSRCPOOLS=(src/arch_gnu+linux_x86{,_community}) +OURPKGPOOLS=(src/parabola_gnu+linux) SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]}) -CLEANUP_DESTDIR="$FTP_BASE/old/packages" +CLEANUP_DESTDIR="$FTP_BASE/old/pkg" CLEANUP_DRYRUN=false # Time in days to keep moved packages CLEANUP_KEEP=30 -SOURCE_CLEANUP_DESTDIR="$FTP_BASE/old/sources" +SOURCE_CLEANUP_DESTDIR="$FTP_BASE/old/src" SOURCE_CLEANUP_DRYRUN=true # Time in days to keep moved sourcepackages SOURCE_CLEANUP_KEEP=30 @@ -56,4 +56,4 @@ MAKEPKGCONF="~/.makepkg.conf" BLACKLIST_FILE="$HOME/blacklist/blacklist.txt" # parabolaweb root -WEB_DIR=/srv/http/parabolagnulinux.org/web +WEB_DIR=/srv/http/parabola.nu/web -- cgit v1.2.3-2-g168b From c1c48223db40547b6d62f699494922c8aee78941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Mon, 28 Sep 2015 04:56:48 -0300 Subject: ARCH*POOLS: change back to legacy directories --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config b/config index 8a38b71..d82889e 100644 --- a/config +++ b/config @@ -19,11 +19,11 @@ SRCPOOL='src/parabola_gnu+linux' # Directories where packages are shared between repos # *relative to FTP_BASE* -ARCHPKGPOOLS=(pool/arch_gnu+linux_x86{,_community}) +ARCHPKGPOOLS=(pool/{packages,community}) OURPKGPOOLS=(pool/parabola_gnu+linux) PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]}) # Directories where sources are stored -ARCHSRCPOOLS=(src/arch_gnu+linux_x86{,_community}) +ARCHSRCPOOLS=(sources/{packages,community}) OURPKGPOOLS=(src/parabola_gnu+linux) SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]}) -- cgit v1.2.3-2-g168b From 4822b418896d2c5d91b50f00476f39f0441f5b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 14 Oct 2015 12:42:11 -0300 Subject: add ARMPKGPOOLS and ARMSRCPOOLS to config --- config | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config b/config index d82889e..f41e6f6 100644 --- a/config +++ b/config @@ -20,12 +20,14 @@ SRCPOOL='src/parabola_gnu+linux' # Directories where packages are shared between repos # *relative to FTP_BASE* ARCHPKGPOOLS=(pool/{packages,community}) +ARMPKGPOOLS=(pool/arch_gnu+linux_arm) OURPKGPOOLS=(pool/parabola_gnu+linux) -PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]}) +PKGPOOLS=(${OURPKGPOOLS[@]} ${ARMPKGPOOLS[@]} ${ARCHPKGPOOLS[@]}) # Directories where sources are stored ARCHSRCPOOLS=(sources/{packages,community}) +ARMSRCPOOLS=(src/arch_gnu+linux_arm) OURPKGPOOLS=(src/parabola_gnu+linux) -SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]}) +SRCPOOLS=(${OURSRCPOOLS[@]} ${ARMSRCPOOLS[@]} ${ARCHSRCPOOLS[@]}) CLEANUP_DESTDIR="$FTP_BASE/old/pkg" CLEANUP_DRYRUN=false -- cgit v1.2.3-2-g168b From f0e4cdbb1ae4d36b5555baeaf420d83258b3003d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 17 Apr 2016 13:45:30 -0400 Subject: Clean up the config files. --- config | 48 ++++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) (limited to 'config') diff --git a/config b/config index f41e6f6..38cdae5 100644 --- a/config +++ b/config @@ -1,33 +1,30 @@ #!/hint/bash +# Please try to refrain from adding new variables to this file. +# Instead, create separate ${toolname}.conf files. Only add a +# variable here if multiple tools start needing the option. FTP_BASE="/srv/repo/main" -# Repos from Arch -ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing') -ARMREPOS=('core' 'extra' 'community') -# 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[@]}") +PKGREPOS=( + 'core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing' + 'libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing' + '~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan' + 'nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java') PKGPOOL='pool/parabola_gnu+linux' -PKGPOOLARM='pool/arch_gnu+linux_arm' SRCPOOL='src/parabola_gnu+linux' # Directories where packages are shared between repos # *relative to FTP_BASE* -ARCHPKGPOOLS=(pool/{packages,community}) -ARMPKGPOOLS=(pool/arch_gnu+linux_arm) -OURPKGPOOLS=(pool/parabola_gnu+linux) -PKGPOOLS=(${OURPKGPOOLS[@]} ${ARMPKGPOOLS[@]} ${ARCHPKGPOOLS[@]}) +PKGPOOLS=(pool/parabola_gnu+linux # Parabola GNU/Linux-libre + pool/arch_gnu+linux_arm # Arch Linux ARM + pool/{packages,community} # Arch Linux + ) # Directories where sources are stored -ARCHSRCPOOLS=(sources/{packages,community}) -ARMSRCPOOLS=(src/arch_gnu+linux_arm) -OURPKGPOOLS=(src/parabola_gnu+linux) -SRCPOOLS=(${OURSRCPOOLS[@]} ${ARMSRCPOOLS[@]} ${ARCHSRCPOOLS[@]}) +OURPKGPOOLS=( +SRCPOOLS=(src/parabola_gnu+linux # Parabola GNU/Linux-libre + src/arch_gnu+linux_arm # Arch Linux ARM + sources/{packages,community} # Arch Linux + ) CLEANUP_DESTDIR="$FTP_BASE/old/pkg" CLEANUP_DRYRUN=false @@ -42,20 +39,11 @@ SOURCE_CLEANUP_KEEP=30 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[@]}) +ARCHES=(i686 x86_64 armv7h) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" - -MAKEPKGCONF="~/.makepkg.conf" -BLACKLIST_FILE="$HOME/blacklist/blacklist.txt" - -# parabolaweb root -WEB_DIR=/srv/http/parabola.nu/web -- cgit v1.2.3-2-g168b From b56bcf5030f7eb8af196edb0aabb6bf75e5283ec Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 17 Apr 2016 13:55:57 -0400 Subject: oops --- config | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config b/config index 38cdae5..ec56c65 100644 --- a/config +++ b/config @@ -20,7 +20,6 @@ PKGPOOLS=(pool/parabola_gnu+linux # Parabola GNU/Linux-libre pool/{packages,community} # Arch Linux ) # Directories where sources are stored -OURPKGPOOLS=( SRCPOOLS=(src/parabola_gnu+linux # Parabola GNU/Linux-libre src/arch_gnu+linux_arm # Arch Linux ARM sources/{packages,community} # Arch Linux -- cgit v1.2.3-2-g168b From f3add3749351c9070e0fbe43f37b5a94ac1e7123 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 17 Apr 2016 13:58:19 -0400 Subject: more config file cleanup --- config | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'config') diff --git a/config b/config index ec56c65..041c9eb 100644 --- a/config +++ b/config @@ -13,18 +13,6 @@ PKGREPOS=( PKGPOOL='pool/parabola_gnu+linux' SRCPOOL='src/parabola_gnu+linux' -# Directories where packages are shared between repos -# *relative to FTP_BASE* -PKGPOOLS=(pool/parabola_gnu+linux # Parabola GNU/Linux-libre - pool/arch_gnu+linux_arm # Arch Linux ARM - pool/{packages,community} # Arch Linux - ) -# Directories where sources are stored -SRCPOOLS=(src/parabola_gnu+linux # Parabola GNU/Linux-libre - src/arch_gnu+linux_arm # Arch Linux ARM - sources/{packages,community} # Arch Linux - ) - CLEANUP_DESTDIR="$FTP_BASE/old/pkg" CLEANUP_DRYRUN=false # Time in days to keep moved packages -- cgit v1.2.3-2-g168b