Skip to content

Commit

Permalink
Merge pull request #15428 from smithfarm/wip-20162-jewel
Browse files Browse the repository at this point in the history
jewel: build/ops: deb: Fix logrotate packaging

Reviewed-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
smithfarm committed Aug 22, 2017
2 parents 161cba9 + 6b99bc9 commit c795241
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions debian/rules
Original file line number Diff line number Diff line change
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

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

0 comments on commit c795241

Please sign in to comment.