Skip to content
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

Add helix image for armv6 raspbian #1083

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
+29 −14
Open

Add helix image for armv6 raspbian #1083

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
20ecbbb
Add helix image for armv6 raspbian
sbomer May 30, 2024
7afb569
Some fixes
sbomer May 31, 2024
8667ab0
Increase timeout
sbomer Jun 7, 2024
360f9ce
Propagate linuxArmBuildJobTimeout
sbomer Jun 7, 2024
7d24c9c
Merge branch 'main' into raspbianHelix
sbomer Jun 17, 2024
232c599
Merge branch 'main' into raspbianHelix
sbomer Jun 18, 2024
7b1bad6
Remove --platform
sbomer Jun 18, 2024
e59bdc7
Revert "Remove --platform"
sbomer Jun 18, 2024
95a10f5
Revert "Revert "Remove --platform""
sbomer Jul 3, 2024
832419e
Merge remote-tracking branch 'origin/main' into raspbianHelix
sbomer Jul 3, 2024
e5366a6
Fix rootfs build
sbomer Jul 3, 2024
131b3d4
Avoid multiple pip installs and use venv
sbomer Jul 3, 2024
c28e26d
Pass --break-system-packages
sbomer Jul 3, 2024
2981dfd
Install rust
sbomer Jul 3, 2024
989dbf0
Increase timeout
sbomer Jul 8, 2024
f4ed118
Install pkg-config, increase timeout
sbomer Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/raspbian/10/crossdeps/arm32v7/Dockerfile → src/raspbian/12/crossdeps/arm32v7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu.azurecr.io/ubuntu:18.04
FROM ubuntu.azurecr.io/ubuntu:22.04

# Install the base toolchain we need to build anything (clang, cmake, make and the like).
RUN apt-get update \
Expand Down
4 changes: 2 additions & 2 deletions src/raspbian/10/helix/arm32v6/Dockerfile → src/raspbian/12/helix/arm32v6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:raspbian-10-crossdeps-local as builder
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:raspbian-12-crossdeps-local as builder

ARG ROOTFS_DIR=/crossrootfs

Expand All @@ -7,7 +7,7 @@ RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts

# Build the rootfs
RUN /scripts/eng/common/cross/build-rootfs.sh armv6 raspbian --skipunmount
RUN /scripts/eng/common/cross/build-rootfs.sh armv6 --skipunmount

Copy link
Member Author

Choose a reason for hiding this comment

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

The raspbian arg was only used for the run-arcade-build-rootfs.sh script, and doesn't do anything here.

FROM scratch
ARG ROOTFS_DIR=/crossrootfs
Expand Down
23 changes: 19 additions & 4 deletions src/raspbian/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,34 @@
"platforms": [
{
"architecture": "arm",
"dockerfile": "src/raspbian/10/crossdeps/arm32v7",
"dockerfile": "src/raspbian/12/crossdeps/arm32v7",
"os": "linux",
"osVersion": "buster",
"tags": {
"raspbian-10-crossdeps-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
"raspbian-10-crossdeps$(FloatingTagSuffix)": {},
"raspbian-10-crossdeps-local": {
"raspbian-12-crossdeps-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
"raspbian-12-crossdeps$(FloatingTagSuffix)": {},
"raspbian-12-crossdeps-local": {
"isLocal": true
}
},
"variant": "v7"
}
]
},
{
"platforms": [
{
"architecture": "arm",
"dockerfile": "src/raspbian/12/helix/arm32v6",
"os": "linux",
"osVersion": "buster",
"tags": {
"raspbian-10-helix-arm32v6-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
"raspbian-10-helix-arm32v6$(FloatingTagSuffix)": {}
},
"variant": "v6"
}
]
}
]
}
Expand Down
Loading