Remove unnecessary files
This commit is contained in:
Boris Ranto
parent
5365b94fc0
commit
d24de38afc
197
ceph.spec
197
ceph.spec
@ -36,7 +36,6 @@
|
|||||||
%bcond_with ocf
|
%bcond_with ocf
|
||||||
%global _remote_tarball_prefix https://download.ceph.com/tarballs/
|
%global _remote_tarball_prefix https://download.ceph.com/tarballs/
|
||||||
%endif
|
%endif
|
||||||
%bcond_with seastar
|
|
||||||
%bcond_with jaeger
|
%bcond_with jaeger
|
||||||
%bcond_with rbd_rwl_cache
|
%bcond_with rbd_rwl_cache
|
||||||
%bcond_with rbd_ssd_cache
|
%bcond_with rbd_ssd_cache
|
||||||
@ -194,28 +193,6 @@ BuildRequires: nlohmann_json-devel
|
|||||||
BuildRequires: libevent-devel
|
BuildRequires: libevent-devel
|
||||||
BuildRequires: yaml-cpp-devel
|
BuildRequires: yaml-cpp-devel
|
||||||
%endif
|
%endif
|
||||||
%if 0%{with seastar}
|
|
||||||
BuildRequires: c-ares-devel
|
|
||||||
BuildRequires: gnutls-devel
|
|
||||||
BuildRequires: hwloc-devel
|
|
||||||
BuildRequires: libpciaccess-devel
|
|
||||||
BuildRequires: lksctp-tools-devel
|
|
||||||
BuildRequires: protobuf-devel
|
|
||||||
BuildRequires: ragel
|
|
||||||
BuildRequires: systemtap-sdt-devel
|
|
||||||
BuildRequires: yaml-cpp-devel
|
|
||||||
%if 0%{?fedora}
|
|
||||||
BuildRequires: libubsan
|
|
||||||
BuildRequires: libasan
|
|
||||||
BuildRequires: libatomic
|
|
||||||
%endif
|
|
||||||
%if 0%{?rhel}
|
|
||||||
BuildRequires: gcc-toolset-9-annobin
|
|
||||||
BuildRequires: gcc-toolset-9-libubsan-devel
|
|
||||||
BuildRequires: gcc-toolset-9-libasan-devel
|
|
||||||
BuildRequires: gcc-toolset-9-libatomic-devel
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
#################################################################################
|
#################################################################################
|
||||||
# distro-conditional dependencies
|
# distro-conditional dependencies
|
||||||
#################################################################################
|
#################################################################################
|
||||||
@ -316,17 +293,6 @@ BuildRequires: expat-devel
|
|||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
BuildRequires: redhat-rpm-config
|
BuildRequires: redhat-rpm-config
|
||||||
%endif
|
%endif
|
||||||
%if 0%{with seastar}
|
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
|
||||||
BuildRequires: cryptopp-devel
|
|
||||||
BuildRequires: numactl-devel
|
|
||||||
BuildRequires: protobuf-compiler
|
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version}
|
|
||||||
BuildRequires: libcryptopp-devel
|
|
||||||
BuildRequires: libnuma-devel
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
%if 0%{?rhel} >= 8
|
%if 0%{?rhel} >= 8
|
||||||
BuildRequires: /usr/bin/pathfix.py
|
BuildRequires: /usr/bin/pathfix.py
|
||||||
%endif
|
%endif
|
||||||
@ -613,10 +579,6 @@ patch -p1 < %{SOURCE1}
|
|||||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200
|
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200
|
||||||
%define _lto_cflags %{nil}
|
%define _lto_cflags %{nil}
|
||||||
|
|
||||||
%if 0%{with seastar} &&0%{?rhel}
|
|
||||||
. /opt/rh/devtoolset-9/enable
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
# the following setting fixed an OOM condition we once encountered in the OBS
|
# the following setting fixed an OOM condition we once encountered in the OBS
|
||||||
RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768"
|
RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768"
|
||||||
@ -627,11 +589,6 @@ export CFLAGS="$RPM_OPT_FLAGS"
|
|||||||
export CXXFLAGS="$RPM_OPT_FLAGS"
|
export CXXFLAGS="$RPM_OPT_FLAGS"
|
||||||
export LDFLAGS="$RPM_LD_FLAGS"
|
export LDFLAGS="$RPM_LD_FLAGS"
|
||||||
|
|
||||||
%if 0%{with seastar}
|
|
||||||
# seastar uses longjmp() to implement coroutine. and this annoys longjmp_chk()
|
|
||||||
export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g')
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Parallel build settings ...
|
# Parallel build settings ...
|
||||||
CEPH_MFLAGS_JOBS="%{?_smp_mflags}"
|
CEPH_MFLAGS_JOBS="%{?_smp_mflags}"
|
||||||
CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//')
|
CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//')
|
||||||
@ -763,33 +720,11 @@ pushd build
|
|||||||
# we have dropped sysvinit bits
|
# we have dropped sysvinit bits
|
||||||
rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph
|
rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph
|
||||||
popd
|
popd
|
||||||
%if 0%{with seastar}
|
|
||||||
# package crimson-osd with the name of ceph-osd
|
|
||||||
install -m 0755 %{buildroot}%{_bindir}/crimson-osd %{buildroot}%{_bindir}/ceph-osd
|
|
||||||
%endif
|
|
||||||
install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
|
install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
|
||||||
install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph
|
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version}
|
|
||||||
install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_fillupdir}/sysconfig.%{name}
|
|
||||||
%endif
|
|
||||||
install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf
|
install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf
|
||||||
install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_presetdir}/50-ceph.preset
|
|
||||||
mkdir -p %{buildroot}%{_sbindir}
|
mkdir -p %{buildroot}%{_sbindir}
|
||||||
install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
|
|
||||||
chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
|
chmod 0644 %{buildroot}%{_docdir}/ceph/sample.ceph.conf
|
||||||
install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING
|
install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING
|
||||||
install -m 0644 -D etc/sysctl/90-ceph-osd.conf %{buildroot}%{_sysctldir}/90-ceph-osd.conf
|
|
||||||
install -m 0755 -D src/tools/rbd_nbd/rbd-nbd_quiesce %{buildroot}%{_libexecdir}/rbd-nbd/rbd-nbd_quiesce
|
|
||||||
|
|
||||||
install -m 0755 src/cephadm/cephadm %{buildroot}%{_sbindir}/cephadm
|
|
||||||
mkdir -p %{buildroot}%{_sharedstatedir}/cephadm
|
|
||||||
chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm
|
|
||||||
mkdir -p %{buildroot}%{_sharedstatedir}/cephadm/.ssh
|
|
||||||
chmod 0700 %{buildroot}%{_sharedstatedir}/cephadm/.ssh
|
|
||||||
touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
|
||||||
chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys
|
|
||||||
|
|
||||||
# firewall templates and /sbin/mount.ceph symlink
|
# firewall templates and /sbin/mount.ceph symlink
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
@ -800,9 +735,6 @@ ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph
|
|||||||
# udev rules
|
# udev rules
|
||||||
install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
|
install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules
|
||||||
|
|
||||||
# sudoers.d
|
|
||||||
install -m 0440 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl
|
|
||||||
|
|
||||||
%if 0%{?rhel} >= 8
|
%if 0%{?rhel} >= 8
|
||||||
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
|
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/*
|
||||||
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_sbindir}/*
|
pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_sbindir}/*
|
||||||
@ -812,23 +744,116 @@ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_sbindir}/*
|
|||||||
mkdir -p %{buildroot}%{_sysconfdir}/ceph
|
mkdir -p %{buildroot}%{_sysconfdir}/ceph
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/run/ceph
|
mkdir -p %{buildroot}%{_localstatedir}/run/ceph
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/log/ceph
|
mkdir -p %{buildroot}%{_localstatedir}/log/ceph
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/tmp
|
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mon
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/osd
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mds
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/mgr
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/crash
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/crash/posted
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/radosgw
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-osd
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mds
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rgw
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-mgr
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
|
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd-mirror
|
|
||||||
|
|
||||||
# prometheus alerts
|
# Remove the rbd/fuse bits
|
||||||
install -m 644 -D monitoring/prometheus/alerts/ceph_default_alerts.yml %{buildroot}/etc/prometheus/ceph/ceph_default_alerts.yml
|
rm -f %{buildroot}%{_bindir}/ceph-fuse
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-fuse.8*
|
||||||
|
rm -f %{buildroot}%{_sbindir}/mount.fuse.ceph
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/mount.fuse.ceph.8*
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-fuse@.service
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-fuse.target
|
||||||
|
rm -f %{buildroot}%{_bindir}/rbd-fuse
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/rbd-fuse.8*
|
||||||
|
|
||||||
|
# Remove the ceph-base package
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-crash
|
||||||
|
rm -f %{buildroot}%{_bindir}/crushtool
|
||||||
|
rm -f %{buildroot}%{_bindir}/monmaptool
|
||||||
|
rm -f %{buildroot}%{_bindir}/osdmaptool
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-kvstore-tool
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-run
|
||||||
|
rm -f %{buildroot}%{_sbindir}/ceph-create-keys
|
||||||
|
rm -f %{buildroot}%{_sbindir}/ceph-volume
|
||||||
|
rm -f %{buildroot}%{_sbindir}/ceph-volume-systemd
|
||||||
|
rm -f %{buildroot}%{_libexecdir}/ceph/ceph_common.sh
|
||||||
|
rm -rf %{buildroot}%{_libdir}/rados-classes
|
||||||
|
rm -rf %{buildroot}%{_libdir}/ceph/erasure-code
|
||||||
|
rm -rf %{buildroot}%{_libdir}/ceph/compressor
|
||||||
|
rm -rf %{buildroot}%{_libdir}/ceph/crypto
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-crash.service
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-volume@.service
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph.target
|
||||||
|
rm -rf %{buildroot}%{python3_sitelib}/ceph_volume/*
|
||||||
|
rm -rf %{buildroot}%{python3_sitelib}/ceph_volume-*
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-deploy.8*
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-create-keys.8*
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-volume.8*
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-volume-systemd.8*
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-run.8*
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/crushtool.8*
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/osdmaptool.8*
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/monmaptool.8*
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-kvstore-tool.8*
|
||||||
|
|
||||||
|
# Remove the ceph-mds package
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-mds
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-mds.8*
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-mds@.service
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-mds.target
|
||||||
|
|
||||||
|
# Remove the ceph-mgr package
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-mgr@.service
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-mgr.target
|
||||||
|
|
||||||
|
# Remove the ceph-mon package
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-mon
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-monstore-tool
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-mon.8*
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-mon@.service
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-mon.target
|
||||||
|
|
||||||
|
# Remove the ceph-radosgw package
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-radosgw@.service
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-radosgw.target
|
||||||
|
|
||||||
|
# Remove the ceph-osd package
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-clsinfo
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-bluestore-tool
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-erasure-code-tool
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-objectstore-tool
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-osdomap-tool
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-osd
|
||||||
|
rm -f %{buildroot}%{_libexecdir}/ceph/ceph-osd-prestart.sh
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-clsinfo.8*
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-osd.8*
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-bluestore-tool.8*
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-osd@.service
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-osd.target
|
||||||
|
|
||||||
|
# Remove rbd-mirror
|
||||||
|
rm -f %{buildroot}%{_bindir}/rbd-mirror
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/rbd-mirror.8*
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-rbd-mirror@.service
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-rbd-mirror.target
|
||||||
|
|
||||||
|
# Remove rbd-nbd
|
||||||
|
rm -f %{buildroot}%{_bindir}/rbd-nbd
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/rbd-nbd.8*
|
||||||
|
|
||||||
|
# Remove cephfs-top
|
||||||
|
rm -rf %{buildroot}%{python3_sitelib}/cephfs_top-*.egg-info
|
||||||
|
rm -f %{buildroot}%{_bindir}/cephfs-top
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/cephfs-top.8*
|
||||||
|
|
||||||
|
# Remove additional files
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-diff-sorted
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-diff-sorted.8*
|
||||||
|
|
||||||
|
# Remove immutable-object-cache
|
||||||
|
rm -f %{buildroot}%{_bindir}/ceph-immutable-object-cache
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/ceph-immutable-object-cache.8*
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-immutable-object-cache@.service
|
||||||
|
rm -f %{buildroot}%{_unitdir}/ceph-immutable-object-cache.target
|
||||||
|
|
||||||
|
# Remove cephfs-mirror
|
||||||
|
rm -f %{buildroot}%{_bindir}/cephfs-mirror
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/cephfs-mirror.8*
|
||||||
|
rm -f %{buildroot}%{_unitdir}/cephfs-mirror@.service
|
||||||
|
rm -f %{buildroot}%{_unitdir}/cephfs-mirror.target
|
||||||
|
|
||||||
|
# Remove cephadm
|
||||||
|
rm -f %{buildroot}%{_mandir}/man8/cephadm.8*
|
||||||
|
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
# create __pycache__ directories and their contents
|
# create __pycache__ directories and their contents
|
||||||
@ -1073,9 +1098,6 @@ fi
|
|||||||
%{_bindir}/ceph-coverage
|
%{_bindir}/ceph-coverage
|
||||||
%{_bindir}/ceph-debugpack
|
%{_bindir}/ceph-debugpack
|
||||||
%{_bindir}/ceph-dedup-tool
|
%{_bindir}/ceph-dedup-tool
|
||||||
%if 0%{with seastar}
|
|
||||||
%{_bindir}/crimson-store-nbd
|
|
||||||
%endif
|
|
||||||
%{_mandir}/man8/ceph-debugpack.8*
|
%{_mandir}/man8/ceph-debugpack.8*
|
||||||
%dir %{_libdir}/ceph
|
%dir %{_libdir}/ceph
|
||||||
%{_libdir}/ceph/ceph-monstore-update-crush.sh
|
%{_libdir}/ceph/ceph-monstore-update-crush.sh
|
||||||
@ -1089,6 +1111,7 @@ fi
|
|||||||
* Fri Jan 29 2021 Boris Ranto <branto[at]redhat.com> - 2:16.1.0-0.2.snapshot
|
* Fri Jan 29 2021 Boris Ranto <branto[at]redhat.com> - 2:16.1.0-0.2.snapshot
|
||||||
- disable multiple build options
|
- disable multiple build options
|
||||||
- disable multiple packages
|
- disable multiple packages
|
||||||
|
- remove unnecessary files
|
||||||
|
|
||||||
* Fri Jan 29 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.1.0-0.1.snapshot
|
* Fri Jan 29 2021 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:16.1.0-0.1.snapshot
|
||||||
- ceph 16.1.0 RC (ceph-16.1.0-43-g6b74fb5c)
|
- ceph 16.1.0 RC (ceph-16.1.0-43-g6b74fb5c)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user