ceph-*-build/build/build_rpm: extract helper functions

to avoid repeatings

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

diff --git a/ceph-build/build/build_rpm b/ceph-build/build/build_rpm
index 5001d54590dc75c49c899f2bebd0cb2bc1b8c9e0..351a328b2d249107fa92784722fa64807968d80b 100644 (file)
--- a/ceph-build/build/build_rpm
+++ b/ceph-build/build/build_rpm
@@ -24,19 +24,8 @@ RPM_RELEASE=`grep Release ceph.spec | sed 's/Release:[ \t]*//g' | cut -d '%' -f
 RPM_VERSION=`grep Version ceph.spec | sed 's/Version:[ \t]*//g'`
 PACKAGE_MANAGER_VERSION="$RPM_VERSION-$RPM_RELEASE"
 
-# Set up build area
-BUILDAREA=./rpm/$dist
-mkdir -p ${BUILDAREA}/{SOURCES,SRPMS,SPECS,RPMS,BUILD}
-cp -a ceph-*.tar.bz2 ${BUILDAREA}/SOURCES/.
-cp -a ceph.spec ${BUILDAREA}/SPECS/.
-cp -a rpm/*.patch ${BUILDAREA}/SOURCES/. || true
-
-# Build RPMs
-BUILDAREA=`readlink -fn ${BUILDAREA}`   ### rpm wants absolute path
-cd ${BUILDAREA}/SPECS
-rpmbuild -ba --define "_topdir ${BUILDAREA}" ${CEPH_EXTRA_RPMBUILD_ARGS} ceph.spec
-
-echo done
+BUILDAREA=$(setup_rpm_build_area ./rpm/$dist)
+build_rpms $BUILDAREA ${CEPH_EXTRA_RPMBUILD_ARGS}
 
 # Make sure we execute at the top level directory
 cd "$WORKSPACE"

diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm
index ee313c6eddbe5e6ada6eda3b61068d562c6c2858..f95c1ed63011b477b28a3fa0af03a7db14abdabd 100644 (file)
--- a/ceph-dev-build/build/build_rpm
+++ b/ceph-dev-build/build/build_rpm
@@ -41,17 +41,8 @@ RPM_RELEASE=`grep Release ceph.spec | sed 's/Release:[ \t]*//g' | cut -d '%' -f
 RPM_VERSION=`grep Version ceph.spec | sed 's/Version:[ \t]*//g'`
 PACKAGE_MANAGER_VERSION="$RPM_VERSION-$RPM_RELEASE"
 
-# Set up build area
-BUILDAREA=./rpm/$dist
-mkdir -p ${BUILDAREA}/{SOURCES,SRPMS,SPECS,RPMS,BUILD}
-cp -a ceph-*.tar.bz2 ${BUILDAREA}/SOURCES/.
-cp -a ceph.spec ${BUILDAREA}/SPECS/.
-cp -a rpm/*.patch ${BUILDAREA}/SOURCES/. || true
-
-# Build RPMs
-BUILDAREA=`readlink -fn ${BUILDAREA}`   ### rpm wants absolute path
-cd ${BUILDAREA}/SPECS
-rpmbuild -ba --define "_topdir ${BUILDAREA}" ${CEPH_EXTRA_RPMBUILD_ARGS} ceph.spec
+BUILDAREA=$(setup_rpm_build_area ./rpm/$dist)
+build_rpms $BUILDAREA ${CEPH_EXTRA_RPMBUILD_ARGS}
 
 # The following was copied from autobuild-ceph/build-ceph-rpm.sh
 # which creates the ceph-release rpm meant to create the repository file for the repo

diff --git a/ceph-dev-new-build/build/build_rpm b/ceph-dev-new-build/build/build_rpm
index aaab10fe841535b58e55be64d530394a78dae40a..97fe6004d61c3e2f5382bee2a4dc2740f37e5640 100644 (file)
--- a/ceph-dev-new-build/build/build_rpm
+++ b/ceph-dev-new-build/build/build_rpm
@@ -42,17 +42,8 @@ RPM_RELEASE=`grep Release ceph.spec | sed 's/Release:[ \t]*//g' | cut -d '%' -f
 RPM_VERSION=`grep Version ceph.spec | sed 's/Version:[ \t]*//g'`
 PACKAGE_MANAGER_VERSION="$RPM_VERSION-$RPM_RELEASE"
 
-# Set up build area
-BUILDAREA=./rpm/$dist
-mkdir -p ${BUILDAREA}/{SOURCES,SRPMS,SPECS,RPMS,BUILD}
-cp -a ceph-*.tar.bz2 ${BUILDAREA}/SOURCES/.
-cp -a ceph.spec ${BUILDAREA}/SPECS/.
-cp -a rpm/*.patch ${BUILDAREA}/SOURCES/. || true
-
-# Build RPMs
-BUILDAREA=`readlink -fn ${BUILDAREA}`   ### rpm wants absolute path
-cd ${BUILDAREA}/SPECS
-rpmbuild -ba --define "_topdir ${BUILDAREA}" ${CEPH_EXTRA_RPMBUILD_ARGS} ceph.spec
+BUILDAREA=$(setup_rpm_build_area ./rpm/$dist)
+build_rpms ${BUILDAREA} ${CEPH_EXTRA_RPMBUILD_ARGS}
 
 # The following was copied from autobuild-ceph/build-ceph-rpm.sh
 # which creates the ceph-release rpm meant to create the repository file for the repo

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index d99276902309df2ad4842d1027db22aa0d377b68..264ce1af62730a734ff6eef4f8c0d9edeb7bd9d2 100644 (file)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -1084,3 +1084,28 @@ maybe_reset_ci_container() {
         CI_CONTAINER=false
     fi
 }
+
+setup_rpm_build_area() {
+    local build_area=$1
+    shift
+
+    # Set up build area
+    mkdir -p ${build_area}/{SOURCES,SRPMS,SPECS,RPMS,BUILD}
+    cp -a ceph-*.tar.bz2 ${build_area}/SOURCES/.
+    cp -a ceph.spec ${build_area}/SPECS/.
+    cp -a rpm/*.patch ${build_area}/SOURCES/. || true
+    ### rpm wants absolute path
+    echo `readlink -fn $build_area`
+}
+
+build_rpms() {
+    local build_area=$1
+    shift
+    local extra_rpm_build_args=$1
+    shift
+
+    # Build RPMs
+    cd ${build_area_path}/SPECS
+    rpmbuild -ba --define "_topdir ${build_area}" ${extra_rpm_build_args} ceph.spec
+    echo done
+}