From 4d01d54886bda33c0c82fc8fdc88dfebce53bb88 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 8 Dec 2020 13:31:21 +0800 Subject: [PATCH] */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 --- ceph-build/build/setup_deb | 21 --------------------- ceph-dev-build/build/setup_deb | 19 ------------------- ceph-dev-new-build/build/setup_deb | 19 ------------------- diamond-build/build/build_deb | 17 ----------------- kernel/build/build_deb | 19 ------------------- scripts/build_utils.sh | 21 +++++++++++++++++++++ 6 files changed, 21 insertions(+), 95 deletions(-) diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb index 7cc04168..931feb1b 100644 --- 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 7277c99c..6759be69 100644 --- 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 7277c99c..6759be69 100644 --- 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 ac7d70df..a418ae01 100644 --- 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 20f3b6f3..cb8ca740 100644 --- 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 482df7ed..96248e0c 100644 --- 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 -- 2.39.5