From 710f1fa60ee7095e03815c7ec9ab3c149d7368f2 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Thu, 5 May 2016 15:20:44 -0400 Subject: [PATCH] add debootstrapopts for Debian to point to the correct keyring location Signed-off-by: Alfredo Deza --- ceph-build/build/setup_pbuilder | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ceph-build/build/setup_pbuilder b/ceph-build/build/setup_pbuilder index d9985755..0e352c74 100755 --- a/ceph-build/build/setup_pbuilder +++ b/ceph-build/build/setup_pbuilder @@ -33,10 +33,20 @@ os="debian" 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" )' + components='COMPONENTS="main contrib"' elif [ "$ARCH" = "arm64" ]; then mirror="http://ports.ubuntu.com/ubuntu-ports" + debootstrapopts="" + components='COMPONENTS="main universe"' else mirror="http://us.archive.ubuntu.com/ubuntu" + debootstrapopts="" + components='COMPONENTS="main universe"' fi # ensure that the tgz is valid, otherwise remove it so that it can be recreated @@ -61,7 +71,8 @@ fi # pbuilder-satisfydepends-dummy : Depends: python-virtualenv which is a virtual package. # Depends: xmlstarlet which is a virtual package. # Unable to resolve dependencies! Giving up... -echo 'COMPONENTS="main universe"' > ~/.pbuilderrc +echo "$components" > ~/.pbuilderrc +echo "$debootstrapopts" >> ~/.pbuilderrc sudo pbuilder --clean -- 2.39.5