diff options
| -rwxr-xr-x | buildkernel.sh | 2 | ||||
| -rw-r--r-- | kernel_definitions.mk | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/buildkernel.sh b/buildkernel.sh index fc629d4..ae0ba52 100755 --- a/buildkernel.sh +++ b/buildkernel.sh @@ -32,7 +32,7 @@ export MODULES_STAGING_DIR=$(readlink -m ${COMMON_OUT_DIR}/staging) export KERNEL_PREBUILT_DIR=$(readlink -m ${KERNEL_DIR}/../ship_prebuilt) export MODULES_PRIVATE_DIR=$(readlink -m ${COMMON_OUT_DIR}/private) export DIST_DIR=$(readlink -m ${DIST_DIR:-${COMMON_OUT_DIR}/dist}) -export UNSTRIPPED_DIR=${ROOT_DIR}/${KERNEL_MODULES_OUT}/unstripped +export UNSTRIPPED_DIR=${KERNEL_MODULES_OUT}/unstripped export CLANG_TRIPLE CROSS_COMPILE CROSS_COMPILE_ARM32 ARCH SUBARCH #Setting up for build 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 |