From 35e5070403ddae96238bcce6356f4b9713c96675 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 11 Nov 2008 22:09:24 -0800 Subject: Move as much as we can out to a config file This should allow us to move FTP and SVN placement around Signed-off-by: Aaron Griffin --- config | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 config (limited to 'config') diff --git a/config b/config new file mode 100644 index 0000000..dbed5bd --- /dev/null +++ b/config @@ -0,0 +1,4 @@ + +FTP_BASE="/home/ftp/" +SVN_PATH="file:///home/svn-packages" +STAGING="$HOME/staging/" -- cgit v1.2.3-2-g168b From 1809269f1df368aab3f7f1bb615c2cdc52860a1f Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Thu, 20 Nov 2008 21:48:00 -0800 Subject: Move everything to /srv to support new server conf Additionally, make TMPDIR configurable so we can move that Signed-off-by: Aaron Griffin --- config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config b/config index dbed5bd..5fe1969 100644 --- a/config +++ b/config @@ -1,4 +1,5 @@ -FTP_BASE="/home/ftp/" -SVN_PATH="file:///home/svn-packages" +FTP_BASE="/srv/ftp/" +SVN_PATH="file:///srv/svn/packages" STAGING="$HOME/staging/" +TMPDIR="/srv/tmp" -- cgit v1.2.3-2-g168b From 830af506b6b1ed7f3c73d55e0771f2ded6cc795a Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Thu, 20 Nov 2008 21:51:17 -0800 Subject: Switch svn path to be proper on gerolde Signed-off-by: Aaron Griffin --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 5fe1969..35fe446 100644 --- a/config +++ b/config @@ -1,5 +1,5 @@ FTP_BASE="/srv/ftp/" -SVN_PATH="file:///srv/svn/packages" +SVN_PATH="file:///srv/svn-packages" STAGING="$HOME/staging/" TMPDIR="/srv/tmp" -- cgit v1.2.3-2-g168b From 73c8c32f315a6a7c493479bbbb9c322d098e9076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9langer?= Date: Mon, 1 Dec 2008 18:57:43 -0600 Subject: Remove slashes from end of config paths Clean up output so that we don't get double slashes FS#12241 Signed-off-by: Aaron Griffin --- config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config b/config index 35fe446..b6b236a 100644 --- a/config +++ b/config @@ -1,5 +1,5 @@ -FTP_BASE="/srv/ftp/" +FTP_BASE="/srv/ftp" SVN_PATH="file:///srv/svn-packages" -STAGING="$HOME/staging/" +STAGING="$HOME/staging" TMPDIR="/srv/tmp" -- cgit v1.2.3-2-g168b From 179acc5b66a610a4e9bf584e1b613b886e12cec0 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 12 Dec 2008 00:03:52 -0600 Subject: Add potential BUILDSCRIPT config setting This may get removed from makepkg.conf in the future, so let's make sure we cover our ass Signed-off-by: Aaron Griffin --- config | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config b/config index b6b236a..5c39919 100644 --- a/config +++ b/config @@ -3,3 +3,5 @@ FTP_BASE="/srv/ftp" SVN_PATH="file:///srv/svn-packages" STAGING="$HOME/staging" TMPDIR="/srv/tmp" +# To be used if $BUILDSCRIPT is removed from makepkg.conf +#BUILDSCRIPT="PKGBUILD" -- cgit v1.2.3-2-g168b From 1ef058dad91a5ca82db2744776251a2ab68bcf90 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 20 Feb 2009 10:01:27 -0800 Subject: Make db-update parse all architecutres ARCHES is defined in config. db-update should now loop over all arches on each run and update whatever is in the staging dir. Remove the db-*64 scripts due to this Signed-off-by: Aaron Griffin --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index 5c39919..07cf783 100644 --- a/config +++ b/config @@ -3,5 +3,6 @@ FTP_BASE="/srv/ftp" SVN_PATH="file:///srv/svn-packages" STAGING="$HOME/staging" TMPDIR="/srv/tmp" +ARCHES=(i686 x86_64) # To be used if $BUILDSCRIPT is removed from makepkg.conf #BUILDSCRIPT="PKGBUILD" -- cgit v1.2.3-2-g168b From 9b7b2a7e774f307b6b5ab398908e883364af7247 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 20 Feb 2009 10:23:07 -0800 Subject: Add per-repo SVN configs This could be useful if we move community to a separate SVN repo Signed-off-by: Aaron Griffin --- config | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 07cf783..867d28e 100644 --- a/config +++ b/config @@ -1,6 +1,11 @@ FTP_BASE="/srv/ftp" -SVN_PATH="file:///srv/svn-packages" + +SVNREPO_core="file:///srv/svn-packages" +SVNREPO_extra="file:///srv/svn-packages" +SVNREPO_testing="file:///srv/svn-packages" +SVNREPO_community="file:///srv/svn-community" + STAGING="$HOME/staging" TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) -- cgit v1.2.3-2-g168b From 05ee55ef20d9e9085f38d95eb303a5b2613a9563 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 6 May 2009 12:28:43 -0700 Subject: config: Add 'any' ARCH to array Signed-off-by: Aaron Griffin --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 867d28e..33b7738 100644 --- a/config +++ b/config @@ -8,6 +8,6 @@ SVNREPO_community="file:///srv/svn-community" STAGING="$HOME/staging" TMPDIR="/srv/tmp" -ARCHES=(i686 x86_64) +ARCHES=(i686 x86_64 any) # To be used if $BUILDSCRIPT is removed from makepkg.conf #BUILDSCRIPT="PKGBUILD" -- cgit v1.2.3-2-g168b From 73f460e1224873d12b6e5879450d79a4b4465b0f Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 6 May 2009 14:08:14 -0700 Subject: config: Revert 'any' addition to the ARCHES array This change was made in error, as db-update does its own parsing of 'any' files independently Signed-off-by: Aaron Griffin --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 33b7738..867d28e 100644 --- a/config +++ b/config @@ -8,6 +8,6 @@ SVNREPO_community="file:///srv/svn-community" STAGING="$HOME/staging" TMPDIR="/srv/tmp" -ARCHES=(i686 x86_64 any) +ARCHES=(i686 x86_64) # To be used if $BUILDSCRIPT is removed from makepkg.conf #BUILDSCRIPT="PKGBUILD" -- cgit v1.2.3-2-g168b From 3bcb9d8c78857cb40110616c3fe08259c577fdca Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Fri, 17 Jul 2009 12:51:58 -0700 Subject: ftpdir-cleanup: Add configurable destdir Signed-off-by: Aaron Griffin --- config | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config b/config index 867d28e..425709a 100644 --- a/config +++ b/config @@ -6,6 +6,8 @@ SVNREPO_extra="file:///srv/svn-packages" SVNREPO_testing="file:///srv/svn-packages" SVNREPO_community="file:///srv/svn-community" +CLEANUP_DESTDIR="/srv/package-cleanup" + STAGING="$HOME/staging" TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) -- cgit v1.2.3-2-g168b From 820452a93f68c05ac1083d56d9e560903d8ae1cf Mon Sep 17 00:00:00 2001 From: Francois Charette Date: Tue, 21 Jul 2009 11:38:09 +0200 Subject: Refactor ftpdir-cleanup to handle all arches This may look like a rather large patch, but the changes are mostly a reshuffling of the code to loop over all arches first, and then handle the arch-indep packages. The cronjob has been changed accordingly. Added new category DELETESYMLINKS, which are deleted instead of being moved to package-cleanup. I have also fixed the arch-specific issue with the ftppath, using parameters in config instead. Signed-off-by: Aaron Griffin --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index 425709a..16a71ce 100644 --- a/config +++ b/config @@ -1,5 +1,6 @@ FTP_BASE="/srv/ftp" +FTP_OS_SUFFIX="os" SVNREPO_core="file:///srv/svn-packages" SVNREPO_extra="file:///srv/svn-packages" -- cgit v1.2.3-2-g168b From 94c1ba6eed3fbdda8be0b7c67257d30dcabfd5c6 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 22 Jul 2009 20:02:37 +0200 Subject: remove support for different svn repos Signed-off-by: Aaron Griffin --- config | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'config') diff --git a/config b/config index 16a71ce..a8748c7 100644 --- a/config +++ b/config @@ -2,10 +2,7 @@ FTP_BASE="/srv/ftp" FTP_OS_SUFFIX="os" -SVNREPO_core="file:///srv/svn-packages" -SVNREPO_extra="file:///srv/svn-packages" -SVNREPO_testing="file:///srv/svn-packages" -SVNREPO_community="file:///srv/svn-community" +SVNREPO="file:///srv/svn-packages" CLEANUP_DESTDIR="/srv/package-cleanup" -- cgit v1.2.3-2-g168b From b82a2ec63574c5fe0a0dd49b242d8c365155b828 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 17 Aug 2009 15:12:33 -0700 Subject: Replace DB_COMPRESSION with DBEXT in the config DBEXT contains the full extension for the db files (.db.tar.gz) and is recorded in the config file Signed-off-by: Aaron Griffin --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index a8748c7..873c2f3 100644 --- a/config +++ b/config @@ -11,3 +11,4 @@ TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) # To be used if $BUILDSCRIPT is removed from makepkg.conf #BUILDSCRIPT="PKGBUILD" +DBEXT=".db.tar.gz" -- cgit v1.2.3-2-g168b From 68bf0be302f7650a31f6c188d99c00596b3fbef1 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 17 Aug 2009 15:13:18 -0700 Subject: Uncomment BUILDSCRIPT in the config file Signed-off-by: Aaron Griffin --- config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config') diff --git a/config b/config index 873c2f3..66ef7e8 100644 --- a/config +++ b/config @@ -9,6 +9,5 @@ CLEANUP_DESTDIR="/srv/package-cleanup" STAGING="$HOME/staging" TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) -# To be used if $BUILDSCRIPT is removed from makepkg.conf -#BUILDSCRIPT="PKGBUILD" +BUILDSCRIPT="PKGBUILD" DBEXT=".db.tar.gz" -- cgit v1.2.3-2-g168b From 15de56aa8bb8104a01a983393f8a398348714a3a Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 17 Aug 2009 15:20:27 -0700 Subject: Remove dependence on makepkg.conf Removed the need for makepkg.conf * Killed off CARCH * Added PKGEXT to the config file * Remove source_makepkg function * Source config file where makepkg.conf was needed Signed-off-by: Aaron Griffin --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index 66ef7e8..c735a91 100644 --- a/config +++ b/config @@ -11,3 +11,4 @@ TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) BUILDSCRIPT="PKGBUILD" DBEXT=".db.tar.gz" +PKGEXT=".pkg.tar.gz" -- cgit v1.2.3-2-g168b From 208cf5f55addd91ea6884657737cc62ee81fe0fb Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 25 Aug 2009 13:11:59 -0700 Subject: Add SRCEXT to config Signed-off-by: Aaron Griffin --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index c735a91..86a5eca 100644 --- a/config +++ b/config @@ -12,3 +12,4 @@ ARCHES=(i686 x86_64) BUILDSCRIPT="PKGBUILD" DBEXT=".db.tar.gz" PKGEXT=".pkg.tar.gz" +SRCEXT=".src.tar.gz" -- cgit v1.2.3-2-g168b From f0e417f2be331b937dd56bf970c59370a55b6301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9langer?= Date: Wed, 14 Oct 2009 15:18:06 -0400 Subject: Moved ALLOWED_LICENSES declaration to config file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bélanger Signed-off-by: Aaron Griffin --- config | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config b/config index 86a5eca..24ec37a 100644 --- a/config +++ b/config @@ -13,3 +13,6 @@ BUILDSCRIPT="PKGBUILD" DBEXT=".db.tar.gz" PKGEXT=".pkg.tar.gz" SRCEXT=".src.tar.gz" + +# Allowed licenses: get sourceballs only for licenses in this array +ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2') -- cgit v1.2.3-2-g168b From 96bcc18c5df5c7ef81a38c7338467ae0c75eca08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9langer?= Date: Wed, 14 Oct 2009 15:18:08 -0400 Subject: Added source-cleanup directory support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bélanger Signed-off-by: Aaron Griffin --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index 24ec37a..92def37 100644 --- a/config +++ b/config @@ -5,6 +5,7 @@ FTP_OS_SUFFIX="os" SVNREPO="file:///srv/svn-packages" CLEANUP_DESTDIR="/srv/package-cleanup" +SOURCE_CLEANUP_DESTDIR="/srv/source-cleanup" STAGING="$HOME/staging" TMPDIR="/srv/tmp" -- cgit v1.2.3-2-g168b From dea6954635ff0eccd116c384065c1ad745fcd1d2 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 21 Feb 2010 16:50:34 +0100 Subject: add dry run option to ftpdir-cleanup Signed-off-by: Pierre Schmitz --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index 92def37..7864532 100644 --- a/config +++ b/config @@ -5,6 +5,7 @@ FTP_OS_SUFFIX="os" SVNREPO="file:///srv/svn-packages" CLEANUP_DESTDIR="/srv/package-cleanup" +CLEANUP_DRYRUN=false SOURCE_CLEANUP_DESTDIR="/srv/source-cleanup" STAGING="$HOME/staging" -- cgit v1.2.3-2-g168b From de0c93a652333b242e7ea282110619f25de7be8d Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 21 Feb 2010 16:54:10 +0100 Subject: Accept any *.pkg.tar.* package file name With this patch packages with different compressions are accepted. It is ensured that one cannot have the same package with different compression extensions. The new functions getpkgfile{,s} are used to sanitize globed filenames. Signed-off-by: Pierre Schmitz --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 7864532..8e582d9 100644 --- a/config +++ b/config @@ -13,7 +13,7 @@ TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) BUILDSCRIPT="PKGBUILD" DBEXT=".db.tar.gz" -PKGEXT=".pkg.tar.gz" +PKGEXT=".pkg.tar.*" SRCEXT=".src.tar.gz" # Allowed licenses: get sourceballs only for licenses in this array -- cgit v1.2.3-2-g168b From 17dd60ced8eb8ca461b73dd8429be0fda83264e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9langer?= Date: Mon, 1 Mar 2010 22:44:08 -0500 Subject: Make repo locking an atomic process and added timeout argument MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The repo locking function now use a lock directory instead of a lock file. This makes the lock checking and creation an atomic process. The repo_lock function will now try to obtain a lock every $LOCK_DELAY seconds until it is successful. An optional third argument can be use to give a timeout in seconds; this is intended for scripts that runs unattended. Repo locking is now used in the ftpdir-cleanup script. This should fix the problem of the ftpdir-cleanup script removing the new package instead of the old one (FS#17058). Signed-off-by: Eric Bélanger --- config | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config b/config index 8e582d9..a563f35 100644 --- a/config +++ b/config @@ -8,6 +8,9 @@ CLEANUP_DESTDIR="/srv/package-cleanup" CLEANUP_DRYRUN=false SOURCE_CLEANUP_DESTDIR="/srv/source-cleanup" +LOCK_DELAY=10 +LOCK_TIMEOUT=300 + STAGING="$HOME/staging" TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) -- cgit v1.2.3-2-g168b From c7e3c501f01b6429519e2b8466d6bd8e2f7e22b9 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 15 Feb 2010 13:50:31 -0800 Subject: Remove FTP_OS_SUFFIX variable This isn't needed and if "os" ever changes, we have bigger changes. Won't save us any time and it's longer to type. --- config | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config b/config index a563f35..57ae64b 100644 --- a/config +++ b/config @@ -1,6 +1,5 @@ FTP_BASE="/srv/ftp" -FTP_OS_SUFFIX="os" SVNREPO="file:///srv/svn-packages" -- cgit v1.2.3-2-g168b From ee4074de910df5c637691ace06ec5a9d475fb4a3 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Mon, 3 May 2010 09:17:04 -0700 Subject: Add PKGPOOL_DIR config variable This is a relative var, descendent from FTP_BASE. We do this because we also need a relative path to the package pool dir --- config | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config b/config index 57ae64b..3a232f2 100644 --- a/config +++ b/config @@ -1,6 +1,9 @@ FTP_BASE="/srv/ftp" +#This dir MUST be under FTP_BASE +PKGPOOL_DIR="packages" + SVNREPO="file:///srv/svn-packages" CLEANUP_DESTDIR="/srv/package-cleanup" -- cgit v1.2.3-2-g168b From 5034b4e644c55631dfd5c88b491873389fc52e50 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 20 Jun 2010 17:29:40 +0200 Subject: Replace PKGPOOL_DIR by a function call The package pool dir depends on the host; so we solve this similar to get_repos_for_host() Note: There is no "os" subdir for the package pool. --- config | 3 --- 1 file changed, 3 deletions(-) (limited to 'config') diff --git a/config b/config index 3a232f2..57ae64b 100644 --- a/config +++ b/config @@ -1,9 +1,6 @@ FTP_BASE="/srv/ftp" -#This dir MUST be under FTP_BASE -PKGPOOL_DIR="packages" - SVNREPO="file:///srv/svn-packages" CLEANUP_DESTDIR="/srv/package-cleanup" -- cgit v1.2.3-2-g168b From e2cc14311b1bfad0c30cef395a1a033cdef030c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9langer?= Date: Sun, 27 Jun 2010 23:40:38 -0400 Subject: sourceballs: Added community and community-testing support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bélanger Signed-off-by: Pierre Schmitz --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index 57ae64b..1cd533f 100644 --- a/config +++ b/config @@ -2,6 +2,7 @@ FTP_BASE="/srv/ftp" SVNREPO="file:///srv/svn-packages" +SVNREPOCOMMUNITY="file:///srv/svn-community" CLEANUP_DESTDIR="/srv/package-cleanup" CLEANUP_DRYRUN=false -- cgit v1.2.3-2-g168b From 140c187203be9d000c0cbad02fdfb7adb972937c Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 7 Aug 2010 16:14:06 +0200 Subject: Override default config with config.local This is useful for local testing --- config | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config b/config index 1cd533f..5e7ab94 100644 --- a/config +++ b/config @@ -21,3 +21,6 @@ SRCEXT=".src.tar.gz" # Allowed licenses: get sourceballs only for licenses in this array ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2') + +# Override default config with config.local +[ -f "$(dirname $0)/config.local" ] && . "$(dirname $0)/config.local" -- cgit v1.2.3-2-g168b From e843fb3b4c5792ca3311aca311c9af6ea764c4fc Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 7 Aug 2010 20:00:29 +0200 Subject: determine correct dir even if config was sourced --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index 5e7ab94..88e50bc 100644 --- a/config +++ b/config @@ -23,4 +23,4 @@ SRCEXT=".src.tar.gz" ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2') # Override default config with config.local -[ -f "$(dirname $0)/config.local" ] && . "$(dirname $0)/config.local" +[ -f "$(dirname ${BASH_SOURCE[0]})/config.local" ] && . "$(dirname ${BASH_SOURCE[0]})/config.local" -- cgit v1.2.3-2-g168b From d0b5dcb3ce6a1ec5222fc7a0420b3e1dc4c3a27e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 8 Aug 2010 11:53:07 +0200 Subject: Remove BUILDSCRIPT variable There is no need to have a variable for things like PKGBUILD that are very unlikely to ever change. --- config | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config b/config index 88e50bc..f6600a6 100644 --- a/config +++ b/config @@ -14,7 +14,6 @@ LOCK_TIMEOUT=300 STAGING="$HOME/staging" TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) -BUILDSCRIPT="PKGBUILD" DBEXT=".db.tar.gz" PKGEXT=".pkg.tar.*" SRCEXT=".src.tar.gz" -- cgit v1.2.3-2-g168b From 328b1ce478e25902aba5d8f19024dadeaaf3f678 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 1 Sep 2010 19:34:47 +0200 Subject: Simplify repo configuration * Repositories can now be defined in the config file for each host * added community-staging, gnome-unstable and kde-unstable * Exception is the adjust-permission cron-job; but we might want to use acls in future anyway Signed-off-by: Pierre Schmitz --- config | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'config') diff --git a/config b/config index f6600a6..f0d6cfc 100644 --- a/config +++ b/config @@ -4,6 +4,14 @@ FTP_BASE="/srv/ftp" SVNREPO="file:///srv/svn-packages" SVNREPOCOMMUNITY="file:///srv/svn-community" +declare -A PKGREPO +PKGREPO['default']='core extra testing staging kde-unstable gnome-unstable' +PKGREPO['sigurd']='community community-testing community-staging multilib' + +declare -A PKGPOOL +PKGPOOL['default']='pool/packages' +PKGPOOL['sigurd']='pool/community' + CLEANUP_DESTDIR="/srv/package-cleanup" CLEANUP_DRYRUN=false SOURCE_CLEANUP_DESTDIR="/srv/source-cleanup" -- cgit v1.2.3-2-g168b From 7db155d48cd5e6120edd0de1264133ddcc5f249f Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 11 Sep 2010 18:31:23 +0200 Subject: adding multilib-testing repository --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index f0d6cfc..a595331 100644 --- a/config +++ b/config @@ -6,7 +6,7 @@ SVNREPOCOMMUNITY="file:///srv/svn-community" declare -A PKGREPO PKGREPO['default']='core extra testing staging kde-unstable gnome-unstable' -PKGREPO['sigurd']='community community-testing community-staging multilib' +PKGREPO['sigurd']='community community-testing community-staging multilib multilib-testing' declare -A PKGPOOL PKGPOOL['default']='pool/packages' -- cgit v1.2.3-2-g168b From f121126f8166fb6dc261ea82f2890ba6693d047e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 11 Sep 2010 22:52:23 +0200 Subject: Use local config instead of guessing by hostname Using the hostname to decide which repos to use is not releiable and hard to test. Instead use config.local to configure these. config files for sigurd and gerolde were added which can be copied or symlinked to config.local on the specific host. --- config | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'config') diff --git a/config b/config index a595331..89e89fd 100644 --- a/config +++ b/config @@ -1,16 +1,10 @@ - FTP_BASE="/srv/ftp" SVNREPO="file:///srv/svn-packages" SVNREPOCOMMUNITY="file:///srv/svn-community" -declare -A PKGREPO -PKGREPO['default']='core extra testing staging kde-unstable gnome-unstable' -PKGREPO['sigurd']='community community-testing community-staging multilib multilib-testing' - -declare -A PKGPOOL -PKGPOOL['default']='pool/packages' -PKGPOOL['sigurd']='pool/community' +PKGREPOS=() +PKGPOOL='' CLEANUP_DESTDIR="/srv/package-cleanup" CLEANUP_DRYRUN=false -- cgit v1.2.3-2-g168b From cb2dcc6ee207e9c5ba4b875d70e387e6347591ed Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 20 Nov 2010 16:11:59 +0100 Subject: Fix sourceballs cron job * add unit test for sourceballs and cleanup * introduce SRCPOOL and LOGDIR variables in config --- config | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config b/config index 89e89fd..efc4381 100644 --- a/config +++ b/config @@ -5,6 +5,7 @@ SVNREPOCOMMUNITY="file:///srv/svn-community" PKGREPOS=() PKGPOOL='' +SRCPOOL='' CLEANUP_DESTDIR="/srv/package-cleanup" CLEANUP_DRYRUN=false @@ -15,6 +16,7 @@ LOCK_TIMEOUT=300 STAGING="$HOME/staging" TMPDIR="/srv/tmp" +LOGDIR="/var/log/dbscripts" ARCHES=(i686 x86_64) DBEXT=".db.tar.gz" PKGEXT=".pkg.tar.*" -- cgit v1.2.3-2-g168b From a7591f4be3f9e741f5d1e5aeadd3ab20b497a252 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 20 Nov 2010 20:38:38 +0100 Subject: Simplify sourceballs creation * Read package lists directly from DB file * Make SVNREPO configurable --- config | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'config') diff --git a/config b/config index efc4381..e149b18 100644 --- a/config +++ b/config @@ -1,8 +1,5 @@ FTP_BASE="/srv/ftp" - -SVNREPO="file:///srv/svn-packages" -SVNREPOCOMMUNITY="file:///srv/svn-community" - +SVNREPO='' PKGREPOS=() PKGPOOL='' SRCPOOL='' -- cgit v1.2.3-2-g168b From de07478719e8462a1f8bb4f61cb83571a37952b8 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 21 Nov 2010 00:01:48 +0100 Subject: sourceballs: add LGPL2.1 --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index e149b18..4b89f2d 100644 --- a/config +++ b/config @@ -20,7 +20,7 @@ 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') +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" -- cgit v1.2.3-2-g168b From 30a128a864bdbfc294b6ba6a49c9264570bb3c58 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 21 Nov 2010 13:23:09 +0100 Subject: sourceballs: Don't write any log This is consistent with the other dbscripts. The output will be send to the mailinglist. --- config | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config b/config index 4b89f2d..01956ba 100644 --- a/config +++ b/config @@ -13,7 +13,6 @@ LOCK_TIMEOUT=300 STAGING="$HOME/staging" TMPDIR="/srv/tmp" -LOGDIR="/var/log/dbscripts" ARCHES=(i686 x86_64) DBEXT=".db.tar.gz" PKGEXT=".pkg.tar.*" -- cgit v1.2.3-2-g168b From cadd215e9d726030bd7b86396eda47c2c69c1bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9langer?= Date: Wed, 24 Nov 2010 15:13:13 -0500 Subject: Added seperate dryrun options for the packages and sources cleanup scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bélanger Signed-off-by: Pierre Schmitz --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index 01956ba..69f40c7 100644 --- a/config +++ b/config @@ -7,6 +7,7 @@ SRCPOOL='' CLEANUP_DESTDIR="/srv/package-cleanup" CLEANUP_DRYRUN=false SOURCE_CLEANUP_DESTDIR="/srv/source-cleanup" +SOURCE_CLEANUP_DRYRUN=false LOCK_DELAY=10 LOCK_TIMEOUT=300 -- cgit v1.2.3-2-g168b From 447986d17554c183d958cf7de79d1904fc32aaf6 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 25 Nov 2010 13:28:04 +0100 Subject: Add FILESEXT variable for use in create-filelists --- config | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config b/config index 69f40c7..ff297ec 100644 --- a/config +++ b/config @@ -16,6 +16,7 @@ STAGING="$HOME/staging" TMPDIR="/srv/tmp" ARCHES=(i686 x86_64) DBEXT=".db.tar.gz" +FILESEXT=".files.tar.gz" PKGEXT=".pkg.tar.*" SRCEXT=".src.tar.gz" -- cgit v1.2.3-2-g168b From 1f81b42ce2cf0c7517609bd6d5fa941a4bc01233 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 18 Dec 2010 12:41:34 +0100 Subject: Remove old files from the cleanup dirs --- config | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config b/config index ff297ec..f1ef098 100644 --- a/config +++ b/config @@ -6,8 +6,13 @@ SRCPOOL='' CLEANUP_DESTDIR="/srv/package-cleanup" CLEANUP_DRYRUN=false +# Time in days to keep moved packages +CLEANUP_KEEP=60 + SOURCE_CLEANUP_DESTDIR="/srv/source-cleanup" SOURCE_CLEANUP_DRYRUN=false +# Time in days to keep moved sourcepackages +SOURCE_CLEANUP_KEEP=14 LOCK_DELAY=10 LOCK_TIMEOUT=300 -- cgit v1.2.3-2-g168b From 9e4f661adf89d150b0891d6edd39e19682d923bf Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 30 Jan 2011 12:18:56 +0100 Subject: Keeping old packages for a month should be long enough --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index f1ef098..53191e0 100644 --- a/config +++ b/config @@ -7,7 +7,7 @@ SRCPOOL='' CLEANUP_DESTDIR="/srv/package-cleanup" CLEANUP_DRYRUN=false # Time in days to keep moved packages -CLEANUP_KEEP=60 +CLEANUP_KEEP=30 SOURCE_CLEANUP_DESTDIR="/srv/source-cleanup" SOURCE_CLEANUP_DRYRUN=false -- cgit v1.2.3-2-g168b 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