From 40604346053c47a0ae23590f47053d3b56801b6a Mon Sep 17 00:00:00 2001 From: alexfanqi Date: Wed, 22 Sep 2021 11:48:48 +1000 Subject: generate containers for riscv64 (lp64 & lp64d one-level) multilib support is still under testing. leave it out for now Signed-off-by: alexfanqi Signed-off-by: Alexys Jacob --- .github/workflows/build.yml | 4 ++++ build.sh | 6 ++++++ deploy.sh | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5ec941..eb666ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,6 +43,10 @@ jobs: - stage3-ppc64le-musl-hardened-openrc - stage3-ppc64le-openrc - stage3-ppc64le-systemd + - stage3-rv64_lp64-openrc + - stage3-rv64_lp64-systemd + - stage3-rv64_lp64d-openrc + - stage3-rv64_lp64d-systemd - stage3-s390x name: ${{ matrix.target }} runs-on: ubuntu-latest diff --git a/build.sh b/build.sh index f17641b..0687c46 100755 --- a/build.sh +++ b/build.sh @@ -43,6 +43,12 @@ case $ARCH in MICROARCH="${ARCH}" ARCH="ppc" ;; + "rv64_"*) + # only support riscv64 for now + DOCKER_ARCH=riscv64 + MICROARCH="${ARCH}" + ARCH="riscv" + ;; "s390x") DOCKER_ARCH="${ARCH}" MICROARCH="${ARCH}" diff --git a/deploy.sh b/deploy.sh index 877c6eb..871f901 100755 --- a/deploy.sh +++ b/deploy.sh @@ -16,14 +16,14 @@ ORG=${ORG:-gentoo} docker push --all-tags "${ORG}/${NAME}" declare -A MANIFEST_TAGS=( - [stage3:latest]="amd64-openrc;armv5tel;armv6j_hardfp;armv7a_hardfp;arm64;i686-openrc;ppc64le-openrc;s390x" + [stage3:latest]="amd64-openrc;armv5tel;armv6j_hardfp;armv7a_hardfp;arm64;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x" [stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc" [stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc" [stage3:musl]="amd64-musl;i686-musl" [stage3:musl-hardened]="amd64-musl-hardened;ppc64le-musl-hardened-openrc" [stage3:nomultilib]="amd64-nomultilib-openrc" [stage3:nomultilib-systemd]="amd64-nomultilib-systemd" - [stage3:systemd]="amd64-systemd;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd" + [stage3:systemd]="amd64-systemd;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd;rv64_lp64d-systemd" ) # Find latest manifest -- cgit v1.2.3-65-gdbad