Date: Saturday, May 29, 2021 @ 23:25:58 Author: shibumi Revision: 950290
archrelease: copy trunk to community-x86_64 Added: skaffold/repos/community-x86_64/PKGBUILD (from rev 950289, skaffold/trunk/PKGBUILD) skaffold/repos/community-x86_64/build_info.patch (from rev 950289, skaffold/trunk/build_info.patch) Deleted: skaffold/repos/community-x86_64/PKGBUILD skaffold/repos/community-x86_64/build_info.patch ------------------+ PKGBUILD | 125 +++++++++++++++++++++++++---------------------------- build_info.patch | 46 +++++++++---------- 2 files changed, 84 insertions(+), 87 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-05-29 23:25:50 UTC (rev 950289) +++ PKGBUILD 2021-05-29 23:25:58 UTC (rev 950290) @@ -1,64 +0,0 @@ -# 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.20.0 -pkgrel=1 -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") -makedepends=("go") -optdepends=( - "minikube: To use Minikube" - "kubectl: For Kubernetes support" - "bash-completion: Tab autocompletion" -) -source=( - "${pkgname}-${pkgver}.tar.gz::https://github.com/GoogleContainerTools/${pkgname}/archive/v${pkgver}.tar.gz" - "build_info.patch" -) -sha256sums=('d47ee974acf1c4432dab3ecdffeadbe271d2ff8098b811da2e73a04f9d9af957' - 'e90797011d2f79c79a6b184a5e9c35c4e5c582622d075b0022675b96fccefc46') -_commit="c48e97690d8daffd68141c2a68fcbe3df6f6936a" - -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 -ldflags=-linkmode=external" - make install - - # To avoid issues deleting directories next time - go clean --modcache - - # Create completion files - "${srcdir}/gopath/bin/${pkgname}" completion bash > "${srcdir}/${pkgname}-completion.bash" - "${srcdir}/gopath/bin/${pkgname}" completion zsh > "${srcdir}/${pkgname}-completion.zsh" -} - -package() { - install -Dm755 "${srcdir}/gopath/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 "${srcdir}/${pkgname}-completion.bash" "${pkgdir}/usr/share/bash-completion/completions/${pkgname}" - install -Dm644 "${srcdir}/${pkgname}-completion.zsh" "${pkgdir}/usr/share/zsh/site-functions/_skaffold" -} Copied: skaffold/repos/community-x86_64/PKGBUILD (from rev 950289, skaffold/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-05-29 23:25:58 UTC (rev 950290) @@ -0,0 +1,61 @@ +# 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.25.0 +pkgrel=1 +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") +makedepends=("go") +optdepends=( + "minikube: To use Minikube" + "kubectl: For Kubernetes support" + "bash-completion: Tab autocompletion" +) +source=( + "${pkgname}-${pkgver}.tar.gz::https://github.com/GoogleContainerTools/${pkgname}/archive/v${pkgver}.tar.gz" +) +sha256sums=('de267c84d95d13bc6358821d352d716c597f76d7ba842c982e99d76be510c485') +_commit="c788c2b15fc3b3a002edcff25b5ef33563d5bb9c" + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + 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 -ldflags=-linkmode=external" + make install + + # To avoid issues deleting directories next time + go clean --modcache + + # Create completion files + "${srcdir}/gopath/bin/${pkgname}" completion bash > "${srcdir}/${pkgname}-completion.bash" + "${srcdir}/gopath/bin/${pkgname}" completion zsh > "${srcdir}/${pkgname}-completion.zsh" +} + +package() { + install -Dm755 "${srcdir}/gopath/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}-completion.bash" "${pkgdir}/usr/share/bash-completion/completions/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}-completion.zsh" "${pkgdir}/usr/share/zsh/site-functions/_skaffold" +} Deleted: build_info.patch =================================================================== --- build_info.patch 2021-05-29 23:25:50 UTC (rev 950289) +++ build_info.patch 2021-05-29 23:25:58 UTC (rev 950290) @@ -1,23 +0,0 @@ -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)\"" Copied: skaffold/repos/community-x86_64/build_info.patch (from rev 950289, skaffold/trunk/build_info.patch) =================================================================== --- build_info.patch (rev 0) +++ build_info.patch 2021-05-29 23:25:58 UTC (rev 950290) @@ -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)\""