From: Kefu Chai <kchai@redhat.com>
Date: Mon, 12 Jul 2021 14:35:17 +0000 (+0800)
Subject: ceph-dev*-setup/build: consolidate logic to write dist/*
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1878%2Fhead;p=ceph-build.git

ceph-dev*-setup/build: consolidate logic to write dist/*

extract write_dist_files() function to consolidate logic to write dist/*
files.

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

diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build
index 65b2ec63..0824e40e 100644
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -150,18 +150,4 @@ mv release/$vers/*.tar.* dist/.
 # Parameters
 mv release/version dist/.
 
-cat > dist/sha1 << EOF
-SHA1=${GIT_COMMIT}
-EOF
-
-cat > dist/branch << EOF
-BRANCH=${BRANCH}
-EOF
-
-# CEPH_EXTRA_{CONFIGURE,RPMBUILD}_ARGS are consumed by ceph-build before
-# the switch to cmake; CEPH_EXTRA_CMAKE_ARGS is for after cmake
-cat > dist/other_envvars << EOF
-CEPH_EXTRA_RPMBUILD_ARGS=${CEPH_EXTRA_RPMBUILD_ARGS}
-CEPH_EXTRA_CMAKE_ARGS=${CEPH_EXTRA_CMAKE_ARGS}
-DEB_BUILD_PROFILES=${DEB_BUILD_PROFILES}
-EOF
+write_dist_files
diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index f7eded36..5c5af0dc 100644
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -143,20 +143,4 @@ mv release/$vers/*.tar.* dist/.
 # Parameters
 mv release/version dist/.
 
-cat > dist/sha1 << EOF
-SHA1=${GIT_COMMIT}
-EOF
-
-cat > dist/branch << EOF
-BRANCH=${BRANCH}
-EOF
-
-# - CEPH_EXTRA_RPMBUILD_ARGS are consumed by build_rpm before
-#   the switch to cmake;
-# - CEPH_EXTRA_CMAKE_ARGS is for after cmake
-# - DEB_BUILD_PROFILES is consumed by build_debs()
-cat > dist/other_envvars << EOF
-CEPH_EXTRA_RPMBUILD_ARGS=${CEPH_EXTRA_RPMBUILD_ARGS}
-CEPH_EXTRA_CMAKE_ARGS=${CEPH_EXTRA_CMAKE_ARGS}
-DEB_BUILD_PROFILES=${DEB_BUILD_PROFILES}
-EOF
+write_dist_files
diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 9df3dee3..5b416cd5 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -865,6 +865,27 @@ ceph_build_args_from_flavor() {
     esac
 }
 
+write_dist_files()
+{
+    cat > dist/sha1 << EOF
+SHA1=${GIT_COMMIT}
+EOF
+
+    cat > dist/branch << EOF
+BRANCH=${BRANCH}
+EOF
+
+    # - CEPH_EXTRA_RPMBUILD_ARGS are consumed by build_rpm before
+    #   the switch to cmake;
+    # - CEPH_EXTRA_CMAKE_ARGS is for after cmake
+    # - DEB_BUILD_PROFILES is consumed by build_debs()
+    cat > dist/other_envvars << EOF
+CEPH_EXTRA_RPMBUILD_ARGS=${CEPH_EXTRA_RPMBUILD_ARGS}
+CEPH_EXTRA_CMAKE_ARGS=${CEPH_EXTRA_CMAKE_ARGS}
+DEB_BUILD_PROFILES=${DEB_BUILD_PROFILES}
+EOF
+}
+
 build_debs() {
     local venv=$1
     shift