debian: packaging fixes for jewel #7807
Conversation
SUSE does not allow the use of /usr/libexec, so commit 69291f8 changed the RPM packaging to put the libexec files into /usr/lib instead. Do the same thing on Debian. Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Fixes a failure to build from source; fallout from the server split change (0cbe3de) Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
|
CC'ing @smithfarm @javacruft @alimaredia in case they want to review. |
| @@ -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.init debian/radosgw.init debian/ceph-base/etc/logrotate.d/ceph.logrotate debian/radosgw.logrotate | |||
| rm -f debian/ceph-base.init debian/radosgw.init debian/ceph.logrotate debian/radosgw.logrotate | |||
There was a problem hiding this comment.
this change and the change above it undo the changes I made before merged, does ceph.logrotate not belong in debian/ceph-base/etc/logrotate.d/ anymore? Or did the changes I made not accomplish that? I remember it was a little tricky getting the logrotate files where I wanted them when I was making changes on them in November
There was a problem hiding this comment.
Yeah, I guess we'd gotten it wrong in the earlier commit (0cbe3de) - sorry for leading you astray!
|
My Debian packaging skills are quite rusty. With that caveat:
|
ktdreyer
force-pushed
the
wip-debian-fixes
branch
from
047b8b8
to
4d1468c
Compare
|
Re-pushed with packaging the libceph compressor files in the ceph-common .deb instead of the ceph-base .rpm (from Sage, "Re: packaging compressor plugins" thread on ceph-devel today.) |
|
@alimaredia and @ktdreyer i've some nit at 0cbe3de if they make sense to you guys, can we also address them in this pull request? |
ktdreyer
force-pushed
the
wip-debian-fixes
branch
from
4d1468c
to
db8c949
Compare
Split up the "ceph" package into four new packages:
1. ceph-mon
2. ceph-osd
3. ceph-mds (already done on Debian)
4. ceph-base (files shared among multiple servers)
and then:
5. Make "ceph" into a metapackage that depends on both -mon and -osd
(and -mds, for RPMs).
To describe the outcome of this change another way:
For RPMs:
- "ceph-{mon,osd,mds}" Require: ceph-base.
- "ceph" will become a metapackage that Requires: ceph-{mon,osd,mds}.
For DEBs:
- "ceph-{mon,osd,mds}" will Depends: ceph-base.
- "ceph" will become a metapackage that Depends: ceph-{mon,osd}.
- "ceph" will continue to Recommends: ceph-mds
New users should "yum install ceph-mon" or "yum install ceph-osd" (or
"apt-get install ceph-mon", etc) in order to install the exact daemons
that they need.
http://tracker.ceph.com/issues/10587 Fixes: #10587
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
|
Thanks Kefu, I've added the fix for ceph-base's dependencies. |
The ceph-base package contains files shared between the -mon, -osd, and -mds. In other words, the MON, OSD, and MDS servers depend on ceph-base, but ceph-base should not depend on the leaf packages. Reported-by: Kefu Chai <kchai@redhat.com> Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
ktdreyer
force-pushed
the
wip-debian-fixes
branch
from
db8c949
to
3fc7fdb
Compare
|
Re-pushed this PR without the compressor plugins. We'll have to handle those some other way. They need to be available to every package (librados2, librbd1, libcephfs1, plus all the daemons). |
Signed-off-by: Ali Maredia <amaredia@redhat.com>
debian: packaging fixes for jewel Reviewed-by: Dan Mick <dmick@redhat.com>
Fixes the Trusty build failure in Gitbuilder.