From 9113badc39c4d86301277b51a1393258cfbdfe0c Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Thu, 24 Aug 2023 14:26:23 -0700 Subject: [PATCH] Fix 16K page size kernel config check Non 16K kernels might have "CONFIG_ARM64_16K_PAGES is not set" string in kernel config, properly handle this case. Test: th Bug: 293313353 Change-Id: I1a9582503c5fd20b8dcf95406166df7e11940424 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 982e0c1e19..863e560c4d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1077,7 +1077,7 @@ $(BUILT_RAMDISK_16K_TARGET): $(foreach file,$(BOARD_KERNEL_MODULES_16K),$(RAMDIS mkdir -p $(TARGET_OUT_RAMDISK_16K)/lib/modules KERNEL_RELEASE=`$(EXTRACT_KERNEL) --input $(BOARD_KERNEL_PATH_16K) --output-release /dev/stdout` ;\ IS_16K_KERNEL=`$(EXTRACT_KERNEL) --input $(BOARD_KERNEL_PATH_16K) --output-config /dev/stdout` ;\ - if [[ "$$IS_16K_KERNEL" == *"CONFIG_ARM64_16K_PAGES"* ]]; then SUFFIX=_16k; fi ;\ + if [[ "$$IS_16K_KERNEL" == *"CONFIG_ARM64_16K_PAGES=y"* ]]; then SUFFIX=_16k; fi ;\ cp -r $(RAMDISK_16K_STAGING_DIR)/lib/modules/0.0 $(TARGET_OUT_RAMDISK_16K)/lib/modules/$$KERNEL_RELEASE$$SUFFIX $(MKBOOTFS) $(TARGET_OUT_RAMDISK_16K) | $(COMPRESSION_COMMAND) > $@