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.

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

archutil: refactor generation and validation #4607

Merged
merged 7 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,27 @@ jobs:
uses: docker/bake-action@v4
with:
targets: ${{ matrix.target }}

archutil-arm64:
runs-on: ubuntu-22.04
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
version: ${{ env.SETUP_BUILDX_VERSION }}
driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
buildkitd-flags: --debug
-
name: Validate
uses: docker/bake-action@v4
with:
targets: validate-archutil
set: |
*.platform=linux/arm64
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ validate-authors:
validate-generated-files:
$(BUILDX_CMD) bake validate-generated-files

.PHONY: validate-archutil
validate-archutil:
$(BUILDX_CMD) bake validate-archutil

.PHONY: validate-doctoc
validate-doctoc:
$(BUILDX_CMD) bake validate-doctoc
Expand All @@ -79,7 +83,7 @@ validate-docs:
$(BUILDX_CMD) bake validate-docs

.PHONY: validate-all
validate-all: test lint validate-vendor validate-generated-files validate-doctoc validate-docs
validate-all: test lint validate-vendor validate-generated-files validate-archutil validate-doctoc validate-docs

.PHONY: vendor
vendor:
Expand All @@ -93,6 +97,10 @@ vendor:
generated-files:
$(BUILDX_CMD) bake generated-files

.PHONY: archutil
archutil:
$(BUILDX_CMD) bake archutil

.PHONY: authors
authors:
$(BUILDX_CMD) bake authors
Expand Down
16 changes: 15 additions & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ target "integration-tests" {
}

group "validate" {
targets = ["lint", "validate-vendor", "validate-doctoc", "validate-generated-files", "validate-shfmt", "validate-docs"]
targets = ["lint", "validate-vendor", "validate-doctoc", "validate-generated-files", "validate-archutil", "validate-shfmt", "validate-docs"]
}

