aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2014-12-22 10:59:03 -0800
committerJames Bottomley <JBottomley@Parallels.com>2014-12-22 10:59:03 -0800
commitfc6c71fb7455749257b79a804c079c619c0d5c76 (patch)
tree8e3aa67608b4c0f326476902dd20be759be86ca5
parent3fbf09011e26fa99c7191d5782052cac430700cf (diff)
downloadefitools-fc6c71fb7455749257b79a804c079c619c0d5c76.tar.gz
Makefile: Consolidate auth file building rules
It's getting a bit complex with hashes, blacklists, updates etc, so consolidate Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--Make.rules3
-rw-r--r--Makefile18
2 files changed, 16 insertions, 5 deletions
diff --git a/Make.rules b/Make.rules
index 0d79dfc..d51abdd 100644
--- a/Make.rules
+++ b/Make.rules
@@ -44,6 +44,9 @@ endif
./hash-to-efi-sig-list $< $@
%-blacklist.esl: %.crt cert-to-efi-hash-list
+ ./cert-to-efi-sig-list $< $@
+
+%-hash-blacklist.esl: %.crt cert-to-efi-hash-list
./cert-to-efi-hash-list $< $@
%.esl: %.crt cert-to-efi-sig-list
diff --git a/Makefile b/Makefile
index cd05ac6..4579f9d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,17 +5,25 @@ BINARIES = cert-to-efi-sig-list sig-list-to-certs sign-efi-sig-list \
MSGUID = 77FA9ABD-0359-4D32-BD60-28F4E78F784B
+KEYS = PK KEK DB
+EXTRAKEYS = DB1 DB2
+EXTERNALKEYS = ms-uefi ms-kek
+
+ALLKEYS = $(KEYS) $(EXTRAKEYS) $(EXTERNALKEYS)
+
+KEYAUTH = $(ALLKEYS:=.auth)
+KEYUPDATEAUTH = $(ALLKEYS:=-update.auth) $(ALLKEYS:=-pkupdate.auth)
+KEYBLACKLISTAUTH = $(ALLKEYS:=-blacklist.auth)
+KEYHASHBLACKLISTAUTH = $(ALLKEYS:=-hash-blacklist.auth)
+
export TOPDIR := $(shell pwd)/
include Make.rules
EFISIGNED = $(patsubst %.efi,%-signed.efi,$(EFIFILES))
-all: $(EFISIGNED) $(BINARIES) $(MANPAGES) noPK.auth KEK-update.auth \
- DB-update.auth ms-uefi-update.auth DB-pkupdate.auth \
- ms-uefi-pkupdate.auth DB-blacklist.auth ms-uefi-blacklist.auth \
- DB-pkblacklist.auth ms-uefi-pkblacklist.auth \
- ms-kek-pkupdate.auth
+all: $(EFISIGNED) $(BINARIES) $(MANPAGES) noPK.auth $(KEYAUTH) \
+ $(KEYUPDATEAUTH) $(KEYBLACKLISTAUTH) $(KEYHASHBLACKLISTAUTH)
install: all