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

Commit aad34e5b authored by Yifan Hong's avatar Yifan Hong
Browse files

Exclude board cmdline/dtb/pagesize/base in generic boot image 

When building with BOARD_USES_GENERIC_KERNEL_IMAGE, even if BUILDING_VENDOR_BOOT_IMAGE
is not set, do not include board-specific cmdline, dtb, page size, and base in the
generic boot image.

This change drops buildvariant=* in the cmdline of the generic boot
image

Bug: 156098440
Test: manual. Deliberately set BOARD_KERNEL_CMDLINE for aosp_arm64 and
      ensure it doesn't go into the boot image.
Change-Id: I846f600058a4a9b349d55c9773d6dd81bbe49312
parent 881df39d

core/Makefile

+35 −15
Original line number Original line Diff line number Diff line
@@ -754,7 +754,19 @@ endif 




INTERNAL_KERNEL_CMDLINE := $(strip $(INTERNAL_KERNEL_CMDLINE) buildvariant=$(TARGET_BUILD_VARIANT) $(VERITY_KEYID))

INTERNAL_KERNEL_CMDLINE := $(strip $(INTERNAL_KERNEL_CMDLINE) buildvariant=$(TARGET_BUILD_VARIANT) $(VERITY_KEYID))





ifndef BUILDING_VENDOR_BOOT_IMAGE

boot_uses_generic_kernel_image :=

ifdef BUILDING_VENDOR_BOOT_IMAGE

  # building vendor boot image, dtb/base/pagesize go there

  boot_uses_generic_kernel_image := true

else ifeq (true,$(BOARD_USES_GENERIC_KERNEL_IMAGE))

  boot_uses_generic_kernel_image := true

endif



ifeq (true,$(boot_uses_generic_kernel_image))

  ifdef GENERIC_KERNEL_CMDLINE

    INTERNAL_BOOTIMAGE_ARGS += --cmdline "$(GENERIC_KERNEL_CMDLINE)"

  endif

else # boot_uses_generic_kernel_image != true

ifdef BOARD_KERNEL_BASE

ifdef BOARD_KERNEL_BASE

  INTERNAL_BOOTIMAGE_ARGS += --base $(BOARD_KERNEL_BASE)

  INTERNAL_BOOTIMAGE_ARGS += --base $(BOARD_KERNEL_BASE)

endif

endif
@@ -764,12 +776,8 @@ endif 
ifdef INTERNAL_KERNEL_CMDLINE

ifdef INTERNAL_KERNEL_CMDLINE

  INTERNAL_BOOTIMAGE_ARGS += --cmdline "$(INTERNAL_KERNEL_CMDLINE)"

  INTERNAL_BOOTIMAGE_ARGS += --cmdline "$(INTERNAL_KERNEL_CMDLINE)"

endif

endif

else

endif # boot_uses_generic_kernel_image == true

# building vendor boot image, dtb/base/pagesize go there

boot_uses_generic_kernel_image :=

ifdef GENERIC_KERNEL_CMDLINE

  INTERNAL_BOOTIMAGE_ARGS += --cmdline "$(GENERIC_KERNEL_CMDLINE)"

endif

endif





INTERNAL_MKBOOTIMG_VERSION_ARGS := \

INTERNAL_MKBOOTIMG_VERSION_ARGS := \

    --os_version $(PLATFORM_VERSION_LAST_STABLE) \

    --os_version $(PLATFORM_VERSION_LAST_STABLE) \
@@ -1882,17 +1890,23 @@ endif 




ifeq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(AB_OTA_UPDATER)))

ifeq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(AB_OTA_UPDATER)))

  INTERNAL_RECOVERYIMAGE_ARGS := --ramdisk $(recovery_ramdisk)

  INTERNAL_RECOVERYIMAGE_ARGS := --ramdisk $(recovery_ramdisk)



ifneq (true,$(BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE))

ifdef GENERIC_KERNEL_CMDLINE

ifdef GENERIC_KERNEL_CMDLINE

  INTERNAL_RECOVERYIMAGE_ARGS += --cmdline "$(GENERIC_KERNEL_CMDLINE)"

  INTERNAL_RECOVERYIMAGE_ARGS += --cmdline "$(GENERIC_KERNEL_CMDLINE)"

endif

endif # GENERIC_KERNEL_CMDLINE != ""

endif # BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE != true



else # not (BUILDING_VENDOR_BOOT_IMAGE and AB_OTA_UPDATER)

else # not (BUILDING_VENDOR_BOOT_IMAGE and AB_OTA_UPDATER)

  INTERNAL_RECOVERYIMAGE_ARGS := \

  INTERNAL_RECOVERYIMAGE_ARGS := \

      $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \

      $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \

      --ramdisk $(recovery_ramdisk)

      --ramdisk $(recovery_ramdisk)

# Assumes this has already been stripped

# Assumes this has already been stripped

ifneq (true,$(BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE))

ifdef INTERNAL_KERNEL_CMDLINE

ifdef INTERNAL_KERNEL_CMDLINE

  INTERNAL_RECOVERYIMAGE_ARGS += --cmdline "$(INTERNAL_KERNEL_CMDLINE)"

  INTERNAL_RECOVERYIMAGE_ARGS += --cmdline "$(INTERNAL_KERNEL_CMDLINE)"

endif

endif # INTERNAL_KERNEL_CMDLINE != ""

endif # BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE != true

ifdef BOARD_KERNEL_BASE

ifdef BOARD_KERNEL_BASE

  INTERNAL_RECOVERYIMAGE_ARGS += --base $(BOARD_KERNEL_BASE)

  INTERNAL_RECOVERYIMAGE_ARGS += --base $(BOARD_KERNEL_BASE)

