From b95d02eac9fd6f88402cdb3a215ee6af2d6d458c Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Fri, 13 Nov 2020 18:33:01 -0800 Subject: [PATCH] Pass kernel release file to check_vintf. check_vintf now accepts a file that contains the full kernel release string as the first half of --kernel. Use it. With this patch, BOARD_KERNEL_VERSION can be a full kernel release string like 5.4.42-something, or 5.4.42-android12-0-something. The content of target_files/META/kernel_version.txt also contains the full kernel release, not just the kernel version. Bug: 161317193 Test: m check-vintf-all Change-Id: I3b52639f557532077894d9356c745c16b41dd91c --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index b4ca842e7c..1225b88023 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3750,7 +3750,7 @@ $(BUILT_KERNEL_CONFIGS_FILE): $(foreach pair,$(my_decompress_tools),$(call word- $(BUILT_KERNEL_CONFIGS_FILE): $(EXTRACT_KERNEL) $(firstword $(INSTALLED_KERNEL_TARGET)) $< --tools $(PRIVATE_DECOMPRESS_TOOLS) --input $(firstword $(INSTALLED_KERNEL_TARGET)) \ --output-configs $@ \ - --output-version $(BUILT_KERNEL_VERSION_FILE) + --output-release $(BUILT_KERNEL_VERSION_FILE) my_decompress_tools :=