Merge lp://staging/~sinzui/juju-release-tools/tarfile-agent-arch into lp://staging/juju-release-tools

Proposed by Curtis Hovey
Status: Merged
Merged at revision: 369
Proposed branch: lp://staging/~sinzui/juju-release-tools/tarfile-agent-arch
Merge into: lp://staging/juju-release-tools
Diff against target: 126 lines (+27/-13)
2 files modified
crossbuild.py (+9/-7)
tests/test_crossbuild.py (+18/-6)
To merge this branch: bzr merge lp://staging/~sinzui/juju-release-tools/tarfile-agent-arch
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
Review via email: mp+312839@code.staging.launchpad.net

Description of the change

Make agent tarfiles with true arch in the same.

This branch fixes a bug were agents build on non-armd64 archs claimed to be amd64. The code to make the tarfile hame hard-coded the arch.

There is a second change to support ppc64el. Debian and Golang maddeningly disagree about the architecture name of Power8 chips configured for little-endian. Debian uses ppc64el (endian little) and golang uses ppc64le (little endian). The build function needs to set GOARCH=ppc64le, but the tarfile function to make the agent needs debian arch=ppc64el.

To post a comment you must log in.
363. By Curtis Hovey

Merged trunk.

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

There are lint errors in trunk.

./agent_archive.py:110:81: E501 line too long (98 > 80 characters)
./agent_archive.py:113:81: E501 line too long (101 > 80 characters)
./agent_archive.py:178:14: E231 missing whitespace after ','
./agent_archive.py:178:81: E501 line too long (82 > 80 characters)
./make_image_streams.py:10:1: E402 module level import not at top of file
./make_image_streams.py:11:1: E402 module level import not at top of file
./make_image_streams.py:12:1: E402 module level import not at top of file
./make_image_streams.py:13:1: E402 module level import not at top of file
./make_image_streams.py:15:1: E402 module level import not at top of file
./make_image_streams.py:16:1: E402 module level import not at top of file
./make_image_streams.py:22:1: E402 module level import not at top of file
./make_image_streams.py:26:1: E402 module level import not at top of file

Are the directions in setup_cross_building still correct?

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches