From 29e49a5147bcb8c3185e66b9528a35e25610bf49 Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 20 May 2018 14:57:54 -0400 Subject: [PATCH] Fixup ether --- Scripts/Common/Patch_CVE.sh | 11 ++++++++++- .../CVE_Patchers/android_kernel_nextbit_msm8992.sh | 2 +- Scripts/LineageOS-15.1/Functions.sh | 1 + Scripts/LineageOS-15.1/Rebrand.sh | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Scripts/Common/Patch_CVE.sh b/Scripts/Common/Patch_CVE.sh index 8faf36bd..0a419d89 100644 --- a/Scripts/Common/Patch_CVE.sh +++ b/Scripts/Common/Patch_CVE.sh @@ -1,6 +1,6 @@ #!/bin/bash #DivestOS: A privacy oriented Android distribution -#Copyright (c) 2017 Spot Communications, Inc. +#Copyright (c) 2017-2018 Spot Communications, Inc. # #This program is free software: you can redistribute it and/or modify #it under the terms of the GNU General Public License as published by @@ -19,6 +19,15 @@ #Is this the best way to do it? No. Is it the proper way to do it? No. Do I wish device maintainers would do it? Yes. Is it better then nothing? YES! +#Troubleshooting a patch +##If you get an error like the following +#> ../../../../../../kernel/nextbit/msm8992/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c:1116:32: error: 'ACTUATOR_POWER_UP' undeclared (first use in this function) +#$ cd $cvePatchesLinux +#$ grep "ACTUATOR_POWER_UP" . -Ri +#> ./CVE-2018-3585/3.10/0001.patch:+ if (a_ctrl->actuator_state != ACTUATOR_POWER_UP) { +#$ nano $cveScripts/android_kernel_nextbit_msm8992.sh +# Comment out CVE-2018-3585/3.10/0001.patch + echo "Patching CVEs..."; cd $base; diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index b24c0871..9c32665d 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -64,7 +64,7 @@ git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2018-3585/3.10/0001.patch +#git apply $cvePatchesLinux/CVE-2018-3585/3.10/0001.patch git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.patch git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 3181ee4d..1c6265e8 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -49,6 +49,7 @@ export -f buildDeviceDebug; buildAll() { if [ "$MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; #Select devices are userdebug due to SELinux policy issues +#TODO: hiae star2lte starlte brunch lineage_d852-user; brunch lineage_bacon-user; brunch lineage_mako-user; diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index a7f143f6..556f5568 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -51,7 +51,7 @@ enter "packages/apps/Updater"; sed -i 's|>LineageOS|>DivestOS|' res/values*/strings.xml; enter "vendor/lineage"; -sed -i 's|https://lineageos.org/legal|https://divestos.xyz/index.php?page=about|' config/common.mk; +sed -i 's|https://lineageos.org/legal|https://divestos.xyz/index.php?page=about|' config/main_version.mk; sed -i '/.*ZIPPATH=/s/lineage/coverage/' build/envsetup.sh; sed -i '/LINEAGE_TARGET_PACKAGE/s/lineage/coverage/' build/tasks/bacon.mk; rm -rf bootanimation; #TODO: Create a boot animation