Skip to content

Add support for loongarch64 #51

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −6
Draft

Add support for loongarch64 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3469fdd
add loong64 support
yzewei Oct 23, 2023
5486f88
Merge branch 'main' into feature/add-loong64
yzewei Jan 9, 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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN go mod vendor && go mod tidy

# for ARCH IN ${ALL_ARCH}; do
RUN \
for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do \
for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do \
GOARCH=${arch} ./scripts/build_flannel.sh; \
for format in tgz; do \
FILENAME=cni-plugin-flannel-linux-${arch}-${TAG}.${format}; \
Expand All @@ -60,7 +60,7 @@ RUN \
done

RUN \
for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do \
for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do \
GOARCH=${arch} ./scripts/check_static.sh >> static-check.log; \
done

Expand Down
2 changes: 2 additions & 0 deletions Dockerfile.loong64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM cr.loongnix.cn/library/debian:buster-slim
COPY dist/flannel-loong64 /flannel
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ build_all_linux: vendor
GOOS=linux GOARCH=s390x scripts/build_flannel.sh
GOOS=linux GOARCH=ppc64le scripts/build_flannel.sh
GOOS=linux GOARCH=riscv64 scripts/build_flannel.sh
GOOS=linux GOARCH=loong64 scripts/build_flannel.sh

vendor:
go mod tidy
Expand Down
4 changes: 2 additions & 2 deletions scripts/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ mkdir -p dist
umask 0022

# linux archives
for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do
for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do
echo $arch
for format in tgz; do
FILENAME=cni-plugin-flannel-linux-$arch-"${TAG}".$format
Expand All @@ -25,7 +25,7 @@ tar -C "${OUTPUT_DIR}" --owner=0 --group=0 -caf "$FILEPATH" flannel-amd64.exe

cd "${SRC_DIR}"
# linux
for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do
for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do
GOOS=${GOOS:-$("${GO}" env GOOS)}
RELEASE_DIR=release \
OUTPUT_DIR=dist \
Expand Down
6 changes: 4 additions & 2 deletions scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ $DOCKER run -ti -v "${SRC_DIR}":z -e TAG="${TAG}" --rm golang:"${GOLANG_VERSION}

go mod vendor && go mod tidy

for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do \

for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do \
echo \$arch;\
GOARCH=\$arch ./scripts/build_flannel.sh; \
for format in tgz; do \
Expand All @@ -47,7 +48,8 @@ $DOCKER run -ti -v "${SRC_DIR}":z -e TAG="${TAG}" --rm golang:"${GOLANG_VERSION}
tar -C ${OUTPUT_DIR} --owner=0 --group=0 -caf \$FILEPATH . ; \
done;

for arch in amd64 386 arm arm64 s390x ppc64le riscv64; do \

for arch in amd64 386 arm arm64 s390x ppc64le riscv64 loong64; do \
GOARCH=\$arch ./scripts/check_static.sh >> static-check.log; \
done;

Expand Down