diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2022-03-22 21:05:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 21:05:53 +0800 |
| commit | 1f34430ef60d268cd69384ccec9ed0da75727d4d (patch) | |
| tree | 0c304bd57c78132728140f9b10b4241ce4687867 | |
| parent | Merge pull request #3709 from Shelley-BaoYue/automated-cherry-pick-of-#3670-u... (diff) | |
| parent | support armhf (diff) | |
| download | kubeedge-1.9.2.tar.gz | |
Merge pull request #3725 from fisherxu/automated-cherry-pick-of-#3723-upstream-release-1.9v1.9.2
Automated cherry pick of #3723: support armhf
| -rw-r--r-- | .github/workflows/main.yaml | 2 | ||||
| -rwxr-xr-x | hack/lib/golang.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 06652ea56..199a6cfa2 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -60,7 +60,7 @@ jobs: - name: Install dependences run: | sudo apt-get update - sudo apt-get install -y upx-ucl gcc-aarch64-linux-gnu libc6-dev-arm64-cross gcc-arm-linux-gnueabi libc6-dev-armel-cross + sudo apt-get install -y upx-ucl gcc-aarch64-linux-gnu libc6-dev-arm64-cross gcc-arm-linux-gnueabihf - name: Checkout code uses: actions/checkout@v2 diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index 4907bdc88..5c3cb46d8 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -299,7 +299,7 @@ kubeedge::golang::cross_build_place_binaries() { set +x elif [ "${goarm}" == "7" ]; then set -x - GOARCH=arm GOOS="linux" GOARM=${goarm} CGO_ENABLED=1 CC=arm-linux-gnueabi-gcc go build -o ${KUBEEDGE_OUTPUT_BINPATH}/${name} -ldflags "$ldflags" $bin + GOARCH=arm GOOS="linux" GOARM=${goarm} CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc go build -o ${KUBEEDGE_OUTPUT_BINPATH}/${name} -ldflags "$ldflags" $bin set +x fi done |