[arch-projects] [devtools] [PATCH] makechrootpkg: Do not copy the user keyring into the chroot.
Since commit 75fdff1811a0487f82c75b2e260da905102b4eea we no longer run integrity checks inside the chroot anyway, so this is no longer needed and will never be used. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- makechrootpkg.in | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 511e519..9c79171 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -180,12 +180,7 @@ prepare_chroot() { printf >>"$copydir/etc/group" 'builduser:x:%d:\n' "$builduser_gid" printf >>"$copydir/etc/passwd" 'builduser:x:%d:%d:builduser:/build:/bin/bash\n' "$builduser_uid" "$builduser_gid" - $install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest} - - for x in .gnupg/pubring.{kbx,gpg}; do - [[ -r $USER_HOME/$x ]] || continue - $install -m 644 "$USER_HOME/$x" "$copydir/build/$x" - done + $install -d "$copydir"/{build,startdir,{pkg,srcpkg,src,log}dest} 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 \ -- 2.15.1
participants (1)
-
Eli Schwartz