Fix various issues with fedora (f21+) builds #4981
Conversation
592e6c0
to
5d3826e
Compare
|
I have just started a build using OBS at Which includes git hashes |
19eab86
to
da6ba44
Compare
|
211bfe8 can no longer be merged. |
|
Yeah, it was "superseded" by a patch in PR 4990 that was sent out later and imo the fix is broken as it does not prefer junit4.jar to the junit.jar -- what if the system default version is junit3 or junit5 (some time in the future) but the system also provides junit4? In that case, the variable that is being set might point to the system default version instead of the correct required version. -- that is the reason why I did not use the find's -o option... |
|
I agree your fix is better for exactly these reasons, but since the guy does not (I think0 work for a distro it was good he got his patch in. Maybe you could remake this patch to apply your solution on top of his? |
Git is not a SUSE-only dependency, the build process itself requires it. Signed-off-by: Boris Ranto <branto@redhat.com>
If a system contains older (3) or later (5) release of junit.jar that is default in the system, the auto-detection might find it before it finds junit4.jar. This commit fixes that issue by always preferring the junit4.jar library. Signed-off-by: Boris Ranto <branto@redhat.com>
Signed-off-by: Boris Ranto <branto@redhat.com>
da6ba44
to
85517d6
Compare
|
thanks @BRANTO1
|
|
Longer term, we should figure out what's breaking with rbd-replay-prep so that it can ship on RHEL 7 and modern Fedoras. http://tracker.ceph.com/issues/11587 has some clues. |
Fix various issues with fedora (f21+) builds Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
|
After digging a bit further into that We can also drop the references to Fedora < 20 at the same time, since F19 is EOL. See https://github.com/ceph/ceph/tree/wip-fedora-babeltrace . Once Gitbuilder has tested this I'd like to get a PR for the two commits there. |
|
@ktdreyer Should we submit an EPEL request to get RHEL 7 package support for babeltrace? |
|
Yep! done here: https://bugzilla.redhat.com/1235466 |
This PR is #5082 |
This patchset contains various fixes for issues that uncover when you try to build ceph with upstream .spec file on f21+.
The patchset fixes missing build requires, rbd-replay-prep being in filelist on f21+, failed junit detection and man pages not being built by default anymore.