Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-25 15:39:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixup previous 2 commits + misc tweaks

Browse Source
This commit is contained in:
Tad 2018-06-27 12:04:42 -04:00
parent d0dd1893c6
commit 29ace39eb9
9 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Manifests/Manifest_LAOS-14.1.xml
View File

@ -181,6 +181,10 @@
<!-- Nexus 7 [2013] (flo) --> <!-- Nexus 7 [2013] (flo) -->
<project path="device/asus/flo" name="LineageOS/android_device_asus_flo" remote="github" /> <project path="device/asus/flo" name="LineageOS/android_device_asus_flo" remote="github" />
<!-- Nexus 4 (mako) -->
<project path="device/lge/mako" name="LineageOS/android_device_lge_mako" remote="github" />
<project path="kernel/lge/mako" name="LineageOS/lge-kernel-mako" remote="github" />
<!-- Nexus 5 (hammerhead) --> <!-- Nexus 5 (hammerhead) -->
<project path="device/lge/hammerhead" name="LineageOS/android_device_lge_hammerhead" remote="github" /> <project path="device/lge/hammerhead" name="LineageOS/android_device_lge_hammerhead" remote="github" />
<project path="kernel/lge/hammerhead" name="LineageOS/android_kernel_lge_hammerhead" remote="github" /> <project path="kernel/lge/hammerhead" name="LineageOS/android_kernel_lge_hammerhead" remote="github" />

0
Patches/Common/android_device_lge_mako/0001-Enable_LTE.patch → Patches/LineageOS-15.1/android_device_lge_mako/0001-Enable_LTE.patch
View File

23
Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh Normal file
View File

@ -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

4
Scripts/LineageOS-14.1/Functions.sh
View File

@ -18,7 +18,7 @@
#Last verified: 2018-04-27 #Last verified: 2018-04-27
patchAllKernels() { 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; export -f patchAllKernels;
@ -51,7 +51,6 @@ buildAll() {
#Select devices are userdebug due to SELinux policy issues #Select devices are userdebug due to SELinux policy issues
#TODO: Add victara, athene, us997, us996, pme, t0lte, hlte #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_thor-userdebug; #deprecated
brunch lineage_clark-user; brunch lineage_clark-user;
brunch lineage_FP2-user; brunch lineage_FP2-user;
@ -81,6 +80,7 @@ buildAll() {
#brunch lineage_hammerhead-user; #brunch lineage_hammerhead-user;
#brunch lineage_klte-user; #brunch lineage_klte-user;
#brunch lineage_m8-user; #brunch lineage_m8-user;
#brunch lineage_mako-user;
#brunch lineage_marlin-user; #brunch lineage_marlin-user;
#brunch lineage_sailfish-user; #brunch lineage_sailfish-user;
#brunch lineage_shamu-user; #brunch lineage_shamu-user;

3
Scripts/LineageOS-14.1/Patch.sh
View File

@ -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 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 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"; 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/ 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/

2
Scripts/LineageOS-14.1/Rebrand.sh
View File

@ -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 cp "$patchesCommon/android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours
enter "packages/apps/Updater"; 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; sed -i 's|>LineageOS|>'"$REBRAND_NAME"'|' res/values*/strings.xml;
enter "vendor/cm"; enter "vendor/cm";

2
Scripts/LineageOS-15.1/Patch.sh
View File

@ -231,7 +231,7 @@ echo "/dev/block/platform/msm_sdcc\.1/by-name/pad u:object_r:misc_block_devi
enterAndClear "device/lge/mako"; enterAndClear "device/lge/mako";
cp "$patches/android_device_lge_mako/proprietary-blobs.txt" proprietary-blobs.txt; #update that? nah 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 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"; 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/ 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/

2
Scripts/LineageOS-15.1/Rebrand.sh
View File

@ -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 cp "$patchesCommon/android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours
enter "packages/apps/Updater"; 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; sed -i 's|>LineageOS|>'"$REBRAND_NAME"'|' res/values*/strings.xml;
enter "vendor/lineage"; enter "vendor/lineage";

2
Scripts/init.sh
View File

@ -41,7 +41,7 @@ export REBRAND_BOOTANIMATION_STYLE="plasma"; #Options: gradient, plasma
export REBRAND_BOOTANIMATION_COLOR="#FF5722-#03A9F4"; #plasma export REBRAND_BOOTANIMATION_COLOR="#FF5722-#03A9F4"; #plasma
export REBRAND_LINK_ABOUT="https://divestos.xyz/index.php?page=about"; 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_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 #END OF USER CONFIGURABLE OPTIONS
BUILD_WORKING_DIR=${PWD##*/}; BUILD_WORKING_DIR=${PWD##*/};