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.

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

hammer: rpm package building fails if the build machine has lttng and babeltrace development packages installed locally #8440

Merged
1 commit merged into from Apr 6, 2016

Commits on Apr 5, 2016

  1. ceph.spec.in: disable lttng and babeltrace explicitly

    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
    ldachary committed Apr 5, 2016
    Copy the full SHA
    77a4ed0 View commit details
    Browse the repository at this point in the history