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

Commit 54fdb2ce authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents 31a9adfa 290dabda

build/tasks/kernel.mk

+8 −2
Original line number Diff line number Diff line
@@ -106,7 +106,13 @@ KERNEL_CONFIG := $(KERNEL_OUT)/.config 
KERNEL_RELEASE := $(KERNEL_OUT)/include/config/kernel.release

RECOVERY_KERNEL_CONFIG := $(RECOVERY_KERNEL_OUT)/.config

RECOVERY_KERNEL_RELEASE := $(RECOVERY_KERNEL_OUT)/include/config/kernel.release

GKI_SUFFIX := $(shell echo android$(PLATFORM_VERSION)-$(TARGET_KERNEL_VERSION))

ifeq ($(BOARD_USES_QCOM_HARDWARE),true)

ifeq ($(shell expr $(TARGET_KERNEL_VERSION) \>= 5.15), 1)

ifeq ($(shell expr $(TARGET_KERNEL_VERSION) \<= 6.1), 1)

GKI_SUFFIX := /$(shell echo android$(PLATFORM_VERSION)-$(TARGET_KERNEL_VERSION))

endif

endif

endif



ifeq ($(KERNEL_ARCH),x86_64)

KERNEL_DEFCONFIG_ARCH := x86
@@ -536,7 +542,7 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) $(KERNEL_MODULE 
					if [ -n "$$p" ]; then echo $$p; else echo "ERROR: $$m from SYSTEM_KERNEL_MODULES was not found" 1>&2 && exit 1; fi; \

				done); \

				[ $$? -ne 0 ] && exit 1; \

				($(call build-image-kernel-modules-lineage,$$gki_modules,$(SYSTEM_KERNEL_MODULES_OUT),$(SYSTEM_KERNEL_MODULE_MOUNTPOINT)/,$(SYSTEM_KERNEL_DEPMOD_STAGING_DIR),$(BOARD_SYSTEM_KERNEL_MODULES_LOAD),/$(GKI_SUFFIX),$(SYSTEM_KERNEL_MODULES_PARTITION_FILE_LIST),)) || exit "$$?"; \

				($(call build-image-kernel-modules-lineage,$$gki_modules,$(SYSTEM_KERNEL_MODULES_OUT),$(SYSTEM_KERNEL_MODULE_MOUNTPOINT)/,$(SYSTEM_KERNEL_DEPMOD_STAGING_DIR),$(BOARD_SYSTEM_KERNEL_MODULES_LOAD),$(GKI_SUFFIX),$(SYSTEM_KERNEL_MODULES_PARTITION_FILE_LIST),)) || exit "$$?"; \

				filtered_modules=$$(for n in $$all_modules; do \

					module_name=$$(basename $$n); \

					if [[ ! "$(SYSTEM_KERNEL_MODULES)" =~ "$$module_name" ]]; then echo $$n; fi; \

vars/qcom

+6 −0
Original line number Diff line number Diff line
@@ -25,3 +25,9 @@ qcom_group_revision[lanai-audio]=AUDIO.LA.9.0.r1-08500-lanai.0 
qcom_group_revision[lanai-vendor]=LA.VENDOR.14.3.0.r1-20500-lanai.QSSI15.0

# https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wfd-commonsys/-/tags?sort=updated_desc&search=VIDEO.LA.4.0.r2

qcom_group_revision[lanai-video]=VIDEO.LA.4.0.r2-07400-lanai.0

# https://git.codelinaro.org/clo/la/platform/hardware/qcom/audio-ar/-/tags?sort=updated_desc&search=AUDIO_HANDSET.LA.10.0.r1

qcom_group_revision[pakala-audio]=AUDIO_HANDSET.LA.10.0.r1-06400-pakala.0

# https://git.codelinaro.org/clo/la/device/qcom/sepolicy_vndr/-/tags?sort=updated_desc&search=LA.VENDOR.15.4.0.r1

qcom_group_revision[pakala-vendor]=LA.VENDOR.15.4.0.r1-17900-pakala.0

# https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/wfd-commonsys/-/tags?sort=updated_desc&search=VIDEO.LA.5.0.r1

qcom_group_revision[pakala-video]=VIDEO.LA.5.0.r1-06200-pakala.0