Skip to content

mantle/system: Add RpmArch API #1257

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
Merged
openshift-merge-robot merged 1 commit into from
Mar 19, 2020
Merged

mantle/system: Add RpmArch API #1257

openshift-merge-robot merged 1 commit into from
Mar 19, 2020

Conversation

@cgwalters
Copy link
Member

@cgwalters cgwalters commented Mar 18, 2020

A lot of our code uses the portage architecture, which no longer
makes sense. Now, the more correct code for this is part of
rpm-ostree but I'm not sure we want to go to forking off that yet.
Since the build system only supports this set of architectures
currently, let's just inline the Go -> RPM translation here.

@cgwalters
mantle/system: Add RpmArch API
794f077 
A lot of our code uses the portage architecture, which no longer
makes sense.  Now, the more correct code for this is part of
rpm-ostree but I'm not sure we want to go to forking off that yet.
Since the build system only supports this set of architectures
currently, let's just inline the Go -> RPM translation here.
This was referenced Mar 18, 2020
Merged
Merged
arithx
arithx approved these changes Mar 19, 2020
View reviewed changes
Copy link
Contributor

@arithx arithx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 19, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arithx, cgwalters

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 86966cc into coreos:master Mar 19, 2020
@menantea
Copy link

menantea commented Mar 24, 2020

In the commit 794f077 , the code specific to ppc64le is not valid and make "cosa run" failed with : "panic: RpmArch: No mapping defined for GOARCH ppc64le"

it should be:
case "ppc64le":
return "ppc64le"
or eventually
case "ppc64", "ppc64le":
return "ppc64le"

cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Mar 24, 2020
@cgwalters
system/arch: Canonicalize ppc64, ppc64le => ppc64le
7b83be2 
The previous code here wasn't right for ppc64.

coreos#1257 (comment)
@cgwalters cgwalters mentioned this pull request Mar 24, 2020
Merged
@cgwalters
Copy link
Member Author

cgwalters commented Mar 24, 2020

#1278

@cgwalters
Copy link
Member Author

cgwalters commented Mar 24, 2020 •
edited
Loading

OK so the goal of this was to reduce the number of architecture strings we need to care about:

  • RPM architectures
  • Golang architectures
  • Portage architectures

And we were converting between these in different places. But it looks like there's more cleanup necessary in at least boardToArch()`.

cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Mar 24, 2020
@cgwalters
system/arch: Fix ppc64le arch mapping
a517bfb 
The previous code here wasn't right for ppc64.
coreos#1257 (comment)

While we're here turn consolidate ppc64le+s390x into
"list of arches that don't need mapping".
openshift-merge-robot pushed a commit that referenced this pull request Mar 24, 2020
@cgwalters @openshift-merge-robot
system/arch: Fix ppc64le arch mapping
ed4f511 
The previous code here wasn't right for ppc64.
#1257 (comment)

While we're here turn consolidate ppc64le+s390x into
"list of arches that don't need mapping".
Prashanth684 added a commit to Prashanth684/coreos-assembler that referenced this pull request Mar 24, 2020
@Prashanth684
kola: Use RpmArch() instead of architecture()
7f2d18d 
While not a comprehensive fix as suggested here: coreos#1257 (comment)
this helps to unblock kola tests on non x86 arches
@Prashanth684 Prashanth684 mentioned this pull request Mar 24, 2020
Merged
Prashanth684 added a commit to Prashanth684/coreos-assembler that referenced this pull request Mar 25, 2020
@Prashanth684
kola: Use RpmArch() instead of architecture()
4a8fc18 
While not a comprehensive fix as suggested here: coreos#1257 (comment)
this helps to unblock kola tests on non x86 arches
openshift-merge-robot pushed a commit that referenced this pull request Mar 27, 2020
@Prashanth684 @openshift-merge-robot
kola: Use RpmArch() instead of architecture()
0a67da7 
While not a comprehensive fix as suggested here: #1257 (comment)
this helps to unblock kola tests on non x86 arches
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bgilbert bgilbert Awaiting requested review from bgilbert

@lucab lucab Awaiting requested review from lucab

1 more reviewer

@arithx arithx arithx approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@arithx arithx

Labels

approved lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@cgwalters @openshift-ci-robot @menantea @arithx @openshift-merge-robot