endif

endif
@@ -4464,7 +4478,9 @@ else ifneq (true,$(BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE)) 
endif

endif

endif

endif

ifeq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(AB_OTA_UPDATER)))

ifeq (truetrue,$(strip $(BUILDING_VENDOR_BOOT_IMAGE))$(strip $(AB_OTA_UPDATER)))

ifneq (true,$(BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE))

	echo "$(GENERIC_KERNEL_CMDLINE)" > $(zip_root)/$(PRIVATE_RECOVERY_OUT)/cmdline

	echo "$(GENERIC_KERNEL_CMDLINE)" > $(zip_root)/$(PRIVATE_RECOVERY_OUT)/cmdline

endif # BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE != true

else # not (BUILDING_VENDOR_BOOT_IMAGE and AB_OTA_UPDATER)

else # not (BUILDING_VENDOR_BOOT_IMAGE and AB_OTA_UPDATER)

ifdef INSTALLED_2NDBOOTLOADER_TARGET

ifdef INSTALLED_2NDBOOTLOADER_TARGET

	cp $(INSTALLED_2NDBOOTLOADER_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/second

	cp $(INSTALLED_2NDBOOTLOADER_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/second
@@ -4482,9 +4498,11 @@ endif 
ifdef INSTALLED_DTBIMAGE_TARGET

ifdef INSTALLED_DTBIMAGE_TARGET

	cp $(INSTALLED_DTBIMAGE_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/dtb

	cp $(INSTALLED_DTBIMAGE_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/dtb

endif

endif

ifneq (true,$(BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE))

ifdef INTERNAL_KERNEL_CMDLINE

ifdef INTERNAL_KERNEL_CMDLINE

	echo "$(INTERNAL_KERNEL_CMDLINE)" > $(zip_root)/$(PRIVATE_RECOVERY_OUT)/cmdline

	echo "$(INTERNAL_KERNEL_CMDLINE)" > $(zip_root)/$(PRIVATE_RECOVERY_OUT)/cmdline

endif

endif # INTERNAL_KERNEL_CMDLINE != ""

endif # BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE != true

ifdef BOARD_KERNEL_BASE

ifdef BOARD_KERNEL_BASE

	echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/$(PRIVATE_RECOVERY_OUT)/base

	echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/$(PRIVATE_RECOVERY_OUT)/base

endif

endif
@@ -4507,23 +4525,25 @@ endif 
ifdef INSTALLED_KERNEL_TARGET

ifdef INSTALLED_KERNEL_TARGET

	$(hide) cp $(INSTALLED_KERNEL_TARGET) $(zip_root)/BOOT/

	$(hide) cp $(INSTALLED_KERNEL_TARGET) $(zip_root)/BOOT/

endif

endif

ifndef INSTALLED_VENDOR_BOOTIMAGE_TARGET

ifdef INSTALLED_VENDOR_BOOTIMAGE_TARGET

	echo "$(GENERIC_KERNEL_CMDLINE)" > $(zip_root)/BOOT/cmdline

else ifeq (true,$(BOARD_USES_GENERIC_KERNEL_IMAGE))

	echo "$(GENERIC_KERNEL_CMDLINE)" > $(zip_root)/BOOT/cmdline

else # INSTALLED_VENDOR_BOOTIMAGE_TARGET == "" && BOARD_USES_GENERIC_KERNEL_IMAGE != true

	echo "$(INTERNAL_KERNEL_CMDLINE)" > $(zip_root)/BOOT/cmdline

ifdef INSTALLED_2NDBOOTLOADER_TARGET

ifdef INSTALLED_2NDBOOTLOADER_TARGET

	cp $(INSTALLED_2NDBOOTLOADER_TARGET) $(zip_root)/BOOT/second

	cp $(INSTALLED_2NDBOOTLOADER_TARGET) $(zip_root)/BOOT/second

endif

endif

ifdef INSTALLED_DTBIMAGE_TARGET

ifdef INSTALLED_DTBIMAGE_TARGET

	cp $(INSTALLED_DTBIMAGE_TARGET) $(zip_root)/BOOT/dtb

	cp $(INSTALLED_DTBIMAGE_TARGET) $(zip_root)/BOOT/dtb

endif

endif

	echo "$(INTERNAL_KERNEL_CMDLINE)" > $(zip_root)/BOOT/cmdline

ifdef BOARD_KERNEL_BASE

ifdef BOARD_KERNEL_BASE

	echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/BOOT/base

	echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/BOOT/base

endif

endif

ifdef BOARD_KERNEL_PAGESIZE

ifdef BOARD_KERNEL_PAGESIZE

	echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/BOOT/pagesize

	echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/BOOT/pagesize

endif

endif

else # INSTALLED_VENDOR_BOOTIMAGE_TARGET defined

endif # INSTALLED_VENDOR_BOOTIMAGE_TARGET == "" && BOARD_USES_GENERIC_KERNEL_IMAGE != true

	echo "$(GENERIC_KERNEL_CMDLINE)" > $(zip_root)/BOOT/cmdline

endif # INSTALLED_VENDOR_BOOTIMAGE_TARGET defined

endif # BOARD_USES_RECOVERY_AS_BOOT not true

endif # BOARD_USES_RECOVERY_AS_BOOT not true

	$(hide) $(foreach t,$(INSTALLED_RADIOIMAGE_TARGET),\

	$(hide) $(foreach t,$(INSTALLED_RADIOIMAGE_TARGET),\

	            mkdir -p $(zip_root)/RADIO; \

	            mkdir -p $(zip_root)/RADIO; \