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

Commit 4b0eb2c3 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 6cc90d7b 231338af

build/tasks/kernel.mk

+2 −3
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ TARGET_MERGE_DTBS_WILDCARD ?= * 


## Internal variables

DTC := $(HOST_OUT_EXECUTABLES)/dtc

PAHOLE := $(HOST_OUT_EXECUTABLES)/pahole

KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ

RECOVERY_KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/RECOVERY_KERNEL_OBJ

DTBO_OUT := $(TARGET_OUT_INTERMEDIATES)/DTBO_OBJ
@@ -435,7 +434,7 @@ $(KERNEL_CONFIG): $(KERNEL_OUT) $(ALL_KERNEL_DEFCONFIG_SRCS) 
	@echo "Building Kernel Config"

	$(call make-kernel-config,$(KERNEL_OUT),$(KERNEL_DEFCONFIG))



$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) $(PAHOLE)

$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC)

	@echo "Building Kernel Image ($(BOARD_KERNEL_IMAGE_NAME))"

	$(call make-kernel-target,$(BOARD_KERNEL_IMAGE_NAME))

	$(hide) if grep -q '^CONFIG_OF=y' $(KERNEL_CONFIG); then \
@@ -609,7 +608,7 @@ $(RECOVERY_KERNEL_CONFIG): $(ALL_RECOVERY_KERNEL_DEFCONFIG_SRCS) 
	@echo "Building Recovery Kernel Config"

	$(call make-kernel-config,$(RECOVERY_KERNEL_OUT),$(RECOVERY_DEFCONFIG))



$(TARGET_PREBUILT_INT_RECOVERY_KERNEL): $(RECOVERY_KERNEL_CONFIG) $(DEPMOD) $(DTC) $(PAHOLE)

$(TARGET_PREBUILT_INT_RECOVERY_KERNEL): $(RECOVERY_KERNEL_CONFIG) $(DEPMOD) $(DTC)

	@echo "Building Recovery Kernel Image ($(BOARD_KERNEL_IMAGE_NAME))"

	$(call make-recovery-kernel-target,$(BOARD_KERNEL_IMAGE_NAME))

config/BoardConfigKernel.mk

+3 −0
Original line number Diff line number Diff line
@@ -219,6 +219,9 @@ KERNEL_MAKE_FLAGS += YACC=$(BUILD_TOP)/prebuilts/build-tools/$(HOST_PREBUILT_TAG 
KERNEL_MAKE_FLAGS += M4=$(BUILD_TOP)/prebuilts/build-tools/$(HOST_PREBUILT_TAG)/bin/m4

TOOLS_PATH_OVERRIDE += BISON_PKGDATADIR=$(BUILD_TOP)/prebuilts/build-tools/common/bison



# Since Linux 5.10, pahole is required

KERNEL_MAKE_FLAGS += PAHOLE=$(BUILD_TOP)/prebuilts/kernel-build-tools/linux-x86/bin/pahole



# Set the out dir for the kernel's O= arg

# This needs to be an absolute path, so only set this if the standard out dir isn't used

OUT_DIR_PREFIX := $(shell echo $(OUT_DIR) | sed -e 's|/target/.*$$||g')