From fdeaed894a86e3b836848ddeabf64eb93f8d8af5 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Nov 2012 17:32:33 +0100 Subject: Use nymeria.archlinux.org as shared host for developers and trusted users --- Makefile | 2 +- archco.in | 4 ++-- commitpkg.in | 10 +--------- crossrepomove.in | 8 ++++---- rebuildpkgs.in | 2 +- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index b0e07fa..694f84a 100644 --- a/Makefile +++ b/Makefile @@ -115,6 +115,6 @@ dist: gpg --detach-sign --use-agent devtools-$(V).tar.gz upload: - scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig gerolde.archlinux.org:/srv/ftp/other/devtools/ + scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig nymeria.archlinux.org:/srv/ftp/other/devtools/ .PHONY: all clean install uninstall dist upload diff --git a/archco.in b/archco.in index 4e462ba..1ee977e 100644 --- a/archco.in +++ b/archco.in @@ -11,9 +11,9 @@ fi case $scriptname in archco) - SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";; + SVNURL="svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn";; communityco) - SVNURL="svn+ssh://sigurd.archlinux.org/srv/svn-packages";; + SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";; *) die "Couldn't find svn url for $scriptname" ;; diff --git a/commitpkg.in b/commitpkg.in index be1ed71..4d13cf8 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -105,15 +105,7 @@ for _arch in ${arch[@]}; do done if [[ -z $server ]]; then - case "$repo" in - core|extra|testing|staging|kde-unstable|gnome-unstable) - server='gerolde.archlinux.org' ;; - community*|multilib*) - server='sigurd.archlinux.org' ;; - *) - server='gerolde.archlinux.org' - msg "Non-standard repository $repo in use, defaulting to server $server" ;; - esac + server='nymeria.archlinux.org' fi if [[ -n $(svn status -q) ]]; then diff --git a/crossrepomove.in b/crossrepomove.in index 5a2c6e9..fa649b1 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -11,10 +11,10 @@ fi pkgbase="${1}" -packages_svn='svn+ssh://gerolde.archlinux.org/srv/svn-packages' -packages_server='gerolde.archlinux.org' -community_svn='svn+ssh://sigurd.archlinux.org/srv/svn-packages' -community_server='sigurd.archlinux.org' +packages_svn='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn' +packages_server='nymeria.archlinux.org' +community_svn='svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn' +community_server='nymeria.archlinux.org' mirror='http://mirrors.kernel.org/archlinux' case $scriptname in diff --git a/rebuildpkgs.in b/rebuildpkgs.in index f7b1612..49c7ac7 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -47,7 +47,7 @@ pkg_from_pkgbuild() { chrootdir="$1"; shift pkgs="$@" -SVNPATH='svn+ssh://gerolde.archlinux.org/srv/svn-packages' +SVNPATH='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn' msg "Work will be done in $(pwd)/rebuilds" -- cgit v1.2.3-70-g09d2 From a05969b29d31e3fc8e7186f6e53dfe1b839b6f5f Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Nov 2012 18:26:45 +0100 Subject: prepare release --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 694f84a..5cd51b9 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=20121027 +V=20121103 PREFIX = /usr/local -- cgit v1.2.3-70-g09d2 From 21458bd07b06e35b9b4ad6495440b9a0c4bbd345 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 11 Nov 2012 21:07:34 +0100 Subject: For now only packages and svn from sigurd will be moved to nymeria --- Makefile | 2 +- archco.in | 2 +- commitpkg.in | 10 +++++++++- crossrepomove.in | 4 ++-- rebuildpkgs.in | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5cd51b9..88479d5 100644 --- a/Makefile +++ b/Makefile @@ -115,6 +115,6 @@ dist: gpg --detach-sign --use-agent devtools-$(V).tar.gz upload: - scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig nymeria.archlinux.org:/srv/ftp/other/devtools/ + scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig gerolde.archlinux.org:/srv/ftp/other/devtools/ .PHONY: all clean install uninstall dist upload diff --git a/archco.in b/archco.in index 1ee977e..5d497cc 100644 --- a/archco.in +++ b/archco.in @@ -11,7 +11,7 @@ fi case $scriptname in archco) - SVNURL="svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn";; + SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";; communityco) SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";; *) diff --git a/commitpkg.in b/commitpkg.in index 4d13cf8..e31838c 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -105,7 +105,15 @@ for _arch in ${arch[@]}; do done if [[ -z $server ]]; then - server='nymeria.archlinux.org' + case "$repo" in + core|extra|testing|staging|kde-unstable|gnome-unstable) + server='gerolde.archlinux.org' ;; + community*|multilib*) + server='nymeria.archlinux.org' ;; + *) + server='gerolde.archlinux.org' + msg "Non-standard repository $repo in use, defaulting to server $server" ;; + esac fi if [[ -n $(svn status -q) ]]; then diff --git a/crossrepomove.in b/crossrepomove.in index fa649b1..a19e5f3 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -11,8 +11,8 @@ fi pkgbase="${1}" -packages_svn='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn' -packages_server='nymeria.archlinux.org' +packages_svn='svn+ssh://gerolde.archlinux.org/srv/svn-packages' +packages_server='gerolde.archlinux.org' community_svn='svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn' community_server='nymeria.archlinux.org' mirror='http://mirrors.kernel.org/archlinux' diff --git a/rebuildpkgs.in b/rebuildpkgs.in index 49c7ac7..f7b1612 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -47,7 +47,7 @@ pkg_from_pkgbuild() { chrootdir="$1"; shift pkgs="$@" -SVNPATH='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn' +SVNPATH='svn+ssh://gerolde.archlinux.org/srv/svn-packages' msg "Work will be done in $(pwd)/rebuilds" -- cgit v1.2.3-70-g09d2 From fc95a5755667a06cd7bab7c4b24ea8ce331648b9 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 12 Nov 2012 18:44:26 +0100 Subject: prepare release --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 88479d5..d716c05 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=20121103 +V=20121112 PREFIX = /usr/local -- cgit v1.2.3-70-g09d2 From 54bad4c91d1d003a6d8c8e365d0d9fd724386b8e Mon Sep 17 00:00:00 2001 From: Eric Bélanger Date: Sun, 4 Nov 2012 01:14:57 -0400 Subject: checkpkg: replace wget usage by curl 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 --- checkpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkpkg.in b/checkpkg.in index d3a63ba..95bf049 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -58,7 +58,7 @@ for _pkgname in "${pkgname[@]}"; do elif [[ -f "$STARTDIR/$oldpkg" ]]; then ln -s "$STARTDIR/$oldpkg" "$oldpkg" else - wget --quiet "$pkgurl" + curl -fsLC - --retry 3 --retry-delay 3 -o "$oldpkg" "$pkgurl" fi fi -- cgit v1.2.3-70-g09d2 From 41b54bdde5112e884c8577a07805db9c9d2bdb7b Mon Sep 17 00:00:00 2001 From: Eric Bélanger Date: Mon, 12 Nov 2012 21:25:30 -0500 Subject: mkarchroot: Remove unnecessary parameter for usage function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes FS#28973 Signed-off-by: Eric Bélanger Signed-off-by: Pierre Schmitz --- mkarchroot.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkarchroot.in b/mkarchroot.in index 76ad840..6a86231 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -44,7 +44,7 @@ while getopts 'r:ufnhC:M:c:' arg; do M) makepkg_conf="$OPTARG" ;; n) NOCOPY='y' ;; c) cache_dir="$OPTARG" ;; - h|?) usage 0 ;; + h|?) usage ;; *) error "invalid argument '${arg}'"; usage ;; esac done -- cgit v1.2.3-70-g09d2 From 4427b80aba6fe2de16d1403b86995d9761926100 Mon Sep 17 00:00:00 2001 From: Eric Bélanger Date: Tue, 13 Nov 2012 03:08:46 -0500 Subject: crossrepomove: Fix dbscripts path for [community] move to nymeria 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 --- crossrepomove.in | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/crossrepomove.in b/crossrepomove.in index a19e5f3..8794326 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -72,11 +72,23 @@ svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${targe pushd "target_checkout/${pkgbase}/trunk" >/dev/null archrelease "${arch[@]/#/$target_repo-}" || die popd >/dev/null -ssh "${target_server}" '/arch/db-update' || die + +if [[ "${target_server}" == "${community_server}" ]]; then + dbscripts_path='/srv/repos/svn-community/dbscripts' +else + dbscripts_path='/arch' +fi + +ssh "${target_server}" "${dbscripts_path}/db-update" || die msg "Removing ${pkgbase} from ${source_repo}" +if [[ "${source_server}" == "${community_server}" ]]; then + dbscripts_path='/srv/repos/svn-community/dbscripts' +else + dbscripts_path='/arch' +fi for _arch in ${arch[@]}; do - ssh "${source_server}" "/arch/db-remove ${source_repo} ${_arch} ${pkgbase}" + ssh "${source_server}" "${dbscripts_path}/db-remove ${source_repo} ${_arch} ${pkgbase}" done svn -q checkout -N "${source_svn}" source_checkout svn -q up "source_checkout/${pkgbase}" -- cgit v1.2.3-70-g09d2 From 2020fb406a37d4d1ee981e72f9fa08d203e39cad Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 15 Nov 2012 14:38:03 +0100 Subject: prepare release --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d716c05..931318b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=20121112 +V=20121115 PREFIX = /usr/local -- cgit v1.2.3-70-g09d2 From 890baf68915294d27dfb11efc7a889e21e46ec2b Mon Sep 17 00:00:00 2001 From: Eric Bélanger Date: Thu, 15 Nov 2012 09:22:50 -0500 Subject: Make sure the usage functions are consistent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The usage messages now begins with a "Usage:", i.e. capitalized and with a colon. Fixes FS#26956. Signed-off-by: Eric Bélanger Signed-off-by: Pierre Schmitz --- archbuild.in | 2 +- commitpkg.in | 4 ++-- finddeps.in | 2 +- makechrootpkg.in | 2 +- mkarchroot.in | 2 +- rebuildpkgs.in | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/archbuild.in b/archbuild.in index 00234f3..10d33b8 100644 --- a/archbuild.in +++ b/archbuild.in @@ -18,7 +18,7 @@ chroots='/var/lib/archbuild' clean_first=false usage() { - echo "usage $cmd" + echo "Usage: $cmd" echo ' -c Recreate the chroot before building' echo ' -r Create chroots in this directory' exit 1 diff --git a/commitpkg.in b/commitpkg.in index e31838c..d9ee0aa 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -42,7 +42,7 @@ pkgbase=${pkgbase:-$pkgname} case "$cmd" in commitpkg) if (( $# == 0 )); then - die 'usage: commitpkg [-f] [-s server] [-l limit] [-a arch] [commit message]' + die 'Usage: commitpkg [-f] [-s server] [-l limit] [-a arch] [commit message]' fi repo="$1" shift @@ -51,7 +51,7 @@ case "$cmd" in repo="${cmd%pkg}" ;; *) - die 'usage: commitpkg [-f] [-s server] [-l limit] [-a arch] [commit message]' + die 'Usage: commitpkg [-f] [-s server] [-l limit] [-a arch] [commit message]' ;; esac diff --git a/finddeps.in b/finddeps.in index 1526fb8..7a2a3fb 100644 --- a/finddeps.in +++ b/finddeps.in @@ -8,7 +8,7 @@ m4_include(lib/common.sh) match=$1 if [[ -z $match ]]; then - echo 'usage: finddeps ' + echo 'Usage: finddeps ' echo '' echo 'Find packages that depend on a given depname.' echo 'Run this script from the top-level directory of your ABS tree.' diff --git a/makechrootpkg.in b/makechrootpkg.in index 6c0b013..762ad7b 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -28,7 +28,7 @@ default_copy=$USER src_owner=${SUDO_USER:-$USER} usage() { - echo "usage ${0##*/} [options] -r [--] [makepkg args]" + echo "Usage: ${0##*/} [options] -r [--] [makepkg args]" echo ' Run this script in a PKGBUILD dir to build a package inside a' echo ' clean chroot. All unrecognized arguments passed to this script' echo ' will be passed to makepkg.' diff --git a/mkarchroot.in b/mkarchroot.in index 6a86231..cb95f8e 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -22,7 +22,7 @@ APPNAME=$(basename "${0}") # usage: usage usage() { - echo "usage ${APPNAME} [options] working-dir [package-list | app]" + echo "Usage: ${APPNAME} [options] working-dir [package-list | app]" echo ' options:' echo ' -r Run "app" within the context of the chroot' echo ' -u Update the chroot via pacman' diff --git a/rebuildpkgs.in b/rebuildpkgs.in index f7b1612..a4c8969 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -12,7 +12,7 @@ m4_include(lib/common.sh) if (( $# < 1 )); then - echo "usage: $(basename $0) " + echo "Usage: $(basename $0) " echo " example: $(basename $0) ~/chroot readline bash foo bar baz" exit 1 fi -- cgit v1.2.3-70-g09d2