From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 3 Jun 2015 18:10:49 +0000 (-0400)
Subject: remove raring from pbuilder setup
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=703c705c4ca6e73a9b2159b6553cb4d448df6ca0;p=ceph-build.git

remove raring from pbuilder setup

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb
index 280bebe7..893ffdbf 100644
--- a/ceph-build/build/build_deb
+++ b/ceph-build/build/build_deb
@@ -76,7 +76,7 @@ whoami=`whoami`
 # not how this script never passed any. This potentially means that we are
 # building for all the dists in every debian host. Jenkins passes a $DIST
 # variable around that could be re-used here.
-dists="sid wheezy squeeze raring quantal precise saucy trusty"
+dists="sid wheezy squeeze quantal precise saucy trusty"
 
 dvers=`cat $releasedir/$cephver/debian_version`
 echo deb vers $dvers
@@ -93,7 +93,6 @@ gen_debian_version() {
     [ "$dist" = "lenny" ] && dver="$raw~bpo50+1"
     [ "$dist" = "trusty" ] && dver="$raw$dist"
     [ "$dist" = "saucy" ] && dver="$raw$dist"
-    [ "$dist" = "raring" ] && dver="$raw$dist"
     [ "$dist" = "quantal" ] && dver="$raw$dist"
     [ "$dist" = "precise" ] && dver="$raw$dist"
     [ "$dist" = "oneiric" ] && dver="$raw$dist"
diff --git a/ceph-build/build/setup_pbuilder b/ceph-build/build/setup_pbuilder
index f757cc7b..7de283a1 100755
--- a/ceph-build/build/setup_pbuilder
+++ b/ceph-build/build/setup_pbuilder
@@ -18,13 +18,12 @@ basedir="/srv/debian-base"
 # /srv/ceph-build/update_pbuilder.sh Now it lives here because it doesn't make
 # sense to have a file that lives in /srv/ that we then concatenate to get its
 # contents.  what.
-dists="sid wheezy squeeze raring quantal precise saucy trusty"
+dists="sid wheezy squeeze quantal precise saucy trusty"
 
 
 for dist in $dists
 do
     os="debian"
-    [ "$dist" = "raring" ] && os="ubuntu"
     [ "$dist" = "saucy" ] && os="ubuntu"
     [ "$dist" = "trusty" ] && os="ubuntu"
     [ "$dist" = "precise" ] && os="ubuntu"