diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml index 9fee8e8c..c9542b9a 100644 --- a/Manifests/Manifest_LAOS-14.1.xml +++ b/Manifests/Manifest_LAOS-14.1.xml @@ -181,6 +181,10 @@ + + + + diff --git a/Patches/Common/android_device_lge_mako/0001-Enable_LTE.patch b/Patches/LineageOS-15.1/android_device_lge_mako/0001-Enable_LTE.patch similarity index 100% rename from Patches/Common/android_device_lge_mako/0001-Enable_LTE.patch rename to Patches/LineageOS-15.1/android_device_lge_mako/0001-Enable_LTE.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh new file mode 100644 index 00000000..be8a421f --- /dev/null +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -0,0 +1,23 @@ +#!/bin/bash +cd $base"kernel/lge/mako" +git apply $cvePatchesLinux/0010-Accelerated_AES/3.4/0002.patch +git apply $cvePatchesLinux/0012-Copperhead-Deny_USB/3.4/3.4-Backport.patch +git apply $cvePatchesLinux/CVE-2013-4738/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2016-3857/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-3894/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-9793/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch +git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch +git apply $cvePatchesLinux/CVE-2017-17806/ANY/0001.patch +git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch +editKernelLocalversion "-dos.p19" +cd $base diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 718204fd..cdbd5698 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -18,7 +18,7 @@ #Last verified: 2018-04-27 patchAllKernels() { - startPatcher "kernel_amazon_hdx-common kernel_asus_grouper kernel_asus_msm8916 kernel_fairphone_msm8974 kernel_google_marlin kernel_google_msm kernel_huawei_angler kernel_htc_msm8974 kernel_htc_msm8994 kernel_lge_bullhead kernel_lge_g3 kernel_lge_hammerhead kernel_lge_msm8974 kernel_lge_msm8992 kernel_lge_msm8996 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8974 kernel_nextbit_msm8992 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_samsung_universal8890"; + startPatcher "kernel_amazon_hdx-common kernel_asus_grouper kernel_asus_msm8916 kernel_fairphone_msm8974 kernel_google_marlin kernel_google_msm kernel_huawei_angler kernel_htc_msm8974 kernel_htc_msm8994 kernel_lge_bullhead kernel_lge_g3 kernel_lge_hammerhead kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8992 kernel_lge_msm8996 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8974 kernel_nextbit_msm8992 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_smdk4412 kernel_samsung_universal8890"; } export -f patchAllKernels; @@ -51,7 +51,6 @@ buildAll() { #Select devices are userdebug due to SELinux policy issues #TODO: Add victara, athene, us997, us996, pme, t0lte, hlte - brunch lineage_mako-user; #superseded, but used for testing brunch lineage_thor-userdebug; #deprecated brunch lineage_clark-user; brunch lineage_FP2-user; @@ -81,6 +80,7 @@ buildAll() { #brunch lineage_hammerhead-user; #brunch lineage_klte-user; #brunch lineage_m8-user; + #brunch lineage_mako-user; #brunch lineage_marlin-user; #brunch lineage_sailfish-user; #brunch lineage_shamu-user; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 5c968c2a..733c6cbb 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -238,9 +238,6 @@ enterAndClear "device/motorola/clark"; sed -i 's/0xA04D/0xA04D|0xA052/' board-info.txt; #Allow installing on Nougat bootloader, assume the user is running the correct modem rm board-info.txt; #Never restrict installation -enterAndClear "device/lge/mako"; -patch -p1 < "$patchesCommon/android_device_lge_mako/0001-Enable_LTE.patch"; - enterAndClear "device/oneplus/bacon"; sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/ diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh index 5cfcea15..6743113b 100644 --- a/Scripts/LineageOS-14.1/Rebrand.sh +++ b/Scripts/LineageOS-14.1/Rebrand.sh @@ -44,7 +44,7 @@ sed -i '/.*services_explanation/s/LineageOS/'"$REBRAND_NAME"'/' res/values*/stri cp "$patchesCommon/android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours enter "packages/apps/Updater"; -sed -i 's|0OTASERVER0|'"$REBRAND_OTA_SERVER"'|' src/org/lineageos/updater/misc/Utils.java; +sed -i 's|0OTASERVER0|'"$REBRAND_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java; sed -i 's|>LineageOS|>'"$REBRAND_NAME"'|' res/values*/strings.xml; enter "vendor/cm"; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 49faec46..b845070b 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -231,7 +231,7 @@ echo "/dev/block/platform/msm_sdcc\.1/by-name/pad u:object_r:misc_block_devi enterAndClear "device/lge/mako"; cp "$patches/android_device_lge_mako/proprietary-blobs.txt" proprietary-blobs.txt; #update that? nah echo "allow kickstart usbfs:dir search;" >> sepolicy/kickstart.te; #Fix forceencrypt on first boot -patch -p1 < "$patchesCommon/android_device_lge_mako/0001-Enable_LTE.patch"; +patch -p1 < "$patches/android_device_lge_mako/0001-Enable_LTE.patch"; enterAndClear "device/oppo/msm8974-common"; sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/ diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index f9988e63..57d61cc7 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -56,7 +56,7 @@ sed -i '/.*services_explanation/s/LineageOS/'"$REBRAND_NAME"'/' res/values*/stri cp "$patchesCommon/android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours enter "packages/apps/Updater"; -sed -i 's|0OTASERVER0|'"$REBRAND_OTA_SERVER"'|' src/org/lineageos/updater/misc/Utils.java; +sed -i 's|0OTASERVER0|'"$REBRAND_SERVER_OTA"'|' src/org/lineageos/updater/misc/Utils.java; sed -i 's|>LineageOS|>'"$REBRAND_NAME"'|' res/values*/strings.xml; enter "vendor/lineage"; diff --git a/Scripts/init.sh b/Scripts/init.sh index 24d7abf8..ec4c7208 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -41,7 +41,7 @@ export REBRAND_BOOTANIMATION_STYLE="plasma"; #Options: gradient, plasma export REBRAND_BOOTANIMATION_COLOR="#FF5722-#03A9F4"; #plasma export REBRAND_LINK_ABOUT="https://divestos.xyz/index.php?page=about"; export REBRAND_LINK_PRIVACY="https://divestos.xyz/index.php?page=privacy_policy"; -export REBRAND_OTA_SERVER="https://divestos.xyz/updater.php"; +export REBRAND_SERVER_OTA="https://divestos.xyz/updater.php"; #END OF USER CONFIGURABLE OPTIONS BUILD_WORKING_DIR=${PWD##*/};