From: Kefu Chai <kchai@redhat.com>
Date: Wed, 2 Dec 2020 07:31:41 +0000 (+0800)
Subject: debian: mark "make check" deps with "pkg.ceph.check" build
X-Git-Tag: v17.1.0~1676^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0fad448e98d58fc977631a086a91c3decfef0ce;p=ceph.git

debian: mark "make check" deps with "pkg.ceph.check" build

instead of inventing our way for defining "make check" dependencies, use
build profile for adding "make check" specific dependencies. see
https://wiki.debian.org/BuildProfileSpec

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

diff --git a/debian/control b/debian/control
index b14402aa06c3..11cf3f7224df 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: automake,
                gperf,
                g++ (>= 7),
                javahelper,
-# Make-Check   jq,
+               jq <pkg.ceph.check>,
                junit4,
                libaio-dev,
                libbabeltrace-ctf-dev,
@@ -37,7 +37,7 @@ Build-Depends: automake,
                libcurl4-openssl-dev,
 # Jaeger       libevent-dev,
                libexpat1-dev,
-# Make-Check   libffi-dev [!amd64],
+               libffi-dev [!amd64] <pkg.ceph.check>,
                libfuse-dev,
                libgoogle-perftools-dev [i386 amd64 arm64],
 # Crimson      libgnutls28-dev,
@@ -68,47 +68,49 @@ Build-Depends: automake,
                librabbitmq-dev,
                librdkafka-dev,
                luarocks,
-# Make-Check   libzstd-dev,
-# Make-Check   libxmlsec1,
-# Make-Check   libxmlsec1-nss,
-# Make-Check   libxmlsec1-openssl,
-# Make-Check   libxmlsec1-dev,
 # Crimson      libyaml-cpp-dev,
+               libzstd-dev <pkg.ceph.check>,
+               libxmlsec1 <pkg.ceph.check>,
+               libxmlsec1-nss <pkg.ceph.check>,
+               libxmlsec1-openssl <pkg.ceph.check>,
+               libxmlsec1-dev <pkg.ceph.check>,
+               libyaml-cpp-dev <pkg.ceph.crimson>,
                lsb-release,
-# Make-Check   ninja-build,
+               ninja-build <pkg.ceph.check>,
 # Jaeger       nlohmann-json-dev | nlohmann-json3-dev,
                parted,
                patch,
                pkg-config,
-# Make-Check   prometheus,
+               prometheus <pkg.ceph.check>,
 # Crimson      protobuf-compiler,
                python3-all-dev,
                python3-cherrypy3,
-# Make-Check   python3-jwt,
-# Make-Check   python3-nose,
-# Make-Check   python3-pecan,
-# Make-Check   python3-bcrypt,
-# Make-Check   tox,
-# Make-Check   python3-coverage,
-# Make-Check   python3-dateutil,
-# Make-Check   python3-openssl,
-# Make-Check   python3-prettytable,
-# Make-Check   python3-requests,
-# Make-Check   python3-scipy,
+               python3-jwt <pkg.ceph.check>,
+               python3-nose <pkg.ceph.check>,
+               python3-pecan <pkg.ceph.check>,
+               python3-bcrypt <pkg.ceph.check>,
+               tox <pkg.ceph.check>,
+               python3-coverage <pkg.ceph.check>,
+               python3-dateutil <pkg.ceph.check>,
+               python3-openssl <pkg.ceph.check>,
+               python3-prettytable <pkg.ceph.check>,
+               python3-requests <pkg.ceph.check>,
+               python3-scipy <pkg.ceph.check>,
                python3-setuptools,
                python3-sphinx,
-# Make-Check   python3-werkzeug,
+               python3-werkzeug <pkg.ceph.check>,
+               python3-setuptools,
                python3-yaml,
 # Crimson      ragel,
-# Make-Check   socat,
+               socat <pkg.ceph.check>,
 # Crimson      systemtap-sdt-dev,
-# Make-Check   uuid-dev,
+               uuid-dev <pkg.ceph.check>,
                uuid-runtime,
                valgrind,
                virtualenv,
                xfslibs-dev,
-# Make-Check   xfsprogs,
-# Make-Check   xmlstarlet,
+               xfsprogs <pkg.ceph.check>,
+               xmlstarlet <pkg.ceph.check>,
                nasm [amd64],
                zlib1g-dev,
 # Jaeger       Built-Using:   libyaml-cpp-dev (>= 0.6),
diff --git a/install-deps.sh b/install-deps.sh
index 1ce53084e851..b37ffe31fa74 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -52,8 +52,6 @@ function munge_debian_control {
     shift
     local with_seastar=$1
     shift
-    local for_make_check=$1
-    shift
     local control=$1
     case "$version" in
         *squeeze*|*wheezy*)
@@ -68,9 +66,6 @@ function munge_debian_control {
 	sed -i -e 's/^# Jaeger[[:space:]]//g' $control
 	sed -i -e 's/^# Crimson      libyaml-cpp-dev,/d' $control
     fi
-    if $for_make_check; then
-        sed -i 's/^# Make-Check[[:space:]]/             /g' $control
-    fi
     echo $control
 }
 
@@ -344,7 +339,7 @@ else
         touch $DIR/status
 
 	backports=""
-	control=$(munge_debian_control "$VERSION" "$with_seastar" "$for_make_check" "debian/control")
+	control=$(munge_debian_control "$VERSION" "$with_seastar" "debian/control")
         case "$VERSION" in
             *squeeze*|*wheezy*)
                 backports="-t $codename-backports"
@@ -354,7 +349,14 @@ else
 	# make a metapackage that expresses the build dependencies,
 	# install it, rm the .deb; then uninstall the package as its
 	# work is done
-	$SUDO env DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool="apt-get -y --no-install-recommends $backports" $control || exit 1
+	build_profiles=""
+	if $for_make_check; then
+	    build_profiles+=",pkg.ceph.check"
+	fi
+	$SUDO env DEBIAN_FRONTEND=noninteractive mk-build-deps \
+	      --build-profiles "${build_profiles#,}" \
+	      --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
 	if [ "$control" != "debian/control" ] ; then rm $control; fi
         ;;