Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2dd6834 authored by hungweichen's avatar hungweichen
Browse files

Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER 

These varaibles are going to be deprecated since we removed VB 1.0
support. This change removes the related references. boot.img can be
verified by a AVB 2.0 hash descriptor now.

Bug: 241044073
Test: atest under build/make
Change-Id: I267da2d591525ffc0cabf92791cf66a36ef8ff62
parent ef1d2f06

core/Makefile

+1 −34
Original line number Diff line number Diff line
@@ -1108,30 +1108,7 @@ bootimage-nodeps: $(MKBOOTIMG) $(AVBTOOL) $(BOARD_AVB_BOOT_KEY_PATH) $(INTERNAL_ 
	@echo "make $@: ignoring dependencies"

	$(foreach b,$(INSTALLED_BOOTIMAGE_TARGET),$(call build_boot_board_avb_enabled,$(b)))



else ifeq (true,$(PRODUCT_SUPPORTS_BOOT_SIGNER)) # BOARD_AVB_ENABLE != true



# $1: boot image target

define build_boot_supports_boot_signer

  $(MKBOOTIMG) --kernel $(call bootimage-to-kernel,$(1)) $(INTERNAL_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $(1)

  $(BOOT_SIGNER) /boot $@ $(PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1)

  $(call assert-max-image-size,$(1),$(call get-bootimage-partition-size,$(1),boot))

endef



$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_SIGNER)

	$(call pretty,"Target boot image: $@")

	$(call build_boot_supports_boot_signer,$@)



$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)



.PHONY: bootimage-nodeps

bootimage-nodeps: $(MKBOOTIMG) $(BOOT_SIGNER)

	@echo "make $@: ignoring dependencies"

	$(foreach b,$(INSTALLED_BOOTIMAGE_TARGET),$(call build_boot_supports_boot_signer,$(b)))



else ifeq (true,$(PRODUCT_SUPPORTS_VBOOT)) # PRODUCT_SUPPORTS_BOOT_SIGNER != true

else ifeq (true,$(PRODUCT_SUPPORTS_VBOOT)) # BOARD_AVB_ENABLE != true



# $1: boot image target

