From 9b1d5248390361b42ec17f9a8ef5ca8040734e2b Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Wed, 2 Dec 2020 15:48:38 +0800
Subject: [PATCH] debian: mark "crimson" specific deps with "pkg.ceph.crimson"

see also https://wiki.debian.org/BuildProfileSpec

Signed-off-by: Kefu Chai <kchai@redhat.com>
---
 debian/control  | 24 ++++++++++++------------
 install-deps.sh | 10 ++++------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 11cf3f7224df9..7ca78844766ab 100644
--- a/debian/control
+++ b/debian/control
@@ -29,8 +29,8 @@ Build-Depends: automake,
                libbabeltrace-ctf-dev,
                libbabeltrace-dev,
                libblkid-dev (>= 2.17),
-# Crimson      libc-ares-dev,
-# Crimson      libcrypto++-dev,
+               libc-ares-dev <pkg.ceph.crimson>,
+               libcrypto++-dev <pkg.ceph.crimson>,
                libcryptsetup-dev,
                libcap-ng-dev,
                libcunit1-dev,
@@ -40,8 +40,8 @@ Build-Depends: automake,
                libffi-dev [!amd64] <pkg.ceph.check>,
                libfuse-dev,
                libgoogle-perftools-dev [i386 amd64 arm64],
-# Crimson      libgnutls28-dev,
-# Crimson      libhwloc-dev,
+               libgnutls28-dev <pkg.ceph.crimson>,
+               libhwloc-dev <pkg.ceph.crimson>,
                libibverbs-dev,
                libicu-dev,
                librdmacm-dev,
@@ -54,10 +54,10 @@ Build-Depends: automake,
                libncurses-dev,
                libnss3-dev,
                liboath-dev,
-# Crimson      libnuma-dev,
-# Crimson      libpciaccess-dev,
-# Crimson      libprotobuf-dev,
-# Crimson      libsctp-dev,
+               libnuma-dev <pkg.ceph.crimson>,
+               libpciaccess-dev <pkg.ceph.crimson>,
+               libprotobuf-dev <pkg.ceph.crimson>,
+               libsctp-dev <pkg.ceph.crimson>,
                libsnappy-dev,
                libsqlite3-dev,
                libssl-dev,
@@ -68,7 +68,7 @@ Build-Depends: automake,
                librabbitmq-dev,
                librdkafka-dev,
                luarocks,
-# Crimson      libyaml-cpp-dev,
+               libyaml-cpp-dev <pkg.ceph.crimson>,
                libzstd-dev <pkg.ceph.check>,
                libxmlsec1 <pkg.ceph.check>,
                libxmlsec1-nss <pkg.ceph.check>,
@@ -82,7 +82,7 @@ Build-Depends: automake,
                patch,
                pkg-config,
                prometheus <pkg.ceph.check>,
-# Crimson      protobuf-compiler,
+               protobuf-compiler <pkg.ceph.crimson>,
                python3-all-dev,
                python3-cherrypy3,
                python3-jwt <pkg.ceph.check>,
@@ -101,9 +101,9 @@ Build-Depends: automake,
                python3-werkzeug <pkg.ceph.check>,
                python3-setuptools,
                python3-yaml,
-# Crimson      ragel,
+               ragel <pkg.ceph.crimson>,
                socat <pkg.ceph.check>,
-# Crimson      systemtap-sdt-dev,
+               systemtap-sdt-dev <pkg.ceph.crimson>,
                uuid-dev <pkg.ceph.check>,
                uuid-runtime,
                valgrind,
diff --git a/install-deps.sh b/install-deps.sh
index b37ffe31fa74a..af9ac2657cf87 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -50,8 +50,6 @@ function munge_ceph_spec_in {
 function munge_debian_control {
     local version=$1
     shift
-    local with_seastar=$1
-    shift
     local control=$1
     case "$version" in
         *squeeze*|*wheezy*)
@@ -59,9 +57,6 @@ 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 $with_jaeger; then
 	sed -i -e 's/^# Jaeger[[:space:]]//g' $control
 	sed -i -e 's/^# Crimson      libyaml-cpp-dev,/d' $control
@@ -339,7 +334,7 @@ else
         touch $DIR/status
 
 	backports=""
-	control=$(munge_debian_control "$VERSION" "$with_seastar" "debian/control")
+	control=$(munge_debian_control "$VERSION" "debian/control")
         case "$VERSION" in
             *squeeze*|*wheezy*)
                 backports="-t $codename-backports"
@@ -353,6 +348,9 @@ else
 	if $for_make_check; then
 	    build_profiles+=",pkg.ceph.check"
 	fi
+	if $with_seastar; then
+	    build_profiles+=",pkg.ceph.crimson"
+	fi
 	$SUDO env DEBIAN_FRONTEND=noninteractive mk-build-deps \
 	      --build-profiles "${build_profiles#,}" \
 	      --install --remove \
-- 
2.39.5