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.

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

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

Merged
merged 2 commits into from Jun 16, 2017

Conversation

Projects
None yet
4 participants
@smithfarm
Contributor

smithfarm commented Jun 9, 2017

No description provided.

@smithfarm smithfarm requested review from tchaikov, ktdreyer and b-ranto Jun 9, 2017

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 9, 2017

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 9, 2017

@tserong Can you review?

@tserong

This comment has been minimized.

Contributor

tserong commented Jun 9, 2017

LGTM

@@ -11,6 +11,7 @@ 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/doc/ceph/COPYING

This comment has been minimized.

@tchaikov

tchaikov Jun 9, 2017

Contributor

as discussed over IRC, i don't think we need two copies of copyright / COPYING in debian packaging.

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 9, 2017

https://shaman.ceph.com/builds/ceph/wip-copying/23a24472cfa2e346667d19a72e0472fe4b703012

Changelog:

  • make PR rpm-specific; do not touch CMakeLists.txt
  • move all three files in %{_docdir}/ceph from ceph-base to ceph-common
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 9, 2017

@liewegas Is src/fetch_config still needed?

@smithfarm smithfarm changed the title from build/ops: package the COPYING file to build/ops: rpm: package COPYING, move sample ceph.conf to ceph-common Jun 9, 2017

@liewegas

This comment has been minimized.

Member

liewegas commented Jun 9, 2017

i don't think so

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 15, 2017

ChangeLog:

  • rebased
  • add commit to drop fetch_config
  • conflict resolution
@@ -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

This comment has been minimized.

@tchaikov

tchaikov Jun 15, 2017

Contributor

@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?

This comment has been minimized.

@smithfarm

smithfarm added some commits Jun 15, 2017

build/ops: drop sample.fetch_config
smithfarm: @liewegas Is src/fetch_config still needed?
liewegas: i don't think so

Signed-off-by: Nathan Cutler <ncutler@suse.com>
build/ops: rpm: package COPYING, move conf example to ceph-common
Signed-off-by: Nathan Cutler <ncutler@suse.com>
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 15, 2017

ChangeLog:

  • removed the references to sample.fetch_config in alpine/APKBUILD.in also
@tchaikov

This comment has been minimized.

Contributor

tchaikov commented Jun 16, 2017

@tchaikov tchaikov merged commit 0202d5f into ceph:master Jun 16, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
arm64 make check arm64 make check succeeded
Details
make check make check succeeded
Details

@smithfarm smithfarm deleted the smithfarm:wip-copying branch Jun 19, 2017

@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 19, 2017

@tchaikov Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment