diff options
| author | chrisl7 <wandersonrodriguesf1@gmail.com> | 2023-02-25 06:42:27 -0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2023-07-15 00:23:20 +0800 |
| commit | 9de2d055cfd06ef42012ad07fe3ce45952b2dfff (patch) | |
| tree | 39f6ce115247935c4ccc0dc22f05963a955b7367 | |
| parent | 9163a6e445efee928a640f9905ae1009f5fb632d (diff) | |
generate_extra_images: Update to LA.VENDOR.13.2.0.r1-13100-KAILUA.0
Change-Id: Ia59b82e047341d4b5b8fe37cfc90387fd3e39d99
Signed-off-by: chrisl7 <wandersonrodriguesf1@gmail.com>
| -rw-r--r-- | generate_extra_images.mk | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/generate_extra_images.mk b/generate_extra_images.mk index f097df7..828ddf1 100644 --- a/generate_extra_images.mk +++ b/generate_extra_images.mk @@ -62,6 +62,7 @@ $(INSTALLED_PERSISTIMAGE_TARGET): $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(INTERNAL_PERS ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PERSISTIMAGE_TARGET) ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_PERSISTIMAGE_TARGET) droidcore: $(INSTALLED_PERSISTIMAGE_TARGET) +droidcore-unbundled: $(INSTALLED_PERSISTIMAGE_TARGET) .PHONY: persistimage persistimage: $(INSTALLED_PERSISTIMAGE_TARGET) @@ -74,30 +75,49 @@ endif # As of now this in empty at build and data is runtime generated only, # so create an empty fs #---------------------------------------------------------------------- +ifneq ($(BOARD_USES_METADATA_PARTITION),) ifneq ($(strip $(BOARD_METADATAIMAGE_PARTITION_SIZE)),) TARGET_OUT_METADATA := $(PRODUCT_OUT)/metadata INSTALLED_METADATAIMAGE_TARGET := $(PRODUCT_OUT)/metadata.img +ifeq ($(BOARD_METADATAIMAGE_FILE_SYSTEM_TYPE),ext4) define build-metadataimage-target $(call pretty,"Target metadata fs image: $(INSTALLED_METADATAIMAGE_TARGET)") @mkdir -p $(TARGET_OUT_METADATA) - $(hide)PATH=$(HOST_OUT_EXECUTABLES):$${PATH} $(MKEXTUSERIMG) -s $(TARGET_OUT_METADATA) $@ ext4 metadata $(BOARD_METADATAIMAGE_PARTITION_SIZE) + $(hide)PATH=$(HOST_OUT_EXECUTABLES):$${PATH} $(MKEXTUSERIMG) -s $(TARGET_OUT_METADATA) $@ $(BOARD_METADATAIMAGE_FILE_SYSTEM_TYPE) metadata $(BOARD_METADATAIMAGE_PARTITION_SIZE) $(hide) chmod a+r $@ endef $(INSTALLED_METADATAIMAGE_TARGET): $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(build-metadataimage-target) +else +ifeq ($(BOARD_METADATAIMAGE_FILE_SYSTEM_TYPE),f2fs) +define build-metadataimage-target + $(call pretty,"Target metadata fs image: $(INSTALLED_METADATAIMAGE_TARGET)") + @mkdir -p $(TARGET_OUT_METADATA) + $(hide)PATH=$(HOST_OUT_EXECUTABLES):$${PATH} $(MKF2FSUSERIMG) $(INSTALLED_METADATAIMAGE_TARGET) $(BOARD_METADATAIMAGE_PARTITION_SIZE) -S -f $(TARGET_OUT_METADATA) -t metadata -L metadata $@ + $(hide) chmod a+r $@ +endef + +$(INSTALLED_METADATAIMAGE_TARGET): $(MKF2FSUSERIMG) + $(build-metadataimage-target) + +endif +endif + ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_METADATAIMAGE_TARGET) ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_METADATAIMAGE_TARGET) droidcore: $(INSTALLED_METADATAIMAGE_TARGET) +droidcore-unbundled: $(INSTALLED_METADATAIMAGE_TARGET) .PHONY: metadataimage metadataimage: $(INSTALLED_METADATAIMAGE_TARGET) endif +endif #---------------------------------------------------------------------- # Generate device tree overlay image (dtbo.img) @@ -241,8 +261,12 @@ kernelclean: $(hide) if [ -f "$(PRODUCT_OUT)/kernel" ]; then rm $(PRODUCT_OUT)/kernel; fi @echo "kernel cleanup done" +ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true) # Set correct dependency for kernel modules ifneq ($(KERNEL_MODULES_INSTALL),) +ifneq ($(BOARD_GKI_KERNEL_MODULES),) +$(BOARD_GKI_KERNEL_MODULES): $(INSTALLED_BOOTIMAGE_TARGET) +endif ifneq ($(BOARD_VENDOR_KERNEL_MODULES),) $(BOARD_VENDOR_KERNEL_MODULES): $(INSTALLED_BOOTIMAGE_TARGET) endif @@ -250,6 +274,7 @@ ifneq ($(BOARD_RECOVERY_KERNEL_MODULES),) $(BOARD_RECOVERY_KERNEL_MODULES): $(INSTALLED_BOOTIMAGE_TARGET) endif endif +endif define board-vendorkernel-ota $(call pretty,"Processing following kernel modules for vendor: $(BOARD_VENDOR_KERNEL_MODULES)") |