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

Merge changes from topic "gki_vintf_level"

Browse Source 
* changes:
  Pass kernel release file to check_vintf.
  Pass kernel version file to check_vintf.
This commit is contained in:
Yifan Hong
2020-11-16 23:48:47 +00:00
committed by Gerrit Code Review
parent 59dd38cdb0 b95d02eac9
commit 187e975927
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -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)) $(BUILT_KERNEL_CONFIGS_FILE): $(EXTRACT_KERNEL) $(firstword $(INSTALLED_KERNEL_TARGET))
$< --tools $(PRIVATE_DECOMPRESS_TOOLS) --input $(firstword $(INSTALLED_KERNEL_TARGET)) \ $< --tools $(PRIVATE_DECOMPRESS_TOOLS) --input $(firstword $(INSTALLED_KERNEL_TARGET)) \
--output-configs $@ \ --output-configs $@ \
--output-version $(BUILT_KERNEL_VERSION_FILE) --output-release $(BUILT_KERNEL_VERSION_FILE)
my_decompress_tools := my_decompress_tools :=
@@ -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):