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

Commit 052f5861 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove BOARD_KERNEL_CONFIG_FILE pacakging logic" into main am: 1917078b am: 1340a41c 

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



Change-Id: If733264e8ee1de56c321ddaa270385277f991dbe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2f93447 1340a41c

core/Makefile

+1 −8
Original line number Diff line number Diff line
@@ -5343,7 +5343,7 @@ my_decompress_tools := \ 
    lz4:$(HOST_OUT_EXECUTABLES)/lz4 \





# BOARD_KERNEL_CONFIG_FILE and BOARD_KERNEL_VERSION can be used to override the values extracted

# BOARD_KERNEL_VERSION can be used to override the values extracted

# from INSTALLED_KERNEL_TARGET.

ifdef BOARD_KERNEL_VERSION

$(BUILT_KERNEL_VERSION_FILE): PRIVATE_DECOMPRESS_TOOLS := $(my_decompress_tools)
@@ -5355,15 +5355,8 @@ $(BUILT_KERNEL_VERSION_FILE): $(EXTRACT_KERNEL) $(firstword $(INSTALLED_KERNEL_T 
    echo "Specified kernel version '$(BOARD_KERNEL_VERSION)' does not match actual kernel version '$$KERNEL_RELEASE' " ; exit 1; fi;

	echo '$(BOARD_KERNEL_VERSION)' > $@



ifdef BOARD_KERNEL_CONFIG_FILE

$(BUILT_KERNEL_CONFIGS_FILE): $(BOARD_KERNEL_CONFIG_FILE)

	cp $< $@



$(call declare-license-metadata,$(BUILT_KERNEL_CONFIGS_FILE),SPDX-license-identifier-GPL-2.0-only,restricted,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,"Kernel",kernel)

$(call declare-license-metadata,$(BUILT_KERNEL_VERSION_FILE),SPDX-license-identifier-GPL-2.0-only,restricted,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,"Kernel",kernel)



my_board_extracted_kernel := true

endif # BOARD_KERNEL_CONFIG_FILE

endif # BOARD_KERNEL_VERSION