From 8c32e4f8a446104622f204cd8eaa092fcb514ec8 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Thu, 20 Jul 2017 06:54:35 +0900 Subject: [PATCH] dist/debian: add more versions of Debian/Ubuntu releases This will add Debian 9(stretch) support, and also non-official support of Debian testing/unstable and Ubuntu non-LTS versions. Signed-off-by: Takuya ASADA Message-Id: <1500501275-8419-1-git-send-email-syuu@scylladb.com> --- dist/debian/pbuilderrc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dist/debian/pbuilderrc b/dist/debian/pbuilderrc index 5f5def2..9a2d866 100644 --- a/dist/debian/pbuilderrc +++ b/dist/debian/pbuilderrc @@ -6,18 +6,20 @@ BUILDRESULT="/var/cache/pbuilder/scylla-jmx-$DIST/result/" APTCACHE="/var/cache/pbuilder/scylla-jmx-$DIST/aptcache/" ALLOWUNTRUSTED=yes -if [ "$DIST" = "trusty" ] || [ "$DIST" = "xenial" ]; then +if [ "$DIST" = "trusty" ] || [ "$DIST" = "xenial" ] || [ "$DIST" = "yakkety" ] || [ "$DIST" = "zesty" ] || [ "$DIST" = "artful" ]; then MIRRORSITE="http://archive.ubuntu.com/ubuntu/" COMPONENTS="main restricted universe multiverse" DEBOOTSTRAPOPTS="--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg" if [ "$DIST" = "trusty" ]; then OTHERMIRROR="deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu trusty main" fi -elif [ "$DIST" = "jessie" ]; then - MIRRORSITE="http://ftp.us.debian.org/debian/" +elif [ "$DIST" = "jessie" ] || [ "$DIST" = "stretch" ] || [ "$DIST" = "buster" ] || [ "$DIST" = "sid" ]; then + MIRRORSITE="http://deb.debian.org/debian/" COMPONENTS="main contrib non-free" DEBOOTSTRAPOPTS="--keyring=/usr/share/keyrings/debian-archive-keyring.gpg" - OTHERMIRROR="deb http://httpredir.debian.org/debian jessie-backports main" + if [ "$DIST" = "jessie" ]; then + OTHERMIRROR="deb http://httpredir.debian.org/debian jessie-backports main" + fi else echo "Unknown distribution: $DIST" exit 1