From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BE30E158094 for ; Thu, 28 Jul 2022 00:15:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A71DBE11BB; Thu, 28 Jul 2022 00:15:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C2A6E11BB for ; Thu, 28 Jul 2022 00:15:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52B39340AC0 for ; Thu, 28 Jul 2022 00:15:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 675EF52C for ; Thu, 28 Jul 2022 00:15:14 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1658967288.70907ff4c71a8f9f737d3255fc399fd76e599092.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/cosign/files/, app-containers/cosign/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-containers/cosign/cosign-1.10.0.ebuild app-containers/cosign/files/cosign-1.10.0-fix-makefile.patch X-VCS-Directories: app-containers/cosign/files/ app-containers/cosign/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 70907ff4c71a8f9f737d3255fc399fd76e599092 X-VCS-Branch: master Date: Thu, 28 Jul 2022 00:15:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 61ef333f-62d2-476f-a37f-c566f2466618 X-Archives-Hash: f04dfba9369a0dc7d3f974bd2b3c9338 commit: 70907ff4c71a8f9f737d3255fc399fd76e599092 Author: William Hubbs gentoo org> AuthorDate: Thu Jul 28 00:10:56 2022 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Jul 28 00:14:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70907ff4 app-containers/cosign: remove the goimports calls Add a patch from upstream for this bug. Closes: https://bugs.gentoo.org/859208 Signed-off-by: William Hubbs gentoo.org> app-containers/cosign/cosign-1.10.0.ebuild | 4 +++ .../cosign/files/cosign-1.10.0-fix-makefile.patch | 40 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/app-containers/cosign/cosign-1.10.0.ebuild b/app-containers/cosign/cosign-1.10.0.ebuild index 194effdf1cd3..7adb2e5ed8d1 100644 --- a/app-containers/cosign/cosign-1.10.0.ebuild +++ b/app-containers/cosign/cosign-1.10.0.ebuild @@ -16,6 +16,10 @@ KEYWORDS="~amd64" RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${P}-fix-makefile.patch +) + src_compile() { emake \ GIT_HASH=${GIT_HASH} \ diff --git a/app-containers/cosign/files/cosign-1.10.0-fix-makefile.patch b/app-containers/cosign/files/cosign-1.10.0-fix-makefile.patch new file mode 100644 index 000000000000..5699bca5732c --- /dev/null +++ b/app-containers/cosign/files/cosign-1.10.0-fix-makefile.patch @@ -0,0 +1,40 @@ +diff --git a/Makefile b/Makefile +index 3b6dcb5..8981549 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,8 +20,6 @@ else + GOBIN=$(shell go env GOBIN) + endif + +-GOFILES ?= $(shell find . -type f -name '*.go' -not -path "./vendor/*") +- + # Set version variables for LDFLAGS + PROJECT_ID ?= projectsigstore + RUNTIME_IMAGE ?= gcr.io/distroless/static +@@ -72,18 +70,6 @@ log-%: + printf "\033[36m==> %s\033[0m\n", $$2 \ + }' + +-.PHONY: checkfmt +-checkfmt: SHELL := /usr/bin/env bash +-checkfmt: ## Check formatting of all go files +- @ $(MAKE) --no-print-directory log-$@ +- $(shell test -z "$(shell gofmt -l $(GOFILES) | tee /dev/stderr)") +- $(shell test -z "$(shell goimports -l $(GOFILES) | tee /dev/stderr)") +- +-.PHONY: fmt +-fmt: ## Format all go files +- @ $(MAKE) --no-print-directory log-$@ +- goimports -w $(GOFILES) +- + cosign: $(SRCS) + CGO_ENABLED=0 go build -trimpath -ldflags "$(LDFLAGS)" -o $@ ./cmd/cosign + +@@ -121,7 +107,6 @@ clean: + rm -rf sget + rm -rf dist/ + +- + KOCACHE_PATH=/tmp/ko + ARTIFACT_HUB_LABELS=--image-label io.artifacthub.package.readme-url="https://raw.githubusercontent.com/sigstore/cosign/main/README.md" \ + --image-label io.artifacthub.package.logo-url=https://raw.githubusercontent.com/sigstore/cosign/main/images/logo.svg \