diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2018-03-26 18:22:51 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2018-03-26 18:22:51 -0400 |
| commit | c506c60b50c38dab337fe843c812cb77be606d48 (patch) | |
| tree | be0143fe6fd50ea461f92f10610bd0c0705d244c | |
| parent | 07cd357384e67c7b03a19cf3ec182907a00efef4 (diff) | |
| parent | 1ce1c85402a8dab1dfe629628af50438d4054b79 (diff) | |
| download | devtools32-c506c60b50c38dab337fe843c812cb77be606d48.tar.xz | |
Merge branch 'lukeshu/rebase/master'libretools-20180326
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | makechrootpkg.in | 7 |
2 files changed, 4 insertions, 4 deletions
@@ -31,7 +31,6 @@ CONFIGFILES = \ COMMITPKG_LINKS = \ extrapkg \ - corepkg \ testingpkg \ stagingpkg \ communitypkg \ diff --git a/makechrootpkg.in b/makechrootpkg.in index d357b46..b594de2 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -69,7 +69,7 @@ load_vars() { [[ -f $makepkg_conf ]] || return 1 for var in {SRC,SRCPKG,PKG,LOG}DEST MAKEFLAGS PACKAGER; do - [[ -z ${!var:-} ]] && eval "$(grep "^${var}=" "$makepkg_conf")" + [[ -z ${!var:-} ]] && eval "$(grep -a "^${var}=" "$makepkg_conf")" done return 0 @@ -301,7 +301,8 @@ download_sources() { chmod 1777 "$builddir" # Ensure sources are downloaded - sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \ + sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \ + env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \ makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o || die "Could not download sources." @@ -390,7 +391,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 + check_root SOURCE_DATE_EPOCH,GNUPGHOME # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir") |