target "lint" {
Expand Down Expand Up @@ -160,6 +160,13 @@ target "validate-generated-files" {
output = ["type=cacheonly"]
}

target "validate-archutil" {
inherits = ["_common"]
dockerfile = "./hack/dockerfiles/archutil.Dockerfile"
target = "validate"
output = ["type=cacheonly"]
}

target "validate-shfmt" {
inherits = ["_common"]
dockerfile = "./hack/dockerfiles/shfmt.Dockerfile"
Expand Down Expand Up @@ -202,6 +209,13 @@ target "generated-files" {
output = ["."]
}

target "archutil" {
inherits = ["_common"]
dockerfile = "./hack/dockerfiles/archutil.Dockerfile"
target = "update"
output = ["./util/archutil"]
}

target "shfmt" {
inherits = ["_common"]
dockerfile = "./hack/dockerfiles/shfmt.Dockerfile"
Expand Down
111 changes: 111 additions & 0 deletions hack/dockerfiles/archutil.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
# syntax=docker/dockerfile-upstream:master

ARG GO_VERSION=1.21
ARG ALPINE_VERSION=3.19
ARG DEBIAN_VERSION=trixie

FROM debian:${DEBIAN_VERSION}-slim AS base
RUN apt-get update && apt-get --no-install-recommends install -y git binutils \
gcc-x86-64-linux-gnu \
binutils-x86-64-linux-gnu \
binutils-arm-linux-gnueabihf \
binutils-aarch64-linux-gnu \
binutils-i686-linux-gnu \
binutils-riscv64-linux-gnu \
binutils-s390x-linux-gnu \
binutils-powerpc64le-linux-gnu \
binutils-mips64el-linux-gnuabi64 \
binutils-mips64-linux-gnuabi64
WORKDIR /src

FROM base AS exit-amd64
COPY util/archutil/fixtures/exit.amd64.S .
RUN x86_64-linux-gnu-gcc -static -nostdlib -Wa,--noexecstack -o exit exit.amd64.S && x86_64-linux-gnu-strip --strip-unneeded exit

FROM base AS exit-386
COPY util/archutil/fixtures/exit.386.s .
RUN i686-linux-gnu-as --noexecstack -o exit.o exit.386.s && i686-linux-gnu-ld -o exit -s exit.o && i686-linux-gnu-strip --strip-unneeded exit

FROM base AS exit-arm64
COPY util/archutil/fixtures/exit.arm64.s .
RUN aarch64-linux-gnu-as --noexecstack -o exit.o exit.arm64.s && aarch64-linux-gnu-ld -o exit -s exit.o && aarch64-linux-gnu-strip --strip-unneeded exit

FROM base AS exit-arm
COPY util/archutil/fixtures/exit.arm.s .
RUN arm-linux-gnueabihf-as --noexecstack -o exit.o exit.arm.s && arm-linux-gnueabihf-ld -o exit -s exit.o && arm-linux-gnueabihf-strip --strip-unneeded exit

FROM base AS exit-riscv64
COPY util/archutil/fixtures/exit.riscv64.s .
RUN riscv64-linux-gnu-as --noexecstack -o exit.o exit.riscv64.s && riscv64-linux-gnu-ld -o exit -s exit.o && riscv64-linux-gnu-strip --strip-unneeded exit

FROM base AS exit-s390x
COPY util/archutil/fixtures/exit.s390x.s .
RUN s390x-linux-gnu-as --noexecstack -o exit.o exit.s390x.s && s390x-linux-gnu-ld -o exit -s exit.o && s390x-linux-gnu-strip --strip-unneeded exit

FROM base AS exit-ppc64
COPY util/archutil/fixtures/exit.ppc64.s .
RUN powerpc64le-linux-gnu-as -mbig --noexecstack -o exit.o exit.ppc64.s && powerpc64le-linux-gnu-ld -EB -o exit -s exit.o && powerpc64le-linux-gnu-strip --strip-unneeded exit

FROM base AS exit-ppc64le
COPY util/archutil/fixtures/exit.ppc64le.s .
RUN powerpc64le-linux-gnu-as --noexecstack -o exit.o exit.ppc64le.s && powerpc64le-linux-gnu-ld -o exit -s exit.o && powerpc64le-linux-gnu-strip --strip-unneeded exit

FROM base AS exit-mips64le
COPY util/archutil/fixtures/exit.mips64le.s .
RUN mips64el-linux-gnuabi64-as --noexecstack -o exit.o exit.mips64le.s && mips64el-linux-gnuabi64-ld -o exit -s exit.o && mips64el-linux-gnuabi64-strip --strip-unneeded exit

FROM base AS exit-mips64
COPY util/archutil/fixtures/exit.mips64.s .
RUN mips64-linux-gnuabi64-as --noexecstack -o exit.o exit.mips64.s && mips64-linux-gnuabi64-ld -o exit -s exit.o && mips64-linux-gnuabi64-strip --strip-unneeded exit

FROM scratch AS exits
COPY --from=exit-amd64 /src/exit amd64
COPY --from=exit-386 /src/exit 386
COPY --from=exit-arm64 /src/exit arm64
COPY --from=exit-arm /src/exit arm
COPY --from=exit-riscv64 /src/exit riscv64
COPY --from=exit-s390x /src/exit s390x
COPY --from=exit-ppc64 /src/exit ppc64
COPY --from=exit-ppc64le /src/exit ppc64le
COPY --from=exit-mips64le /src/exit mips64le
COPY --from=exit-mips64 /src/exit mips64

FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS generate
WORKDIR /go/src/github.com/moby/buildkit
RUN --mount=type=bind,target=.,rw \
--mount=from=exits,target=./bin/archutil,rw <<EOT
set -ex
mkdir /out
go run ./util/archutil/generate.go \
bin/archutil/amd64 \
bin/archutil/386 \
bin/archutil/arm64 \
bin/archutil/arm \
bin/archutil/riscv64 \
bin/archutil/s390x \
bin/archutil/ppc64 \
bin/archutil/ppc64le \
bin/archutil/mips64le \
bin/archutil/mips64
tree -nh bin/archutil
cp bin/archutil/*_binary.go /out
EOT

FROM scratch AS update
COPY --from=generate /out /

FROM base AS validate
RUN --mount=type=bind,target=.,rw \
--mount=type=bind,from=generate,source=/out,target=/generated-files <<EOT
set -e
git add -A
if [ "$(ls -A /generated-files)" ]; then
cp -rf /generated-files/* ./util/archutil
fi
diff=$(git status --porcelain)
if [ -n "$diff" ]; then
echo >&2 'ERROR: The result of archutil differs. Please update with "make archutil"'
echo "$diff"
exit 1
fi
EOT
2 changes: 1 addition & 1 deletion util/archutil/386_binary.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package archutil

// This file is generated by running make inside the archutil package.
// This file is generated by running "make archutil".
// Do not edit manually.

const Binary386 = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xaa\x77\xf5\x71\x63\x64\x64\x64\x80\x01\x26\x06\x66\x06\x30\x6f\x02\x0b\x87\x09\x03\x03\x83\x8c\x00\x44\xdc\x84\x41\x81\x81\x99\x41\x83\x81\x99\x81\x89\x01\xae\xba\x81\x85\x03\x84\xa7\x30\x30\x30\x80\x30\x0b\x48\x4c\x80\x01\x22\x2f\x00\x31\x03\x84\x39\x19\x18\x18\x40\x98\x15\x2a\x1e\xf8\xb4\x24\x85\x01\x0b\x60\x83\x6a\x1b\x05\xa3\x60\x14\x8c\x82\x51\x30\x0a\x46\xc1\x28\x18\x05\xa3\x60\x14\x8c\x82\x51\x30\x0a\x46\x01\x75\xc1\x0e\x50\x67\xdd\xf0\xf6\xd9\x06\x06\xbd\xe2\x8c\xe2\x92\xa2\x92\xc4\x24\x06\xbd\x92\xd4\x8a\x12\x12\xcc\xe0\x66\x80\xf4\xf9\xd9\xa0\xe3\x06\xa0\x4e\x3c\x27\x92\x3c\x23\x12\xcd\x8c\x24\xce\x29\xc0\xc0\x20\x88\x45\x1d\x20\x00\x00\xff\xff\x3d\x67\xa6\x38\x94\x10\x00\x00"
73 changes: 0 additions & 73 deletions util/archutil/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions util/archutil/Makefile

This file was deleted.

4 changes: 2 additions & 2 deletions util/archutil/amd64_binary.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package archutil

// This file is generated by running make inside the archutil package.
// This file is generated by running "make archutil".
// Do not edit manually.

const Binaryamd64 = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xec\x98\x3f\x8b\x13\x41\x18\xc6\x9f\xd9\x6c\xee\x0f\x08\xb9\xe0\x81\xc2\x59\xa8\x58\xd8\xb8\xe1\x54\x38\x05\x95\x55\x50\x07\xf1\xec\xce\xd2\x65\x93\x5d\xce\x80\x97\x5b\xb2\xb3\xe7\x0a\x07\x77\x47\xbe\x83\x58\x07\x14\x0b\x4b\xc1\x94\xa9\x5c\x2c\x6d\xac\x4d\x21\x04\xad\xec\x0c\x28\xca\x6e\xde\x49\xb2\x63\xa2\x82\xdd\x31\x3f\x08\xcf\xbc\xcf\xbe\x33\xef\x90\xa4\xd9\x67\xef\xe6\xdd\x5b\x06\x63\x90\x18\xb8\x86\xac\x5a\xb2\xb3\xda\x26\xff\x63\x79\xd4\x02\x1b\x97\x50\x80\x8d\x39\x14\xb3\x5e\x13\x93\xd8\x39\x3d\x42\x47\x4b\xc5\xd2\x50\xd2\xb2\x38\x51\xcb\x79\x52\x03\xb2\xa5\xca\x3e\x93\x3e\x7d\xb2\xfb\x34\x47\xea\x19\xf2\xa5\x9a\x13\xba\x0c\xa0\x00\xe0\xf6\xbd\x0d\xf8\xcf\xdf\x5c\xfe\xf0\xf2\xd3\xfd\xf5\x1f\x4f\x8f\x7e\x7f\xf1\x79\xef\xed\x85\xf7\xaf\xa1\xd1\x68\x34\x1a\x8d\x46\xa3\xd1\x68\x34\x1a\xcd\x21\x85\xaf\x76\x4b\x6d\xde\xfa\x36\xbf\x7b\x87\x77\x00\xec\xa7\x66\xa9\x7d\x95\x01\xfb\xbb\x6b\x3c\xe9\xb2\xac\xe9\x5d\xa9\xcd\x0f\x7a\xec\xf4\x33\xf0\x83\x41\x2a\xd1\x0a\xef\x30\x6a\x1f\x3e\x6e\xf5\x18\x6f\x0d\x58\x64\x7c\x59\xe4\x49\x72\x1d\x40\xb6\xb8\x91\x2e\xc0\x93\xee\x95\xf4\xe0\xe2\x9f\xee\x52\x00\x1b\xbd\xc7\xe7\x7d\x63\x9c\x0f\x60\x9c\x1f\x98\xf8\xfa\x53\xed\x2d\x53\x8a\xb1\xa1\xf4\x2f\x93\xff\x40\xf1\x8f\x91\xbf\xa9\xf8\xa7\xb2\xc8\xe1\xf7\xb9\x27\xa4\x7f\x32\xef\x9f\x9d\xe1\x57\x66\xf8\xa8\x88\xad\xa0\x52\xab\xc5\xb5\xb5\xc7\xcd\x75\x6b\x1b\x3b\xab\xd8\x39\x0f\x3f\xae\x0b\x38\x4e\x35\x0c\x9d\x50\xb8\x4d\x01\xc7\xf7\x5c\xe1\xc2\xf1\x1b\x1e\x60\x85\x4f\xb6\x84\x5b\x85\x15\x8a\xe6\x50\x1f\xca\x55\x63\x5b\xf8\xd6\x66\x23\xb2\xaa\x51\xfd\x91\x77\xae\xee\xc1\x12\x7e\x2c\xfe\xfb\xff\xb1\x02\x60\x3e\xfb\x86\xd4\xbc\x25\x9f\xb3\x40\xc9\x5b\x24\x16\xfd\x56\x73\xa3\x1c\xc7\xce\xe5\x39\x81\xd2\xcf\xa6\xd4\xc6\x94\x7b\x05\xb4\x7f\x81\x8d\xe7\xa6\xf7\x5c\xa0\xe7\xc7\x49\x17\x29\xf3\x51\x89\x29\xcf\xba\xf8\x97\xf9\xe5\x19\xfb\x5f\xfd\xe3\xfe\x5f\x01\x00\x00\xff\xff\xa5\x58\xb1\x16\x60\x13\x00\x00"
const Binaryamd64 = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xec\x98\x3f\x4b\xc3\x40\x18\xc6\x9f\x6b\x53\x8b\x38\x34\x83\x9b\x20\xad\xb8\x89\x01\x27\x1d\x54\x4e\xf1\xcf\x21\x55\x28\xe8\x07\xb0\xb4\x68\x51\x6a\xb1\x17\xe8\x50\xb0\xa5\x93\xdf\xa0\x73\xbe\x84\x1d\xb3\x05\xbf\x82\x5b\x07\x5d\x5c\x1c\xad\x20\x48\xce\xbb\x98\x84\x0e\x0e\x0e\x0e\xef\x0f\xc2\x73\xef\x9b\xe7\xde\xbb\x5b\x9f\xbb\xfd\xf2\x41\x86\x31\x18\x32\xd8\x86\xaa\x6c\xae\x6a\xae\xfb\x43\x3b\xb2\x80\x63\x03\x16\x38\x2c\x64\x95\xd7\x42\x1c\x9e\xd0\x3d\x3d\xda\x28\xf4\x9c\xb0\xcc\xc5\x6a\x73\x9e\xd1\x96\x6e\x1b\x35\x3e\x4b\x7f\x45\x3d\xaf\xc8\x78\x42\x97\xb5\xdd\xa8\xb9\x5b\xe5\x59\xd6\x66\xf0\x7b\xec\xd8\xfe\x79\x00\x59\x00\x87\x27\x67\x78\x7a\x6b\xad\xd4\xcb\xbd\xd3\xfb\xd2\x55\xe7\xe1\xe3\xf3\xf8\xa5\x52\x2a\x83\x20\x08\x82\x20\x08\x82\x20\x08\x82\x20\xfe\x39\x62\xcd\x2f\x78\x62\xf0\x9e\xef\x1e\x89\x11\x80\x5e\xd8\x2c\x78\x5b\x0c\xe8\x75\xd7\x45\xe0\x33\x65\x7a\x2c\x78\xa2\x3f\x66\x4b\x43\x88\xfe\x24\x14\x77\x41\x8c\x98\xb6\x7f\xff\x1e\x8c\x99\x18\x4c\x98\x9b\x79\x9d\x15\x41\xb0\x03\x40\x2d\x76\xc3\x05\x44\xe0\x6f\x86\x83\x73\x70\xda\x97\x6d\x79\x2b\xcf\xab\x70\x9a\x37\xb2\xee\x5c\x34\x5d\xa7\xea\x36\xae\x6b\xab\x8d\x1a\x1c\x59\xef\xc8\x3f\x79\xd7\x1c\x80\xbc\xca\x33\xd2\x39\x41\x32\x1f\x40\x2a\x27\x30\x2c\xea\x8c\x22\xca\x0c\xa2\x7c\x22\x95\x4b\xe0\x27\xcf\x48\xd7\xd9\x29\xf7\x6a\xd9\xd3\xcf\x4f\xef\xff\x0a\x00\x00\xff\xff\x79\x37\x55\x39\x98\x11\x00\x00"
2 changes: 1 addition & 1 deletion util/archutil/arm64_binary.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package archutil

// This file is generated by running make inside the archutil package.
// This file is generated by running "make archutil".
// Do not edit manually.

const Binaryarm64 = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xaa\x77\xf5\x71\x63\x62\x64\x64\x80\x01\x26\x86\xed\x0c\x20\xde\x06\x06\x07\x30\xdf\x01\x2a\x7e\x81\x01\x01\x1c\x18\x2c\x18\x98\x18\x1c\x18\x98\x19\x98\xc0\x6a\x59\x19\x18\x50\x64\x91\xe9\x3d\x50\xde\x1e\xb8\x3c\xc4\xae\xc0\xa7\x25\x29\x6c\x0c\xc4\x03\x01\x38\xab\xe1\xd2\x0a\xee\x86\x4b\x8c\x0c\x0c\x57\x18\xf4\x8a\x33\x8a\x4b\x8a\x4a\x12\x93\x18\xf4\x4a\x52\x2b\x4a\x18\xa8\x00\xb8\xa1\x2e\x84\xb9\x0d\x16\x0e\x1b\xa0\x7c\x1e\x34\xf5\x2c\x68\x7c\x90\x5e\x66\x2c\xe6\xc2\xfc\x2f\x88\x45\x3d\x32\x00\x04\x00\x00\xff\xff\xbb\x46\x88\x1e\x90\x01\x00\x00"
4 changes: 2 additions & 2 deletions util/archutil/arm_binary.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package archutil

// This file is generated by running make inside the archutil package.
// This file is generated by running "make archutil".
// Do not edit manually.

const Binaryarm = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\x8c\x8f\x3d\x6e\xc2\x40\x10\x85\xbf\x89\x7f\x12\x29\x29\x92\x9c\x20\xe9\xa8\xb6\xf2\x05\x5c\x40\x05\x05\xdc\x60\x2d\x2c\xe1\xce\xb2\x07\x89\x0e\xce\xc0\x09\x7c\x08\x6e\x64\x51\x73\x05\xe4\x65\x2d\xb6\x70\xc1\x93\x46\xb3\xfb\xcd\x2b\xde\x3b\xce\x97\x0b\x11\x61\xd4\x1b\x33\x86\x9f\x22\x64\xc0\xe5\x01\x93\x8c\x3f\x77\x8b\x89\x78\xba\xc5\xcd\x09\xdc\x24\x9e\xad\xaf\xba\x65\x42\x29\xf0\xed\x5e\x5d\x2f\x75\xd7\x03\xb7\xfc\x07\xb0\xa5\x2d\x2a\xe4\x1d\xf8\x10\x4c\xbb\x6b\xb5\x51\x5b\x60\xb4\x3c\x28\x26\xdf\xac\x8c\x55\x6d\xaa\x62\xaf\x65\xcb\xcb\xfa\xf4\x09\x53\xdf\x47\x81\xaf\xe0\x1e\xfb\x3d\x44\x88\xa0\x1e\xf9\xd0\xe5\x37\xf0\x49\xb0\xa3\x80\x9f\x81\xff\x09\xdf\x3d\x00\x00\xff\xff\x0b\x8f\xbf\xbd\x54\x01\x00\x00"
const Binaryarm = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\x8c\x8f\xbd\x8d\xc2\x40\x10\x85\xbf\x39\xff\xdc\x49\x77\xc1\xdd\x55\x00\x19\xd1\x46\x6e\xc0\x01\x44\x10\x40\x07\x6b\x61\x09\x67\x96\x3d\x48\x64\x50\x03\x15\xb8\x08\x3a\xb2\x88\x69\x01\xad\x7f\xc4\x06\x0e\x78\xd2\x68\x34\xdf\x7b\xc1\xbc\xf3\x72\xbd\x12\x11\x46\x7d\xb0\xc0\x5d\x8a\x90\x00\xb7\x1e\x46\x09\xb3\xce\x0b\x09\x78\xa5\xa5\x9b\x0b\x74\x13\x39\xf4\x0b\xdb\xbb\xee\x99\x50\xdc\xdb\x40\xd3\x4a\xd9\xb4\xc0\x23\xfd\x03\x6c\x6e\xb3\x02\xf9\x04\xbe\x04\x53\x1f\x6a\xad\xd4\x66\x18\xcd\x4f\x8a\x49\x77\x1b\x63\x55\xab\x22\x3b\x6a\x5e\xf3\xb6\xbe\x87\x0f\xe3\xa1\x8f\x02\x3f\x9e\x1f\x0e\xdb\xbd\x10\x40\x39\x72\xd7\xe5\xdf\xcb\x89\xb7\x03\x8f\x5f\x81\xf9\x44\xee\x19\x00\x00\xff\xff\xb6\x04\x27\x29\x54\x01\x00\x00"
16 changes: 7 additions & 9 deletions util/archutil/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ func main() {
panic(errors.New("arch is required"))
}

for _, arch := range flag.Args() {
wd, err := os.Getwd()
if err != nil {
panic(err)
}
f, err := os.Open(filepath.Join(wd, arch))
for _, farch := range flag.Args() {
dir := filepath.Dir(farch)
arch := filepath.Base(farch)

f, err := os.Open(farch)
if err != nil {
panic(err)
}
Expand All @@ -44,8 +43,7 @@ func main() {
if err := gz.Close(); err != nil {
panic(err)
}

fn := filepath.Join(wd, arch+"_binary.go")
fn := filepath.Join(dir, arch+"_binary.go")
dest, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
if err != nil {
panic(err)
Expand Down Expand Up @@ -90,7 +88,7 @@ var tmpl = template.Must(template.New("pause").Parse(`//go:build !{{.Arch}}

package {{.Package}}

// This file is generated by running make inside the archutil package.
// This file is generated by running "make archutil".
// Do not edit manually.

const Binary{{.Arch}} = "{{.Data}}"
Expand Down
2 changes: 1 addition & 1 deletion util/archutil/mips64_binary.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package archutil

// This file is generated by running make inside the archutil package.
// This file is generated by running "make archutil".
// Do not edit manually.

const Binarymips64 = "\x1f\x8b\x08\x00\x00\x00\x00\x00\x02\xff\xac\x92\xb1\x4a\xf4\x40\x14\x85\xbf\x99\xcd\xe6\xff\x41\xc5\x05\x2d\xc4\x2a\xc5\x16\x8b\xc5\x60\x69\x25\xb1\x50\x10\x14\x56\x7c\x82\x04\xd7\x18\x90\x24\x6c\x26\x60\x27\xbe\x81\xcf\xe4\xbb\x08\xbe\x80\xf5\xca\x24\x93\x98\x44\xa6\x10\x3c\x45\xce\xdc\x93\x7b\x72\xc3\x9c\xfb\x7c\x7e\x75\x21\xa5\xa0\x83\xe4\x3f\x60\x04\x11\x20\x8e\xad\x1a\x36\x24\x5e\x83\xa6\x3a\x61\x42\x88\xcf\xb4\x80\x09\xe0\xd9\xbe\x8f\xc6\x37\x60\x83\x83\x11\xb7\x33\xa6\xdf\x83\xeb\xfe\x3e\x9b\x63\x38\x60\x01\x77\xfa\xfd\x06\xf0\xf9\x1d\x66\xe6\x37\xa5\x44\xf4\xe7\xd5\x8f\x45\x57\xef\x3b\xbc\x22\x10\x2f\xed\x3d\x30\xf7\x60\x2e\xf7\xde\x80\x6d\x53\x9f\x01\xbb\x49\x56\xd5\x5f\xfb\xe7\x09\x54\xf9\x50\xea\xb5\x8e\x62\xd4\xf5\xe5\xf2\x56\x45\x71\x7a\xff\x18\x25\xa5\x2d\xf3\x42\xa7\x79\x56\xa2\xf4\xea\x49\xa3\x92\xac\x52\x91\xd6\xeb\x34\xae\xf4\xaa\xe4\x4f\xb0\x55\xc0\x51\x97\xe6\x30\x87\x71\x1e\xf4\xf2\x68\xf5\xc3\x02\x76\xac\x68\xfd\xa2\x7f\x65\x06\x0b\x87\x5f\xd8\x77\x6d\xa3\x3f\xdc\xa3\x6e\x9f\x66\x3f\xf3\xe9\xa0\xf2\xcd\xe6\xd3\x11\x45\xe8\xf0\x8f\x73\x9d\x38\xfc\x4b\x7b\x38\x75\xf9\xbf\x02\x00\x00\xff\xff\x61\x89\x8d\x22\x10\x03\x00\x00"
Loading
Loading