Date: Monday, October 26, 2020 @ 20:00:09 Author: shibumi Revision: 734042
archrelease: copy trunk to community-x86_64 Added: skaffold/repos/community-x86_64/ skaffold/repos/community-x86_64/PKGBUILD (from rev 734041, skaffold/trunk/PKGBUILD) skaffold/repos/community-x86_64/build_info.patch (from rev 734041, skaffold/trunk/build_info.patch) ------------------+ PKGBUILD | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ build_info.patch | 23 +++++++++++++++++++++ 2 files changed, 81 insertions(+) Copied: skaffold/repos/community-x86_64/PKGBUILD (from rev 734041, skaffold/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2020-10-26 20:00:09 UTC (rev 734042) @@ -0,0 +1,58 @@ +# Maintainer Christian Rebischke <chris.rebisc...@archlinux.org> +# Maintainer: Fredy GarcĂa <frealgagu at gmail dot com> +# Maintainer: Maxim Baz <${pkgname} at maximbaz dot com> +# Contributor: Stefan Cocora <stefan dot cocora at gmail dot com> + +pkgname=skaffold +pkgver=1.15.0 +pkgrel=2 +pkgdesc="A command line tool that facilitates continuous development for Kubernetes applications" +arch=("x86_64") +url="https://github.com/GoogleContainerTools/${pkgname}" +license=("Apache") +depends=("docker" "kubectl") +makedepends=("go") +optdepends=( + "minikube: To use Minikube" +) +source=( + "${pkgname}-${pkgver}.tar.gz::https://github.com/GoogleContainerTools/${pkgname}/archive/v${pkgver}.tar.gz" + "build_info.patch" +) +sha256sums=( + "d16c91191d4d0ac0d8eb29f9fb02462b948faffefcf0d5b91fd6491a3157d8c2" + "e90797011d2f79c79a6b184a5e9c35c4e5c582622d075b0022675b96fccefc46" +) +_commit="c4dce04b0d692dce61051d14cf4a2c04c8c688bd" + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/build_info.patch" + + rm -rf "${srcdir}/gopath" + mkdir -p "${srcdir}/gopath/bin" + mkdir -p "${srcdir}/gopath/src/github.com/GoogleContainerTools" + ln -rTsf "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/gopath/src/github.com/GoogleContainerTools/${pkgname}" +} + +build() { + cd "${srcdir}/gopath/src/github.com/GoogleContainerTools/${pkgname}" + export GOPATH="${srcdir}/gopath" + export PATH="${PATH}:${GOPATH}/bin" + export VERSION="v${pkgver}" + export COMMIT="${_commit}" + export TREE_STATE="clean" + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + export GOFLAGS="-buildmode=pie -mod=readonly -modcacherw -x -v" + make install + + # To avoid issues deleting directories next time + go clean --modcache +} + +package() { + install -Dm755 "${srcdir}/gopath/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" +} Copied: skaffold/repos/community-x86_64/build_info.patch (from rev 734041, skaffold/trunk/build_info.patch) =================================================================== --- community-x86_64/build_info.patch (rev 0) +++ community-x86_64/build_info.patch 2020-10-26 20:00:09 UTC (rev 734042) @@ -0,0 +1,23 @@ +diff --git a/Makefile b/Makefile +index dd22ea0..aa47490 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,7 +35,8 @@ SKAFFOLD_TEST_PACKAGES = ./pkg/skaffold/... ./cmd/... ./hack/... ./pkg/webhook/. + GO_FILES = $(shell find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./pkg/diag/*") + + VERSION_PACKAGE = $(REPOPATH)/pkg/skaffold/version +-COMMIT = $(shell git rev-parse HEAD) ++COMMIT ?= $(shell git rev-parse HEAD) ++TREE_STATE ?= $(if $(shell git status --porcelain),dirty,clean) + + ifeq "$(strip $(VERSION))" "" + override VERSION = $(shell git describe --always --tags --dirty) +@@ -52,7 +53,7 @@ GO_BUILD_TAGS_windows = "release" + GO_LDFLAGS = -X $(VERSION_PACKAGE).version=$(VERSION) + GO_LDFLAGS += -X $(VERSION_PACKAGE).buildDate=$(shell date +'%Y-%m-%dT%H:%M:%SZ') + GO_LDFLAGS += -X $(VERSION_PACKAGE).gitCommit=$(COMMIT) +-GO_LDFLAGS += -X $(VERSION_PACKAGE).gitTreeState=$(if $(shell git status --porcelain),dirty,clean) ++GO_LDFLAGS += -X $(VERSION_PACKAGE).gitTreeState=$(TREE_STATE) + GO_LDFLAGS += -s -w + + GO_LDFLAGS_windows =" $(GO_LDFLAGS) -extldflags \"$(LDFLAGS_windows)\""