From d9b476e3f574a158d541a024bc888e649045422a Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 9 Dec 2022 13:52:52 +0900 Subject: [PATCH 1/8] zuma: setup CI to update from upstream Change-Id: I5682fe1cba15944229fbea0f53289ba01c90818e --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..f01e7779 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,7 @@ +stages: + - update-from-upstream + +include: + - project: 'e/templates' + ref: master + file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' -- GitLab From f8acbfd6de6f2bd509074eab675666121d149933 Mon Sep 17 00:00:00 2001 From: Jackeagle Date: Sun, 11 Aug 2024 23:36:27 -0400 Subject: [PATCH 2/8] zuma: Add automerge script Change-Id: Ic18ab80b63cd6fa17a1f844412b1fbfdbd1ff1a1 --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f01e7779..51503631 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,11 @@ stages: + - auto-merge-main - update-from-upstream include: + - project: 'e/templates' + ref: master + file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml' - project: 'e/templates' ref: master file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml' -- GitLab From 3eba245f8ccafa6c0aed376c08411d3afcd40aa6 Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Tue, 6 Dec 2022 16:21:23 +0530 Subject: [PATCH 3/8] zuma: Setup BL Lock support on /e/OS Co-authored-by: Omkar Chandorkar Co-authored-by: Jackeagle Signed-off-by: SahilSonar Change-Id: Ide179ff81aeed40341f99449b20bb6142d58d4ce --- BoardConfig-common.mk | 12 ++++++++++++ BoardConfigLineage.mk | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 59cb31de..35728136 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -163,7 +163,11 @@ endif # Enable chain partition for system. BOARD_AVB_VBMETA_SYSTEM := system system_dlkm system_ext product +ifneq (,$(wildcard $(KEYS_DIR)/avb_rsa2048.pem)) +BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := $(KEYS_DIR)/avb_rsa2048.pem +else BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem +endif BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 @@ -173,13 +177,21 @@ BOARD_AVB_VBMETA_SYSTEM += pvmfw endif # Enable chained vbmeta for boot images +ifneq (,$(wildcard $(KEYS_DIR)/avb_rsa2048.pem)) +BOARD_AVB_BOOT_KEY_PATH := $(KEYS_DIR)/avb_rsa2048.pem +else BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem +endif BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048 BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2 # Enable chained vbmeta for init_boot images +ifneq (,$(wildcard $(KEYS_DIR)/avb_rsa2048.pem)) +BOARD_AVB_INIT_BOOT_KEY_PATH := $(KEYS_DIR)/avb_rsa2048.pem +else BOARD_AVB_INIT_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem +endif BOARD_AVB_INIT_BOOT_ALGORITHM := SHA256_RSA2048 BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_INIT_BOOT_ROLLBACK_INDEX_LOCATION := 4 diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk index 1e72f9e6..e47ead75 100644 --- a/BoardConfigLineage.mk +++ b/BoardConfigLineage.mk @@ -33,4 +33,11 @@ AB_OTA_PARTITIONS += \ -include vendor/lineage/config/BoardConfigReservedSize.mk # Verified Boot +ifeq (eng,$(TARGET_BUILD_VARIANT)) BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3 +endif + +ifneq (,$(wildcard $(KEYS_DIR)/avb_rsa2048.pem)) +BOARD_AVB_ALGORITHM := SHA256_RSA2048 +BOARD_AVB_KEY_PATH := $(KEYS_DIR)/avb_rsa2048.pem +endif -- GitLab From 66b32397f1ccb9a55b433aba8e5d6a03aa8ea542 Mon Sep 17 00:00:00 2001 From: SahilSonar Date: Sun, 6 Oct 2024 15:31:22 +0530 Subject: [PATCH 4/8] zuma: Sign vendor image with /e/OS AVB keys Change-Id: I687d9f14a4976f85f96396c4969c2c8228121dc7 --- BoardConfigLineage.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk index e47ead75..95ea7b8e 100644 --- a/BoardConfigLineage.mk +++ b/BoardConfigLineage.mk @@ -21,7 +21,11 @@ TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm # Enable chain partition for vendor. BOARD_AVB_VBMETA_VENDOR := vendor +ifneq (,$(wildcard $(KEYS_DIR)/avb_rsa2048.pem)) +BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := $(KEYS_DIR)/avb_rsa2048.pem +else BOARD_AVB_VBMETA_VENDOR_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem +endif BOARD_AVB_VBMETA_VENDOR_ALGORITHM := SHA256_RSA2048 BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION := 3 -- GitLab From 69a83c34d5cbf387384bed584de4364180ead9ad Mon Sep 17 00:00:00 2001 From: Daniel Jacob Chittoor Date: Fri, 14 Apr 2023 23:35:13 +0530 Subject: [PATCH 5/8] zuma: Use Murena bootanimation As per specifications mentioned in https://gitlab.e.foundation/e/devices/backlog/-/issues/502 Change-Id: I87b9db921cad2e4e58e121c6f152bed5384c32fc --- BoardConfigLineage.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk index 95ea7b8e..e480a143 100644 --- a/BoardConfigLineage.mk +++ b/BoardConfigLineage.mk @@ -4,6 +4,9 @@ # SPDX-License-Identifier: Apache-2.0 # +# Bootanimation +TARGET_USES_MURENA_BOOTANIMATION := true + # Manifests DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += vendor/lineage/config/device_framework_matrix.xml DEVICE_MANIFEST_FILE += \ -- GitLab From 549a02d4f76293127df67a364ce455da8c270437 Mon Sep 17 00:00:00 2001 From: SahilSonar Date: Sun, 6 Oct 2024 13:12:22 +0530 Subject: [PATCH 6/8] zuma: Enable priortize update process by default Change-Id: I8a09a1695b2cb091f98be2b92074f1196574f97f --- .../app/src/main/res/values/config.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 overlay-lineage/packages/apps/Updater/app/src/main/res/values/config.xml diff --git a/overlay-lineage/packages/apps/Updater/app/src/main/res/values/config.xml b/overlay-lineage/packages/apps/Updater/app/src/main/res/values/config.xml new file mode 100644 index 00000000..114bc743 --- /dev/null +++ b/overlay-lineage/packages/apps/Updater/app/src/main/res/values/config.xml @@ -0,0 +1,19 @@ + + + + true + -- GitLab From 408783ff7119237463e56c7e1537e79d59dbdec6 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Mon, 2 Jun 2025 23:04:36 +0200 Subject: [PATCH 7/8] Add license --- LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..7a4a3ea2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file -- GitLab From f5814cb5872081395f9453f5d0a79456ac4a81d7 Mon Sep 17 00:00:00 2001 From: SahilSonar Date: Fri, 22 Aug 2025 06:12:12 +0000 Subject: [PATCH 8/8] zuma: Update AVB keys path --- BoardConfig-common.mk | 12 ++++++------ BoardConfigLineage.mk | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 35728136..66edf4b1 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -163,8 +163,8 @@ endif # Enable chain partition for system. BOARD_AVB_VBMETA_SYSTEM := system system_dlkm system_ext product -ifneq (,$(wildcard $(KEYS_DIR)/avb_rsa2048.pem)) -BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := $(KEYS_DIR)/avb_rsa2048.pem +ifneq (,$(wildcard user-keys/avb_rsa2048.pem)) +BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := user-keys/avb_rsa2048.pem else BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem endif @@ -177,8 +177,8 @@ BOARD_AVB_VBMETA_SYSTEM += pvmfw endif # Enable chained vbmeta for boot images -ifneq (,$(wildcard $(KEYS_DIR)/avb_rsa2048.pem)) -BOARD_AVB_BOOT_KEY_PATH := $(KEYS_DIR)/avb_rsa2048.pem +ifneq (,$(wildcard user-keys/avb_rsa2048.pem)) +BOARD_AVB_BOOT_KEY_PATH := user-keys/avb_rsa2048.pem else BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem endif @@ -187,8 +187,8 @@ BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2 # Enable chained vbmeta for init_boot images -ifneq (,$(wildcard $(KEYS_DIR)/avb_rsa2048.pem)) -BOARD_AVB_INIT_BOOT_KEY_PATH := $(KEYS_DIR)/avb_rsa2048.pem +ifneq (,$(wildcard user-keys/avb_rsa2048.pem)) +BOARD_AVB_INIT_BOOT_KEY_PATH := user-keys/avb_rsa2048.pem else BOARD_AVB_INIT_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem endif diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk index e480a143..7877edc4 100644 --- a/BoardConfigLineage.mk +++ b/BoardConfigLineage.mk @@ -24,8 +24,8 @@ TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm # Enable chain partition for vendor. BOARD_AVB_VBMETA_VENDOR := vendor -ifneq (,$(wildcard $(KEYS_DIR)/avb_rsa2048.pem)) -BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := $(KEYS_DIR)/avb_rsa2048.pem +ifneq (,$(wildcard user-keys/avb_rsa2048.pem)) +BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := user-keys/avb_rsa2048.pem else BOARD_AVB_VBMETA_VENDOR_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem endif @@ -44,7 +44,7 @@ ifeq (eng,$(TARGET_BUILD_VARIANT)) BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3 endif -ifneq (,$(wildcard $(KEYS_DIR)/avb_rsa2048.pem)) +ifneq (,$(wildcard user-keys/avb_rsa2048.pem)) BOARD_AVB_ALGORITHM := SHA256_RSA2048 -BOARD_AVB_KEY_PATH := $(KEYS_DIR)/avb_rsa2048.pem +BOARD_AVB_KEY_PATH := user-keys/avb_rsa2048.pem endif -- GitLab