Backported redistributable logic to Origin specfile #12969
Merged
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
tdawson
approved these changes
Feb 15, 2017
There was a problem hiding this comment.
Thank You Thank You
I was so busy when I found this I didn't have time to backport it.
It seems that when you wrap condition statements in that initial stuff (that this removes) nullifies all the condition statements. The only reason this was working before was because the statement we wanted was always last.
|
No problem! Lets merge this so the Friday merge is simpler |
|
[Test]ing while waiting on the merge queue |
|
Broke rpm build in gce |
|
@tdawson do you have cycles to re-evaluate the logic? |
|
Looking into it. It should have built them all. |
|
OK, I found the problem. I'll work on a solution that works for both. |
|
As long as there is a way to indicate that we only want Linux binaries, we don't necessarily need the |
tdawson
reviewed
Feb 17, 2017
origin.spec
Outdated
| @@ -40,7 +39,6 @@ | |||
| %global make_redistributable 0 | |||
| %endif | |||
| %endif | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
The following works in all cases.
Replace line 32-43 with the following
%if 0%{?fedora} || 0%{?epel}
%global need_redistributable_set 0
%else
# Due to library availability, redistributable builds only work on x86_64
%ifarch x86_64
%global need_redistributable_set 1
%else
%global need_redistributable_set 0
%endif
%endif
%{!?make_redistributable: %global make_redistributable %{need_redistributable_set}}
There was a problem hiding this comment.
I think that seems reasonable -- if you patch it into OSE I'll pick up the new commit in this PR
|
Will do |
This back-ports downstream commit 25fa795. Signed-off-by: Steve Kuznetsov <[email protected]>
stevekuznetsov
force-pushed
the
skuznets/specfile-updates
branch
from
414c465 to
ab709c2
Compare
|
@tdawson updated here [test] |
|
Evaluated for origin test up to ab709c2 |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/358/) (Base Commit: e376a9a) |
|
LGTM ... and it passed the tests this time. :) |
|
[merge] |
1 similar comment
|
[merge] |
|
@stevekuznetsov We are not frozen. We are branching tomorrow morning. |
|
Oh jeez there was a sneaky merge queue comment at the top ... |
|
gotta love it when there are 24 comments, but the merge bot takes comment #4 to use to tell us it's merging. :) |
|
Evaluated for origin merge up to ab709c2 |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_future/358/) (Base Commit: 3ef5377) (Image: devenv-rhel7_5945) |
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.
This back-ports downstream commit 25fa795.
Signed-off-by: Steve Kuznetsov [email protected]