define build_boot_supports_vboot
@@ -1949,7 +1926,6 @@ $(if $(BOARD_EROFS_USE_LEGACY_COMPRESSION),$(hide) echo "erofs_use_legacy_compre 
$(if $(BOARD_EXT4_SHARE_DUP_BLOCKS),$(hide) echo "ext4_share_dup_blocks=$(BOARD_EXT4_SHARE_DUP_BLOCKS)" >> $(1))

$(if $(BOARD_FLASH_LOGICAL_BLOCK_SIZE), $(hide) echo "flash_logical_block_size=$(BOARD_FLASH_LOGICAL_BLOCK_SIZE)" >> $(1))

$(if $(BOARD_FLASH_ERASE_BLOCK_SIZE), $(hide) echo "flash_erase_block_size=$(BOARD_FLASH_ERASE_BLOCK_SIZE)" >> $(1))

$(if $(PRODUCT_SUPPORTS_BOOT_SIGNER),$(hide) echo "boot_signer=$(PRODUCT_SUPPORTS_BOOT_SIGNER)" >> $(1))

$(if $(PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity=$(PRODUCT_SUPPORTS_VERITY)" >> $(1))

$(if $(PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_key=$(PRODUCT_VERITY_SIGNING_KEY)" >> $(1))

$(if $(PRODUCT_SUPPORTS_VERITY),$(hide) echo "verity_signer_cmd=$(notdir $(VERITY_SIGNER))" >> $(1))
@@ -2483,12 +2459,6 @@ define build-recoveryimage-target 
    $(MKBOOTIMG) $(if $(strip $(2)),--kernel $(strip $(2))) $(INTERNAL_RECOVERYIMAGE_ARGS) \

                 $(INTERNAL_MKBOOTIMG_VERSION_ARGS) \

                 $(BOARD_RECOVERY_MKBOOTIMG_ARGS) --output $(1))

  $(if $(filter true,$(PRODUCT_SUPPORTS_BOOT_SIGNER)),\

    $(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)),\

      $(BOOT_SIGNER) /boot $(1) $(PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1),\

      $(BOOT_SIGNER) /recovery $(1) $(PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCT_VERITY_SIGNING_KEY).x509.pem $(1)\

    )\

  )

  $(if $(filter true,$(PRODUCT_SUPPORTS_VBOOT)), \

    $(VBOOT_SIGNER) $(FUTILITY) $(1).unsigned $(PRODUCT_VBOOT_SIGNING_KEY).vbpubk $(PRODUCT_VBOOT_SIGNING_KEY).vbprivk $(PRODUCT_VBOOT_SIGNING_SUBKEY).vbprivk $(1).keyblock $(1))

  $(if $(filter true,$(BOARD_USES_RECOVERY_AS_BOOT)), \
@@ -2501,9 +2471,6 @@ define build-recoveryimage-target 
endef



recoveryimage-deps := $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_kernel)

ifeq (true,$(PRODUCT_SUPPORTS_BOOT_SIGNER))

  recoveryimage-deps += $(BOOT_SIGNER)

endif

ifeq (true,$(PRODUCT_SUPPORTS_VBOOT))

  recoveryimage-deps += $(VBOOT_SIGNER)

endif

core/config.mk

+1 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ $(KATI_obsolete_var TARGET_NO_VENDOR_BOOT,Use PRODUCT_BUILD_VENDOR_BOOT_IMAGE in 
$(KATI_obsolete_var PRODUCT_CHECK_ELF_FILES,Use BUILD_BROKEN_PREBUILT_ELF_FILES instead)

$(KATI_obsolete_var ALL_GENERATED_SOURCES,ALL_GENERATED_SOURCES is no longer used)

$(KATI_obsolete_var ALL_ORIGINAL_DYNAMIC_BINARIES,ALL_ORIGINAL_DYNAMIC_BINARIES is no longer used)



$(KATI_obsolete_var PRODUCT_SUPPORTS_BOOT_SIGNER,VB 1.0 and related variables are no longer supported)

# Used to force goals to build.  Only use for conditionally defined goals.

.PHONY: FORCE

FORCE:
@@ -629,7 +629,6 @@ APPEND2SIMG := $(HOST_OUT_EXECUTABLES)/append2simg 
VERITY_SIGNER := $(HOST_OUT_EXECUTABLES)/verity_signer

BUILD_VERITY_METADATA := $(HOST_OUT_EXECUTABLES)/build_verity_metadata

BUILD_VERITY_TREE := $(HOST_OUT_EXECUTABLES)/build_verity_tree

BOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/boot_signer

FUTILITY := $(HOST_OUT_EXECUTABLES)/futility-host

VBOOT_SIGNER := $(HOST_OUT_EXECUTABLES)/vboot_signer

FEC := $(HOST_OUT_EXECUTABLES)/fec

core/product.mk

+0 −1
Original line number Diff line number Diff line
@@ -136,7 +136,6 @@ _product_list_vars += PRODUCT_BOOT_JARS 
# PRODUCT_BOOT_JARS, so that device-specific jars go after common jars.

_product_list_vars += PRODUCT_BOOT_JARS_EXTRA



_product_single_value_vars += PRODUCT_SUPPORTS_BOOT_SIGNER

_product_single_value_vars += PRODUCT_SUPPORTS_VBOOT

_product_single_value_vars += PRODUCT_SUPPORTS_VERITY

_product_single_value_vars += PRODUCT_SUPPORTS_VERITY_FEC

target/product/verity.mk

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


# Provides dependencies necessary for verified boot.



PRODUCT_SUPPORTS_BOOT_SIGNER := true

PRODUCT_SUPPORTS_VERITY := true

PRODUCT_SUPPORTS_VERITY_FEC := true