MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker: reproducibility add -trimpath to go -> $GO patches

Browse Source 
With this, we build and package docker without QA warnings due to
references to TMPDIR.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2022-09-13 11:25:46 -04:00
parent c991546a7f
commit 7cea149bb0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-containers/docker/files/0001-cli-use-external-GO111MODULE-and-cross-compiler.patch
View File

@ -19,6 +19,6 @@ Index: git/cli/scripts/build/binary
-export GO111MODULE=auto -export GO111MODULE=auto
-go build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}" -go build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}"
+${GO} build -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}" +${GO} build -trimpath -o "${TARGET}" -tags "${GO_BUILDTAGS}" --ldflags "${GO_LDFLAGS}" ${GO_BUILDMODE} "${SOURCE}"
ln -sf "$(basename "${TARGET}")" "$(dirname "${TARGET}")/docker" ln -sf "$(basename "${TARGET}")" "$(dirname "${TARGET}")/docker"

2
recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch
View File

@ -17,7 +17,7 @@ Index: git/src/import/hack/make/.binary
echo "Building: $DEST/$BINARY_FULLNAME" echo "Building: $DEST/$BINARY_FULLNAME"
echo "GOOS=\"${GOOS}\" GOARCH=\"${GOARCH}\" GOARM=\"${GOARM}\"" echo "GOOS=\"${GOOS}\" GOARCH=\"${GOARCH}\" GOARM=\"${GOARM}\""
- go build \ - go build \
+ ${GO} build \ + ${GO} build -trimpath \
-o "$DEST/$BINARY_FULLNAME" \ -o "$DEST/$BINARY_FULLNAME" \
"${BUILDFLAGS[@]}" \ "${BUILDFLAGS[@]}" \
-ldflags " -ldflags "

10
recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch
View File

@ -22,9 +22,9 @@ Index: git/libnetwork/Makefile
- go build -tags experimental -o "bin/dnet" ./cmd/dnet - go build -tags experimental -o "bin/dnet" ./cmd/dnet
- go build -o "bin/docker-proxy" ./cmd/proxy - go build -o "bin/docker-proxy" ./cmd/proxy
- CGO_ENABLED=0 go build -o "bin/diagnosticClient" ./cmd/diagnostic - CGO_ENABLED=0 go build -o "bin/diagnosticClient" ./cmd/diagnostic
+ $(GO) build -tags experimental -o "bin/dnet" ./cmd/dnet + $(GO) build -trimpath -tags experimental -o "bin/dnet" ./cmd/dnet
+ $(GO) build -o "bin/proxy" ./cmd/proxy + $(GO) build -trimpath -o "bin/proxy" ./cmd/proxy
+ CGO_ENABLED=0 $(GO) build -o "bin/diagnosticClient" ./cmd/diagnostic + CGO_ENABLED=0 $(GO) build -trimpath -o "bin/diagnosticClient" ./cmd/diagnostic
CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go CGO_ENABLED=0 go build -o "bin/testMain" ./cmd/networkdb-test/testMain.go
build-images: build-images:
@ -34,8 +34,8 @@ Index: git/libnetwork/Makefile
@echo "🐳 $@" @echo "🐳 $@"
- go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet - go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet
- go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy - go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy
+ @$(GO) build -linkshared $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy + @$(GO) build -trimpath -linkshared $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy
+ @$(GO) build -linkshared $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet + @$(GO) build -trimpath -linkshared $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet
# Rebuild protocol buffers. # Rebuild protocol buffers.
# These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt. # These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt.