hammer: rpm package building fails if the build machine has lttng and babeltrace development packages installed locally #8440
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
before this change, we do not pacakge tracepoint probe shared libraries on rhel7. but "configure" script enables them if lttng is detected. and rpm complains at seeing installed but not pacakged files. as EPEL-7 now includes lttng-ust-devel and libbabeltrace-devel, we'd better BuildRequire them, and build with them unless disabled otherwise. so in this change * make "lttng" an rpm build option enabled by default * BuildRequire lttng-ust-devel and libbabeltrace-devel if the "lttng" "lttng" option is enabled * --without-lttng --without-babeltrace if the "lttng" option is disabled Fixes: #14844 Signed-off-by: Kefu Chai <kchai@redhat.com> (cherry picked from commit f1a4490) Conflicts: ceph.spec.in: trivial resolution, the context changed (other packages, files etc.) but the semantic did not
ghost
self-assigned this
|
Comparing the diffs after conflict resolution shows something strange: $ commit=77a4ed0 ; picked_from=$(git show --no-patch --pretty=%b $commit | perl -ne 'print if(s/.*cherry picked from commit (\w+).*/$1/)') ; diff -u --ignore-matching-lines '^[^+-]' <(git show $picked_from) <(git show $commit) --- /dev/fd/63 2016-04-05 12:01:09.705058342 +0200
+++ /dev/fd/62 2016-04-05 12:01:09.709058309 +0200
@@ -30,12 +35,13 @@
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} == 1315
+%bcond_without lttng
+%endif
-
++
%if (0%{?el5} || (0%{?rhel_version} >= 500 && 0%{?rhel_version} <= 600))
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-@@ -62,11 +66,6 @@ restorecon -R /var/log/radosgw > /dev/null 2>&1;
- %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create}
- %endif
+ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+@@ -8,11 +13,6 @@
+
+ %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
-# LTTng-UST enabled on Fedora, RHEL 6, and SLES 12
-%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?suse_version} == 1315I believe this is because moving the # LTTng-UST enabled on Fedora, RHEL 6+, and SLES 12 block up in the ceph.spec.in file confuses diff into thinking the distutil.sysconfig lines also changed although they did not. |
|
@tchaikov how does that look ? |
ghost
pushed a commit
that referenced
this pull request
Apr 5, 2016
…uild machine has lttng and babeltrace development packages installed locally Reviewed-by: Loic Dachary <ldachary@redhat.com>
|
@dachary lgtm. |
|
For the record: http://tracker.ceph.com/issues/15383 |
ghost
merged commit
|
Passed an upgrade suite in addition to the gitbuilders http://tracker.ceph.com/issues/14692#note-52 |
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
http://tracker.ceph.com/issues/15382