| Message ID | 20250414101843.2348330-7-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Rootfs/argo cleanup and microcode support | expand |
On Mon, Apr 14, 2025 at 11:18:42AM +0100, Andrew Cooper wrote: > The only extra package needed is libfdt. > > The older ARM64 rootfs configured modloop, networking and sysctl, but none of > this is used in any of the testing, so is omitted here for now. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7d187168df2..d70ddd99e529 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,13 @@ stages: # # ARM64 artifacts # +alpine-3.18-arm64-rootfs: + extends: .arm64-artifacts + script: + - ./scripts/alpine-rootfs.sh cpio + variables: + CONTAINER: alpine:3.18-arm64-base + linux-6.6.86-arm64: extends: .arm64-artifacts script: ./scripts/build-linux.sh diff --git a/containerize b/containerize index c23f55ead737..38a434ab7075 100755 --- a/containerize +++ b/containerize @@ -24,6 +24,7 @@ die() { # BASE="registry.gitlab.com/xen-project/hardware/test-artifacts" case "_${CONTAINER}" in + _alpine-3.18-arm64-base) CONTAINER="${BASE}/alpine:3.18-arm64-base" ;; _alpine-3.18-arm64-build) CONTAINER="${BASE}/alpine:3.18-arm64-build" ;; _alpine-3.18-x86_64-base) CONTAINER="${BASE}/alpine:3.18-x86_64-base" ;; _alpine-3.18-x86_64-build|_) CONTAINER="${BASE}/alpine:3.18-x86_64-build" ;; diff --git a/images/alpine/3.18-arm64-base.dockerfile b/images/alpine/3.18-arm64-base.dockerfile new file mode 100644 index 000000000000..ab597c75b80e --- /dev/null +++ b/images/alpine/3.18-arm64-base.dockerfile @@ -0,0 +1,6 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/arm64/v8 alpine:3.18 +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +RUN apk --no-cache add bash diff --git a/scripts/alpine-rootfs.sh b/scripts/alpine-rootfs.sh index 53547b5c5282..e52908a3d588 100755 --- a/scripts/alpine-rootfs.sh +++ b/scripts/alpine-rootfs.sh @@ -37,6 +37,13 @@ case $UNAME in libelf ) ;; + + aarch64) + PKGS+=( + # Xen + libfdt + ) + ;; esac apk add --no-cache "${PKGS[@]}"
The only extra package needed is libfdt. The older ARM64 rootfs configured modloop, networking and sysctl, but none of this is used in any of the testing, so is omitted here for now. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Anthony PERARD <anthony.perard@vates.tech> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Michal Orzel <michal.orzel@amd.com> CC: Doug Goldstein <cardoe@cardoe.com> CC: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> --- .gitlab-ci.yml | 7 +++++++ containerize | 1 + images/alpine/3.18-arm64-base.dockerfile | 6 ++++++ scripts/alpine-rootfs.sh | 7 +++++++ 4 files changed, 21 insertions(+) create mode 100644 images/alpine/3.18-arm64-base.dockerfile