openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "update gentoo-releng gpg key"

This commit is contained in:
Zuul 2020-07-14 00:39:15 +00:00 committed by Gerrit Code Review
parent ea6403388e e384da1a98
commit 70892a7a16
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
diskimage_builder/elements/gentoo/extra-data.d/gentoo-releng.gpg
View File

Binary file not shown.

5
diskimage_builder/elements/gentoo/root.d/10-gentoo-image
View File

@ -86,15 +86,12 @@ else
# https://wiki.gentoo.org/wiki/Project:RelEng#Keys # https://wiki.gentoo.org/wiki/Project:RelEng#Keys
# https://dev.gentoo.org/~dolsen/releases/keyrings/gentoo-keys-*.tar.xz # https://dev.gentoo.org/~dolsen/releases/keyrings/gentoo-keys-*.tar.xz
# http://distfiles.gentoo.org/distfiles/gentoo-keys-*.tar.xz # http://distfiles.gentoo.org/distfiles/gentoo-keys-*.tar.xz
GPGDIR=$(mktemp -d -t)
gpg --no-default-keyring --keyring "${GPGDIR}"/gentookeys.gpg --import "${TMP_HOOKS_PATH}"/extra-data.d/gentoo-releng.gpg
# check the sig file # check the sig file
gpgv --keyring "${GPGDIR}"/gentookeys.gpg "${CACHED_SIGNATURE_FILE}" gpgv --keyring "${TMP_HOOKS_PATH}"/extra-data.d/gentoo-releng.gpg "${CACHED_SIGNATURE_FILE}"
if [[ "${?}" != 0 ]]; then if [[ "${?}" != 0 ]]; then
echo 'invalid signature file' echo 'invalid signature file'
exit 1 exit 1
fi fi
rm -rf "${GPGDIR}"
echo 'valid key used' echo 'valid key used'
CACHED_SHA512SUM=$(grep -A1 -e 'SHA512' "${CACHED_SIGNATURE_FILE}" | grep -e "${BASE_IMAGE_FILE_SUFFIX}$" | cut -d\ -f 1) CACHED_SHA512SUM=$(grep -A1 -e 'SHA512' "${CACHED_SIGNATURE_FILE}" | grep -e "${BASE_IMAGE_FILE_SUFFIX}$" | cut -d\ -f 1)
ACTUAL_SHA512SUM=$(sha512sum "${CACHED_FILE}" | cut -d\ -f 1) ACTUAL_SHA512SUM=$(sha512sum "${CACHED_FILE}" | cut -d\ -f 1)