From 11db46275d14c9a9c2e59019fed3de4b8803f9f4 Mon Sep 17 00:00:00 2001 From: Parabola Date: Fri, 18 Feb 2011 15:42:59 -0800 Subject: Parabola specific changes --- config | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'config') diff --git a/config b/config index 53191e0..720d110 100644 --- a/config +++ b/config @@ -1,25 +1,25 @@ -FTP_BASE="/srv/ftp" -SVNREPO='' -PKGREPOS=() -PKGPOOL='' -SRCPOOL='' +FTP_BASE="/home/parabolavnx/parabolagnulinux.org/free" +SVNREPO="/home/parabolavnx/parabolagnulinux.org/abslibre" +PKGREPOS=('core' 'extra' 'community' 'libre' 'libre-testing' 'social' 'sugar' 'testing') +PKGPOOL='pool/packages' +SRCPOOL='sources/packages' -CLEANUP_DESTDIR="/srv/package-cleanup" +CLEANUP_DESTDIR="$FTP_BASE/old/packages" CLEANUP_DRYRUN=false # Time in days to keep moved packages CLEANUP_KEEP=30 -SOURCE_CLEANUP_DESTDIR="/srv/source-cleanup" +SOURCE_CLEANUP_DESTDIR="$FTP_BASE/old/sources" SOURCE_CLEANUP_DRYRUN=false # Time in days to keep moved sourcepackages -SOURCE_CLEANUP_KEEP=14 +SOURCE_CLEANUP_KEEP=30 LOCK_DELAY=10 LOCK_TIMEOUT=300 -STAGING="$HOME/staging" -TMPDIR="/srv/tmp" -ARCHES=(i686 x86_64) +STAGING="$FTP_BASE/staging" +TMPDIR="$HOME/tmp" +ARCHES=(i686 x86_64 mipsel) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" PKGEXT=".pkg.tar.*" @@ -29,4 +29,4 @@ SRCEXT=".src.tar.gz" ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2' 'LGPL2.1') # Override default config with config.local -[ -f "$(dirname ${BASH_SOURCE[0]})/config.local" ] && . "$(dirname ${BASH_SOURCE[0]})/config.local" +#[ -f "$(dirname ${BASH_SOURCE[0]})/config.local" ] && . "$(dirname ${BASH_SOURCE[0]})/config.local" -- cgit v1.2.3-2-g168b From c6516eca2803b780a01a6b2bf3e081c8bd570301 Mon Sep 17 00:00:00 2001 From: Parabola Date: Sun, 20 Feb 2011 17:10:40 -0800 Subject: sourceballs --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index 720d110..12bdaaa 100644 --- a/config +++ b/config @@ -1,4 +1,5 @@ FTP_BASE="/home/parabolavnx/parabolagnulinux.org/free" +ARCH_BASE="/home/parabolavnx/parabolagnulinux.org/repo" SVNREPO="/home/parabolavnx/parabolagnulinux.org/abslibre" PKGREPOS=('core' 'extra' 'community' 'libre' 'libre-testing' 'social' 'sugar' 'testing') PKGPOOL='pool/packages' -- cgit v1.2.3-2-g168b From 229a9c504cbd733c93cf91399dc54bedf5160cc5 Mon Sep 17 00:00:00 2001 From: Parabola Date: Sun, 6 Mar 2011 15:22:21 -0800 Subject: Fixes --- config | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config b/config index 12bdaaa..217b627 100644 --- a/config +++ b/config @@ -20,14 +20,10 @@ LOCK_TIMEOUT=300 STAGING="$FTP_BASE/staging" TMPDIR="$HOME/tmp" -ARCHES=(i686 x86_64 mipsel) +ARCHES=(i686 x86_64 mips64el) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" PKGEXT=".pkg.tar.*" SRCEXT=".src.tar.gz" -# Allowed licenses: get sourceballs only for licenses in this array -ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2' 'LGPL2.1') - -# Override default config with config.local -#[ -f "$(dirname ${BASH_SOURCE[0]})/config.local" ] && . "$(dirname ${BASH_SOURCE[0]})/config.local" +MAKEPKGCONF="$HOME/etc/makepkg.conf" -- cgit v1.2.3-2-g168b From 374c8e2a5183cdbaefe9f54184603ad8d09e30c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Sat, 16 Apr 2011 03:15:01 -0500 Subject: * bash-repo for testing * merged dbscripts with repm --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 217b627..d9bad13 100644 --- a/config +++ b/config @@ -1,7 +1,7 @@ FTP_BASE="/home/parabolavnx/parabolagnulinux.org/free" ARCH_BASE="/home/parabolavnx/parabolagnulinux.org/repo" SVNREPO="/home/parabolavnx/parabolagnulinux.org/abslibre" -PKGREPOS=('core' 'extra' 'community' 'libre' 'libre-testing' 'social' 'sugar' 'testing') +PKGREPOS=('core' 'extra' 'community' 'libre' 'libre-testing' 'social' 'sugar' 'testing' 'multilib') PKGPOOL='pool/packages' SRCPOOL='sources/packages' -- cgit v1.2.3-2-g168b From b8a883720066e4f91b162ea91719f9a0f15958ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Tue, 19 Apr 2011 21:38:28 -0500 Subject: Another fix --- config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 300893a..7180f9e 100644 --- a/config +++ b/config @@ -1,7 +1,8 @@ FTP_BASE="/home/parabolavnx/parabolagnulinux.org/free" ARCH_BASE="/home/parabolavnx/parabolagnulinux.org/repo" SVNREPO="/home/parabolavnx/parabolagnulinux.org/abslibre" -PKGREPOS=('core' 'extra' 'community' 'libre' 'libre-testing' 'social' 'sugar' 'testing' 'multilib') +ARCHREPOS=('core' 'extra' 'community' 'testing' 'multilib') +PKGREPOS=(${ARCHREPOS[@]} 'libre' 'libre-testing' 'social' 'sugar') PKGPOOL='pool/packages' SRCPOOL='sources/packages' -- cgit v1.2.3-2-g168b From bba8c33a039ec4d1e1d13f88304ba0aeb754b03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Fri, 22 Apr 2011 00:30:43 -0700 Subject: Midnight fix --- config | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config b/config index 7180f9e..6936a9b 100644 --- a/config +++ b/config @@ -1,6 +1,8 @@ -FTP_BASE="/home/parabolavnx/parabolagnulinux.org/free" +#!/bin/bash +FTP_BASE="/home/parabolavnx/parabolagnulinux.org/repo" ARCH_BASE="/home/parabolavnx/parabolagnulinux.org/repo" SVNREPO="/home/parabolavnx/parabolagnulinux.org/abslibre" + ARCHREPOS=('core' 'extra' 'community' 'testing' 'multilib') PKGREPOS=(${ARCHREPOS[@]} 'libre' 'libre-testing' 'social' 'sugar') PKGPOOL='pool/packages' @@ -23,7 +25,8 @@ LOCK_TIMEOUT=300 STAGING="$FTP_BASE/staging" TMPDIR="$HOME/tmp" -ARCHES=(i686 x86_64 mips64el) +ARCHARCHES=(i686 x86_64) +ARCHES=(${ARCHARCHES[@]} mips64el) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" PKGEXT=".pkg.tar.?z" -- cgit v1.2.3-2-g168b From 74093d95cba935badaf7572e1dcd38ffd76bdc53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Sun, 8 May 2011 18:45:02 -0500 Subject: * Remove non free packages on db-update --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index 6936a9b..effdde4 100644 --- a/config +++ b/config @@ -33,3 +33,4 @@ PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" MAKEPKGCONF="$HOME/etc/makepkg.conf" +BLACKLIST_FILE="$HOME/parabolagnulinux.org/docs/blacklist.txt" \ No newline at end of file -- cgit v1.2.3-2-g168b From cd45a4e2e000312d86b072eef9349b9494cd6d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Fri, 5 Aug 2011 19:49:23 -0300 Subject: Repo organization --- config | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config b/config index effdde4..8fd37bf 100644 --- a/config +++ b/config @@ -3,8 +3,15 @@ FTP_BASE="/home/parabolavnx/parabolagnulinux.org/repo" ARCH_BASE="/home/parabolavnx/parabolagnulinux.org/repo" SVNREPO="/home/parabolavnx/parabolagnulinux.org/abslibre" +# Repos from Arch ARCHREPOS=('core' 'extra' 'community' 'testing' 'multilib') -PKGREPOS=(${ARCHREPOS[@]} 'libre' 'libre-testing' 'social' 'sugar') +# Official Parabola repos +OURREPOS=('libre' 'libre-testing') +# User repos +USERREPOS=('~fauno' '~smv' '~xihh') +# Community project repos +PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'social') +PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) PKGPOOL='pool/packages' SRCPOOL='sources/packages' @@ -33,4 +40,4 @@ PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" MAKEPKGCONF="$HOME/etc/makepkg.conf" -BLACKLIST_FILE="$HOME/parabolagnulinux.org/docs/blacklist.txt" \ No newline at end of file +BLACKLIST_FILE="$HOME/parabolagnulinux.org/docs/blacklist.txt" -- cgit v1.2.3-2-g168b From 4d760a1e9b92168a07aa8c7a3a9de481ebcac2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?= Date: Fri, 9 Sep 2011 12:33:51 -0700 Subject: Added [~mtjm], changed blacklist to git --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config b/config index 8fd37bf..0e8dc2e 100644 --- a/config +++ b/config @@ -8,7 +8,7 @@ ARCHREPOS=('core' 'extra' 'community' 'testing' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~fauno' '~smv' '~xihh') +USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm') # Community project repos PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'social') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) @@ -40,4 +40,4 @@ PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" MAKEPKGCONF="$HOME/etc/makepkg.conf" -BLACKLIST_FILE="$HOME/parabolagnulinux.org/docs/blacklist.txt" +BLACKLIST_FILE="$HOME/blacklist/blacklist.txt" -- cgit v1.2.3-2-g168b From 9612e5d915faf63ea6d5a5ca5c3ff74cca8eb923 Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Fri, 28 Oct 2011 12:15:09 -0300 Subject: Reflect server changes on config --- config | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config b/config index effdde4..4f4d81d 100644 --- a/config +++ b/config @@ -1,7 +1,7 @@ #!/bin/bash -FTP_BASE="/home/parabolavnx/parabolagnulinux.org/repo" -ARCH_BASE="/home/parabolavnx/parabolagnulinux.org/repo" -SVNREPO="/home/parabolavnx/parabolagnulinux.org/abslibre" +FTP_BASE="/home/repo/public" +ARCH_BASE="/home/repo/public" +SVNREPO="/home/repo/abslibre" ARCHREPOS=('core' 'extra' 'community' 'testing' 'multilib') PKGREPOS=(${ARCHREPOS[@]} 'libre' 'libre-testing' 'social' 'sugar') @@ -24,7 +24,7 @@ LOCK_DELAY=10 LOCK_TIMEOUT=300 STAGING="$FTP_BASE/staging" -TMPDIR="$HOME/tmp" +TMPDIR="/tmp" ARCHARCHES=(i686 x86_64) ARCHES=(${ARCHARCHES[@]} mips64el) DBEXT=".db.tar.gz" @@ -32,5 +32,5 @@ FILESEXT=".files.tar.gz" PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" -MAKEPKGCONF="$HOME/etc/makepkg.conf" -BLACKLIST_FILE="$HOME/parabolagnulinux.org/docs/blacklist.txt" \ No newline at end of file +MAKEPKGCONF="/etc/makepkg.conf" +BLACKLIST_FILE="$HOME/blacklist/blacklist.txt" -- cgit v1.2.3-2-g168b From 92a8525eb5ed349f95c080c61c821399e3917842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sun, 30 Oct 2011 20:49:41 -0300 Subject: Local test config --- config | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config b/config index c8b3f0b..9a20f4a 100644 --- a/config +++ b/config @@ -1,10 +1,10 @@ #!/bin/bash -FTP_BASE="/home/repo/public" -ARCH_BASE="/home/repo/public" -SVNREPO="/home/repo/abslibre" +FTP_BASE="/tmp/repo" +ARCH_BASE="/tmp/repo" +SVNREPO="/var/abs" # Repos from Arch -ARCHREPOS=('core' 'extra' 'community' 'testing' 'multilib') +ARCHREPOS=('core') #'extra' 'community' 'testing' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos @@ -32,7 +32,7 @@ LOCK_TIMEOUT=300 STAGING="$FTP_BASE/staging" TMPDIR="/tmp" -ARCHARCHES=(i686 x86_64) +ARCHARCHES=(i686) # x86_64) ARCHES=(${ARCHARCHES[@]} mips64el) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" @@ -40,4 +40,4 @@ PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" MAKEPKGCONF="/etc/makepkg.conf" -BLACKLIST_FILE="$HOME/blacklist/blacklist.txt" +BLACKLIST_FILE="$FTP_BASE/blacklist.txt" -- cgit v1.2.3-2-g168b From 801ea2c927ace5ee892209dd8e3c1044e1b3842e Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 14 Nov 2011 05:14:04 -0800 Subject: Fixes while testing it --- config | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'config') diff --git a/config b/config index a0849a9..23b7bbb 100644 --- a/config +++ b/config @@ -1,10 +1,10 @@ #!/bin/bash -FTP_BASE="/tmp/repo" -ARCH_BASE="/tmp/repo" +FTP_BASE="/srv/http/repo/public/temprepo" +ARCH_BASE="/srv/http/repo/public/temprepo" SVNREPO="/var/abs" # Repos from Arch -ARCHREPOS=('core') #'extra' 'community' 'testing' 'multilib') +ARCHREPOS=('core' 'testing') #'extra' 'community' 'testing' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos @@ -32,7 +32,7 @@ LOCK_TIMEOUT=300 STAGING="$FTP_BASE/staging" TMPDIR="/tmp" -ARCHARCHES=(i686) # x86_64) +ARCHARCHES=(i686 x86_64) ARCHES=(${ARCHARCHES[@]} mips64el) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" @@ -40,4 +40,4 @@ PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" MAKEPKGCONF="/etc/makepkg.conf" -BLACKLIST_FILE="$FTP_BASE/blacklist.txt" +BLACKLIST_FILE="$HOME/blacklist/blacklist.txt" -- cgit v1.2.3-2-g168b From 93255c0baf9beb4f86815a8ba45c7cfa07ccac22 Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 14 Nov 2011 05:18:51 -0800 Subject: Local changes --- config | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'config') diff --git a/config b/config index 0e8dc2e..0e26efb 100644 --- a/config +++ b/config @@ -1,27 +1,27 @@ #!/bin/bash -FTP_BASE="/home/parabolavnx/parabolagnulinux.org/repo" -ARCH_BASE="/home/parabolavnx/parabolagnulinux.org/repo" -SVNREPO="/home/parabolavnx/parabolagnulinux.org/abslibre" +FTP_BASE="/srv/http/repo/public" +ARCH_BASE="/srv/http/repo/public" +SVNREPO="/srv/http/repo/abslibre" # Repos from Arch ARCHREPOS=('core' 'extra' 'community' 'testing' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm') +USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan') # Community project repos -PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'social') +PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'sugar') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) PKGPOOL='pool/packages' SRCPOOL='sources/packages' CLEANUP_DESTDIR="$FTP_BASE/old/packages" -CLEANUP_DRYRUN=false +CLEANUP_DRYRUN=true # Time in days to keep moved packages CLEANUP_KEEP=30 SOURCE_CLEANUP_DESTDIR="$FTP_BASE/old/sources" -SOURCE_CLEANUP_DRYRUN=false +SOURCE_CLEANUP_DRYRUN=true # Time in days to keep moved sourcepackages SOURCE_CLEANUP_KEEP=30 @@ -31,13 +31,14 @@ LOCK_DELAY=10 LOCK_TIMEOUT=300 STAGING="$FTP_BASE/staging" -TMPDIR="$HOME/tmp" +TMPDIR="/tmp" ARCHARCHES=(i686 x86_64) -ARCHES=(${ARCHARCHES[@]} mips64el) +OURARCHES=(mips64el) +ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]}) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" -MAKEPKGCONF="$HOME/etc/makepkg.conf" +MAKEPKGCONF="~/.makepkg.conf" BLACKLIST_FILE="$HOME/blacklist/blacklist.txt" -- cgit v1.2.3-2-g168b From 9ef417865ef8b102875d42d4cb8ebe277de4ec01 Mon Sep 17 00:00:00 2001 From: Parabola Date: Wed, 23 Nov 2011 07:54:13 -0800 Subject: Making it work --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 7122aef..e0d474c 100644 --- a/config +++ b/config @@ -4,7 +4,7 @@ ARCH_BASE="/srv/http/repo/public" SVNREPO="/var/abs" # Repos from Arch -ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') +ARCHREPOS=('core' 'testing' 'extra' 'community') # 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -- cgit v1.2.3-2-g168b From 51e733fdb525e1c1e9392aa4c3a0b882a6433ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Wed, 23 Nov 2011 13:19:35 -0300 Subject: Cleanup script + New config vars --- config | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config') diff --git a/config b/config index e0d474c..47c9c66 100644 --- a/config +++ b/config @@ -15,6 +15,12 @@ PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) PKGPOOL='pool/packages' SRCPOOL='sources/packages' +# Directories where packages are shared between repos +# *relative to FTP_BASE* +PKGPOOLS=('pool/packages' 'pool/community' 'extra/os/any' 'community/os/any') +# Directories where sources are stored +SRCPOOLS=('sources/packages' 'sources/community') + CLEANUP_DESTDIR="$FTP_BASE/old/packages" CLEANUP_DRYRUN=true # Time in days to keep moved packages -- cgit v1.2.3-2-g168b From 323b2e1d83af45b7e4fe90c4822d3366cc48e588 Mon Sep 17 00:00:00 2001 From: Parabola Date: Wed, 7 Dec 2011 06:04:08 -0800 Subject: Added [multilib] --- config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config b/config index 47c9c66..92b7bfa 100644 --- a/config +++ b/config @@ -4,11 +4,11 @@ ARCH_BASE="/srv/http/repo/public" SVNREPO="/var/abs" # Repos from Arch -ARCHREPOS=('core' 'testing' 'extra' 'community') # 'multilib') +ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan') +USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu') # Community project repos PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'sugar') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) @@ -22,7 +22,7 @@ PKGPOOLS=('pool/packages' 'pool/community' 'extra/os/any' 'community/os/any') SRCPOOLS=('sources/packages' 'sources/community') CLEANUP_DESTDIR="$FTP_BASE/old/packages" -CLEANUP_DRYRUN=true +CLEANUP_DRYRUN=false # Time in days to keep moved packages CLEANUP_KEEP=30 -- cgit v1.2.3-2-g168b From 3b719e6ffcc9a4e30ba9ecb00de7be0e1e11bc46 Mon Sep 17 00:00:00 2001 From: Parabola Date: Sun, 8 Jan 2012 18:26:20 +0000 Subject: [gnu] repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 92b7bfa..949d171 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu') # Community project repos -PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'sugar') +PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) PKGPOOL='pool/packages' SRCPOOL='sources/packages' -- cgit v1.2.3-2-g168b From 47b0e5207b933e5563324c92c8a1841322cde6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Mon, 9 Jan 2012 15:34:13 -0300 Subject: Use config ARCHES and REPOS to get-repos --- config | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config b/config index 949d171..1304e01 100644 --- a/config +++ b/config @@ -11,6 +11,8 @@ OURREPOS=('libre' 'libre-testing') USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu') # Community project repos PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu') +# Remote repos +RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) PKGPOOL='pool/packages' SRCPOOL='sources/packages' @@ -48,3 +50,6 @@ SRCEXT=".src.tar.gz" MAKEPKGCONF="~/.makepkg.conf" BLACKLIST_FILE="$HOME/blacklist/blacklist.txt" + +# parabolaweb root +WEB_DIR=/srv/http/web -- cgit v1.2.3-2-g168b From 88773a8de82e8064fcf1e9fb6b73d64c717b7cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Mon, 23 Jan 2012 12:06:56 -0300 Subject: Cross-toolchains repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 1304e01..4de9d00 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu') # Community project repos -PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu') +PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3-2-g168b From 75ad12313337cfb57fed8633b667e1fa8e3d48db Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 27 Feb 2012 19:34:41 +0000 Subject: Added user repos --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 4de9d00..af31f37 100644 --- a/config +++ b/config @@ -8,7 +8,7 @@ ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu') +USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien') # Community project repos PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross') # Remote repos -- cgit v1.2.3-2-g168b From 46224d22f8f1f59144b1feab2abd7aca18901e9a Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 27 Feb 2012 19:46:45 +0000 Subject: [extra] doesn't have the any dir anymore --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index af31f37..b1a7308 100644 --- a/config +++ b/config @@ -19,7 +19,7 @@ SRCPOOL='sources/packages' # Directories where packages are shared between repos # *relative to FTP_BASE* -PKGPOOLS=('pool/packages' 'pool/community' 'extra/os/any' 'community/os/any') +PKGPOOLS=('pool/packages' 'pool/community' 'community/os/any') # Directories where sources are stored SRCPOOLS=('sources/packages' 'sources/community') -- cgit v1.2.3-2-g168b From 623ccccff54b5497708debd0a6271d8143d03257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Thu, 22 Mar 2012 12:02:45 -0300 Subject: community/os/any doesn't exist anymore --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index b1a7308..cb552e4 100644 --- a/config +++ b/config @@ -19,7 +19,7 @@ SRCPOOL='sources/packages' # Directories where packages are shared between repos # *relative to FTP_BASE* -PKGPOOLS=('pool/packages' 'pool/community' 'community/os/any') +PKGPOOLS=('pool/packages' 'pool/community') # Directories where sources are stored SRCPOOLS=('sources/packages' 'sources/community') -- cgit v1.2.3-2-g168b From 65a4d2f541a4292efe422f829d5eac41c548efd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 18 Apr 2012 18:42:20 -0300 Subject: adding artistic repo to community project --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index cb552e4..b3a4658 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien') # Community project repos -PROJREPOS=('social' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross') +PROJREPOS=('social' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3-2-g168b From 6942fc113939c487a4292589225d0cc60a6a4222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 20 Apr 2012 02:07:01 -0300 Subject: adding jorginho repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index b3a4658..e6f52e1 100644 --- a/config +++ b/config @@ -8,7 +8,7 @@ ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien') +USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho') # Community project repos PROJREPOS=('social' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross') # Remote repos -- cgit v1.2.3-2-g168b From 6aa0446283a8ee995fae1e5da196a8027032d68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Thu, 26 Apr 2012 15:41:01 -0300 Subject: [gis] repo for geospatial software --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index e6f52e1..4909b6d 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho') # Community project repos -PROJREPOS=('social' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross') +PROJREPOS=('social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3-2-g168b From bd8ba6724d09ca83a533f5641fc84ad3ac492e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Silva?= Date: Mon, 21 May 2012 16:11:56 -0300 Subject: adding coadde repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 4909b6d..c582bea 100644 --- a/config +++ b/config @@ -8,7 +8,7 @@ ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho') +USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos PROJREPOS=('social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross') # Remote repos -- cgit v1.2.3-2-g168b From f43b4881b168b951f39dd00f075c8d47ef17df4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Tue, 22 May 2012 11:27:20 -0300 Subject: adding pcr (Parabola Community Repo) --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index c582bea..20ad307 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos -PROJREPOS=('social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross') +PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3-2-g168b From f8f54ad1926d3f10e895fda553474db278c2ed7d Mon Sep 17 00:00:00 2001 From: Parabola Date: Wed, 31 Oct 2012 04:44:23 +0000 Subject: sitting on the server --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 20ad307..7601527 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos -PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross') +PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3-2-g168b From 33b8cb611363102e23972cf3914a03d65cb3cad8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 17 Jun 2013 23:59:15 -0600 Subject: use xbs, not svn --- config | 2 -- 1 file changed, 2 deletions(-) (limited to 'config') diff --git a/config b/config index 3df6c95..e1e705b 100644 --- a/config +++ b/config @@ -1,6 +1,4 @@ FTP_BASE="/srv/ftp" -SVNREPO='' -SVNUSER='' PKGREPOS=() PKGPOOL='' SRCPOOL='' -- cgit v1.2.3-2-g168b From d744cae51bf5ea3e8c01d70ddbec564ad66b036c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 18 Jun 2013 00:06:38 -0600 Subject: use /etc/makepkg.conf for sourceballs --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config b/config index e1e705b..34869ab 100644 --- a/config +++ b/config @@ -25,8 +25,8 @@ TMPDIR="/var/tmp" ARCHES=(i686 x86_64) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" -PKGEXT=".pkg.tar.?z" -SRCEXT=".src.tar.gz" +PKGEXT="$(. $(librelib conf); load_files makepkg; echo "$PKGEXT")" +SRCEXT="$(. $(librelib conf); load_files makepkg; echo "$SRCEXT")" # Allowed licenses: get sourceballs only for licenses in this array ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2' 'LGPL2.1') -- cgit v1.2.3-2-g168b From ac6ebd38626a052049c17f166dd2ebee81a0168a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 28 Jul 2013 00:17:44 -0600 Subject: twiddle with config --- config | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config b/config index 34869ab..179a2b9 100644 --- a/config +++ b/config @@ -1,3 +1,5 @@ +#/bin/bash # as a hint to editors + FTP_BASE="/srv/ftp" PKGREPOS=() PKGPOOL='' @@ -20,13 +22,13 @@ REQUIRE_SIGNATURE=true LOCK_DELAY=10 LOCK_TIMEOUT=300 -STAGING="$HOME/staging" +[ -z "${STAGING:-}" ] && STAGING="$HOME/staging" TMPDIR="/var/tmp" ARCHES=(i686 x86_64) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" -PKGEXT="$(. $(librelib conf); load_files makepkg; echo "$PKGEXT")" -SRCEXT="$(. $(librelib conf); load_files makepkg; echo "$SRCEXT")" +PKGEXT=".pkg.tar.?z" +SRCEXT=".src.tar.gz" # Allowed licenses: get sourceballs only for licenses in this array ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2' 'LGPL2.1') -- cgit v1.2.3-2-g168b From e0a2005c59d15ef462d2bf26404a5b2d14266f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Fri, 16 Aug 2013 18:50:49 -0300 Subject: add coherence repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 7601527..42842de 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos -PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly') +PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'coherence') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3-2-g168b From 2bb8c19bdff6b45dbb2ce09d7f45ca42d56bcd4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Tue, 20 Aug 2013 00:10:01 -0300 Subject: adding nonprism repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 42842de..5bff50a 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos -PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'coherence') +PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'coherence' 'nonprism') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3-2-g168b From f8051126147e57292eeaa730f2c499aea1b1a16f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Tue, 20 Aug 2013 00:20:13 -0300 Subject: fixing PKGEXT variable --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 5bff50a..0eb851a 100644 --- a/config +++ b/config @@ -45,7 +45,7 @@ OURARCHES=(mips64el) ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]}) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" -PKGEXT=".pkg.tar.?z" +PKGEXT=".pkg.tar.xz" SRCEXT=".src.tar.gz" MAKEPKGCONF="~/.makepkg.conf" -- cgit v1.2.3-2-g168b From f9a2c29e6c0d114071af70e99f6000760cb993f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 22 Aug 2013 12:54:10 -0300 Subject: remove coherence repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 0eb851a..2c1fa43 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos -PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'coherence' 'nonprism') +PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3-2-g168b From f185efe31d518b08b45e07288a4239eddaac11b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 26 Aug 2013 16:36:21 -0300 Subject: remove deprecated repos --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 2c1fa43..f390bea 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos -PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'nonprism') +PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3-2-g168b From 97ed9a26bd00c8a4c03a331c076e9f2a9c7ac57f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 26 Aug 2013 16:47:10 -0300 Subject: remove fauno repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index f390bea..0882c86 100644 --- a/config +++ b/config @@ -8,7 +8,7 @@ ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') +USERREPOS=('~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos -- cgit v1.2.3-2-g168b From c2513af7d1a4ab9180cbcfd34135cd04add73c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 28 Aug 2013 18:18:53 -0300 Subject: remove mtjm repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 0882c86..6c652a7 100644 --- a/config +++ b/config @@ -8,7 +8,7 @@ ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') +USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos -- cgit v1.2.3-2-g168b From 93229619764ff3c59fd097c72fb7890a7f542668 Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 14 Oct 2013 22:32:27 +0000 Subject: config: only set staging if it is not set from the environment --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 6c652a7..03a80bd 100644 --- a/config +++ b/config @@ -38,7 +38,7 @@ REQUIRE_SIGNATURE=true LOCK_DELAY=10 LOCK_TIMEOUT=300 -STAGING="$FTP_BASE/staging" +[ -n "${STAGING:-}" ] || STAGING="$FTP_BASE/staging" TMPDIR="/tmp" ARCHARCHES=(i686 x86_64) OURARCHES=(mips64el) -- cgit v1.2.3-2-g168b From 280421c67b7042ea94fc2ec94f04278cb72e2a06 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 30 Nov 2013 03:17:18 +0000 Subject: Change the default WEB_DIR to reflect the new server --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 03a80bd..3d15c1b 100644 --- a/config +++ b/config @@ -52,4 +52,4 @@ MAKEPKGCONF="~/.makepkg.conf" BLACKLIST_FILE="$HOME/blacklist/blacklist.txt" # parabolaweb root -WEB_DIR=/srv/http/web +WEB_DIR=/srv/http/parabolagnulinux.org/web -- cgit v1.2.3-2-g168b From 8a693d7f3a9324de445b5a151c1f46194405f0eb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 30 Nov 2013 03:17:57 +0000 Subject: Drop remote (connos) repo support --- config | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config b/config index 3d15c1b..e323d00 100644 --- a/config +++ b/config @@ -12,7 +12,6 @@ USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jor # Community project repos PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos -RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) PKGPOOL='pool/packages' SRCPOOL='sources/packages' -- cgit v1.2.3-2-g168b From a88674528c5df02f03bf30449982932b6cc378dc Mon Sep 17 00:00:00 2001 From: Drtan Samos Date: Tue, 17 Dec 2013 10:24:33 +0100 Subject: Added a user repository for me in order to test packages before they come to the offical repositories. --- config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index e323d00..9baf816 100644 --- a/config +++ b/config @@ -8,7 +8,8 @@ ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') +USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' +'~coadde' '~drtan') # Community project repos PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos -- cgit v1.2.3-2-g168b From ea21f1388681d4fed43201bda54efc9d63aadc88 Mon Sep 17 00:00:00 2001 From: Drtan Samos Date: Tue, 17 Dec 2013 10:36:31 +0100 Subject: Removes the extra new line added by nano for unknown reasons. --- config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config') diff --git a/config b/config index 9baf816..8b8117f 100644 --- a/config +++ b/config @@ -8,8 +8,7 @@ ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' -'~coadde' '~drtan') +USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan') # Community project repos PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos -- cgit v1.2.3-2-g168b From 63810122211aa60b056895989984eaccf6242c58 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 8 Dec 2013 15:12:55 -0500 Subject: clarify comment on bogus shebangs --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 179a2b9..f327cd4 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ -#/bin/bash # as a hint to editors +#/bin/bash # as a hint to text editors FTP_BASE="/srv/ftp" PKGREPOS=() -- cgit v1.2.3-2-g168b From e210b136790f740a6eb42913b30f6d0c8557c81d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 31 Dec 2013 14:53:28 -0500 Subject: get rid of $ARCH_BASE --- config | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config b/config index 496b3ef..3b7c13a 100644 --- a/config +++ b/config @@ -1,6 +1,5 @@ #/bin/bash # as a hint to text editors FTP_BASE="/srv/http/repo/public" -ARCH_BASE="/srv/http/repo/public" SVNREPO="/var/abs" # Repos from Arch -- cgit v1.2.3-2-g168b From 08496a8bd13ffc7228feac53accb93b063c4b358 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 8 Jan 2014 14:55:11 -0500 Subject: config: fix typo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 3b7c13a..c6fca1b 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ -#/bin/bash # as a hint to text editors +#!/bin/bash # as a hint to text editors FTP_BASE="/srv/http/repo/public" SVNREPO="/var/abs" -- cgit v1.2.3-2-g168b From 3537841a9287ea1c7871545ffebb855561f7c1e0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 8 Jan 2014 21:17:35 -0500 Subject: misc touch up - TODO: add trailing newline - config: add text editor hint - config.orig: remove - getrepos: quote, use -- - db-functions: hardcode some paths, remove needless nullglob --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 8b8117f..0152b69 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash # as a hint to text editors FTP_BASE="/srv/http/repo/public" ARCH_BASE="/srv/http/repo/public" SVNREPO="/var/abs" -- cgit v1.2.3-2-g168b From 0811dea8b9c695ed9e67b22d389142956bd1cdd8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 8 Jan 2014 17:40:26 -0500 Subject: Fix quoting on arrays. --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 0152b69..9d72ebd 100644 --- a/config +++ b/config @@ -12,7 +12,7 @@ USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jor # Community project repos PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos -PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) +PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}") PKGPOOL='pool/packages' SRCPOOL='sources/packages' -- cgit v1.2.3-2-g168b From 8650ad4fdef09b1244ba138531b6a1e2bbd0975b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 8 Jan 2014 18:00:12 -0500 Subject: Get rid of $ARCH_BASE; these days it is the same as $FTP_BASE --- config | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config b/config index 9d72ebd..c3f9a55 100644 --- a/config +++ b/config @@ -1,6 +1,5 @@ #!/bin/bash # as a hint to text editors FTP_BASE="/srv/http/repo/public" -ARCH_BASE="/srv/http/repo/public" SVNREPO="/var/abs" # Repos from Arch -- cgit v1.2.3-2-g168b From 0b52c6e030fc60377a4dfc0a4e142bee50b0344e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 29 Jan 2014 19:01:46 -0200 Subject: add [multilib-testing], [libre-multilib] and [libre-multilib-testing] repos --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config b/config index c3f9a55..29c42fe 100644 --- a/config +++ b/config @@ -3,9 +3,9 @@ FTP_BASE="/srv/http/repo/public" SVNREPO="/var/abs" # Repos from Arch -ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') +ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing') # Official Parabola repos -OURREPOS=('libre' 'libre-testing') +OURREPOS=('libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing') # User repos USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan') # Community project repos -- cgit v1.2.3-2-g168b From d902025a8a000c1383c7612e9f442c6734290169 Mon Sep 17 00:00:00 2001 From: Parabola Date: Sun, 15 Jun 2014 22:20:18 +0000 Subject: put our packages in a separate pool --- config | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config b/config index 29c42fe..c6efac6 100644 --- a/config +++ b/config @@ -12,14 +12,18 @@ USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jor PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}") -PKGPOOL='pool/packages' -SRCPOOL='sources/packages' +PKGPOOL='pool/parabola' +SRCPOOL='sources/parabola' # Directories where packages are shared between repos # *relative to FTP_BASE* -PKGPOOLS=('pool/packages' 'pool/community') +ARCHPKGPOOLS=(pool/{packages,community}) +OURPKGPOOLS=(pool/parabola) +PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]}) # Directories where sources are stored -SRCPOOLS=('sources/packages' 'sources/community') +ARCHSRCPOOLS=(sources/{packages,community}) +OURPKGPOOLS=(sources/parabola) +SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]}) CLEANUP_DESTDIR="$FTP_BASE/old/packages" CLEANUP_DRYRUN=false -- cgit v1.2.3-2-g168b From d8e9a3ea7c9d8924eef16e6bd9725cf151151936 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 15 Jun 2014 23:02:17 -0400 Subject: config: don't clobber the existing STAGING scheme --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index baf5da7..63698b9 100644 --- a/config +++ b/config @@ -41,7 +41,7 @@ REQUIRE_SIGNATURE=true LOCK_DELAY=10 LOCK_TIMEOUT=300 -[ -n "${STAGING:-}" ] || STAGING="$HOME/staging" +[ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging" TMPDIR="/tmp" ARCHARCHES=(i686 x86_64) OURARCHES=(mips64el) -- cgit v1.2.3-2-g168b From fae18d372c7d5fad545526b554e9cde657192226 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 16 Jun 2014 10:59:34 -0400 Subject: config:remove java-ugly --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index c6efac6..c7ea7c2 100644 --- a/config +++ b/config @@ -9,7 +9,7 @@ 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=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') +PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'nonprism') # Remote repos PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}") PKGPOOL='pool/parabola' -- cgit v1.2.3-2-g168b From 7a94b2db24e707606d9e620ba1b8a9462dce5e0f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 16 Jun 2014 11:01:06 -0400 Subject: config: don't have default STAGING be public --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index c7ea7c2..75e88cb 100644 --- a/config +++ b/config @@ -40,7 +40,7 @@ REQUIRE_SIGNATURE=true LOCK_DELAY=10 LOCK_TIMEOUT=300 -[ -n "${STAGING:-}" ] || STAGING="$FTP_BASE/staging" +[ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging" TMPDIR="/tmp" ARCHARCHES=(i686 x86_64) OURARCHES=(mips64el) -- cgit v1.2.3-2-g168b From cab7fb7288f6f3f02b80f6145dd5650b83f809fa Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 18 Jun 2014 20:08:02 -0400 Subject: Remove db-sync and friends. Simplify the config accordingly --- config | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) (limited to 'config') diff --git a/config b/config index e43c13d..87fbf2d 100644 --- a/config +++ b/config @@ -2,29 +2,26 @@ FTP_BASE="/srv/http/repo/public" SVNREPO="/var/abs" -# Repos from Arch -ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing') TESTING_REPO='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=('pcr' 'kernels' 'cross' 'java' 'nonprism') -# Remote repos -PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}") +PKGREPOS=( + # Arch + {core,extra,testing,staging} + {gnome,kde}-unstable + {community,multilib}{,-testing,-staging} + # Parabola + libre{,-testing} + libre-multilib{,-testing} + pcr kernels cross java nonprism + '~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan') +) 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[@]}) +PKGPOOLS=(pool/{packages,community,parabola}) # Directories where sources are stored -ARCHSRCPOOLS=(sources/{packages,community}) -OURPKGPOOLS=(sources/parabola) -SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]}) +SRCPOOLS=(sources/{packages,community,parabola}) CLEANUP_DESTDIR="$FTP_BASE/old/packages" CLEANUP_DRYRUN=false @@ -43,16 +40,11 @@ LOCK_TIMEOUT=300 [ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging" TMPDIR="/tmp" -ARCHARCHES=(i686 x86_64) -OURARCHES=(mips64el) -ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]}) +ARCHES=(i686 x86_64 mips64el) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" PKGEXT=".pkg.tar.xz" SRCEXT=".src.tar.gz" +# Used by cron-jobs/sourceballs2 MAKEPKGCONF="~/.makepkg.conf" -BLACKLIST_FILE="$HOME/blacklist/blacklist.txt" - -# parabolaweb root -WEB_DIR=/srv/http/parabolagnulinux.org/web -- cgit v1.2.3-2-g168b From b82fbfc8761fda2a682e4037d08cf1a9730eebf8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 18 Jun 2014 20:31:31 -0400 Subject: rm cron-jobs/repo-sanity-check This was the last program using SVNREPO. Also, I want to do better than this. --- config | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config b/config index 87fbf2d..77df26f 100644 --- a/config +++ b/config @@ -1,6 +1,5 @@ #!/bin/bash # as a hint to text editors FTP_BASE="/srv/http/repo/public" -SVNREPO="/var/abs" TESTING_REPO='testing' PKGREPOS=( -- cgit v1.2.3-2-g168b From f6b561c1ef3fd1ec0c0abba0e426ef769e14d0a0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 18 Jun 2014 20:58:51 -0400 Subject: clean up config --- config | 50 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 17 deletions(-) (limited to 'config') diff --git a/config b/config index 77df26f..fff797d 100644 --- a/config +++ b/config @@ -1,7 +1,6 @@ -#!/bin/bash # as a hint to text editors -FTP_BASE="/srv/http/repo/public" +#!/bin/bash # non-executable, but put this there as a hint to text editors -TESTING_REPO='testing' +FTP_BASE="/srv/http/repo/public" PKGREPOS=( # Arch {core,extra,testing,staging} @@ -11,24 +10,29 @@ PKGREPOS=( libre{,-testing} libre-multilib{,-testing} pcr kernels cross java nonprism - '~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan') + '~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan' ) PKGPOOL='pool/parabola' SRCPOOL='sources/parabola' +TESTING_REPO='testing' +STABLE_REPOS=( + # Arch + {core,extra} + {community,multilib} + # Parabola + libre + libre-multilib + pcr kernels cross java nonprism + '~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan' +) -# Directories where packages are shared between repos -# *relative to FTP_BASE* -PKGPOOLS=(pool/{packages,community,parabola}) -# Directories where sources are stored -SRCPOOLS=(sources/{packages,community,parabola}) - -CLEANUP_DESTDIR="$FTP_BASE/old/packages" +CLEANUP_DESTDIR="/srv/http/repo/private/cleanup-destdir" CLEANUP_DRYRUN=false # Time in days to keep moved packages CLEANUP_KEEP=30 -SOURCE_CLEANUP_DESTDIR="$FTP_BASE/old/sources" -SOURCE_CLEANUP_DRYRUN=true +SOURCE_CLEANUP_DESTDIR="/srv/http/repo/private/source-cleanup-destdir" +SOURCE_CLEANUP_DRYRUN=false # Time in days to keep moved sourcepackages SOURCE_CLEANUP_KEEP=30 @@ -38,12 +42,24 @@ LOCK_DELAY=10 LOCK_TIMEOUT=300 [ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging" -TMPDIR="/tmp" +export TMPDIR="${TMPDIR:-/tmp}" ARCHES=(i686 x86_64 mips64el) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" -PKGEXT=".pkg.tar.xz" +PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" -# Used by cron-jobs/sourceballs2 -MAKEPKGCONF="~/.makepkg.conf" +# Allowed licenses: get sourceballs only for licenses in this array +# Empty (commented out) to get sourceballs for all packages +#ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2' 'LGPL2.1') + +# For db-cleanup +PKGPOOLS=(pool/{packages,community,parabola}) +SRCPOOLS=(sources/{packages,community,parabola}) + +# Where to send error emails, and who they are from +LIST="dev@lists.parabolagnulinux.org" +FROM="dbscripts+$(whoami)@$(hostname -f)" + +# Override default config with config.local +[ -f "$(dirname "${BASH_SOURCE[0]}")/config.local" ] && . "$(dirname "${BASH_SOURCE[0]}")/config.local" -- cgit v1.2.3-2-g168b From d433fbd1da44acdf3dd50abce428fe57912f9fa7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 18 Jun 2014 21:01:23 -0400 Subject: remove db-cleanup in favor of ftpdir-cleanup --- config | 4 ---- 1 file changed, 4 deletions(-) (limited to 'config') diff --git a/config b/config index fff797d..8b4b8ab 100644 --- a/config +++ b/config @@ -53,10 +53,6 @@ SRCEXT=".src.tar.gz" # Empty (commented out) to get sourceballs for all packages #ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2' 'LGPL2.1') -# For db-cleanup -PKGPOOLS=(pool/{packages,community,parabola}) -SRCPOOLS=(sources/{packages,community,parabola}) - # Where to send error emails, and who they are from LIST="dev@lists.parabolagnulinux.org" FROM="dbscripts+$(whoami)@$(hostname -f)" -- cgit v1.2.3-2-g168b From aae3b0a2490d65832547f29327f9e8828442a48d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 18 Jun 2014 21:33:20 -0400 Subject: cleanup: - move some config into config.local.* - `mv createrepos db-init` - `mv {,db-}check-package-libraries.py` - `mv `list_nonfree_in_db.py db-list-nonfree.py` - `rm abslibre`: To be replaced by XBS+update abs tarballs script - `rm create-repo mkrepo`: Both did the same thing, just fancy `mkdir` - `rm `testing2x`: Just use db-move. --- config | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) (limited to 'config') diff --git a/config b/config index 8b4b8ab..51d89ea 100644 --- a/config +++ b/config @@ -1,40 +1,25 @@ #!/bin/bash # non-executable, but put this there as a hint to text editors +case "$USER" in + db-import-packages) _name=import-packages;; + db-import-community) _name=import-community;; + *) _name=parabola;; +esac + FTP_BASE="/srv/http/repo/public" -PKGREPOS=( - # Arch - {core,extra,testing,staging} - {gnome,kde}-unstable - {community,multilib}{,-testing,-staging} - # Parabola - libre{,-testing} - libre-multilib{,-testing} - pcr kernels cross java nonprism - '~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan' -) -PKGPOOL='pool/parabola' -SRCPOOL='sources/parabola' -TESTING_REPO='testing' -STABLE_REPOS=( - # Arch - {core,extra} - {community,multilib} - # Parabola - libre - libre-multilib - pcr kernels cross java nonprism - '~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan' -) - -CLEANUP_DESTDIR="/srv/http/repo/private/cleanup-destdir" +PKGREPOS=() +PKGPOOL='' +SRCPOOL='' + +CLEANUP_DESTDIR="/srv/http/repo/private/${_name}/package-cleanup" CLEANUP_DRYRUN=false # Time in days to keep moved packages CLEANUP_KEEP=30 -SOURCE_CLEANUP_DESTDIR="/srv/http/repo/private/source-cleanup-destdir" +SOURCE_CLEANUP_DESTDIR="/srv/http/repo/private/${_name}/source-cleanup" SOURCE_CLEANUP_DRYRUN=false # Time in days to keep moved sourcepackages -SOURCE_CLEANUP_KEEP=30 +SOURCE_CLEANUP_KEEP=14 REQUIRE_SIGNATURE=true @@ -55,7 +40,9 @@ SRCEXT=".src.tar.gz" # Where to send error emails, and who they are from LIST="dev@lists.parabolagnulinux.org" -FROM="dbscripts+$(whoami)@$(hostname -f)" +FROM="dbscripts+${_name}@$(hostname -f)" # Override default config with config.local [ -f "$(dirname "${BASH_SOURCE[0]}")/config.local" ] && . "$(dirname "${BASH_SOURCE[0]}")/config.local" +[ -f "$(dirname "${BASH_SOURCE[0]}")/config.local.${_name}" ] && . "$(dirname "${BASH_SOURCE[0]}")/config.local.${_name}" +unset _name -- cgit v1.2.3-2-g168b From 8e670c23359134af39b1c97173895c09948c2acb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 24 Jun 2014 22:51:14 -0400 Subject: db-update: get the list of repos the same way as upstream Arch The largest advantage of this is that it implicitly ignores directories we don't want to consider repos. --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 75e88cb..f4c1e15 100644 --- a/config +++ b/config @@ -47,7 +47,7 @@ OURARCHES=(mips64el) ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]}) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" -PKGEXT=".pkg.tar.xz" +PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" MAKEPKGCONF="~/.makepkg.conf" -- cgit v1.2.3-2-g168b From e029bd5f834a5973ba3be45fd06eed911f26477b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 25 Jun 2014 02:23:04 -0300 Subject: revert changes on config * fix package extension on PKGEXT variable, because it's generating a bug (e.g. "ERROR Package... already exists in another repository") on all the packages that are being uploaded to the staging folder. --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index f4c1e15..75e88cb 100644 --- a/config +++ b/config @@ -47,7 +47,7 @@ OURARCHES=(mips64el) ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]}) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" -PKGEXT=".pkg.tar.?z" +PKGEXT=".pkg.tar.xz" SRCEXT=".src.tar.gz" MAKEPKGCONF="~/.makepkg.conf" -- cgit v1.2.3-2-g168b From b85f896c2cb614ac22b11c14bd9e7994773309eb Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 4 Jul 2014 22:51:46 -0400 Subject: Fix having a flexible PKGEXT --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 75e88cb..f4c1e15 100644 --- a/config +++ b/config @@ -47,7 +47,7 @@ OURARCHES=(mips64el) ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]}) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" -PKGEXT=".pkg.tar.xz" +PKGEXT=".pkg.tar.?z" SRCEXT=".src.tar.gz" MAKEPKGCONF="~/.makepkg.conf" -- cgit v1.2.3-2-g168b From 52951d35c69766d0d196fc4cf59fb4864f46d334 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 26 Jul 2014 20:21:14 -0400 Subject: config: set FTP_BASE=~repo/public/main instead of ~repo/public This is to do fancy union stuff to make the web server happy --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index f4c1e15..51d044e 100644 --- a/config +++ b/config @@ -1,5 +1,5 @@ #!/bin/bash # as a hint to text editors -FTP_BASE="/srv/http/repo/public" +FTP_BASE="/srv/http/repo/public/main" SVNREPO="/var/abs" # Repos from Arch -- cgit v1.2.3-2-g168b From 01f85e9950540e6718e140882051dd8f3a9ba9a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 3 Sep 2014 17:02:14 -0300 Subject: add nonprism-testing repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 51d044e..92c059c 100644 --- a/config +++ b/config @@ -9,7 +9,7 @@ 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=('pcr' 'kernels' 'cross' 'java' 'nonprism') +PROJREPOS=('nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java') # Remote repos PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}") PKGPOOL='pool/parabola' -- cgit v1.2.3-2-g168b From a264b078cde98c6ad3766d1bdf69ca331f01baa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 29 Sep 2014 02:22:28 -0300 Subject: config: set FTP_BASE=/srv/repo/main instead of /srv/http/repo/public/main --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 92c059c..544a8e9 100644 --- a/config +++ b/config @@ -1,5 +1,5 @@ #!/bin/bash # as a hint to text editors -FTP_BASE="/srv/http/repo/public/main" +FTP_BASE="/srv/repo/main" SVNREPO="/var/abs" # Repos from Arch -- cgit v1.2.3-2-g168b From dd63290fd4c15b6220ade6ef4d6f8f0e4878944e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 15 Apr 2015 11:40:23 -0300 Subject: add nonsystemd and nonsystemd-testing repos --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 544a8e9..fdf3ef9 100644 --- a/config +++ b/config @@ -9,7 +9,7 @@ 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=('nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java') +PROJREPOS=('nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java') # Remote repos PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}") PKGPOOL='pool/parabola' -- cgit v1.2.3-2-g168b From de330518db13ca0a6bb9d0a4227f842d2a8ca941 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 17 May 2015 21:20:56 -0400 Subject: clean up configuration --- config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config b/config index 51d89ea..f494a53 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ -#!/bin/bash # non-executable, but put this there as a hint to text editors +#!/hint/bash case "$USER" in db-import-packages) _name=import-packages;; @@ -11,12 +11,12 @@ PKGREPOS=() PKGPOOL='' SRCPOOL='' -CLEANUP_DESTDIR="/srv/http/repo/private/${_name}/package-cleanup" +CLEANUP_DESTDIR="/srv/repo/private/${_name}/package-cleanup" CLEANUP_DRYRUN=false # Time in days to keep moved packages CLEANUP_KEEP=30 -SOURCE_CLEANUP_DESTDIR="/srv/http/repo/private/${_name}/source-cleanup" +SOURCE_CLEANUP_DESTDIR="/srv/repo/private/${_name}/source-cleanup" SOURCE_CLEANUP_DRYRUN=false # Time in days to keep moved sourcepackages SOURCE_CLEANUP_KEEP=14 @@ -39,7 +39,7 @@ SRCEXT=".src.tar.gz" #ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2' 'LGPL2.1') # Where to send error emails, and who they are from -LIST="dev@lists.parabolagnulinux.org" +LIST="dev@lists.parabola.nu" FROM="dbscripts+${_name}@$(hostname -f)" # Override default config with config.local -- cgit v1.2.3-2-g168b From d0834f7e6bd53ea729374eab138bb38a36c73996 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 20 May 2015 20:41:17 -0600 Subject: Clean up shebangs --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index fdf3ef9..ec732c8 100644 --- a/config +++ b/config @@ -1,4 +1,4 @@ -#!/bin/bash # as a hint to text editors +#!/hint/bash FTP_BASE="/srv/repo/main" SVNREPO="/var/abs" -- cgit v1.2.3-2-g168b From 17a94df0c108f09cada98535138136779b4e13a4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 24 May 2015 12:41:09 -0600 Subject: Use XBS instead of the SVN/ABS grossness. * config: drop SVNREPO * cron-jobs/sourceballs: Replace commented out SVN code and active ABS code with XBS code. The XBS code is fairly similar to the SVN code, the difference being that it uses `xbs releasepath` instead of `svn export`. * db-functions: - Rename check_pkgsvn to check_pkgxbs - check_pkgxbs: Drop the `svn export` bit, as `xbs releasepath` assumes that a working directory already exists. Replace the paths created by the `svn export` with calls to `xbs releasepath`. - check_splitpkgs: Drop the ABS `cp` -r bit, as `xbs releasepath` assumes that a working directory already exists. Replace the paths created by the `cp -r` with calls to `xbs releasepath`. Rename the variables and temporary files s/svn/xbs/ . * db-move: - First loop: Rename the variable svnrepo_from to xbsrepo_from, and get the value from `xbs releasepath`. - Second loop: Run `xbs move` before the inner loop to get a list of architectures. Rename the variable `svnrepo_from` to `xbsrepo_to`, and get the value for it from `xbs releasepath`. Because xbs guarantees that the PKGBUILD exists for the architectures listed, replace the check for whether the PKGBUILD exists with `if true`, to keep merging easy (as opposed to removing the if, and de-indenting the whole thing). * db-remove: Get the location of the PKGBUILD from `xbs releasepath`, call `xbs unrelease`, and adjust a message to use `xbs name` and mention the appropriate repo/arch pair. --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index ec732c8..f1b09eb 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ #!/hint/bash + FTP_BASE="/srv/repo/main" -SVNREPO="/var/abs" # Repos from Arch ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing') -- cgit v1.2.3-2-g168b From 00c15eb70600b5024973fd19528761381a89f759 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 8 Jun 2015 07:03:07 +0100 Subject: config: remove mips64el from ARCHES --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index f1b09eb..287f5b0 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=(mips64el) +OURARCHES=() ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]}) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" -- cgit v1.2.3-2-g168b