[go: nahoru, domu]
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

ceph.spec.in: fix lttng/babeltrace conditionals #5193

Merged
merged 1 commit into from
Sep 4, 2015
Merged

ceph.spec.in: fix lttng/babeltrace conditionals #5193

merged 1 commit into from
Sep 4, 2015

Conversation

smithfarm
Copy link
Contributor

This commit makes sure that, for SLE/openSUSE, babeltrace-devel is a
BuildRequires and rbd-replay-prep is packaged.

Background quote from #5082 :

"Since we BuildRequire: libbabeltrace-devel, autoconf will see that babeltrace
is available during the build, and make will build/install the rbd-replay-prep
utility."

http://tracker.ceph.com/issues/12360 Fixes: #12360

Signed-off-by: Nathan Cutler ncutler@suse.com

@loic-bot
Copy link

SUCCESS: http://jenkins.ceph.dachary.org/job/ceph/6335/

@smithfarm smithfarm changed the title ceph.spec.in: fix babeltrace handling on SLE/openSUSE [DNM] ceph.spec.in: fix babeltrace handling on SLE/openSUSE Jul 10, 2015
@smithfarm
Copy link
Contributor Author

hmm, babeltrace-devel is in the SLE12 SDK, but I do not see it in openSUSE at all

@ktdreyer
Copy link
Member

Do you want to wait until it's packaged in OpenSUSE?

@smithfarm
Copy link
Contributor Author

I ran a test build in OBS with this patch, and it failed even in SLE12. Will need to get that fixed before merging upstream, hence the DNM.

@smithfarm
Copy link
Contributor Author

The problem is that when the BuildRequires is specified only for a subpackage, OBS does not install it in the build environment. I'm currently running another build to make sure, but I strongly suspect that the fix for SUSE will be to move the BuildRequires lines into the SUSE section of the distro-conditional dependencies.

@smithfarm smithfarm changed the title [DNM] ceph.spec.in: fix babeltrace handling on SLE/openSUSE ceph.spec.in: fix babeltrace handling on SLE/openSUSE Jul 14, 2015
@ktdreyer
Copy link
Member

Looks good. It's also useful to know that about BuildRequires in subpackages with OBS. I'll keep that in mind for wip-10587-split-servers

Want to simply move BuildRequires: lttng-ust-devel / libbabeltrace-devel out of the RHEL/SUSE conditionals and up into the main BuildRequires section? There's no real need to have it under the ceph-test package. I suspect it was placed there simply because that's what the author was touching at the time.

@smithfarm
Copy link
Contributor Author

We can do that for lttng-ust-devel, but the libbabeltrace-devel package is
named differently (babeltrace-devel) in SUSE, so we'll have to keep that in
the distro-conditional section.

On Tue, Jul 14, 2015 at 6:20 PM, Ken Dreyer notifications@github.com
wrote:

Looks good. It's also useful to know that about BuildRequires in
subpackages with OBS. I'll keep that in mind for wip-10587-split-servers

Want to simply move BuildRequires: lttng-ust-devel / libbabeltrace-devel
out of the RHEL/SUSE conditionals and up into the main BuildRequires
section? There's no real need to have it under the ceph-test package. I
suspect it was placed there simply because that's what the author was
touching at the time.

—
Reply to this email directly or view it on GitHub
#5193 (comment).

@loic-bot
Copy link

FAILURE: http://jenkins.ceph.dachary.org/job/ceph/6430/

@smithfarm smithfarm force-pushed the wip-babeltrace-suse branch 2 times, most recently from 187562b to fc190bc Compare July 15, 2015 10:57
@smithfarm smithfarm changed the title ceph.spec.in: fix babeltrace handling on SLE/openSUSE ceph.spec.in: fix lttng/babeltrace conditionals Jul 15, 2015
@loic-bot
Copy link

FAILURE: http://jenkins.ceph.dachary.org/job/ceph/6450/

@smithfarm
Copy link
Contributor Author

It's annoying that we always install (and package) the rbd-replay-prep manpage, but the executable is only built and installed on certain platforms.

@loic-bot
Copy link

SUCCESS: http://jenkins.ceph.dachary.org/job/ceph/6471/

@smithfarm
Copy link
Contributor Author

It's also useful to know that about BuildRequires in subpackages with OBS. I'll keep that in mind for wip-10587-split-servers

I'm a bit mystified by this. Today I have looked into other BuildRequires that are only specified for subpackages, and these OBS is respecting. As a general rule, though, it's better to consolidate all the BuildRequires up at the top if playing nicely with OBS is desirable.

@loic-bot
Copy link

SUCCESS: http://jenkins.ceph.dachary.org/job/ceph/6484/

@ghost
Copy link
ghost commented Sep 1, 2015

@smithfarm it needs rebasing

@smithfarm smithfarm force-pushed the wip-babeltrace-suse branch 2 times, most recently from 4971265 to 1686cff Compare September 2, 2015 10:09
@loic-bot
Copy link
loic-bot commented Sep 2, 2015

SUCCESS: http://jenkins.ceph.dachary.org/job/ceph/7431/

@smithfarm
Copy link
Contributor Author

@dachary done

@ktdreyer
Copy link
Member
ktdreyer commented Sep 4, 2015

Er, hmm, does this need to be rebased again? (due to #5791 ?)

@smithfarm
ceph.spec.in: fix lttng/babeltrace conditionals
e267128 
lttng and babeltrace are build dependencies for rbd-replay-prep. Make
sure the right package names are used. Enable for SLE12, as well as
for openSUSE 13.1 and higher.

Move the BuildRequires out of the ceph-test subpackage and into the
distro-conditional dependencies section.

Make ordering of BuildRequires a little more alphabetical.

http://tracker.ceph.com/issues/12360 Fixes: ceph#12360

Signed-off-by: Nathan Cutler <ncutler@suse.com>

sqme
@smithfarm
Copy link
Contributor Author

@ktdreyer Yeah, you're right. Dropped the redundant commit and rebased the other one.

@loic-bot
Copy link
loic-bot commented Sep 4, 2015

SUCCESS: http://jenkins.ceph.dachary.org/job/ceph/7514/

@ktdreyer
Copy link
Member
ktdreyer commented Sep 4, 2015

Ok, this looks good to me. I'm running it through gitbuilder, and will merge when that looks good.

ktdreyer added a commit that referenced this pull request Sep 4, 2015
@ktdreyer
Merge pull request #5193 from SUSE/wip-babeltrace-suse
559a238 
ceph.spec.in: fix lttng/babeltrace conditionals
@ktdreyer ktdreyer merged commit e267128 into ceph:master Sep 4, 2015
ktdreyer added a commit that referenced this pull request Sep 4, 2015
@ktdreyer
Merge pull request #5193 from SUSE/wip-babeltrace-suse
ed4cf3d 
ceph.spec.in: fix lttng/babeltrace conditionals

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
@smithfarm smithfarm deleted the wip-babeltrace-suse branch September 5, 2015 07:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ktdreyer ktdreyer

Labels
bug-fix build/ops
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@smithfarm @loic-bot @ktdreyer