Merge branch 'master' of git.archlinux.org:/srv/git/devtools
This commit is contained in:
commit
eb88a303b7
5
Makefile
5
Makefile
|
@ -1,4 +1,4 @@
|
|||
V=20151129
|
||||
V=20160527.1
|
||||
|
||||
PREFIX = /usr/local
|
||||
|
||||
|
@ -112,6 +112,7 @@ 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 repos.archlinux.org:/srv/ftp/other/devtools/
|
||||
|
||||
.PHONY: all clean install uninstall dist upload
|
||||
|
||||
|
|
|
@ -11,9 +11,9 @@ fi
|
|||
|
||||
case $scriptname in
|
||||
archco)
|
||||
SVNURL="svn+ssh://svn-packages@nymeria.archlinux.org/srv/repos/svn-packages/svn";;
|
||||
SVNURL="svn+ssh://svn-packages@repos.archlinux.org/srv/repos/svn-packages/svn";;
|
||||
communityco)
|
||||
SVNURL="svn+ssh://svn-community@nymeria.archlinux.org/srv/repos/svn-community/svn";;
|
||||
SVNURL="svn+ssh://svn-community@repos.archlinux.org/srv/repos/svn-community/svn";;
|
||||
*)
|
||||
die "Couldn't find svn url for %s" "$scriptname"
|
||||
;;
|
||||
|
|
|
@ -92,7 +92,7 @@ for _arch in ${arch[@]}; do
|
|||
done
|
||||
|
||||
if [[ -z $server ]]; then
|
||||
server='nymeria.archlinux.org'
|
||||
server='repos.archlinux.org'
|
||||
fi
|
||||
|
||||
if [[ -n $(svn status -q) ]]; then
|
||||
|
|
|
@ -29,7 +29,7 @@ case $scriptname in
|
|||
;;
|
||||
esac
|
||||
|
||||
server='nymeria.archlinux.org'
|
||||
server='repos.archlinux.org'
|
||||
source_svn="svn+ssh://svn-${source_name}@${server}/srv/repos/svn-${source_name}/svn"
|
||||
target_svn="svn+ssh://svn-${target_name}@${server}/srv/repos/svn-${target_name}/svn"
|
||||
source_dbscripts="/srv/repos/svn-${source_name}/dbscripts"
|
||||
|
|
|
@ -75,6 +75,8 @@ printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
|
|||
echo 'LANG=C' > "$working_dir/etc/locale.conf"
|
||||
echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"
|
||||
|
||||
systemd-machine-id-setup --root="$working_dir"
|
||||
|
||||
exec arch-nspawn \
|
||||
${pac_conf:+-C "$pac_conf"} \
|
||||
${makepkg_conf:+-M "$makepkg_conf"} \
|
||||
|
|
|
@ -47,7 +47,7 @@ pkg_from_pkgbuild() {
|
|||
chrootdir="$1"; shift
|
||||
pkgs="$@"
|
||||
|
||||
SVNPATH='svn+ssh://nymeria.archlinux.org/srv/repos/svn-packages/svn'
|
||||
SVNPATH='svn+ssh://repos.archlinux.org/srv/repos/svn-packages/svn'
|
||||
|
||||
msg "Work will be done in $(pwd)/rebuilds"
|
||||
|
||||
|
|
Loading…
Reference in New Issue