From 806dc43cb91af463b18127550566ad1d955d2929 Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Tue, 11 Jun 2019 17:18:21 +0800
Subject: [PATCH] ceph-dev-new-setup: move "git diff" before install-deps.sh

as install-deps.sh now changes debian/control if we are building the
crimson flavor.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 ceph-dev-new-setup/build/build | 49 +++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/ceph-dev-new-setup/build/build b/ceph-dev-new-setup/build/build
index b1f97081..4d5914c9 100644
--- a/ceph-dev-new-setup/build/build
+++ b/ceph-dev-new-setup/build/build
@@ -39,6 +39,31 @@ rm -rf release
 #sed -i 's/^Source0:.*/Source0:        http:\/\/ceph.com\/download\/%{name}-%{version}-rc1.tar.bz2/' ceph.spec.in
 #sed -i 's/^%setup.*/%setup -q -n %{name}-%{version}-rc1/' ceph.spec.in
 
+
+# run submodule updates regardless
+echo "Running submodule update ..."
+git submodule update --init
+
+# When using autotools/autoconf it is possible to see output from `git diff`
+# since some macros can be copied over to the ceph source, triggering this
+# check. This is why this check now is done just before running autogen.sh
+# which calls `aclocal -I m4 --install` that copies a system version of
+# ltsugar.m4 that can be different from the one included in the ceph source
+# tree.
+if git diff --quiet ; then
+    echo repository is clean
+else
+    echo
+    echo "**** REPOSITORY IS DIRTY ****"
+    echo
+    git diff
+    if [ "$force" != "force" ]; then
+	echo "add 'force' argument if you really want to continue."
+	exit 1
+    fi
+    echo "forcing."
+fi
+
 # because autogen+configure will check for dependencies, we are forced to install them
 # and ensure they are present in the current host
 if [ -x install-deps.sh ]; then
@@ -47,10 +72,6 @@ if [ -x install-deps.sh ]; then
     WITH_SEASTAR=$WITH_SEASTAR ./install-deps.sh
 fi
 
-# run submodule updates regardless
-echo "Running submodule update ..."
-git submodule update --init
-
 # Flavor Builds support
 
 #cryptopp is not default for CMake
@@ -78,26 +99,6 @@ case "${FLAVOR}" in
         exit 1
 esac
 
-# When using autotools/autoconf it is possible to see output from `git diff`
-# since some macros can be copied over to the ceph source, triggering this
-# check. This is why this check now is done just before running autogen.sh
-# which calls `aclocal -I m4 --install` that copies a system version of
-# ltsugar.m4 that can be different from the one included in the ceph source
-# tree.
-if git diff --quiet ; then
-    echo repository is clean
-else
-    echo
-    echo "**** REPOSITORY IS DIRTY ****"
-    echo
-    git diff
-    if [ "$force" != "force" ]; then
-	echo "add 'force' argument if you really want to continue."
-	exit 1
-    fi
-    echo "forcing."
-fi
-
 # make-dist does not exist for autotools builds
 if [ ! -x make-dist ]; then
     echo "Using autotools build system"
-- 
2.39.5