update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / autopackage.sh

diff --git a/ceph/src/spdk/autopackage.sh b/ceph/src/spdk/autopackage.sh
index ce114af4bc36bfae96c6049909f56173a9819a91..d54d05d5515900ea77e9433793dcb213e2548075 100755 (executable)
--- a/ceph/src/spdk/autopackage.sh
+++ b/ceph/src/spdk/autopackage.sh
@@ -21,76 +21,29 @@ cd $rootdir
 timing_enter porcelain_check
 $MAKE clean
 
-if [ `git status --porcelain --ignore-submodules | wc -l` -ne 0 ]; then
+if [ $(git status --porcelain --ignore-submodules | wc -l) -ne 0 ]; then
        echo make clean left the following files:
        git status --porcelain --ignore-submodules
        exit 1
 fi
 timing_exit porcelain_check
 
-if [ $RUN_NIGHTLY -eq 0 ]; then
+if [[ $RUN_NIGHTLY -eq 0 ]]; then
        timing_finish
        exit 0
 fi
 
-timing_enter autopackage
+timing_enter build_release
 
-spdk_pv=spdk-$(date +%Y_%m_%d)
-spdk_tarball=${spdk_pv}.tar
-dpdk_pv=dpdk-$(date +%Y_%m_%d)
-dpdk_tarball=${dpdk_pv}.tar
-ipsec_pv=ipsec-$(date +%Y_%m_%d)
-ipsec_tarball=${ipsec_pv}.tar
-isal_pv=isal-$(date +%Y_%m_%d)
-isal_tarball=${isal_pv}.tar
-ocf_pv=ocf-$(date +%Y_%m_%d)
-ocf_tarball=${ocf_pv}.tar
-
-find . -iname "spdk-*.tar* dpdk-*.tar* ipsec-*.tar* isal-*.tar*" -delete
-git archive HEAD^{tree} --prefix=${spdk_pv}/ -o ${spdk_tarball}
-
-# Build from packaged source
-tmpdir=$(mktemp -d)
-echo "tmpdir=$tmpdir"
-tar -C "$tmpdir" -xf $spdk_tarball
-
-if [ -z "$WITH_DPDK_DIR" ]; then
-       cd dpdk
-       git archive HEAD^{tree} --prefix=dpdk/ -o ../${dpdk_tarball}
-       cd ..
-       tar -C "$tmpdir/${spdk_pv}" -xf $dpdk_tarball
-fi
-
-if [ -d "intel-ipsec-mb" ]; then
-       cd intel-ipsec-mb
-       git archive HEAD^{tree} --prefix=intel-ipsec-mb/ -o ../${ipsec_tarball}
-       cd ..
-       tar -C "$tmpdir/${spdk_pv}" -xf $ipsec_tarball
+if [ $(uname -s) = Linux ]; then
+       ./configure $(get_config_params) --disable-debug --enable-lto
+else
+       # LTO needs a special compiler to work on BSD.
+       ./configure $(get_config_params) --disable-debug
 fi
+$MAKE ${MAKEFLAGS}
+$MAKE ${MAKEFLAGS} clean
 
-if [ -d "isa-l" ]; then
-       cd isa-l
-       git archive HEAD^{tree} --prefix=isa-l/ -o ../${isal_tarball}
-       cd ..
-       tar -C "$tmpdir/${spdk_pv}" -xf $isal_tarball
-fi
-
-if [ -d "ocf" ]; then
-       cd ocf
-       git archive HEAD^{tree} --prefix=ocf/ -o ../${ocf_tarball}
-       cd ..
-       tar -C "$tmpdir/${spdk_pv}" -xf $ocf_tarball
-fi
-
-(
-       cd "$tmpdir"/spdk-*
-       # use $config_params to get the right dependency options, but disable coverage and ubsan
-       #  explicitly since they are not needed for this build
-       ./configure $config_params --disable-debug --enable-werror --disable-coverage --disable-ubsan
-       time $MAKE ${MAKEFLAGS}
-)
-rm -rf "$tmpdir"
-
-timing_exit autopackage
+timing_exit build_release
 
 timing_finish