Commit 3325db7e authored Nov 13, 2021 by lambdadroid Committed by Tommaso Fonda Nov 15, 2021

build: Respect fs_config when generating recovery ramdisk

Without the -d $(TARGET_OUT) option for mkbootfs, only the
compiled-in fs_config (from AOSP) is used for the generated
ramdisk image. Device-specific additions are ignored.

This is why AOSP sets this option for both the boot- and recovery
ramdisk [1]. However, the option was removed for the recovery ramdisk
in review.lineageos.org/c/LineageOS/android_build/+/222722

This causes device-specific fs_config additions to be ignored when
generating the recovery ramdisk, potentially setting the wrong
permissions.

[1]: android.googlesource.com/platform/build/+/refs/tags/android-9.0.0_r37/core/Makefile#1388

Change-Id: I0f77a49d8b2f08791e60b34ddbb6f3b32bc2f0bc

parent 41c7f433

core/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2249,7 +2249,7 @@ $(recovery_uncompressed_ramdisk): $(MKBOOTFS) \
		ln -sf prop.default $(TARGET_RECOVERY_ROOT_OUT)/default.prop
		$(BOARD_RECOVERY_IMAGE_PREPARE)
		@echo ----- Making uncompressed recovery ramdisk ------
		$(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) > $@
		$(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RECOVERY_ROOT_OUT) > $@

		$(recovery_ramdisk): $(recovery_uncompressed_ramdisk) $(COMPRESSION_COMMAND_DEPS)
		@echo ----- Making compressed recovery ramdisk ------