install-deps.sh,deb,rpm: move python-saml deps into debian/control and ceph.spec.in

these dependencies are only used for building python-saml which is in
turn used for the SAML support. this feature is tested using
`test_sso.py` while performing dashboard tests. we do not package or
ship python-saml along with other Ceph packages. so let's move these
dependencies to the "make check" sections in ceph.spec.in and
debian/control for simplifying install-deps.sh.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5d6d770e2fbf06c9aca58246147d92aa9b221e1b)

Conflicts:
	ceph.spec.in
	debian/control
	install-deps.sh

diff --git a/ceph.spec.in b/ceph.spec.in
index 87e1a3e6cb4a0dec0d0daa98b1e0bccab145bbb2..7c71ea02640ee467caa3de224a3cf254c0abd67d 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -293,13 +293,24 @@ BuildRequires:  pyOpenSSL%{_python_buildid}
 %else
 BuildRequires:  python%{_python_buildid}-pyOpenSSL
 %endif
+BuildRequires: libtool-ltdl-devel
 BuildRequires: python%{_python_buildid}-cherrypy
 BuildRequires: python%{_python_buildid}-jwt
 BuildRequires: python%{_python_buildid}-routes
 BuildRequires:  python%{_python_buildid}-scipy
 BuildRequires: python%{_python_buildid}-werkzeug
-%endif
-%if 0%{?suse_version}
+BuildRequires: xmlsec1
+BuildRequires: xmlsec1-devel
+BuildRequires: xmlsec1-nss
+BuildRequires: xmlsec1-openssl
+BuildRequires: xmlsec1-openssl-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxmlsec1-1
+BuildRequires: libxmlsec1-nss1
+BuildRequires: libxmlsec1-openssl1
+BuildRequires: xmlsec1-devel
+BuildRequires: xmlsec1-openssl-devel
 BuildRequires: python%{_python_buildid}-CherryPy
 BuildRequires: python%{_python_buildid}-PyJWT
 BuildRequires: python%{_python_buildid}-Routes
@@ -310,7 +321,6 @@ BuildRequires:      python%{_python_buildid}-pecan
 BuildRequires: python%{_python_buildid}-pyOpenSSL
 BuildRequires: python%{_python_buildid}-tox
 BuildRequires: rpm-build
-BuildRequires:  xmlsec1-devel
 %endif
 %endif
 # lttng and babeltrace for rbd-replay-prep

diff --git a/debian/control b/debian/control
index fb16e8ca15fff84e5615f43289c22c460e3a1e0a..fdcfee29c8de4b7e0451dbe82cff6cd5b839a086 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,10 @@ Build-Depends: cmake (>= 3.5),
                libxml2-dev,
                librabbitmq-dev,
                librdkafka-dev,
+# Make-Check   libxmlsec1
+# Make-Check   libxmlsec1-nss
+# Make-Check   libxmlsec1-openssl
+# Make-Check   libxmlsec1-dev
                lsb-release,
                parted,
                patch,

diff --git a/install-deps.sh b/install-deps.sh
index 0fccd5b621f3f64d8dbc4e3a17b90f66d5b1b458..4f64ee176128e1841cd6dabd10bbee88a91852f7 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -316,7 +316,6 @@ else
        $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
         ;;
     centos|fedora|rhel|ol|virtuozzo)
         yumdnf="dnf"
@@ -379,8 +378,6 @@ else
             ensure_decent_gcc_on_rh $dts_ver
        fi
         ! grep -q -i error: $DIR/yum-builddep.out || exit 1
-        # for building python-saml and its dependencies
-        $SUDO $yumdnf install -y xmlsec1 xmlsec1-nss xmlsec1-openssl xmlsec1-devel xmlsec1-openssl-devel libtool-ltdl-devel
         ;;
     opensuse*|suse|sles)
         echo "Using zypper to install dependencies"
@@ -392,7 +389,6 @@ else
         fi
         munge_ceph_spec_in $for_make_check $DIR/ceph.spec
         $SUDO $zypp_install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1
-        $SUDO $zypp_install libxmlsec1-1 libxmlsec1-nss1 libxmlsec1-openssl1 xmlsec1-devel xmlsec1-openssl-devel
         ;;
     alpine)
         # for now we need the testing repo for leveldb