diff options
| author | Erich Eckner <git@eckner.net> | 2018-05-16 15:52:04 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-05-29 09:02:49 +0200 |
| commit | 472b0e98a87c9fc942db930a4d5c3f34a88d2169 (patch) | |
| tree | c0902d5d62f55370ca973d4138829b267a393e4a | |
| parent | 75cd26b393b4dc5903a3894c34ac2287b6ae4d5b (diff) | |
| download | devtools32-472b0e98a87c9fc942db930a4d5c3f34a88d2169.tar.xz | |
revert eab5aba9b027a7689acaf2382a04ff69b5b8771e - it does not work with sudo-1.8.23-1v20180528archlinux32/v20180528
| -rw-r--r-- | archbuild.in | 7 | ||||
| -rw-r--r-- | lib/archroot.sh | 6 | ||||
| -rw-r--r-- | makechrootpkg.in | 5 |
3 files changed, 5 insertions, 13 deletions
diff --git a/archbuild.in b/archbuild.in index 73ae65d..7e1a964 100644 --- a/archbuild.in +++ b/archbuild.in @@ -45,7 +45,7 @@ while getopts 'hcr:' arg; do esac done -check_root SOURCE_DATE_EPOCH +check_root if [ "${arch}" = "x86_64" ]; then cache_dir='' @@ -100,10 +100,5 @@ else pacman --arch ${arch} -Syu --noconfirm || abort fi -# Always build official packages reproducibly -if [[ ! -v SOURCE_DATE_EPOCH ]]; then - export SOURCE_DATE_EPOCH=$(date +%s) -fi - msg "Building in chroot for [%s] (%s)..." "${repo}" "${arch}" exec makechrootpkg -r "${chroots}/${repo}-${arch}" "${makechrootpkg_args[@]}" diff --git a/lib/archroot.sh b/lib/archroot.sh index f279603..98fd2cf 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -6,15 +6,13 @@ CHROOT_VERSION='v4' ## -# usage : check_root $keepenv +# usage : check_root ## orig_argv=("$0" "$@") check_root() { - local keepenv=$1 - (( EUID == 0 )) && return if type -P sudo >/dev/null; then - exec sudo --preserve-env=$keepenv -- "${orig_argv[@]}" + exec sudo -- "${orig_argv[@]}" else exec su root -c "$(printf ' %q' "${orig_argv[@]}")" fi diff --git a/makechrootpkg.in b/makechrootpkg.in index 9264134..c584089 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -202,7 +202,6 @@ EOF { printf '#!/bin/bash\n' declare -f _chrootbuild - declare -p SOURCE_DATE_EPOCH 2>/dev/null || true printf '_chrootbuild "$@" || exit\n' if [[ $run_namcap = true ]]; then @@ -229,7 +228,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 --preserve-env=SOURCE_DATE_EPOCH -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@" + sudo -iu builduser bash -c 'cd /startdir; makepkg "$@"' -bash "$@" } _chrootnamcap() { @@ -341,7 +340,7 @@ main() { [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.' makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}} - check_root SOURCE_DATE_EPOCH,GNUPGHOME + check_root # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") |