diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2018-01-15 18:36:45 +0100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2018-05-13 15:16:20 +0200 |
| commit | 509c00ea23e676d97072786f1fbe97dc23fa898b (patch) | |
| tree | 09216c0c3a07b47852866725ee43494bb482df3f | |
| parent | 5713cd629c97c7a12a600a1dd73ad81d87374eb1 (diff) | |
| download | devtools-509c00ea23e676d97072786f1fbe97dc23fa898b.tar.gz devtools-509c00ea23e676d97072786f1fbe97dc23fa898b.tar.xz | |
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.
| -rw-r--r-- | makechrootpkg.in | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index 57231d5..f709955 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -181,12 +181,7 @@ prepare_chroot() { printf >>"$copydir/etc/passwd" 'builduser:x:%d:%d:builduser:/build:/bin/bash\n' "$builduser_uid" "$builduser_gid" printf >>"$copydir/etc/shadow" 'builduser:!!:%d::::::\n' "$(( $(date -u +%s) / 86400 ))" - $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 \ |