From 9ed8a01519d6bc92aff69a4ce696de65f14f5913 Mon Sep 17 00:00:00 2001
From: Takuya ASADA <syuu@scylladb.com>
Date: Thu, 25 Oct 2018 07:21:35 +0900
Subject: [PATCH] dist/debian: minor fixes for relocatable .deb

- we don't use pbuilder anymore, so drop pbuilderrc
- on build_deb.sh is_debian / is_ubuntu functions are unused now, drop them

Signed-off-by: Takuya ASADA <syuu@scylladb.com>
Message-Id: <20181024222136.3332-1-syuu@scylladb.com>
---
 dist/debian/build_deb.sh | 14 --------------
 dist/debian/pbuilderrc   | 26 --------------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 dist/debian/pbuilderrc

diff --git a/dist/debian/build_deb.sh b/dist/debian/build_deb.sh
index 7318dfd..dabd06c 100755
--- a/dist/debian/build_deb.sh
+++ b/dist/debian/build_deb.sh
@@ -28,20 +28,6 @@ is_redhat_variant() {
 is_debian_variant() {
     [ -f /etc/debian_version ]
 }
-is_debian() {
-    case "$1" in
-        jessie|stretch) return 0;;
-        *) return 1;;
-    esac
-}
-is_ubuntu() {
-    case "$1" in
-        trusty|xenial|bionic) return 0;;
-        *) return 1;;
-    esac
-}
-
-
 pkg_install() {
     if is_redhat_variant; then
         sudo yum install -y $1
diff --git a/dist/debian/pbuilderrc b/dist/debian/pbuilderrc
deleted file mode 100644
index 52a3b00..0000000
--- a/dist/debian/pbuilderrc
+++ /dev/null
@@ -1,26 +0,0 @@
-USENETWORK=yes
-BUILD_HOME=/tmp
-BASETGZ="/var/cache/pbuilder/$PRODUCT-jmx-$DIST.tgz"
-DISTRIBUTION="$DIST"
-BUILDRESULT="/var/cache/pbuilder/$PRODUCT-jmx-$DIST/result/"
-APTCACHE="/var/cache/pbuilder/$PRODUCT-jmx-$DIST/aptcache/"
-ALLOWUNTRUSTED=yes
-
-if [ "$DIST" = "trusty" ] || [ "$DIST" = "xenial" ] || [ "$DIST" = "yakkety" ] || [ "$DIST" = "zesty" ] || [ "$DIST" = "artful" ] || [ "$DIST" = "bionic" ]; 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" ] || [ "$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"
-    if [ "$DIST" = "jessie" ]; then
-        OTHERMIRROR="deb http://httpredir.debian.org/debian jessie-backports main"
-    fi
-else
-    echo "Unknown distribution: $DIST"
-    exit 1
-fi