fix pgp key fetching and indentation
This commit is contained in:
parent
5612c59b9a
commit
dad6fe859b
12
Makefile
12
Makefile
|
@ -1,17 +1,19 @@
|
||||||
VERSION := development
|
VERSION := development
|
||||||
GIT_REF := $(shell git log -1 --format=%H)
|
GIT_REF := $(shell git log -1 --format=%H)
|
||||||
GIT_AUTHOR := $(shell git log -1 --format=%an)
|
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)
|
GIT_TIMESTAMP := $(shell git log -1 --format=%cd --date=iso)
|
||||||
export
|
export
|
||||||
|
|
||||||
## Use env vars from latest release when reproducing
|
## Use env vars from latest release when reproducing
|
||||||
ifdef REPRODUCE
|
ifdef REPRODUCE
|
||||||
include dist/release.env
|
include dist/release.env
|
||||||
export
|
export
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
## Prevents use of caching when building docker image
|
||||||
ifdef NOCACHE
|
ifdef NOCACHE
|
||||||
NO_CACHE := --no-cache
|
NO_CACHE := --no-cache
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.DEFAULT_GOAL :=
|
.DEFAULT_GOAL :=
|
||||||
|
@ -71,7 +73,7 @@ vm: out/dev-shell.digest out/airgap.iso out/sdcard.img
|
||||||
-nographic; \
|
-nographic; \
|
||||||
"
|
"
|
||||||
|
|
||||||
## Signing, Verification, and Release Targets
|
## Release, Signing, Verification, and Reproduction Targets
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
|
|
Loading…
Reference in New Issue