Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build/ops: rpm: package COPYING, move sample ceph.conf to ceph-common #15596

Merged
merged 2 commits into from
Jun 16, 2017
Merged

build/ops: rpm: package COPYING, move sample ceph.conf to ceph-common #15596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c43bbd8
build/ops: drop sample.fetch_config
smithfarm Jun 15, 2017
9164804
build/ops: rpm: package COPYING, move conf example to ceph-common
smithfarm Jun 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions alpine/APKBUILD.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ package() {
|| return 1

chmod 0644 $pkgdir$_docdir/ceph/sample.ceph.conf || return 1
chmod 0644 $pkgdir$_docdir/ceph/sample.fetch_config || return 1

# udev rules
install -m 0644 -D udev/50-rbd.rules $pkgdir$_udevrulesdir/50-rbd.rules || return 1
Expand All @@ -192,7 +191,6 @@ base() {
xfsprogs
"

_pkg $_docdir/ceph sample.ceph.conf sample.fetch_config
_pkg $_bindir crushtool monmaptool osdmaptool ceph-run ceph-detect-init
_pkg $_sbindir ceph-create-keys mount.ceph
_pkg $_libexecdir/ceph ceph_common.sh
Expand Down
10 changes: 5 additions & 5 deletions ceph.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_libexecdir}/systemd/sys
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.fetch_config
install -m 0644 -D COPYING %{buildroot}%{_docdir}/ceph/COPYING
Copy link
Contributor

@tchaikov tchaikov Jun 15, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smithfarm could you remove the references to sample.fetch_config in alpine/APKBUILD.in also , so we don't break the alpine build if it is not broken already @dx9 , what do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tchaikov Done!


# firewall templates and /sbin/mount.ceph symlink
%if 0%{?suse_version}
Expand Down Expand Up @@ -927,10 +927,6 @@ rm -rf %{buildroot}
%files

%files base
%docdir %{_docdir}
%dir %{_docdir}/ceph
%{_docdir}/ceph/sample.ceph.conf
%{_docdir}/ceph/sample.fetch_config
%{_bindir}/crushtool
%{_bindir}/monmaptool
%{_bindir}/osdmaptool
Expand Down Expand Up @@ -1030,6 +1026,10 @@ if [ $FIRST_ARG -ge 1 ] ; then
fi

%files common
%docdir %{_docdir}
%docdir %{_docdir}/ceph
%doc %{_docdir}/ceph/sample.ceph.conf
%doc %{_docdir}/ceph/COPYING
%{_bindir}/ceph
%{_bindir}/ceph-authtool
%{_bindir}/ceph-conf
Expand Down
1 change: 0 additions & 1 deletion debian/ceph-base.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ usr/lib/ceph/ceph_common.sh
usr/lib/ceph/erasure-code/*
usr/lib/rados-classes/*
usr/share/doc/ceph/sample.ceph.conf
usr/share/doc/ceph/sample.fetch_config
usr/share/man/man8/ceph-debugpack.8
usr/share/man/man8/ceph-deploy.8
usr/share/man/man8/ceph-run.8
Expand Down
4 changes: 0 additions & 4 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,10 +1066,6 @@ endif(WITH_RADOSGW)
install(FILES
sample.ceph.conf
DESTINATION ${CMAKE_INSTALL_DOCDIR})
install(FILES
fetch_config
DESTINATION ${CMAKE_INSTALL_DOCDIR}
RENAME sample.fetch_config)

# Now create a useable config.h
configure_file(
Expand Down
20 changes: 0 additions & 20 deletions src/fetch_config
View file
Open in desktop

This file was deleted.