Fix PGP errors

This commit is contained in:
Jesús 2021-07-31 17:09:43 -05:00
parent 3c829f0b87
commit 87d866c50e
No known key found for this signature in database
GPG Key ID: F6EE7BC59A315766
2 changed files with 8 additions and 4 deletions

View File

@ -35,7 +35,7 @@ PACMAN_PACKAGES=(
libassuan libgpg-error libnghttp2 libssh2 lzo libressl pacman pacman-mirrorlist xz zlib libffi libassuan libgpg-error libnghttp2 libssh2 lzo libressl pacman pacman-mirrorlist xz zlib libffi
krb5 e2fsprogs keyutils libidn2 gcc-libs lz4 libpsl icu zstd readline libunistring findutils krb5 e2fsprogs keyutils libidn2 gcc-libs lz4 libpsl icu zstd readline libunistring findutils
ncurses pinentry-curses lsb-release ca-certificates ca-certificates-utils p11-kit libtasn1 ncurses pinentry-curses lsb-release ca-certificates ca-certificates-utils p11-kit libtasn1
libcap shadow pcre gzip libcap shadow pcre gzip gettext-tiny
) )
BASIC_PACKAGES=(${PACMAN_PACKAGES[*]} filesystem) BASIC_PACKAGES=(${PACMAN_PACKAGES[*]} filesystem)
EXTRA_PACKAGES=(gawk file tar hyperrc) EXTRA_PACKAGES=(gawk file tar hyperrc)
@ -121,7 +121,10 @@ clean_chroot() {
local DEST=$1 local DEST=$1
debug "Clean Chroot" debug "Clean Chroot"
rm -rf "$DEST/.BUILDINFO" "$DEST/.INSTALL" "$DEST/.MTREE" "$DEST/.PKGINFO" || true rm -rf "$DEST/.BUILDINFO" "$DEST/.INSTALL" "$DEST/.MTREE" "$DEST/.PKGINFO" || true
echo '' > "$DEST/var/log/pacman.log" for i in $DEST/usr/share/{doc,man,info}; do
rm -rf "$i" && install -d "$i"
done
truncate -s 0 "$DEST/var/log/pacman.log"
} }
configure_minimal_system() { configure_minimal_system() {
@ -130,6 +133,7 @@ configure_minimal_system() {
mkdir -p "$DEST/dev" mkdir -p "$DEST/dev"
sed -ie 's|^root:.*$|root:$1$GT9AUpJe$oXANVIjIzcnmOpY07iaGi/:14657::::::|' "$DEST/etc/shadow" sed -ie 's|^root:.*$|root:$1$GT9AUpJe$oXANVIjIzcnmOpY07iaGi/:14657::::::|' "$DEST/etc/shadow"
touch "$DEST/etc/group" touch "$DEST/etc/group"
echo "nameserver 9.9.9.9" > "$DEST/etc/resolv.conf"
echo "bootstrap" > "$DEST/etc/hostname" echo "bootstrap" > "$DEST/etc/hostname"
rm -f "$DEST/etc/mtab" rm -f "$DEST/etc/mtab"
@ -196,7 +200,7 @@ configure_keyring() {
sed -i 's|SigLevel = Never|SigLevel = Required DatabaseOptional|' "$DEST/etc/pacman.conf" sed -i 's|SigLevel = Never|SigLevel = Required DatabaseOptional|' "$DEST/etc/pacman.conf"
LC_ALL=C chroot "$DEST" \ LC_ALL=C chroot "$DEST" \
/usr/bin/pacman-key --init && /usr/bin/pacman-key --populate hyperbola \ /usr/bin/pacman-key --init && /usr/bin/pacman-key --populate hyperbola \
&& /usr/bin/pacman-key --refresh-keys && /usr/bin/pacman-key --keyserver pgp.rediris.es --refresh-keys
} }
show_usage() { show_usage() {

View File

@ -29,7 +29,7 @@ cd "${ROOTFS}"
rm -rf var/cache/* rm -rf var/cache/*
# create new archive # create new archive
cd ${RESULTPATH} cd "${RESULTPATH}"
tar --create --gzip --numeric-owner --xattrs --acls --file="hyperbola-bootstrap.tar.gz" "${ROOTFS}" tar --create --gzip --numeric-owner --xattrs --acls --file="hyperbola-bootstrap.tar.gz" "${ROOTFS}"
# create shasum # create shasum