From: Kefu Chai <kchai@redhat.com>
Date: Thu, 6 Jun 2019 02:57:53 +0000 (+0800)
Subject: d/control,install-deps: use d/control for installing seastar deps
X-Git-Tag: v15.1.0~2531^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d363edc598d3c78e48ab2ff60c914d05ccd17be;p=ceph.git

d/control,install-deps: use d/control for installing seastar deps

prepare for building ceph-crimson-osd deb package

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

diff --git a/debian/control b/debian/control
index 2bb5e6fbb90e..2a7a69aa36ff 100644
--- a/debian/control
+++ b/debian/control
@@ -26,11 +26,15 @@ Build-Depends: cmake (>= 3.5),
                libbabeltrace-ctf-dev,
                libbabeltrace-dev,
                libblkid-dev (>= 2.17),
+# Crimson      libc-ares-dev,
+# Crimson      libcrypto++-dev,
                libcunit1-dev,
                libcurl4-openssl-dev,
                libexpat1-dev,
                libfuse-dev,
                libgoogle-perftools-dev [i386 amd64 arm64],
+# Crimson      libgnutls28-dev,
+# Crimson      libhwloc-dev,
                libibverbs-dev,
                librdmacm-dev,
                libkeyutils-dev,
@@ -41,15 +45,21 @@ Build-Depends: cmake (>= 3.5),
                libncurses-dev,
                libnss3-dev,
                liboath-dev,
+# Crimson      libnuma-dev,
+# Crimson      libpciaccess-dev,
+# Crimson      libprotobuf-dev,
+# Crimson      libsctp-dev,
                libsnappy-dev,
                libssl-dev,
                libtool,
                libudev-dev,
                libxml2-dev,
+# Crimson      libyaml-cpp-dev,
                librabbitmq-dev,
                lsb-release,
                parted,
                pkg-config,
+# Crimson      protobuf-compiler,
                python (>= 2.7),
                python-all-dev,
                python-cherrypy3,
@@ -68,7 +78,9 @@ Build-Depends: cmake (>= 3.5),
 # Make-Check   python-werkzeug,
                python3-all-dev,
                python3-setuptools,
+# Crimson      ragel,
 # Make-Check   socat,
+# Crimson      systemtap-sdt-dev,
                uuid-dev,
                uuid-runtime,
                valgrind,
diff --git a/install-deps.sh b/install-deps.sh
index 291a33331e78..9e45920ebea0 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -23,15 +23,6 @@ export LC_ALL=C # the following is vulnerable to i18n
 
 ARCH=$(uname -m)
 
-function install_seastar_deps {
-    if [ $WITH_SEASTAR ]; then
-        $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y \
-              ragel libc-ares-dev libhwloc-dev libnuma-dev libpciaccess-dev \
-              libcrypto++-dev libgnutls28-dev libsctp-dev libprotobuf-dev \
-              protobuf-compiler systemtap-sdt-dev libyaml-cpp-dev
-    fi
-}
-
 function munge_ceph_spec_in {
     local for_make_check=$1
     shift
@@ -58,6 +49,9 @@ function munge_debian_control {
 	    grep -v babeltrace debian/control > $control
 	    ;;
     esac
+    if [ $with_seastar ]; then
+	sed -i -e 's/^# Crimson[[:space:]]//g' $control
+    fi
     if $for_make_check; then
         sed -i 's/^# Make-Check[[:space:]]/             /g' $control
     fi
@@ -307,7 +301,6 @@ else
 	# work is done
 	$SUDO env DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool="apt-get -y --no-install-recommends $backports" $control || exit 1
 	$SUDO env DEBIAN_FRONTEND=noninteractive apt-get -y remove ceph-build-deps
-	install_seastar_deps
 	if [ "$control" != "debian/control" ] ; then rm $control; fi
 	$SUDO apt-get install -y libxmlsec1 libxmlsec1-nss libxmlsec1-openssl libxmlsec1-dev
         ;;