fix pub key extraction

fix casing for oci directive
fix readme with proper reproduce command
2025-02-03 23:10:32 -05:00 · 2025-02-03 23:10:03 -05:00 · 2025-02-03 23:06:22 -05:00 · 2025-02-03 23:06:05 -05:00 · 2025-02-03 23:05:39 -05:00
3 changed files with 9 additions and 8 deletions
--- a/3
+++ b/3
@ -14,7 +14,6 @@ FROM stagex/gpg:sx2024.09.0@sha256:f63555b39740db63b34c06894a4a9d5e125d04f5d51e7
 FROM stagex/grub:sx2024.09.0@sha256:a14c60f152c759185e5702e910053cb5c0d9eee11f43d8d5d40a84123aece9fd AS grub
 FROM stagex/ipxe:sx2024.09.0@sha256:5791d9b42c7e9099a0180c4fe6cc4b8e9afc9e6b9ec392099c65c53b71db7908 AS ipxe
 FROM stagex/jq:sx2024.09.0@sha256:3e8b44aa54481bdd46406e9d3a63862f4216f81530a1898b3c144e1c38847a82 AS jq
-FROM stagex/jq:sx2024.09.0@sha256:3e8b44aa54481bdd46406e9d3a63862f4216f81530a1898b3c144e1c38847a82 AS jq
 FROM stagex/keyfork:sx2024.09.0@sha256:2288c1d769a0c3c535835019ad4919cc45b094492b5aa959a0eaf1e883a96214 AS keyfork
 FROM stagex/libaio:sx2024.09.0@sha256:c8d6dd6f3e6fbda73ac0620b2bc4b4cfe6fa504bf7a17eee3bb56e286c394b8b AS libaio
 FROM stagex/libassuan:sx2024.09.0@sha256:1f31e888ab3f02634009d1a38acca9f25deb827432eb91392e21fd75128a44aa AS libassuan
@ -66,7 +65,7 @@ COPY --from=mtools . /
 COPY --from=xz . /
 COPY --from=grub . /

-FROM base as dev
+FROM base AS dev
 COPY --from=gcc . /
 COPY --from=glib . /
 COPY --from=alsa-lib . /
--- a/12
+++ b/12
@ -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 :=
@ -70,7 +72,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:
--- a/README.md
+++ b/README.md
@ -57,7 +57,7 @@ make release
 ### Reproduce an existing release

 ```
-make attest
+make reproduce 
 ```

 ### Sign an existing release
Author	SHA1	Message	Date
Anton Livaja	d7f6e6fe15	fix pub key extraction	2025-02-03 23:10:32 -05:00
Anton Livaja	30df22190a	fix casing for oci directive	2025-02-03 23:10:03 -05:00
Anton Livaja	a25eea37e4	fix readme with proper reproduce command	2025-02-03 23:06:22 -05:00
Anton Livaja	dc2fa6492f	remove duplicate jq import	2025-02-03 23:06:05 -05:00
Anton Livaja	f3a90644e9	clean up makefile	2025-02-03 23:05:39 -05:00