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

jewel: build/ops: deb: Fix logrotate packaging #15428

Merged
merged 1 commit into from Aug 22, 2017
Merged

jewel: build/ops: deb: Fix logrotate packaging #15428

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions debian/rules
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@ build-stamp: configure-stamp

cp src/init-ceph debian/ceph-base.ceph.init
cp src/init-radosgw debian/radosgw.init
cp src/logrotate.conf debian/ceph.logrotate
cp src/logrotate.conf debian/ceph-common.logrotate

touch $@

Expand All @@ -67,7 +67,7 @@ clean:
ltmain.sh missing
rm -f configure Makefile.in man/Makefile.in src/Makefile.in
rm -f src/acconfig.h.in
rm -f debian/ceph-base.ceph.init debian/radosgw.init debian/ceph.logrotate debian/radosgw.logrotate
rm -f debian/ceph-base.ceph.init debian/radosgw.init debian/ceph-common.logrotate
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 When a current jewel user upgrades to a new version containing this change, is this the line that cleans up the old files? I wonder if we should retain debian/ceph.logrotate here.

Copy link
Contributor

@tchaikov tchaikov Jun 15, 2017 •
edited

Choose a reason for hiding this comment

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

no, these lines instruct how "make clean" is supposed to cleanup the package maintainer's building directory. it has nothing to do with the end user.


dh_clean

Expand Down Expand Up @@ -116,7 +116,7 @@ binary-arch: build install
dh_installexamples -a
dh_install -a --sourcedir=$(DESTDIR) --list-missing
install -d -m0755 debian/ceph-base/etc/logrotate.d
install -m0644 debian/ceph.logrotate debian/ceph-base/etc/logrotate.d
install -m0644 debian/ceph-common.logrotate debian/ceph-base/etc/logrotate.d

# dh_installinit is only set up to handle one upstart script
# per package, so do this ourselves
Expand Down