From 3c8af4dbd228090b6380d98c0f2f6c9ff4c8d508 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 11 Jul 2018 11:35:43 -0400 Subject: [PATCH] build_utils.sh: Use archive keyring for Jessie Signed-off-by: David Galloway --- scripts/build_utils.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index 2d23af1c..c0b9dd27 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -382,11 +382,18 @@ setup_pbuilder() { if [ $os = "debian" ]; then mirror="http://www.gtlib.gatech.edu/pub/debian" - # this assumes that newer Debian releases are being added to - # /etc/apt/trusted.gpg that is also the default location for Ubuntu trusted - # keys. The slave should ensure that the needed keys are added accordingly - # to this location. - debootstrapopts='DEBOOTSTRAPOPTS=( "--keyring" "/etc/apt/trusted.gpg" )' + if [ "$DIST" = "jessie" ]; then + # despite the fact we're building for jessie, pbuilder was failing due to + # missing wheezy key 8B48AD6246925553. Pointing pbuilder at the archive + # keyring takes care of it. + debootstrapopts='DEBOOTSTRAPOPTS=( "--keyring" "/usr/share/keyrings/debian-archive-keyring.gpg" )' + else + # this assumes that newer Debian releases are being added to + # /etc/apt/trusted.gpg that is also the default location for Ubuntu trusted + # keys. The slave should ensure that the needed keys are added accordingly + # to this location. + debootstrapopts='DEBOOTSTRAPOPTS=( "--keyring" "/etc/apt/trusted.gpg" )' + fi components='COMPONENTS="main contrib"' elif [ "$ARCH" = "arm64" ]; then mirror="http://ports.ubuntu.com/ubuntu-ports" -- 2.39.5