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

Commit 6cc90d7b authored by /e/ robot's avatar /e/ robot
Browse files

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

parents d125e0aa 2a0d4179

build/tasks/kernel.mk

+43 −15
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ 
#

#   TARGET_FORCE_PREBUILT_KERNEL       = Optional, use TARGET_PREBUILT_KERNEL even if

#                                          kernel sources are present

#

#   TARGET_MERGE_DTBS_WILDCARD         = Optional, limits the .dtb files used to generate the

#                                          final DTB image when using QCOM's merge_dtbs script.



ifneq ($(TARGET_NO_KERNEL),true)

ifneq ($(TARGET_NO_KERNEL_OVERRIDE),true)
@@ -78,6 +81,8 @@ KERNEL_DEFCONFIG := $(TARGET_KERNEL_CONFIG) 
RECOVERY_DEFCONFIG := $(TARGET_KERNEL_RECOVERY_CONFIG)

VARIANT_DEFCONFIG := $(TARGET_KERNEL_VARIANT_CONFIG)

SELINUX_DEFCONFIG := $(TARGET_KERNEL_SELINUX_CONFIG)

# dtb generation - optional

TARGET_MERGE_DTBS_WILDCARD ?= *



## Internal variables

DTC := $(HOST_OUT_EXECUTABLES)/dtc
@@ -94,6 +99,7 @@ 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 ($(KERNEL_ARCH),x86_64)

KERNEL_DEFCONFIG_ARCH := x86
@@ -347,20 +353,21 @@ endef 
# $(3): mount point

# $(4): staging dir

# $(5): module load list

# $(6): suffix for output dir, needed for GKI modules usecase, empty otherwise

# Depmod requires a well-formed kernel version so 0.0 is used as a placeholder.

define build-image-kernel-modules-lineage

    mkdir -p $(2)/lib/modules

    cp $(1) $(2)/lib/modules/

    mkdir -p $(2)/lib/modules$(6)

    cp $(1) $(2)/lib/modules$(6)

    rm -rf $(4)

    mkdir -p $(4)/lib/modules/0.0/$(3)lib/modules

    cp $(1) $(4)/lib/modules/0.0/$(3)lib/modules

    mkdir -p $(4)/lib/modules/0.0/$(3)lib/modules$(6)

    cp $(1) $(4)/lib/modules/0.0/$(3)lib/modules$(6)

    $(DEPMOD) -b $(4) 0.0

    sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(4)/lib/modules/0.0/modules.dep > $(2)/lib/modules/modules.dep

    cp $(4)/lib/modules/0.0/modules.softdep $(2)/lib/modules

    cp $(4)/lib/modules/0.0/modules.alias $(2)/lib/modules

    rm -f $(2)/lib/modules/modules.load

    sed -e 's/\(.*modules.*\):/\/\1:/g' -e 's/ \([^ ]*modules[^ ]*\)/ \/\1/g' $(4)/lib/modules/0.0/modules.dep > $(2)/lib/modules$(6)/modules.dep

    cp $(4)/lib/modules/0.0/modules.softdep $(2)/lib/modules$(6)

    cp $(4)/lib/modules/0.0/modules.alias $(2)/lib/modules$(6)

    rm -f $(2)/lib/modules$(6)/modules.load

    for MODULE in $(5); do \

        basename $$MODULE >> $(2)/lib/modules/modules.load; \

        basename $$MODULE >> $(2)/lib/modules$(6)/modules.load; \

    done

endef
@@ -393,6 +400,12 @@ KERNEL_DEPMOD_STAGING_DIR := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir- 
KERNEL_MODULE_MOUNTPOINT := vendor

$(INSTALLED_VENDORIMAGE_TARGET): $(TARGET_PREBUILT_INT_KERNEL)

endif

ifeq ($(BOARD_USES_SYSTEM_DLKMIMAGE),true)

SYSTEM_KERNEL_MODULES_OUT := $(TARGET_OUT_SYSTEM_DLKM)

SYSTEM_KERNEL_DEPMOD_STAGING_DIR := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir-for,PACKAGING,depmod_system_dlkm)

SYSTEM_KERNEL_MODULE_MOUNTPOINT := system_dlkm

$(INSTALLED_SYSTEM_DLKMIMAGE_TARGET): $(TARGET_PREBUILT_INT_KERNEL)

endif

MODULES_INTERMEDIATES := $(KERNEL_BUILD_OUT_PREFIX)$(call intermediates-dir-for,PACKAGING,kernel_modules)



