*/build_deb: extract gen_debian_version() 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 7cc0416866750813497d783f4cade4bc337842c4..931feb1b0786878be21e1b93f93e53c4c0630b90 100644 (file)
--- a/ceph-build/build/setup_deb
+++ b/ceph-build/build/setup_deb
@@ -73,27 +73,6 @@ esac
 
 debian_version=${vers}-1
 
-gen_debian_version() {
-    raw=$1
-    dist=$2
-
-    [ "$dist" = "sid" ] && dver="$raw"
-    [ "$dist" = "buster" ] && dver="$raw~bpo10+1"
-    [ "$dist" = "stretch" ] && dver="$raw~bpo90+1"
-    [ "$dist" = "jessie" ] && dver="$raw~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="$raw~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="$raw~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="$raw~bpo50+1"
-    [ "$dist" = "precise" ] && dver="$raw$dist"
-    [ "$dist" = "saucy" ] && dver="$raw$dist"
-    [ "$dist" = "trusty" ] && dver="$raw$dist"
-    [ "$dist" = "xenial" ] && dver="$raw$dist"
-    [ "$dist" = "bionic" ] && dver="$raw$dist"
-    [ "$dist" = "focal" ] && dver="$raw$dist"
-
-    echo $dver
-}
-
 bpvers=`gen_debian_version $debian_version $DIST`
 
 # Normalize variables across rpm/deb builds

diff --git a/ceph-dev-build/build/setup_deb b/ceph-dev-build/build/setup_deb
index 7277c99c22951a9ece322b1f84720cd9a6116035..6759be695b16e1cb41b2fabffd9d83fbddddddef 100644 (file)
--- a/ceph-dev-build/build/setup_deb
+++ b/ceph-dev-build/build/setup_deb
@@ -71,25 +71,6 @@ esac
 
 debian_version=${vers}-1
 
-gen_debian_version() {
-    raw=$1
-    dist=$2
-
-    [ "$dist" = "sid" ] && dver="$raw"
-    [ "$dist" = "jessie" ] && dver="$raw~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="$raw~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="$raw~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="$raw~bpo50+1"
-    [ "$dist" = "precise" ] && dver="$raw$dist"
-    [ "$dist" = "saucy" ] && dver="$raw$dist"
-    [ "$dist" = "trusty" ] && dver="$raw$dist"
-    [ "$dist" = "xenial" ] && dver="$raw$dist"
-    [ "$dist" = "bionic" ] && dver="$raw$dist"
-    [ "$dist" = "focal" ] && dver="$raw$dist"
-
-    echo $dver
-}
-
 bpvers=`gen_debian_version $debian_version $DIST`
 
 # Normalize variables across rpm/deb builds

diff --git a/ceph-dev-new-build/build/setup_deb b/ceph-dev-new-build/build/setup_deb
index 7277c99c22951a9ece322b1f84720cd9a6116035..6759be695b16e1cb41b2fabffd9d83fbddddddef 100644 (file)
--- a/ceph-dev-new-build/build/setup_deb
+++ b/ceph-dev-new-build/build/setup_deb
@@ -71,25 +71,6 @@ esac
 
 debian_version=${vers}-1
 
-gen_debian_version() {
-    raw=$1
-    dist=$2
-
-    [ "$dist" = "sid" ] && dver="$raw"
-    [ "$dist" = "jessie" ] && dver="$raw~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="$raw~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="$raw~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="$raw~bpo50+1"
-    [ "$dist" = "precise" ] && dver="$raw$dist"
-    [ "$dist" = "saucy" ] && dver="$raw$dist"
-    [ "$dist" = "trusty" ] && dver="$raw$dist"
-    [ "$dist" = "xenial" ] && dver="$raw$dist"
-    [ "$dist" = "bionic" ] && dver="$raw$dist"
-    [ "$dist" = "focal" ] && dver="$raw$dist"
-
-    echo $dver
-}
-
 bpvers=`gen_debian_version $debian_version $DIST`
 
 # Normalize variables across rpm/deb builds

diff --git a/diamond-build/build/build_deb b/diamond-build/build/build_deb
index ac7d70dfda0cfcd2649b7b0118b1c16fd309b12c..a418ae0126a9c76c2176226fe0242cd7871784ff 100644 (file)
--- a/diamond-build/build/build_deb
+++ b/diamond-build/build/build_deb
@@ -48,23 +48,6 @@ esac
 
 debian_version=${VERSION}-1
 
-gen_debian_version() {
-    raw=$1
-    dist=$2
-
-    [ "$dist" = "sid" ] && dver="$raw"
-    [ "$dist" = "jessie" ] && dver="$raw~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="$raw~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="$raw~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="$raw~bpo50+1"
-    [ "$dist" = "precise" ] && dver="$raw$dist"
-    [ "$dist" = "saucy" ] && dver="$raw$dist"
-    [ "$dist" = "trusty" ] && dver="$raw$dist"
-    [ "$dist" = "xenial" ] && dver="$raw$dist"
-
-    echo $dver
-}
-
 BPVER=`gen_debian_version $debian_version $DIST`
 
 chacra_endpoint="diamond/${BRANCH}/${SHA1}/${DISTRO}/${DIST}"

diff --git a/kernel/build/build_deb b/kernel/build/build_deb
index 20f3b6f3cdadfd7fd9c48204d1b641d89b34718b..cb8ca740d8ffd6634cf8a9719a1fc382616e1a1a 100644 (file)
--- a/kernel/build/build_deb
+++ b/kernel/build/build_deb
@@ -45,25 +45,6 @@ esac
 
 debian_version=${VERSION}-1
 
-gen_debian_version() {
-    raw=$1
-    dist=$2
-
-    [ "$dist" = "sid" ] && dver="$raw"
-    [ "$dist" = "jessie" ] && dver="$raw~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="$raw~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="$raw~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="$raw~bpo50+1"
-    [ "$dist" = "precise" ] && dver="$raw$dist"
-    [ "$dist" = "saucy" ] && dver="$raw$dist"
-    [ "$dist" = "trusty" ] && dver="$raw$dist"
-    [ "$dist" = "xenial" ] && dver="$raw$dist"
-    [ "$dist" = "bionic" ] && dver="$raw$dist"
-    [ "$dist" = "focal" ] && dver="$raw$dist"
-
-    echo $dver
-}
-
 BPVER=`gen_debian_version $debian_version $DIST`
 
 chacra_endpoint="kernel/${BRANCH}/${GIT_COMMIT}/${DISTRO}/${DIST}"

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