packages/ceph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!16 remove python2 dependency

Browse Source 
From: @xinghe_1
Reviewed-by: @chixinze
Signed-off-by: @chixinze
This commit is contained in:
openeuler-ci-bot 2020-11-09 10:38:04 +08:00 committed by Gitee
commit 129c8cfa17
2 changed files with 232 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
6004-py3.patch Normal file
View File

@ -0,0 +1,168 @@
From 96e17e73608333c1d23e8950f7daf59d6e290248 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Thu, 29 Oct 2020 14:37:47 +0800
Subject: [PATCH] cpeh-remove-python3
https://src.fedoraproject.org/rpms/ceph/c/96e17e73608333c1d23e8950f7daf59d6e290248
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
src/CMakeLists.txt | 3 ---
src/brag/client/ceph-brag | 2 +-
src/ceph-create-keys | 2 +-
src/ceph-detect-init/ceph_detect_init/main.py | 2 +-
src/ceph-disk/ceph_disk/main.py | 2 +-
src/ceph-rest-api | 2 +-
src/ceph-volume/bin/ceph-volume | 2 +-
src/ceph-volume/bin/ceph-volume-systemd | 2 +-
src/ceph.in | 2 +-
src/mount.fuse.ceph | 2 +-
src/pybind/CMakeLists.txt | 3 +--
src/tools/setup-virtualenv.sh | 4 +++-
12 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 80d4b351..7ca500b1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -244,9 +244,6 @@ if(WITH_CEPHFS_JAVA)
endif()
# Python stuff
-find_package(PythonInterp 2 REQUIRED)
-find_package(PythonLibs 2 REQUIRED)
-
option(WITH_PYTHON3 "build python3 bindings" "CHECK")
if(WITH_PYTHON3 MATCHES "check|CHECK")
find_package(Python3Interp 3 QUIET)
diff --git a/src/brag/client/ceph-brag b/src/brag/client/ceph-brag
index 7df51674..69bbba20 100755
--- a/src/brag/client/ceph-brag
+++ b/src/brag/client/ceph-brag
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
from __future__ import print_function
diff --git a/src/ceph-create-keys b/src/ceph-create-keys
index c14c02f2..7e80aab6 100755
--- a/src/ceph-create-keys
+++ b/src/ceph-create-keys
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
import argparse
import errno
import json
diff --git a/src/ceph-detect-init/ceph_detect_init/main.py b/src/ceph-detect-init/ceph_detect_init/main.py
index 320ae170..c18ce74c 100644
--- a/src/ceph-detect-init/ceph_detect_init/main.py
+++ b/src/ceph-detect-init/ceph_detect_init/main.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
#
# Copyright (C) 2015 <contact@redhat.com>
# Copyright (C) 2015 SUSE LINUX GmbH
diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index 0058f1ac..0bdbcba3 100644
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
#
# Copyright (C) 2015, 2016, 2017 Red Hat <contact@redhat.com>
# Copyright (C) 2014 Inktank <info@inktank.com>
diff --git a/src/ceph-rest-api b/src/ceph-rest-api
index d185a804..2761dcc7 100755
--- a/src/ceph-rest-api
+++ b/src/ceph-rest-api
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# vim: ts=4 sw=4 smarttab expandtab
import argparse
diff --git a/src/ceph-volume/bin/ceph-volume b/src/ceph-volume/bin/ceph-volume
index 5905cfcc..a4f62b4a 100755
--- a/src/ceph-volume/bin/ceph-volume
+++ b/src/ceph-volume/bin/ceph-volume
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
from ceph_volume import main
diff --git a/src/ceph-volume/bin/ceph-volume-systemd b/src/ceph-volume/bin/ceph-volume-systemd
index 7da8ec6b..f6c751cf 100755
--- a/src/ceph-volume/bin/ceph-volume-systemd
+++ b/src/ceph-volume/bin/ceph-volume-systemd
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
from ceph_volume.systemd import main
diff --git a/src/ceph.in b/src/ceph.in
index 7c1eda2c..5e0471cb 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -1,4 +1,4 @@
-#!@PYTHON_EXECUTABLE@
+#!@PYTHON3_EXECUTABLE@
# -*- mode:python -*-
# vim: ts=4 sw=4 smarttab expandtab
#
diff --git a/src/mount.fuse.ceph b/src/mount.fuse.ceph
index 5c65ddca..4c0addf5 100755
--- a/src/mount.fuse.ceph
+++ b/src/mount.fuse.ceph
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
'''
Helper to mount ceph-fuse from /etc/fstab. To use, add an entry
like:
diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt
index dbdb23f1..1a14df97 100644
--- a/src/pybind/CMakeLists.txt
+++ b/src/pybind/CMakeLists.txt
@@ -6,7 +6,6 @@ set(CYTHON_MODULE_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules)
if(WITH_PYTHON3)
set(py_vers 3)
endif()
-list(APPEND py_vers 2)
foreach(python_version ${py_vers})
if(${python_version} EQUAL 2)
@@ -58,7 +57,7 @@ endforeach()
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/ceph_rest_api.py
- DESTINATION ${PYTHON_INSTDIR})
+ DESTINATION ${PYTHON${PYTHON_VERSION}_INSTDIR})
if(WITH_MGR)
# Location needs to match default setting for mgr_module_path, currently:
diff --git a/src/tools/setup-virtualenv.sh b/src/tools/setup-virtualenv.sh
index d249d49f..51763ac6 100755
--- a/src/tools/setup-virtualenv.sh
+++ b/src/tools/setup-virtualenv.sh
@@ -15,10 +15,12 @@
# GNU Library Public License for more details.
#
+echo ====================== setup-virtualenv $DIR ================
+
DIR=$1
rm -fr $DIR
mkdir -p $DIR
-virtualenv --python python2.7 $DIR
+virtualenv --python python3 $DIR
. $DIR/bin/activate
if pip --help | grep -q disable-pip-version-check; then
--
2.27.0

205
ceph.spec
View File

@ -20,6 +20,8 @@
# openEuler added some patches and rewrote several sentences. # openEuler added some patches and rewrote several sentences.
# #
%global fixme 0
%bcond_without ocf %bcond_without ocf
%bcond_with cephfs_java %bcond_with cephfs_java
%if 0%{?suse_version} %if 0%{?suse_version}
@ -68,7 +70,7 @@
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 12.2.8 Version: 12.2.8
Release: 7 Release: 8
Epoch: 2 Epoch: 2
# define _epoch_prefix macro which will expand to the empty string if epoch is # define _epoch_prefix macro which will expand to the empty string if epoch is
@ -87,7 +89,8 @@ Source0: http://download.ceph.com/tarballs/ceph-12.2.8.tar.gz
Patch6000: 6000-CVE-2018-16889.patch Patch6000: 6000-CVE-2018-16889.patch
Patch6001: 6001-CVE-2018-16846-1.patch Patch6001: 6001-CVE-2018-16846-1.patch
Patch6002: 6002-CVE-2018-16846-2.patch Patch6002: 6002-CVE-2018-16846-2.patch
Patch6003: 6003-CVE-2018-14662.patch Patch6003: 6003-CVE-2018-14662.patch
Patch6004: 6004-py3.patch
%if 0%{?suse_version} %if 0%{?suse_version}
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
@ -101,7 +104,9 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x
################################################################################# #################################################################################
Requires: ceph-osd = %{_epoch_prefix}%{version}-%{release} Requires: ceph-osd = %{_epoch_prefix}%{version}-%{release}
Requires: ceph-mds = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mds = %{_epoch_prefix}%{version}-%{release}
%if %fixme
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
%endif
Requires: ceph-mon = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mon = %{_epoch_prefix}%{version}-%{release}
Requires(post): binutils Requires(post): binutils
%if 0%{with cephfs_java} %if 0%{with cephfs_java}
@ -115,16 +120,16 @@ BuildRequires: selinux-policy-doc
%endif %endif
%if 0%{with make_check} %if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
BuildRequires: python-cherrypy BuildRequires: python3-cherrypy
BuildRequires: python-werkzeug BuildRequires: python3-werkzeug
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: python-CherryPy BuildRequires: python3-CherryPy
BuildRequires: python-Werkzeug BuildRequires: python3-Werkzeug
BuildRequires: python-numpy-devel BuildRequires: python-numpy-devel
%endif %endif
BuildRequires: python-coverage BuildRequires: python3-coverage
BuildRequires: python-pecan BuildRequires: python3-pecan
BuildRequires: socat BuildRequires: socat
%endif %endif
BuildRequires: bc BuildRequires: bc
@ -149,12 +154,12 @@ BuildRequires: make
BuildRequires: parted BuildRequires: parted
BuildRequires: perl BuildRequires: perl
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python BuildRequires: python3
BuildRequires: python2-devel BuildRequires: python3-devel
BuildRequires: python-nose BuildRequires: python3-nose
BuildRequires: python-requests BuildRequires: python3-requests
BuildRequires: python-six BuildRequires: python3-six
BuildRequires: python-virtualenv BuildRequires: python3-virtualenv
BuildRequires: snappy-devel BuildRequires: snappy-devel
BuildRequires: udev BuildRequires: udev
BuildRequires: util-linux BuildRequires: util-linux
@ -191,26 +196,22 @@ BuildRequires: rdma-core-devel
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Requires: systemd Requires: systemd
BuildRequires: boost-random BuildRequires: boost-random
BuildRequires: btrfs-progs BuildRequires: boost-devel
BuildRequires: nss-devel BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel BuildRequires: keyutils-libs-devel
BuildRequires: libibverbs-devel BuildRequires: libibverbs-devel
%ifnarch %{arm}
BuildRequires: rdma-core-devel
%endif
BuildRequires: openldap-devel BuildRequires: openldap-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: Cython BuildRequires: python3-Cython
BuildRequires: python-prettytable BuildRequires: python3-prettytable
BuildRequires: python-sphinx BuildRequires: python3-sphinx
%endif %endif
# python34-... for RHEL, python3-... for all other supported distros
%if 0%{?rhel} && ! 0%{?openEuler}
BuildRequires: python34-devel
BuildRequires: python34-setuptools
BuildRequires: python34-Cython
%else
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
BuildRequires: python3-Cython BuildRequires: python3-Cython
%endif
# lttng and babeltrace for rbd-replay-prep # lttng and babeltrace for rbd-replay-prep
%if %{with lttng} %if %{with lttng}
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
@ -231,8 +232,6 @@ BuildRequires: expat-devel
#hardened-cc1 #hardened-cc1
%if 0%{?openEuler} %if 0%{?openEuler}
BuildRequires: openEuler-rpm-config BuildRequires: openEuler-rpm-config
%else if 0%{?fedora} || 0%{?rhel}
BuildRequires: redhat-rpm-config
%endif %endif
%description %description
@ -256,9 +255,11 @@ Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
%if 0%{with selinux} %if 0%{with selinux}
Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release}
%endif %endif
Requires: python Requires(post):/sbin/ldconfig
Requires: python-requests Requires(postun):/sbin/ldconfig
Requires: python-setuptools Requires: python3
Requires: python3-requests
Requires: python3-setuptools
Requires: grep Requires: grep
Requires: xfsprogs Requires: xfsprogs
Requires: logrotate Requires: logrotate
@ -281,17 +282,17 @@ Group: System/Filesystems
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
Requires: python-rados = %{_epoch_prefix}%{version}-%{release} Requires: python3-rados = %{_epoch_prefix}%{version}-%{release}
Requires: python-rbd = %{_epoch_prefix}%{version}-%{release} Requires: python3-rbd = %{_epoch_prefix}%{version}-%{release}
Requires: python-cephfs = %{_epoch_prefix}%{version}-%{release} Requires: python3-cephfs = %{_epoch_prefix}%{version}-%{release}
Requires: python-rgw = %{_epoch_prefix}%{version}-%{release} Requires: python3-rgw = %{_epoch_prefix}%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Requires: python-prettytable Requires: python3-prettytable
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: python-PrettyTable Requires: python-PrettyTable
%endif %endif
Requires: python-requests Requires: python3-requests
%{?systemd_requires} %{?systemd_requires}
%if 0%{?suse_version} %if 0%{?suse_version}
Requires(pre): pwdutils Requires(pre): pwdutils
@ -317,10 +318,10 @@ Summary: Ceph Monitor Daemon
Group: System/Filesystems Group: System/Filesystems
%endif %endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
Requires: python-six Requires: python3-six
# For ceph-rest-api # For ceph-rest-api
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Requires: python-flask Requires: python3-flask
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: python-Flask Requires: python-Flask
@ -331,18 +332,19 @@ system. One or more instances of ceph-mon form a Paxos part-time
parliament cluster that provides extremely reliable and durable storage parliament cluster that provides extremely reliable and durable storage
of cluster membership, configuration, and state. of cluster membership, configuration, and state.
%if %fixme
%package mgr %package mgr
Summary: Ceph Manager Daemon Summary: Ceph Manager Daemon
%if 0%{?suse_version} %if 0%{?suse_version}
Group: System/Filesystems Group: System/Filesystems
%endif %endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
Requires: python-six Requires: python3-six
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Requires: python-cherrypy Requires: python3-cherrypy
Requires: python-jinja2 Requires: python3-jinja2
Requires: python-werkzeug Requires: python3-werkzeug
Requires: pyOpenSSL Requires: python3-pyOpenSSL
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: python-CherryPy Requires: python-CherryPy
@ -350,12 +352,13 @@ Requires: python-jinja2
Requires: python-Werkzeug Requires: python-Werkzeug
Requires: python-pyOpenSSL Requires: python-pyOpenSSL
%endif %endif
Requires: python-pecan Requires: python3-pecan
%description mgr %description mgr
ceph-mgr enables python modules that provide services (such as the REST ceph-mgr enables python modules that provide services (such as the REST
module derived from Calamari) and expose CLI hooks. ceph-mgr gathers module derived from Calamari) and expose CLI hooks. ceph-mgr gathers
the cluster maps, the daemon metadata, and performance counters, and the cluster maps, the daemon metadata, and performance counters, and
exposes all these to the python modules. exposes all these to the python modules.
%endif
%package fuse %package fuse
Summary: Ceph fuse-based client Summary: Ceph fuse-based client
@ -501,18 +504,6 @@ Obsoletes: librgw2-devel < %{_epoch_prefix}%{version}-%{release}
This package contains libraries and headers needed to develop programs This package contains libraries and headers needed to develop programs
that use RADOS gateway client library. that use RADOS gateway client library.
%package -n python-rgw
Summary: Python 2 libraries for the RADOS gateway
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-rgw
This package contains Python 2 libraries for interacting with Cephs RADOS
gateway.
%package -n python%{python3_pkgversion}-rgw %package -n python%{python3_pkgversion}-rgw
Summary: Python 3 libraries for the RADOS gateway Summary: Python 3 libraries for the RADOS gateway
%if 0%{?suse_version} %if 0%{?suse_version}
@ -524,17 +515,6 @@ Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{relea
This package contains Python 3 libraries for interacting with Cephs RADOS This package contains Python 3 libraries for interacting with Cephs RADOS
gateway. gateway.
%package -n python-rados
Summary: Python 2 libraries for the RADOS object store
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-rados
This package contains Python 2 libraries for interacting with Cephs RADOS
object store.
%package -n python%{python3_pkgversion}-rados %package -n python%{python3_pkgversion}-rados
Summary: Python 3 libraries for the RADOS object store Summary: Python 3 libraries for the RADOS object store
%if 0%{?suse_version} %if 0%{?suse_version}
@ -603,18 +583,6 @@ Obsoletes: librbd1-devel < %{_epoch_prefix}%{version}-%{release}
This package contains libraries and headers needed to develop programs This package contains libraries and headers needed to develop programs
that use RADOS block device. that use RADOS block device.
%package -n python-rbd
Summary: Python 2 libraries for the RADOS block device
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-rbd
This package contains Python 2 libraries for interacting with Cephs RADOS
block device.
%package -n python%{python3_pkgversion}-rbd %package -n python%{python3_pkgversion}-rbd
Summary: Python 3 libraries for the RADOS block device Summary: Python 3 libraries for the RADOS block device
%if 0%{?suse_version} %if 0%{?suse_version}
@ -656,20 +624,6 @@ Obsoletes: libcephfs2-devel < %{_epoch_prefix}%{version}-%{release}
This package contains libraries and headers needed to develop programs This package contains libraries and headers needed to develop programs
that use Cephs distributed file system. that use Cephs distributed file system.
%package -n python-cephfs
Summary: Python 2 libraries for Ceph distributed file system
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
%if 0%{?suse_version}
Recommends: python-rados = %{_epoch_prefix}%{version}-%{release}
%endif
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-cephfs
This package contains Python 2 libraries for interacting with Cephs distributed
file system.
%package -n python%{python3_pkgversion}-cephfs %package -n python%{python3_pkgversion}-cephfs
Summary: Python 3 libraries for Ceph distributed file system Summary: Python 3 libraries for Ceph distributed file system
%if 0%{?suse_version} %if 0%{?suse_version}
@ -775,23 +729,6 @@ populated file-systems.
%endif %endif
%package -n python-ceph-compat
Summary: Compatibility package for Cephs python libraries
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
Obsoletes: python-ceph
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
Requires: python-rbd = %{_epoch_prefix}%{version}-%{release}
Requires: python-cephfs = %{_epoch_prefix}%{version}-%{release}
Requires: python-rgw = %{_epoch_prefix}%{version}-%{release}
Provides: python-ceph
%description -n python-ceph-compat
This is a compatibility package to accommodate python-ceph split into
python-rados, python-rbd, python-rgw and python-cephfs. Packages still
depending on python-ceph should be fixed to depend on python-rados,
python-rbd, python-rgw or python-cephfs instead.
################################################################################# #################################################################################
# common # common
################################################################################# #################################################################################
@ -840,6 +777,8 @@ cmake .. \
-DCMAKE_INSTALL_MANDIR=%{_mandir} \ -DCMAKE_INSTALL_MANDIR=%{_mandir} \
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-DWITH_MGR=OFF \
-DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \ -DWITH_MANPAGE=ON \
-DWITH_PYTHON3=ON \ -DWITH_PYTHON3=ON \
-DWITH_SYSTEMD=ON \ -DWITH_SYSTEMD=ON \
@ -922,6 +861,9 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
install -m 0644 -D udev/60-ceph-by-parttypeuuid.rules %{buildroot}%{_udevrulesdir}/60-ceph-by-parttypeuuid.rules install -m 0644 -D udev/60-ceph-by-parttypeuuid.rules %{buildroot}%{_udevrulesdir}/60-ceph-by-parttypeuuid.rules
install -m 0644 -D udev/95-ceph-osd.rules %{buildroot}%{_udevrulesdir}/95-ceph-osd.rules install -m 0644 -D udev/95-ceph-osd.rules %{buildroot}%{_udevrulesdir}/95-ceph-osd.rules
rm -f %{buildroot}%{_unitdir}/ceph-mgr@.service
rm -f %{buildroot}%{_unitdir}/ceph-mgr.target
#set up placeholder directories #set up placeholder directories
mkdir -p %{buildroot}%{_sysconfdir}/ceph mkdir -p %{buildroot}%{_sysconfdir}/ceph
mkdir -p %{buildroot}/run/ceph mkdir -p %{buildroot}/run/ceph
@ -963,10 +905,12 @@ rm -rf %{buildroot}
%{_bindir}/osdmaptool %{_bindir}/osdmaptool
%{_bindir}/ceph-kvstore-tool %{_bindir}/ceph-kvstore-tool
%{_bindir}/ceph-run %{_bindir}/ceph-run
%if %fixme
%{_bindir}/ceph-detect-init %{_bindir}/ceph-detect-init
%{_sbindir}/ceph-disk
%endif
%{_libexecdir}/systemd/system-preset/50-ceph.preset %{_libexecdir}/systemd/system-preset/50-ceph.preset
%{_sbindir}/ceph-create-keys %{_sbindir}/ceph-create-keys
%{_sbindir}/ceph-disk
%{_sbindir}/rcceph %{_sbindir}/rcceph
%dir %{_libexecdir}/ceph %dir %{_libexecdir}/ceph
%{_libexecdir}/ceph/ceph_common.sh %{_libexecdir}/ceph/ceph_common.sh
@ -996,11 +940,6 @@ rm -rf %{buildroot}
%endif %endif
%{_unitdir}/ceph-disk@.service %{_unitdir}/ceph-disk@.service
%{_unitdir}/ceph.target %{_unitdir}/ceph.target
%{python2_sitelib}/ceph_detect_init*
%{python2_sitelib}/ceph_disk*
%dir %{python_sitelib}/ceph_volume
%{python2_sitelib}/ceph_volume/*
%{python2_sitelib}/ceph_volume-*
%{_mandir}/man8/ceph-deploy.8* %{_mandir}/man8/ceph-deploy.8*
%{_mandir}/man8/ceph-detect-init.8* %{_mandir}/man8/ceph-detect-init.8*
%{_mandir}/man8/ceph-create-keys.8* %{_mandir}/man8/ceph-create-keys.8*
@ -1119,8 +1058,6 @@ fi
%config %{_sysconfdir}/bash_completion.d/radosgw-admin %config %{_sysconfdir}/bash_completion.d/radosgw-admin
%config(noreplace) %{_sysconfdir}/ceph/rbdmap %config(noreplace) %{_sysconfdir}/ceph/rbdmap
%{_unitdir}/rbdmap.service %{_unitdir}/rbdmap.service
%{python2_sitelib}/ceph_argparse.py*
%{python2_sitelib}/ceph_daemon.py*
%dir %{_udevrulesdir} %dir %{_udevrulesdir}
%{_udevrulesdir}/50-rbd.rules %{_udevrulesdir}/50-rbd.rules
%attr(3770,ceph,ceph) %dir %{_localstatedir}/log/ceph/ %attr(3770,ceph,ceph) %dir %{_localstatedir}/log/ceph/
@ -1211,6 +1148,7 @@ if [ $FIRST_ARG -ge 1 ] ; then
fi fi
fi fi
%if %fixme
%files mgr %files mgr
%{_bindir}/ceph-mgr %{_bindir}/ceph-mgr
%{_libdir}/ceph/mgr %{_libdir}/ceph/mgr
@ -1259,6 +1197,7 @@ if [ $FIRST_ARG -ge 1 ] ; then
/usr/bin/systemctl try-restart ceph-mgr@\*.service > /dev/null 2>&1 || : /usr/bin/systemctl try-restart ceph-mgr@\*.service > /dev/null 2>&1 || :
fi fi
fi fi
%endif
%files mon %files mon
%{_bindir}/ceph-mon %{_bindir}/ceph-mon
@ -1266,7 +1205,8 @@ fi
%{_bindir}/ceph-monstore-tool %{_bindir}/ceph-monstore-tool
%{_mandir}/man8/ceph-mon.8* %{_mandir}/man8/ceph-mon.8*
%{_mandir}/man8/ceph-rest-api.8* %{_mandir}/man8/ceph-rest-api.8*
%{python2_sitelib}/ceph_rest_api.py* %{python3_sitelib}/ceph_rest_api.py*
%{python3_sitelib}/__pycache__/*
%{_unitdir}/ceph-mon@.service %{_unitdir}/ceph-mon@.service
%{_unitdir}/ceph-mon.target %{_unitdir}/ceph-mon.target
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mon %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mon
@ -1435,8 +1375,10 @@ fi
%{_bindir}/ceph-osdomap-tool %{_bindir}/ceph-osdomap-tool
%{_bindir}/ceph-osd %{_bindir}/ceph-osd
%{_libexecdir}/ceph/ceph-osd-prestart.sh %{_libexecdir}/ceph/ceph-osd-prestart.sh
%if %fixme
%{_sbindir}/ceph-volume %{_sbindir}/ceph-volume
%{_sbindir}/ceph-volume-systemd %{_sbindir}/ceph-volume-systemd
%endif
%dir %{_udevrulesdir} %dir %{_udevrulesdir}
%{_udevrulesdir}/60-ceph-by-parttypeuuid.rules %{_udevrulesdir}/60-ceph-by-parttypeuuid.rules
%{_udevrulesdir}/95-ceph-osd.rules %{_udevrulesdir}/95-ceph-osd.rules
@ -1545,10 +1487,6 @@ fi
%{_bindir}/librados-config %{_bindir}/librados-config
%{_mandir}/man8/librados-config.8* %{_mandir}/man8/librados-config.8*
%files -n python-rados
%{python2_sitearch}/rados.so
%{python2_sitearch}/rados-*.egg-info
%files -n python%{python3_pkgversion}-rados %files -n python%{python3_pkgversion}-rados
%{python3_sitearch}/rados.cpython*.so %{python3_sitearch}/rados.cpython*.so
%{python3_sitearch}/rados-*.egg-info %{python3_sitearch}/rados-*.egg-info
@ -1599,18 +1537,10 @@ fi
%{_includedir}/rados/rgw_file.h %{_includedir}/rados/rgw_file.h
%{_libdir}/librgw.so %{_libdir}/librgw.so
%files -n python-rgw
%{python2_sitearch}/rgw.so
%{python2_sitearch}/rgw-*.egg-info
%files -n python%{python3_pkgversion}-rgw %files -n python%{python3_pkgversion}-rgw
%{python3_sitearch}/rgw.cpython*.so %{python3_sitearch}/rgw.cpython*.so
%{python3_sitearch}/rgw-*.egg-info %{python3_sitearch}/rgw-*.egg-info
%files -n python-rbd
%{python2_sitearch}/rbd.so
%{python2_sitearch}/rbd-*.egg-info
%files -n python%{python3_pkgversion}-rbd %files -n python%{python3_pkgversion}-rbd
%{python3_sitearch}/rbd.cpython*.so %{python3_sitearch}/rbd.cpython*.so
%{python3_sitearch}/rbd-*.egg-info %{python3_sitearch}/rbd-*.egg-info
@ -1628,11 +1558,6 @@ fi
%{_includedir}/cephfs/ceph_statx.h %{_includedir}/cephfs/ceph_statx.h
%{_libdir}/libcephfs.so %{_libdir}/libcephfs.so
%files -n python-cephfs
%{python2_sitearch}/cephfs.so
%{python2_sitearch}/cephfs-*.egg-info
%{python2_sitelib}/ceph_volume_client.py*
%files -n python%{python3_pkgversion}-cephfs %files -n python%{python3_pkgversion}-cephfs
%{python3_sitearch}/cephfs.cpython*.so %{python3_sitearch}/cephfs.cpython*.so
%{python3_sitearch}/cephfs-*.egg-info %{python3_sitearch}/cephfs-*.egg-info
@ -1791,12 +1716,10 @@ exit 0
%endif # with selinux %endif # with selinux
%files -n python-ceph-compat
# We need an empty %%files list for python-ceph-compat, to tell rpmbuild to
# actually build this meta package.
%changelog %changelog
* Thu Nov 03 2020 yanglongkang <yanglongkang@huawei.com> - 1:12.2.8-8
- remove python2 dependency
* Fri Ooc 28 2020 chixinze <xinze@xsky.com> - 1:12.2.8-7 * Fri Ooc 28 2020 chixinze <xinze@xsky.com> - 1:12.2.8-7
- ceph.spec: fix source code download URL - ceph.spec: fix source code download URL