| @@ -7,22 +7,22 @@ obj-$(CONFIG_SYSTEM_TRUSTED_KEYRING) += system_keyring.o system_certificates.o c · 6 unmodified lines |
| 7 | 7 | obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist.o common.o |
| 8 | 8 | obj-$(CONFIG_SYSTEM_REVOCATION_LIST) += revocation_certificates.o |
| 9 | 9 | ifneq ($(CONFIG_SYSTEM_BLACKLIST_HASH_LIST),) |
| 10 | | −quiet_cmd_check_blacklist_hashes = CHECK $(patsubst "%",%,$(2)) |
| 11 | | − cmd_check_blacklist_hashes = $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(2); touch $@ |
| 12 | 10 | |
| 13 | | −$(eval $(call config_filename,SYSTEM_BLACKLIST_HASH_LIST)) |
| 11 | +$(obj)/blacklist_hashes.o: $(obj)/blacklist_hash_list |
| 12 | +CFLAGS_blacklist_hashes.o := -I $(obj) |
| 14 | 13 | |
| 15 | | −$(obj)/blacklist_hashes.o: $(obj)/blacklist_hashes_checked |
| 14 | +quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ |
| 15 | + cmd_check_and_copy_blacklist_hash_list = \ |
| 16 | + $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ |
| 17 | + cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ |
| 16 | 18 | |
| 17 | | −CFLAGS_blacklist_hashes.o += -I$(srctree) |
| 18 | | − |
| 19 | | −targets += blacklist_hashes_checked |
| 20 | | −$(obj)/blacklist_hashes_checked: $(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(SYSTEM_BLACKLIST_HASH_LIST_FILENAME) scripts/check-blacklist-hashes.awk FORCE |
| 21 | | − $(call if_changed,check_blacklist_hashes,$(SYSTEM_BLACKLIST_HASH_LIST_SRCPREFIX)$(CONFIG_SYSTEM_BLACKLIST_HASH_LIST)) |
| 19 | +$(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE |
| 20 | + $(call if_changed,check_and_copy_blacklist_hash_list) |
| 22 | 21 | obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_hashes.o |
| 23 | 22 | else |
| 24 | 23 | obj-$(CONFIG_SYSTEM_BLACKLIST_KEYRING) += blacklist_nohashes.o |
| 25 | 24 | endif |
| 25 | +targets += blacklist_hash_list |
| 26 | 26 | |
| 27 | 27 | quiet_cmd_extract_certs = CERT $@ |
| 28 | 28 | cmd_extract_certs = $(obj)/extract-cert $(extract-cert-in) $@ |
| @@ -33,7 +33,7 @@ $(obj)/system_certificates.o: $(obj)/x509_certificate_list · 4 unmodified lines |
| 33 | 33 | $(obj)/x509_certificate_list: $(CONFIG_SYSTEM_TRUSTED_KEYS) $(obj)/extract-cert FORCE |
| 34 | 34 | $(call if_changed,extract_certs) |
| 35 | 35 | |
| 36 | | −targets += x509_certificate_list blacklist_hashes_checked |
| 36 | +targets += x509_certificate_list |
| 37 | 37 | |
| 38 | 38 | # If module signing is requested, say by allyesconfig, but a key has not been |
| 39 | 39 | # supplied, then one will need to be generated to make sure the build does not |