From dad6fe859be267a2bfe4ab08c38fc38b4466af71 Mon Sep 17 00:00:00 2001 From: Anton Livaja Date: Mon, 10 Feb 2025 00:37:23 -0500 Subject: [PATCH 1/2] fix pgp key fetching and indentation --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1214437..608df40 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,19 @@ VERSION := development GIT_REF := $(shell git log -1 --format=%H) GIT_AUTHOR := $(shell git log -1 --format=%an) -GIT_PUBKEY := $(shell git log -1 --format=%GP) +GIT_PUBKEY := $(shell git log -1 --format=%GK) GIT_TIMESTAMP := $(shell git log -1 --format=%cd --date=iso) export ## Use env vars from latest release when reproducing ifdef REPRODUCE -include dist/release.env -export + include dist/release.env + export endif + +## Prevents use of caching when building docker image ifdef NOCACHE -NO_CACHE := --no-cache + NO_CACHE := --no-cache endif .DEFAULT_GOAL := @@ -71,7 +73,7 @@ vm: out/dev-shell.digest out/airgap.iso out/sdcard.img -nographic; \ " -## Signing, Verification, and Release Targets +## Release, Signing, Verification, and Reproduction Targets .PHONY: clean clean: -- 2.40.1 From 238ca2ce41e91b22eccc4826c065b78b16614fba Mon Sep 17 00:00:00 2001 From: Anton Livaja Date: Mon, 10 Feb 2025 00:37:48 -0500 Subject: [PATCH 2/2] fix readme with make reproduce command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c02b0e6..810b841 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ make release ### Reproduce an existing release ``` -make attest +make reproduce ``` ### Sign an existing release -- 2.40.1