Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/makechrootpkg.in
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-12-12 22:04:16 +0100
committerErich Eckner <git@eckner.net>2017-12-12 22:04:16 +0100
commit1c7d7a8f01f4e8e991cae67fe7210d6351dc0635 (patch)
tree6a5da43ab27fd5c863b7bbad1ee91a9538a05fd4 /makechrootpkg.in
parent5ae91417bd22b287ee3894a2ceea29caf6a0e874 (diff)
parenteab5aba9b027a7689acaf2382a04ff69b5b8771e (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'makechrootpkg.in')
-rw-r--r--makechrootpkg.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index ab9a244..2398818 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -206,6 +206,7 @@ EOF
{
printf '#!/bin/bash\n'
declare -f _chrootbuild
+ declare -p SOURCE_DATE_EPOCH 2>/dev/null
printf '_chrootbuild "$@" || exit\n'
if $run_namcap; then
@@ -235,7 +236,7 @@ _chrootbuild() {
# use "$" in arguments to commands with "sudo -i". ${foo} or
# ${1} is OK, but $foo or $1 isn't.
# https://bugzilla.sudo.ws/show_bug.cgi?id=765
- sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
+ sudo --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@"
}
_chrootnamcap() {
@@ -346,7 +347,7 @@ main() {
[[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.'
makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}}
- check_root
+ check_root SOURCE_DATE_EPOCH
# Canonicalize chrootdir, getting rid of trailing /
chrootdir=$(readlink -e "$passeddir")