From f1effdf989edc616f4ee38808fc420e7f3f2f45b Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Sun, 6 Dec 2015 16:38:01 +0000 Subject: makechrootpkg: use /build as HOME for the builduser This way the HOME dir is writable and no ugly hacks are required in the PKGBUILD if $HOME is accessed (f.e. maven, gradle and also some python tests etc.) --- makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 3c8a20f..309b495 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -189,7 +189,7 @@ prepare_chroot() { # We can't use useradd without chrooting, otherwise it invokes PAM modules # which we might not be able to load (i.e. when building i686 packages on # an x86_64 host). - printf 'builduser:x:%d:100:builduser:/:/usr/bin/nologin\n' "$builduser_uid" >>"$copydir/etc/passwd" + printf 'builduser:x:%d:100:builduser:/build:/usr/bin/nologin\n' "$builduser_uid" >>"$copydir/etc/passwd" chown -R "$builduser_uid" "$copydir"/{build,pkgdest,srcpkgdest,logdest,srcdest,startdir} if [[ -n $MAKEFLAGS ]]; then -- cgit v1.2.3-70-g09d2 From c5128dc45ccb13a4a99a8ffe7aa6bdf84cc89970 Mon Sep 17 00:00:00 2001 From: Evangelos Foutras Date: Sat, 9 Jan 2016 11:53:37 +0200 Subject: makechrootpkg: set builduser's shell to /bin/bash Having it set to nologin breaks a couple of tests in Git and Python. --- makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 309b495..9cb25fc 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -189,7 +189,7 @@ prepare_chroot() { # We can't use useradd without chrooting, otherwise it invokes PAM modules # which we might not be able to load (i.e. when building i686 packages on # an x86_64 host). - printf 'builduser:x:%d:100:builduser:/build:/usr/bin/nologin\n' "$builduser_uid" >>"$copydir/etc/passwd" + printf 'builduser:x:%d:100:builduser:/build:/bin/bash\n' "$builduser_uid" >>"$copydir/etc/passwd" chown -R "$builduser_uid" "$copydir"/{build,pkgdest,srcpkgdest,logdest,srcdest,startdir} if [[ -n $MAKEFLAGS ]]; then -- cgit v1.2.3-70-g09d2 From f85fc32d78414c25f82e0b13e3d99f15ab787b56 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 7 Feb 2016 10:12:56 +0100 Subject: Update bundled pacman and makepkg configuration --- makepkg-i686.conf | 5 +++-- makepkg-x86_64.conf | 5 +++-- pacman-extra.conf | 1 + pacman-gnome-unstable.conf | 1 + pacman-kde-unstable.conf | 1 + pacman-multilib-staging.conf | 1 + pacman-multilib-testing.conf | 1 + pacman-multilib.conf | 1 + pacman-staging.conf | 1 + pacman-testing.conf | 1 + 10 files changed, 14 insertions(+), 4 deletions(-) diff --git a/makepkg-i686.conf b/makepkg-i686.conf index ac54d07..c565795 100644 --- a/makepkg-i686.conf +++ b/makepkg-i686.conf @@ -73,7 +73,7 @@ BUILDENV=(!distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug) +# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -84,9 +84,10 @@ BUILDENV=(!distcc color !ccache check !sign) #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS #-- upx: Compress binary executable files using UPX +#-- optipng: Optimize PNG images with optipng #-- debug: Add debugging flags as specified in DEBUG_* variables # -OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug) +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index 415231a..bf83f35 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -73,7 +73,7 @@ BUILDENV=(!distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug) +# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -84,9 +84,10 @@ BUILDENV=(!distcc color !ccache check !sign) #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS #-- upx: Compress binary executable files using UPX +#-- optipng: Optimize PNG images with optipng #-- debug: Add debugging flags as specified in DEBUG_* variables # -OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug) +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/pacman-extra.conf b/pacman-extra.conf index 45fe03d..8ea402a 100644 --- a/pacman-extra.conf +++ b/pacman-extra.conf @@ -14,6 +14,7 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u diff --git a/pacman-gnome-unstable.conf b/pacman-gnome-unstable.conf index ff905fe..315eb44 100644 --- a/pacman-gnome-unstable.conf +++ b/pacman-gnome-unstable.conf @@ -14,6 +14,7 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u diff --git a/pacman-kde-unstable.conf b/pacman-kde-unstable.conf index 382f091..eb722da 100644 --- a/pacman-kde-unstable.conf +++ b/pacman-kde-unstable.conf @@ -14,6 +14,7 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u diff --git a/pacman-multilib-staging.conf b/pacman-multilib-staging.conf index d1b38e0..7e32aa3 100644 --- a/pacman-multilib-staging.conf +++ b/pacman-multilib-staging.conf @@ -14,6 +14,7 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u diff --git a/pacman-multilib-testing.conf b/pacman-multilib-testing.conf index 276e747..462552d 100644 --- a/pacman-multilib-testing.conf +++ b/pacman-multilib-testing.conf @@ -14,6 +14,7 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u diff --git a/pacman-multilib.conf b/pacman-multilib.conf index a6511e0..b7ef137 100644 --- a/pacman-multilib.conf +++ b/pacman-multilib.conf @@ -14,6 +14,7 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u diff --git a/pacman-staging.conf b/pacman-staging.conf index e3d6e47..291333b 100644 --- a/pacman-staging.conf +++ b/pacman-staging.conf @@ -14,6 +14,7 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u diff --git a/pacman-testing.conf b/pacman-testing.conf index 5712937..8a12d23 100644 --- a/pacman-testing.conf +++ b/pacman-testing.conf @@ -14,6 +14,7 @@ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -- cgit v1.2.3-70-g09d2 From 7fc22b9abaf52a8326b93b38578fd25457f9c253 Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Fri, 27 May 2016 21:02:46 +0200 Subject: Use repos.archlinux.org everywhere instead of hostname based domains This makes it a lot easier to swap out the host that actually serves the repos in the future. --- Makefile | 3 ++- archco.in | 4 ++-- commitpkg.in | 2 +- crossrepomove.in | 2 +- rebuildpkgs.in | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ce2b042..5f73d0b 100644 --- a/Makefile +++ b/Makefile @@ -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 + diff --git a/archco.in b/archco.in index 5bdc4e6..2a58921 100644 --- a/archco.in +++ b/archco.in @@ -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/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" -- cgit v1.2.3-70-g09d2 From f36c45e0c66f0d83dc30f899676c094d925bff24 Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Fri, 27 May 2016 21:11:46 +0200 Subject: Makefile: change version to 20160527 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5f73d0b..d86d078 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=20151129 +V=20160527 PREFIX = /usr/local -- cgit v1.2.3-70-g09d2 From 882f5d04516680b60c0da85c51fd6191c77b38ab Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Fri, 27 May 2016 22:16:09 +0200 Subject: mkarchroot: Manually generate machine-id because nspawn expects it --- mkarchroot.in | 2 ++ 1 file changed, 2 insertions(+) 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"} \ -- cgit v1.2.3-70-g09d2 From 8f94d8118fefc48b12be4a35df5ae2ff7a39486f Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Fri, 27 May 2016 22:17:02 +0200 Subject: This is 20160527.1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d86d078..f3c9692 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=20160527 +V=20160527.1 PREFIX = /usr/local -- cgit v1.2.3-70-g09d2