Skip to content

Refactor/multi arch - #17

Merged
Michael-R-Dickinson merged 3 commits into
masterfrom
refactor/multi-arch
Oct 30, 2026
Merged

Michael-R-Dickinson merged 3 commits into
masterfrom
refactor/multi-arch

Conversation

@Michael-R-Dickinson

Copy link
Copy Markdown
Contributor

Description

Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change.

Resolves # (issue)

Type of change

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)

How Has This Been Tested?

Please describe the tests that you ran to verify your changes.

  • Test A
  • Test B

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. This is simply a reminder of what we are going to look for before merging your code.

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

Replace the separate x86/ and arm/ Dockerfiles with one root Dockerfile
built for linux/amd64 and linux/arm64 under a single tag, so users no
longer pick between copter-X.X.X and copter-arm-X.X.X.

- ARM-only build deps (pygame, lxml from source) gated on TARGETARCH
- Clone ArduPilot on the build platform instead of under emulation
- Skip the STM32 toolchain (DO_AP_STM_ENV=0); SITL doesn't need it and
  extracting it fails under QEMU on arm64
- Copy from lib/ directly, removing configure.sh and .gitignore
- Drop linux/arm/v7: doubles emulated compile time for little use
- CI builds both platforms per vehicle; crossBuild.sh and README updated
@orionblur

Copy link
Copy Markdown

Lgtm

@Michael-R-Dickinson
Michael-R-Dickinson added this pull request to the merge queue Oct 30, 2026
Merged via the queue into master with commit fcf901c Oct 30, 2026
3 checks passed
@Michael-R-Dickinson
Michael-R-Dickinson deleted the refactor/multi-arch branch October 30, 2026 23:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants