StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass kernel version file to check_vintf.

Browse Source 
check_vintf now accept a path to a file that contains the kernel
version string. Use it.

Test: m check-vintf-all and manual inspect
Bug: 161317193
Change-Id: I4812c93f352686d73c5832d59e43a297d93e67a2
This commit is contained in:
Yifan Hong
2020-11-13 18:30:06 -08:00
parent 4cecc43796
commit 72e78f21b2
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -3759,7 +3759,7 @@ my_board_extracted_kernel :=
endif # INSTALLED_KERNEL_TARGET endif # INSTALLED_KERNEL_TARGET
check_vintf_compatible_args += --kernel $$(cat $(BUILT_KERNEL_VERSION_FILE)):$(BUILT_KERNEL_CONFIGS_FILE) check_vintf_compatible_args += --kernel $(BUILT_KERNEL_VERSION_FILE):$(BUILT_KERNEL_CONFIGS_FILE)
check_vintf_compatible_deps += $(BUILT_KERNEL_CONFIGS_FILE) $(BUILT_KERNEL_VERSION_FILE) check_vintf_compatible_deps += $(BUILT_KERNEL_CONFIGS_FILE) $(BUILT_KERNEL_VERSION_FILE)
endif # PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS endif # PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS

5
tools/releasetools/check_target_files_vintf.py
View File

@@ -100,10 +100,7 @@ def GetArgsForKernel(input_tmp):
'PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS is not set') 'PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS is not set')
return [] return []
with open(version_path) as f: return ['--kernel', '{}:{}'.format(version_path, config_path)]
version = f.read().strip()
return ['--kernel', '{}:{}'.format(version, config_path)]
def CheckVintfFromExtractedTargetFiles(input_tmp, info_dict=None): def CheckVintfFromExtractedTargetFiles(input_tmp, info_dict=None):