diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2016-05-28 10:09:45 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2016-05-28 10:09:45 +0200 |
| commit | eb88a303b7d3e3f829800e36e543df9a7dd5d6e2 (patch) | |
| tree | 0596cec456dce28cac22dcd596657c0d61d43ace | |
| parent | 7fe0f688566fe2bf637d0503056cf04a6d4a5c87 (diff) | |
| parent | 8f94d8118fefc48b12be4a35df5ae2ff7a39486f (diff) | |
| download | devtools-eb88a303b7d3e3f829800e36e543df9a7dd5d6e2.tar.xz | |
Merge branch 'master' of git.archlinux.org:/srv/git/devtools
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | archco.in | 4 | ||||
| -rw-r--r-- | commitpkg.in | 2 | ||||
| -rw-r--r-- | crossrepomove.in | 2 | ||||
| -rw-r--r-- | mkarchroot.in | 2 | ||||
| -rw-r--r-- | rebuildpkgs.in | 2 |
6 files changed, 10 insertions, 7 deletions
@@ -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" ;; diff --git a/commitpkg.in b/commitpkg.in index d779e96..3b3246b 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -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 diff --git a/crossrepomove.in b/crossrepomove.in index 912504f..d0964e3 100644 --- a/crossrepomove.in +++ b/crossrepomove.in @@ -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" diff --git a/mkarchroot.in b/mkarchroot.in index 78384da..4d8efb0 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -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"} \ diff --git a/rebuildpkgs.in b/rebuildpkgs.in index 2f71c40..fb19258 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -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" |