diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2018-01-03 00:47:36 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2018-01-03 14:57:56 -0500 |
| commit | 61b1718f50083632e42decb35ebed7c2f188d558 (patch) | |
| tree | 727e753ad1d2168caf27778843e8c2134fef882e | |
| parent | e990ee409f33ca24b6dbc60530c8bd6f0ccf85bb (diff) | |
| download | devtools-61b1718f50083632e42decb35ebed7c2f188d558.tar.xz | |
makechrootpkg: Put "keyserver-options auto-key-retrieve" in gpg.conflukeshu/to-upstream/misc-20180115
This allows signature verification by `makepkg --verifysource`, `git
verify-tag`, and such without requiring the user to manually retrieve
the keys first.
This is based off of devtools32 commit 009695b (2017-06-27) by
Erich Eckner <git@eckner.net>. There are 2 differences from that
commit:
- In this version, gpg.conf is owned by builduser, not by root
- In this version, we don't keep appending duplicate lines if we
re-use a chroot
| -rw-r--r-- | makechrootpkg.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index a6c54cc..d2a0477 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -186,6 +186,7 @@ prepare_chroot() { [[ -r $USER_HOME/$x ]] || continue $install -m 644 "$USER_HOME/$x" "$copydir/build/$x" done + $install -m644 /dev/stdin "$copydir/build/.gnupg/gpg.conf" <<<'keyserver-options auto-key-retrieve' sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf" for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \ |