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

Commit 564b4987 authored by marcost2's avatar marcost2 Committed by Arne Coucheron
Browse files

Add support for separate kernels for boot and recovery [2/2] 

* Either as prebuilts, or with separate defconfigs

Change-Id: Iae31e3634178e66b4119c718994fe1c660414529
parent a33a4a72

core/Makefile

+10 −4
Original line number Diff line number Diff line
@@ -1104,6 +1104,11 @@ else 
  INSTALLED_KERNEL_TARGET :=

endif



ifneq "$(or $(TARGET_KERNEL_RECOVERY_CONFIG), $(TARGET_PREBUILT_RECOVERY_KERNEL))" ""

INSTALLED_RECOVERY_KERNEL := $(PRODUCT_OUT)/recovery_kernel

else

INSTALLED_RECOVERY_KERNEL := $(INSTALLED_KERNEL_TARGET)

endif

# -----------------------------------------------------------------

# the root dir

INTERNAL_ROOT_FILES := $(filter $(TARGET_ROOT_OUT)/%, \
@@ -1941,8 +1946,7 @@ recovery_sepolicy := \ 
# Passed into rsync from non-recovery root to recovery root, to avoid overwriting recovery-specific

# SELinux files

IGNORE_RECOVERY_SEPOLICY := $(patsubst $(TARGET_RECOVERY_OUT)/%,--exclude=/%,$(recovery_sepolicy))



recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system

recovery_kernel := $(INSTALLED_RECOVERY_KERNEL)

recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img

recovery_uncompressed_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.cpio

recovery_resources_common := $(call include-path-for, recovery)/res
@@ -4622,6 +4626,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	    $(INSTALLED_CUSTOMIMAGES_TARGET) \

	    $(INTERNAL_SYSTEMOTHERIMAGE_FILES) \

	    $(INSTALLED_ANDROID_INFO_TXT_TARGET) \

	    $(INSTALLED_RECOVERY_KERNEL) \

	    $(INSTALLED_KERNEL_TARGET) \

	    $(INSTALLED_DTBIMAGE_TARGET) \

	    $(INSTALLED_2NDBOOTLOADER_TARGET) \
@@ -4660,8 +4665,9 @@ ifneq (,$(INSTALLED_RECOVERYIMAGE_TARGET)$(filter true,$(BOARD_USES_RECOVERY_AS_ 
	@# OTA install helpers

	$(hide) $(call package_files-copy-root, \

	    $(PRODUCT_OUT)/install,$(zip_root)/INSTALL)

ifdef INSTALLED_KERNEL_TARGET

	cp $(INSTALLED_KERNEL_TARGET) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/

ifdef INSTALLED_RECOVERY_KERNEL

# The python script that wraps it all up wants it to be named kernel, so do that

	cp $(INSTALLED_RECOVERY_KERNEL) $(zip_root)/$(PRIVATE_RECOVERY_OUT)/kernel 

endif

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

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