From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 3 Jun 2015 16:39:12 +0000 (-0400)
Subject: port gen_debian_version into build_deb
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a720faf34a3db67d430ca3bdffda94d2a323d008;p=ceph-build.git

port gen_debian_version into build_deb

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

diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb
index 1f468b68..21832ba7 100644
--- a/ceph-build/build/build_deb
+++ b/ceph-build/build/build_deb
@@ -75,11 +75,42 @@ echo version $cephver
 whoami=`whoami`
 [ "$whoami" != "root" ] && echo "must run as root not $whoami" && usage && exit 1
 
-[ -z "$dists" ] && dists=`cat $releasedir/$cephver/debian_dists`
+# This used to live in a *file* on /src/ceph-build. 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.
+# XXX before, the script accepted a $4 argument that was set as `$dists` but
+# 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"
+
 dvers=`cat $releasedir/$cephver/debian_version`
 echo deb vers $dvers
 echo dists $dists
 
+# This function used to live as /srv/gen_debian_version.sh
+gen_debian_version() {
+    raw=$1
+    dist=$2
+
+    [ "$dist" = "sid" ] && dver="$raw"
+    [ "$dist" = "wheezy" ] && dver="$raw~bpo70+1"
+    [ "$dist" = "squeeze" ] && dver="$raw~bpo60+1"
+    [ "$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"
+    [ "$dist" = "natty" ] && dver="$raw$dist"
+    [ "$dist" = "maverick" ] && dver="$raw$dist"
+    [ "$dist" = "lucid" ] && dver="$raw$dist"
+    [ "$dist" = "karmic" ] && dver="$raw$dist"
+
+    echo $dver
+}
+
 for dist in $dists
 do
     pbuilder --clean