Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-containers/cosign/files/, app-containers/cosign/
Date: Thu, 27 Jan 2022 20:29:11
Message-Id: 1643315343.95c061b0ea87119901a1c81c1eb9dae3d2e2b297.williamh@gentoo
1 commit: 95c061b0ea87119901a1c81c1eb9dae3d2e2b297
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 27 20:27:56 2022 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 27 20:29:03 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c061b0
7
8 app-containers/cosign: fix makefile
9
10 Thanks to ionen for this fix.
11
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
14
15 app-containers/cosign/cosign-1.5.0.ebuild | 4 ++++
16 app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch | 13 +++++++++++++
17 2 files changed, 17 insertions(+)
18
19 diff --git a/app-containers/cosign/cosign-1.5.0.ebuild b/app-containers/cosign/cosign-1.5.0.ebuild
20 index f1320114bcd2..801eb64a2691 100644
21 --- a/app-containers/cosign/cosign-1.5.0.ebuild
22 +++ b/app-containers/cosign/cosign-1.5.0.ebuild
23 @@ -13,6 +13,10 @@ LICENSE="Apache-2.0"
24 SLOT="0"
25 KEYWORDS="~amd64"
26
27 +PATCHES=(
28 + "${FILESDIR}"/${P}-fix-makefile.patch
29 +)
30 +
31 src_prepare() {
32 default
33 mv ../vendor . || die
34
35 diff --git a/app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch b/app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch
36 new file mode 100644
37 index 000000000000..15cdc7511136
38 --- /dev/null
39 +++ b/app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch
40 @@ -0,0 +1,13 @@
41 +--- a/Makefile 2022-01-22 16:06:02.000000000 -0500
42 ++++ b/Makefile 2022-01-27 15:06:43.986094208 -0500
43 +@@ -71,8 +71,8 @@
44 + checkfmt: SHELL := /usr/bin/env bash
45 + checkfmt: ## Check formatting of all go files
46 + @ $(MAKE) --no-print-directory log-$@
47 +- $(shell test -z "$(shell gofmt -l $(GOFILES) | tee /dev/stderr)")
48 +- $(shell test -z "$(shell goimports -l $(GOFILES) | tee /dev/stderr)")
49 ++ $(shell test -z "$(shell gofmt -l $(GOFILES) | tee /dev/stderr)")
50 ++ $(shell test -z "$(shell goimports -l $(GOFILES) | tee /dev/stderr)")
51 +
52 + .PHONY: fmt
53 + fmt: ## Format all go files