summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2018-03-26 18:22:51 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2018-03-26 18:22:51 -0400
commitc506c60b50c38dab337fe843c812cb77be606d48 (patch)
treebe0143fe6fd50ea461f92f10610bd0c0705d244c
parent07cd357384e67c7b03a19cf3ec182907a00efef4 (diff)
parent1ce1c85402a8dab1dfe629628af50438d4054b79 (diff)
downloaddevtools32-libretools-20180326.tar.xz
Merge branch 'lukeshu/rebase/master'libretools-20180326
-rw-r--r--Makefile1
-rw-r--r--makechrootpkg.in7
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 1debf53..f69d613 100644
--- a/Makefile
+++ b/Makefile
@@ -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")