diff options
| author | Anay Wadhera <awadhera@berkeley.edu> | 2021-05-07 12:25:25 -0700 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2022-01-13 16:38:27 +0800 |
| commit | 5df3eb84cea8076767f4eaade4fea373f33bddc5 (patch) | |
| tree | eb2ce0300747d83dcc0eb4204f108a1b8928071d /kernel_definitions.mk | |
| parent | d19851547c9509b24c19c482949240871375d6f8 (diff) | |
kernelscripts: Fix GKI config generation and fix unstripped module location.
Change-Id: I01fcc121905c2c96f9b0e6e0494d98f616f5ccab
Diffstat (limited to 'kernel_definitions.mk')
| -rw-r--r-- | kernel_definitions.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel_definitions.mk b/kernel_definitions.mk index 1b1ba85..fdbb215 100644 --- a/kernel_definitions.mk +++ b/kernel_definitions.mk @@ -15,11 +15,15 @@ ifeq ($(TARGET_KERNEL_SOURCE),) TARGET_KERNEL_SOURCE := kernel/$(TARGET_KERNEL) endif +SOURCE_ROOT := $(shell pwd) +MAKE_PATH := $(SOURCE_ROOT)/prebuilts/build-tools/linux-x86/bin/ DEPMOD := $(HOST_OUT_EXECUTABLES)/depmod$(HOST_EXECUTABLE_SUFFIX) DTC := $(HOST_OUT_EXECUTABLES)/dtc$(HOST_EXECUTABLE_SUFFIX) #UFDT_APPLY_OVERLAY := $(HOST_OUT_EXECUTABLES)/ufdt_apply_overlay$(HOST_EXECUTABLE_SUFFIX) -SOURCE_ROOT := $(shell pwd) +ifneq (,$(wildcard $(OUT_DIR)/.path_interposer_origpath)) +PATH_OVERRIDE := PATH=$(shell cat $(OUT_DIR)/.path_interposer_origpath):$$PATH +endif ifneq ($(strip $(OUT_DIR)), out) TARGET_KERNEL_MAKE_ENV := DTC_EXT=$(DTC) @@ -146,6 +150,9 @@ GKI_PLATFORM_NAME := $(shell echo $(KERNEL_DEFCONFIG) | sed -r "s/(-gki_defconfi GKI_PLATFORM_NAME := $(shell echo $(GKI_PLATFORM_NAME) | sed "s/vendor\///g") TARGET_USES_UNCOMPRESSED_KERNEL := $(shell grep "CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y" $(TARGET_KERNEL_SOURCE)/arch/arm64/configs/vendor/$(GKI_PLATFORM_NAME)_GKI.config) +# Generate the defconfig file from the fragments +cmd := $(PATH_OVERRIDE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) KERN_OUT=$(KERNEL_OUT) $(TARGET_KERNEL_MAKE_ENV) MAKE_PATH=$(MAKE_PATH) TARGET_BUILD_VARIANT=${TARGET_BUILD_VARIANT} $(TARGET_KERNEL_SOURCE)/scripts/gki/generate_defconfig.sh $(KERNEL_DEFCONFIG) +_x := $(shell $(cmd)) else TARGET_USES_UNCOMPRESSED_KERNEL := $(shell grep "CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y" $(TARGET_KERNEL_SOURCE)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG)) endif @@ -172,7 +179,6 @@ endif KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr KERNEL_MODULES_INSTALL ?= system KERNEL_MODULES_OUT ?= $(PRODUCT_OUT)/$(KERNEL_MODULES_INSTALL)/lib/modules - TARGET_PREBUILT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL) endif @@ -247,8 +253,6 @@ ifdef RTIC_MPGEN RTIC_DTB := $(KERNEL_SYMLINK)/rtic_mp.dtb endif -MAKE_PATH := $(SOURCE_ROOT)/prebuilts/build-tools/linux-x86/bin/ - # Helper functions # Build the kernel |