*/build_deb: extract get_bptag() into build_utils.sh

all of the related job definitions include build_utils.sh before
including build_deb, so it's safe to extract this function into
scripts/build_utils.sh.

it's safer and simpler to maintain this function in a single place.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb
index 931feb1b0786878be21e1b93f93e53c4c0630b90..6332a498cae9982f140428bd74a5ac759aa2cbb6 100644 (file)
--- a/ceph-build/build/setup_deb
+++ b/ceph-build/build/setup_deb
@@ -27,31 +27,6 @@ BRANCH=`branch_slash_filter $BRANCH`
 
 cd $WORKSPACE
 
-get_bptag() {
-    dist=$1
-
-    [ "$dist" = "sid" ] && dver=""
-    [ "$dist" = "buster" ] && dver="~bpo10+1"
-    [ "$dist" = "stretch" ] && dver="~bpo90+1"
-    [ "$dist" = "jessie" ] && dver="~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="~bpo50+1"
-    [ "$dist" = "focal" ] && dver="$dist"
-    [ "$dist" = "bionic" ] && dver="$dist"
-    [ "$dist" = "xenial" ] && dver="$dist"
-    [ "$dist" = "trusty" ] && dver="$dist"
-    [ "$dist" = "saucy" ] && dver="$dist"
-    [ "$dist" = "precise" ] && dver="$dist"
-    [ "$dist" = "oneiric" ] && dver="$dist"
-    [ "$dist" = "natty" ] && dver="$dist"
-    [ "$dist" = "maverick" ] && dver="$dist"
-    [ "$dist" = "lucid" ] && dver="$dist"
-    [ "$dist" = "karmic" ] && dver="$dist"
-
-    echo $dver
-}
-
 BPTAG=`get_bptag $DIST`
 
 chacra_ref="$BRANCH"

diff --git a/ceph-dev-build/build/setup_deb b/ceph-dev-build/build/setup_deb
index 6759be695b16e1cb41b2fabffd9d83fbddddddef..98888e5ae9d60a4fdeec1993339900596fab6635 100644 (file)
--- a/ceph-dev-build/build/setup_deb
+++ b/ceph-dev-build/build/setup_deb
@@ -27,29 +27,6 @@ BRANCH=`branch_slash_filter $BRANCH`
 
 cd $WORKSPACE
 
-get_bptag() {
-    dist=$1
-
-    [ "$dist" = "sid" ] && dver=""
-    [ "$dist" = "jessie" ] && dver="~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="~bpo50+1"
-    [ "$dist" = "focal" ] && dver="$dist"
-    [ "$dist" = "bionic" ] && dver="$dist"
-    [ "$dist" = "xenial" ] && dver="$dist"
-    [ "$dist" = "trusty" ] && dver="$dist"
-    [ "$dist" = "saucy" ] && dver="$dist"
-    [ "$dist" = "precise" ] && dver="$dist"
-    [ "$dist" = "oneiric" ] && dver="$dist"
-    [ "$dist" = "natty" ] && dver="$dist"
-    [ "$dist" = "maverick" ] && dver="$dist"
-    [ "$dist" = "lucid" ] && dver="$dist"
-    [ "$dist" = "karmic" ] && dver="$dist"
-
-    echo $dver
-}
-
 BPTAG=`get_bptag $DIST`
 
 chacra_ref="$BRANCH"

diff --git a/ceph-dev-new-build/build/setup_deb b/ceph-dev-new-build/build/setup_deb
index 6759be695b16e1cb41b2fabffd9d83fbddddddef..98888e5ae9d60a4fdeec1993339900596fab6635 100644 (file)
--- a/ceph-dev-new-build/build/setup_deb
+++ b/ceph-dev-new-build/build/setup_deb
@@ -27,29 +27,6 @@ BRANCH=`branch_slash_filter $BRANCH`
 
 cd $WORKSPACE
 
-get_bptag() {
-    dist=$1
-
-    [ "$dist" = "sid" ] && dver=""
-    [ "$dist" = "jessie" ] && dver="~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="~bpo50+1"
-    [ "$dist" = "focal" ] && dver="$dist"
-    [ "$dist" = "bionic" ] && dver="$dist"
-    [ "$dist" = "xenial" ] && dver="$dist"
-    [ "$dist" = "trusty" ] && dver="$dist"
-    [ "$dist" = "saucy" ] && dver="$dist"
-    [ "$dist" = "precise" ] && dver="$dist"
-    [ "$dist" = "oneiric" ] && dver="$dist"
-    [ "$dist" = "natty" ] && dver="$dist"
-    [ "$dist" = "maverick" ] && dver="$dist"
-    [ "$dist" = "lucid" ] && dver="$dist"
-    [ "$dist" = "karmic" ] && dver="$dist"
-
-    echo $dver
-}
-
 BPTAG=`get_bptag $DIST`
 
 chacra_ref="$BRANCH"

