From 2683d72640cc79deeeb665e945759ee44e82007b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 8 Dec 2020 13:36:37 +0800 Subject: [PATCH] */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 --- ceph-build/build/setup_deb | 25 ------------------------- ceph-dev-build/build/setup_deb | 23 ----------------------- ceph-dev-new-build/build/setup_deb | 23 ----------------------- diamond-build/build/build_deb | 22 ---------------------- kernel/build/build_deb | 24 ------------------------ scripts/build_utils.sh | 25 +++++++++++++++++++++++++ 6 files changed, 25 insertions(+), 117 deletions(-) diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb index 931feb1b..6332a498 100644 --- 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 6759be69..98888e5a 100644 --- 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 6759be69..98888e5a 100644 --- 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 a418ae01..e8ef7355 100644 --- 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 cb8ca740..aff31ee4 100644 --- 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 96248e0c..2d905aaa 100644 --- 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 -- 2.39.5