Martchus
/
devtools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use nymeria instead of gerolde

This commit is contained in:
Pierre Schmitz 2013-01-20 17:55:00 +01:00
parent cb3a6ce1e8
commit 9cef7e0a9e
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,4 +1,4 @@
V=20121115 V=20130120
PREFIX = /usr/local PREFIX = /usr/local
@ -115,6 +115,6 @@ dist:
gpg --detach-sign --use-agent devtools-$(V).tar.gz gpg --detach-sign --use-agent devtools-$(V).tar.gz
upload: 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 .PHONY: all clean install uninstall dist upload

2
archco.in
View File

@ -11,7 +11,7 @@ fi
case $scriptname in case $scriptname in
archco) archco)
SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";; SVNURL="svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn";;
communityco) communityco)
SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";; SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";;
*) *)

10
commitpkg.in
View File

@ -105,15 +105,7 @@ for _arch in ${arch[@]}; do
done done
if [[ -z $server ]]; then if [[ -z $server ]]; then
case "$repo" in server='nymeria.archlinux.org'
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 fi
if [[ -n $(svn status -q) ]]; then if [[ -n $(svn status -q) ]]; then

8
crossrepomove.in
View File

@ -11,8 +11,8 @@ fi
pkgbase="${1}" pkgbase="${1}"
packages_svn='svn+ssh://gerolde.archlinux.org/srv/svn-packages' packages_svn='svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn'
packages_server='gerolde.archlinux.org' packages_server='nymeria.archlinux.org'
community_svn='svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn' community_svn='svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn'
community_server='nymeria.archlinux.org' community_server='nymeria.archlinux.org'
mirror='http://mirrors.kernel.org/archlinux' mirror='http://mirrors.kernel.org/archlinux'
@ -76,7 +76,7 @@ popd >/dev/null
if [[ "${target_server}" == "${community_server}" ]]; then if [[ "${target_server}" == "${community_server}" ]]; then
dbscripts_path='/srv/repos/svn-community/dbscripts' dbscripts_path='/srv/repos/svn-community/dbscripts'
else else
dbscripts_path='/arch' dbscripts_path='/srv/repos/svn-packages/dbscripts'
fi fi
ssh "${target_server}" "${dbscripts_path}/db-update" || die ssh "${target_server}" "${dbscripts_path}/db-update" || die
@ -85,7 +85,7 @@ msg "Removing ${pkgbase} from ${source_repo}"
if [[ "${source_server}" == "${community_server}" ]]; then if [[ "${source_server}" == "${community_server}" ]]; then
dbscripts_path='/srv/repos/svn-community/dbscripts' dbscripts_path='/srv/repos/svn-community/dbscripts'
else else
dbscripts_path='/arch' dbscripts_path='/srv/repos/svn-packages/dbscripts'
fi fi
for _arch in ${arch[@]}; do for _arch in ${arch[@]}; do
ssh "${source_server}" "${dbscripts_path}/db-remove ${source_repo} ${_arch} ${pkgbase}" ssh "${source_server}" "${dbscripts_path}/db-remove ${source_repo} ${_arch} ${pkgbase}"

2
rebuildpkgs.in
View File

@ -47,7 +47,7 @@ pkg_from_pkgbuild() {
chrootdir="$1"; shift chrootdir="$1"; shift
pkgs="$@" pkgs="$@"
SVNPATH='svn+ssh://gerolde.archlinux.org/srv/svn-packages' SVNPATH='svn+ssh://nymeria.archlinux.org/srv/repos/svn-packages/svn'
msg "Work will be done in $(pwd)/rebuilds" msg "Work will be done in $(pwd)/rebuilds"