diff --git a/diamond-build/build/build_deb b/diamond-build/build/build_deb
index a418ae0126a9c76c2176226fe0242cd7871784ff..e8ef73550300a4f93294ddce3412e427b0f7c831 100644 (file)
--- a/diamond-build/build/build_deb
+++ b/diamond-build/build/build_deb
@@ -8,28 +8,6 @@ fi
 
 cd $WORKSPACE
 
-get_bptag() {
-    dist=$1
-
-    [ "$dist" = "sid" ] && dver=""
-    [ "$dist" = "jessie" ] && dver="~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="~bpo50+1"
-    [ "$dist" = "xenial" ] && dver="$dist"
-    [ "$dist" = "trusty" ] && dver="$dist"
-    [ "$dist" = "saucy" ] && dver="$dist"
-    [ "$dist" = "precise" ] && dver="$dist"
-    [ "$dist" = "oneiric" ] && dver="$dist"
-    [ "$dist" = "natty" ] && dver="$dist"
-    [ "$dist" = "maverick" ] && dver="$dist"
-    [ "$dist" = "lucid" ] && dver="$dist"
-    [ "$dist" = "karmic" ] && dver="$dist"
-
-    echo $dver
-}
-
-
 # slap -rc to the ref if we are doing a release-candidate build
 chacra_ref="$BRANCH"
 [ "$RC" = true ] && chacra_ref="$BRANCH-rc"

diff --git a/kernel/build/build_deb b/kernel/build/build_deb
index cb8ca740d8ffd6634cf8a9719a1fc382616e1a1a..aff31ee41eb18012fc4dedc8901b337480b5ec09 100644 (file)
--- a/kernel/build/build_deb
+++ b/kernel/build/build_deb
@@ -3,30 +3,6 @@ set -ex
 
 cd $WORKSPACE
 
-get_bptag() {
-    dist=$1
-
-    [ "$dist" = "sid" ] && dver=""
-    [ "$dist" = "jessie" ] && dver="~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="~bpo50+1"
-    [ "$dist" = "focal" ] && dver="$dist"
-    [ "$dist" = "bionic" ] && dver="$dist"
-    [ "$dist" = "xenial" ] && dver="$dist"
-    [ "$dist" = "trusty" ] && dver="$dist"
-    [ "$dist" = "saucy" ] && dver="$dist"
-    [ "$dist" = "precise" ] && dver="$dist"
-    [ "$dist" = "oneiric" ] && dver="$dist"
-    [ "$dist" = "natty" ] && dver="$dist"
-    [ "$dist" = "maverick" ] && dver="$dist"
-    [ "$dist" = "lucid" ] && dver="$dist"
-    [ "$dist" = "karmic" ] && dver="$dist"
-
-    echo $dver
-}
-
-
 # slap -rc to the ref if we are doing a release-candidate build
 chacra_ref="$BRANCH"
 [ "$RC" = true ] && chacra_ref="$BRANCH-rc"

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 96248e0c1a05aca26c3fe41dbc6d30d4d601c9b6..2d905aaacee3a5441aa5dcda9eeda6a75bf3f6dc 100644 (file)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -740,6 +740,31 @@ setup_pbuilder_for_ppa() {
     echo "HOOKDIR=$hookdir"
 }
 
+get_bptag() {
+    dist=$1
+
+    [ "$dist" = "sid" ] && dver=""
+    [ "$dist" = "buster" ] && dver="~bpo10+1"
+    [ "$dist" = "stretch" ] && dver="~bpo90+1"
+    [ "$dist" = "jessie" ] && dver="~bpo80+1"
+    [ "$dist" = "wheezy" ] && dver="~bpo70+1"
+    [ "$dist" = "squeeze" ] && dver="~bpo60+1"
+    [ "$dist" = "lenny" ] && dver="~bpo50+1"
+    [ "$dist" = "focal" ] && dver="$dist"
+    [ "$dist" = "bionic" ] && dver="$dist"
+    [ "$dist" = "xenial" ] && dver="$dist"
+    [ "$dist" = "trusty" ] && dver="$dist"
+    [ "$dist" = "saucy" ] && dver="$dist"
+    [ "$dist" = "precise" ] && dver="$dist"
+    [ "$dist" = "oneiric" ] && dver="$dist"
+    [ "$dist" = "natty" ] && dver="$dist"
+    [ "$dist" = "maverick" ] && dver="$dist"
+    [ "$dist" = "lucid" ] && dver="$dist"
+    [ "$dist" = "karmic" ] && dver="$dist"
+
+    echo $dver
+}
+
 gen_debian_version() {
     raw=$1
     dist=$2