Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-06-26 14:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Partially revert 59c28bc0

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-05-27 23:38:31 -04:00
parent 5d57bf13c4
commit 8a59c7948f
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Patches/LineageOS-15.1/android_build/0001-OTA_Keys.patch
View File

@ -5,21 +5,20 @@ Subject: [PATCH] Allow setting OTA public keys from environment variable
Change-Id: Ib2a00de63b0c7a8790640462d13a84daf2076fa7
---
core/Makefile | 5 +++++
core/Makefile | 4 ++++
core/product_config.mk | 5 +++++
2 files changed, 10 insertions(+)
2 files changed, 9 insertions(+)
diff --git a/core/Makefile b/core/Makefile
index f2a524d58c..bdd18d7dec 100644
index f2a524d58c..92c7928d35 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1217,6 +1217,11 @@ endif
@@ -1217,6 +1217,10 @@ endif
# substitute other keys for this one.
OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
+ifneq ($(OTA_KEY_OVERRIDE_DIR),)
+ OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem
+ PRODUCT_EXTRA_RECOVERY_KEYS := $(OTA_KEY_OVERRIDE_DIR)/extra
+endif
+
# Generate a file containing the keys that will be read by the

9
Patches/LineageOS-16.0/android_build/0001-OTA_Keys.patch
View File

@ -5,21 +5,20 @@ Subject: [PATCH] Allow setting OTA public keys from environment variable
Change-Id: Ib2a00de63b0c7a8790640462d13a84daf2076fa7
---
core/Makefile | 5 +++++
core/Makefile | 4 ++++
core/product_config.mk | 5 +++++
2 files changed, 10 insertions(+)
2 files changed, 9 insertions(+)
diff --git a/core/Makefile b/core/Makefile
index 404bb54133..88b50d3e1d 100644
index 404bb54133..bd23c8be3d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1413,6 +1413,11 @@ endif
@@ -1413,6 +1413,10 @@ endif
# substitute other keys for this one.
OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
+ifneq ($(OTA_KEY_OVERRIDE_DIR),)
+ OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem
+ PRODUCT_EXTRA_RECOVERY_KEYS := $(OTA_KEY_OVERRIDE_DIR)/extra
+endif
+
# Generate a file containing the keys that will be read by the

9
Patches/LineageOS-17.1/android_build/0002-OTA_Keys.patch
View File

@ -5,21 +5,20 @@ Subject: [PATCH] Allow setting OTA public keys from environment variable
Change-Id: Ib2a00de63b0c7a8790640462d13a84daf2076fa7
---
core/Makefile | 5 +++++
core/Makefile | 4 ++++
core/product_config.mk | 5 +++++
2 files changed, 10 insertions(+)
2 files changed, 9 insertions(+)
diff --git a/core/Makefile b/core/Makefile
index f6c2463439..69f2826e97 100644
index f6c2463439..7f4823a1ac 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1895,6 +1895,11 @@ endif
@@ -1895,6 +1895,10 @@ endif
# substitute other keys for this one.
OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
+ifneq ($(OTA_KEY_OVERRIDE_DIR),)
+ OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem
+ PRODUCT_EXTRA_RECOVERY_KEYS := $(OTA_KEY_OVERRIDE_DIR)/extra
+endif
+
# Generate a file containing the keys that will be read by the