ifneq (,$(filter dlkm,$(BOARD_VENDOR_RAMDISK_FRAGMENTS)))
@@ -447,15 +460,30 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) $(PAHOLE) 
			$(foreach s, $(TARGET_MODULE_ALIASES),\

				$(eval p := $(subst :,$(space),$(s))) \

				; mv $$(find $$kernel_modules_dir -name $(word 1,$(p))) $$kernel_modules_dir/$(word 2,$(p))); \

			modules=$$(find $$kernel_modules_dir -type f -name '*.ko'); \

			($(call build-image-kernel-modules-lineage,$$modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR),$(BOARD_VENDOR_KERNEL_MODULES_LOAD))); \

			all_modules=$$(find $$kernel_modules_dir -type f -name '*.ko'); \

			filtered_modules=""; \

			$(if $(BOARD_SYSTEM_KERNEL_MODULES),\

				gki_modules=$$(for m in $(BOARD_SYSTEM_KERNEL_MODULES); do \

					p=$$(find $$kernel_modules_dir -type f -name $$m); \

					if [ -n "$$p" ]; then echo $$p; else echo "ERROR: $$m from BOARD_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))); \

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

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

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

				done); \

				($(call build-image-kernel-modules-lineage,$$filtered_modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR),$(BOARD_VENDOR_KERNEL_MODULES_LOAD),/)); \

				,\

				($(call build-image-kernel-modules-lineage,$$all_modules,$(KERNEL_MODULES_OUT),$(KERNEL_MODULE_MOUNTPOINT)/,$(KERNEL_DEPMOD_STAGING_DIR),$(BOARD_VENDOR_KERNEL_MODULES_LOAD),/)); \

			) \

			$(if $(BOOT_KERNEL_MODULES),\

				vendor_boot_modules=$$(for m in $(BOOT_KERNEL_MODULES); do \

					p=$$(find $$kernel_modules_dir -type f -name $$m); \

					if [ -n "$$p" ]; then echo $$p; else echo "ERROR: $$m from BOOT_KERNEL_MODULES was not found" 1>&2 && exit 1; fi; \

				done); \

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

				($(call build-image-kernel-modules-lineage,$$vendor_boot_modules,$(KERNEL_VENDOR_RAMDISK_MODULES_OUT),/,$(KERNEL_VENDOR_RAMDISK_DEPMOD_STAGING_DIR),$(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD))); \

				($(call build-image-kernel-modules-lineage,$$vendor_boot_modules,$(KERNEL_VENDOR_RAMDISK_MODULES_OUT),/,$(KERNEL_VENDOR_RAMDISK_DEPMOD_STAGING_DIR),$(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD),/)); \

			) \

			$(if $(RECOVERY_KERNEL_MODULES),\

				recovery_modules=$$(for m in $(RECOVERY_KERNEL_MODULES); do \
@@ -463,7 +491,7 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) $(PAHOLE) 
					if [ -n "$$p" ]; then echo $$p; else echo "ERROR: $$m from RECOVERY_KERNEL_MODULES was not found" 1>&2 && exit 1; fi; \

				done); \

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

				($(call build-image-kernel-modules-lineage,$$recovery_modules,$(KERNEL_RECOVERY_MODULES_OUT),/,$(KERNEL_RECOVERY_DEPMOD_STAGING_DIR),$(BOARD_RECOVERY_RAMDISK_KERNEL_MODULES_LOAD))); \

				($(call build-image-kernel-modules-lineage,$$recovery_modules,$(KERNEL_RECOVERY_MODULES_OUT),/,$(KERNEL_RECOVERY_DEPMOD_STAGING_DIR),$(BOARD_RECOVERY_RAMDISK_KERNEL_MODULES_LOAD),/)); \

			) \

		fi
@@ -556,9 +584,9 @@ else 
ifeq ($(BOARD_USES_QCOM_MERGE_DTBS_SCRIPT),true)

	$(hide) find $(DTBS_BASE) -type f -name "*.dtb*" | xargs rm -f

	$(hide) find $(DTBS_OUT) -type f -name "*.dtb*" | xargs rm -f

	mv $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom/*.dtb $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom/*.dtbo $(DTBS_BASE)/

	mv $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom/*.dtb $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/*/*.dtbo $(DTBS_BASE)/

	PATH=$(abspath $(HOST_OUT_EXECUTABLES)):$${PATH} python3 $(BUILD_TOP)/vendor/lineage/build/tools/merge_dtbs.py $(DTBS_BASE) $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts/vendor/qcom $(DTBS_OUT)

	cat $(shell find $(DTB_OUT)/out -type f -name "*.dtb" | sort) > $@

	cat $(shell find $(DTB_OUT)/out -type f -name "${TARGET_MERGE_DTBS_WILDCARD}.dtb" | sort) > $@

else

	cat $(shell find $(DTB_OUT)/arch/$(KERNEL_ARCH)/boot/dts -type f -name "*.dtb" | sort) > $@

endif # BOARD_USES_QCOM_MERGE_DTBS_SCRIPT

overlay/common/frameworks/base/packages/SettingsLib/res/values/config.xml

0 → 100644
+11 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2023 The LineageOS Project

     SPDX-License-Identifier: Apache-2.0

-->

<!-- These resources are around just to allow their values to be customized -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Control whether status bar should distinguish HSPA data icon form UMTS

    data icon on devices -->

    <bool name="config_hspa_data_distinguishable">true</bool>

</resources>

overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ 
<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources>

    <!-- Control whether status bar should distinguish HSPA data icon

         from UMTS data icon on devices -->

    <bool name="config_hspa_data_distinguishable">true</bool>



    <!-- SystemUI Plugins that can be loaded on user builds. -->

    <string-array name="config_pluginAllowlist" translatable="false">

        <item>com.android.systemui</item>