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

Commit 03130d98 authored by Vincent Donnefort's avatar Vincent Donnefort Committed by Automerger Merge Worker
Browse files

Merge "Add null and console dev nodes to the Android initramfs" am: 6133aea4 

Original change: https://android-review.googlesource.com/c/platform/build/+/2368008



Change-Id: I8f706fe07bc3dcbc00753f52612aae1304d2d569
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b261e8a2 6133aea4

core/Makefile

+5 −2
Original line number Original line Diff line number Diff line
@@ -918,16 +918,19 @@ COMPRESSION_COMMAND := $(MINIGZIP) 
RAMDISK_EXT := .gz

RAMDISK_EXT := .gz

endif

endif





# This file contains /dev nodes description added to the generic ramdisk

RAMDISK_NODE_LIST := $(PRODUCT_OUT)/ramdisk_node_list



# We just build this directly to the install location.

# We just build this directly to the install location.

INSTALLED_RAMDISK_TARGET := $(BUILT_RAMDISK_TARGET)

INSTALLED_RAMDISK_TARGET := $(BUILT_RAMDISK_TARGET)

$(INSTALLED_RAMDISK_TARGET): PRIVATE_DIRS := debug_ramdisk dev metadata mnt proc second_stage_resources sys

$(INSTALLED_RAMDISK_TARGET): PRIVATE_DIRS := debug_ramdisk dev metadata mnt proc second_stage_resources sys

$(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_RAMDISK_FILES) $(INSTALLED_FILES_FILE_RAMDISK) | $(COMPRESSION_COMMAND_DEPS)

$(INSTALLED_RAMDISK_TARGET): $(MKBOOTFS) $(RAMDISK_NODE_LIST) $(INTERNAL_RAMDISK_FILES) $(INSTALLED_FILES_FILE_RAMDISK) | $(COMPRESSION_COMMAND_DEPS)

	$(call pretty,"Target ramdisk: $@")

	$(call pretty,"Target ramdisk: $@")

	$(hide) mkdir -p $(addprefix $(TARGET_RAMDISK_OUT)/,$(PRIVATE_DIRS))

	$(hide) mkdir -p $(addprefix $(TARGET_RAMDISK_OUT)/,$(PRIVATE_DIRS))

ifeq (true,$(BOARD_USES_GENERIC_KERNEL_IMAGE))

ifeq (true,$(BOARD_USES_GENERIC_KERNEL_IMAGE))

	$(hide) mkdir -p $(addprefix $(TARGET_RAMDISK_OUT)/first_stage_ramdisk/,$(PRIVATE_DIRS))

	$(hide) mkdir -p $(addprefix $(TARGET_RAMDISK_OUT)/first_stage_ramdisk/,$(PRIVATE_DIRS))

endif

endif

	$(hide) $(MKBOOTFS) -d $(TARGET_OUT) $(TARGET_RAMDISK_OUT) | $(COMPRESSION_COMMAND) > $@

	$(hide) $(MKBOOTFS) -n $(RAMDISK_NODE_LIST) -d $(TARGET_OUT) $(TARGET_RAMDISK_OUT) | $(COMPRESSION_COMMAND) > $@





$(call declare-1p-container,$(INSTALLED_RAMDISK_TARGET),)

$(call declare-1p-container,$(INSTALLED_RAMDISK_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_RAMDISK_TARGET),$(INTERNAL_RAMDISK_FILE),$(PRODUCT_OUT)/:/)

$(call declare-container-license-deps,$(INSTALLED_RAMDISK_TARGET),$(INTERNAL_RAMDISK_FILE),$(PRODUCT_OUT)/:/)