Commit eb88a303 authored by Pierre Schmitz's avatar Pierre Schmitz
Browse files

Merge branch 'master' of git.archlinux.org:/srv/git/devtools

parents 7fe0f688 8f94d811

Makefile

+3 −2
Original line number Original line Diff line number Diff line 
V=20151129

V=20160527.1





PREFIX = /usr/local

PREFIX = /usr/local
@@ -112,6 +112,7 @@ 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 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

.PHONY: all clean install uninstall dist upload

archco.in

+2 −2
Original line number Original line Diff line number Diff line
@@ -11,9 +11,9 @@ fi 




case $scriptname in

case $scriptname in

	archco)

	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)

	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"

		die "Couldn't find svn url for %s" "$scriptname"

		;;

		;;

commitpkg.in

+1 −1
Original line number Original line Diff line number Diff line
@@ -92,7 +92,7 @@ for _arch in ${arch[@]}; do 
done

done





if [[ -z $server ]]; then

if [[ -z $server ]]; then

	server='nymeria.archlinux.org'

	server='repos.archlinux.org'

fi

fi





if [[ -n $(svn status -q) ]]; then

if [[ -n $(svn status -q) ]]; then

crossrepomove.in

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ case $scriptname in 
		;;

		;;

esac

esac





server='nymeria.archlinux.org'

server='repos.archlinux.org'

source_svn="svn+ssh://svn-${source_name}@${server}/srv/repos/svn-${source_name}/svn"

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"

target_svn="svn+ssh://svn-${target_name}@${server}/srv/repos/svn-${target_name}/svn"

source_dbscripts="/srv/repos/svn-${source_name}/dbscripts"

source_dbscripts="/srv/repos/svn-${source_name}/dbscripts"

mkarchroot.in

+2 −0
Original line number Original line Diff line number Diff line
@@ -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 'LANG=C' > "$working_dir/etc/locale.conf"

echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"

echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"





systemd-machine-id-setup --root="$working_dir"



exec arch-nspawn \

exec arch-nspawn \

	${pac_conf:+-C "$pac_conf"} \

	${pac_conf:+-C "$pac_conf"} \

	${makepkg_conf:+-M "$makepkg_conf"} \

	${makepkg_conf:+-M "$makepkg_conf"} \