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

Unverified Commit ffbbec17 authored by Michael Bestas's avatar Michael Bestas
Browse files

Revert "Remove mkyaffs2image references." 

* Can be enabled on devices that need it with TARGET_USERIMAGES_USE_YAFFS

This reverts commit 65d4186f.

Change-Id: I891f2e6a963178ffec92fedb25e7e28c60a768d1
parent b701f064

core/Makefile

+15 −2
Original line number Diff line number Diff line
@@ -786,6 +786,9 @@ ifeq ($(INTERNAL_USERIMAGES_EXT_VARIANT),) 
INTERNAL_USERIMAGES_EXT_VARIANT := f2fs

endif

endif

ifeq ($(TARGET_USERIMAGES_USE_YAFFS),true)

INTERNAL_USERIMAGES_USE_YAFFS := true

endif



# These options tell the recovery updater/installer how to mount the partitions writebale.

# <fstype>=<fstype_opts>[|<fstype_opts>]...
@@ -805,6 +808,9 @@ endif 
ifeq ($(INTERNAL_USERIMAGES_USE_F2FS),true)

INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS)

endif

ifeq ($(INTERNAL_USERIMAGES_USE_YAFFS),true)

INTERNAL_USERIMAGES_DEPS += $(MKYAFFS2)

endif



ifneq (true,$(TARGET_USERIMAGES_SPARSE_SQUASHFS_DISABLED))

  INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG := -s
@@ -859,6 +865,7 @@ $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VENDOR_BASE_FS_PATH),$(hide) echo "v 
$(if $(BOARD_OEMIMAGE_PARTITION_SIZE),$(hide) echo "oem_size=$(BOARD_OEMIMAGE_PARTITION_SIZE)" >> $(1))

$(if $(BOARD_OEMIMAGE_JOURNAL_SIZE),$(hide) echo "oem_journal_size=$(BOARD_OEMIMAGE_JOURNAL_SIZE)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG),$(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(1))

$(if $(mkyaffs2_extra_flags),$(hide) echo "mkyaffs2_extra_flags=$(mkyaffs2_extra_flags)" >> $(1))

$(if $(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG),$(hide) echo "squashfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG)" >> $(1))

$(hide) echo "selinux_fc=$(SELINUX_FC)" >> $(1)

$(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER),$(hide) echo "boot_signer=$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)" >> $(1))
@@ -1161,11 +1168,16 @@ endif 
.PHONY: recoveryimage

recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_RESOURCE_ZIP)



ifeq ($(BOARD_NAND_PAGE_SIZE),)

ifneq ($(BOARD_NAND_PAGE_SIZE),)

mkyaffs2_extra_flags := -c $(BOARD_NAND_PAGE_SIZE)

else

mkyaffs2_extra_flags :=

BOARD_NAND_PAGE_SIZE := 2048

endif



ifeq ($(BOARD_NAND_SPARE_SIZE),)

ifneq ($(BOARD_NAND_SPARE_SIZE),)

mkyaffs2_extra_flags += -s $(BOARD_NAND_SPARE_SIZE)

else

BOARD_NAND_SPARE_SIZE := 64

endif
@@ -1705,6 +1717,7 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ 
  $(HOST_OUT_EXECUTABLES)/mkbootimg \

  $(HOST_OUT_EXECUTABLES)/unpackbootimg \

  $(HOST_OUT_EXECUTABLES)/fs_config \

  $(HOST_OUT_EXECUTABLES)/mkyaffs2image \

  $(HOST_OUT_EXECUTABLES)/zipalign \

  $(HOST_OUT_EXECUTABLES)/bsdiff \

  $(HOST_OUT_EXECUTABLES)/imgdiff \

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -556,6 +556,7 @@ MKBOOTIMG := $(HOST_OUT_EXECUTABLES)/mkbootimg$(HOST_EXECUTABLE_SUFFIX) 
else

MKBOOTIMG := $(BOARD_CUSTOM_MKBOOTIMG)

endif

MKYAFFS2 := $(HOST_OUT_EXECUTABLES)/mkyaffs2image$(HOST_EXECUTABLE_SUFFIX)

APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX)

MKIMAGE :=  $(HOST_OUT_EXECUTABLES)/mkimage$(HOST_EXECUTABLE_SUFFIX)

FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX)