Skip to content

Commit

Permalink
Merge #1093
Browse files Browse the repository at this point in the history
1093: Add note for custom images and arm-unknown-linux-gnueabihf. r=Emilgardis a=Alexhuszagh



Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
  • Loading branch information
bors[bot] and Alexhuszagh authored Oct 26, 2022
2 parents 2c9843f + daecce3 commit a8082de
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/docker/shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ impl DockerOptions {
msg_info: &mut MessageInfo,
) -> Result<String> {
let mut image = self.image.clone();
if self.target.triple() == "arm-unknown-linux-gnueabihf" {
msg_info.note("cannot install armhf system packages via apt for `arm-unknown-linux-gnueabihf`, since they are for ARMv7a targets but this target is ARMv6. installation of all packages for the armhf architecture has been blocked.")?;
}

if let Some(path) = self.config.dockerfile(&self.target)? {
let context = self.config.dockerfile_context(&self.target)?;
Expand Down

0 comments on commit a8082de

Please sign in to comment.