Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update cherrypicks

Browse Source
This commit is contained in:
Tad 2020-11-07 17:20:30 -05:00
parent dc5b1d91f2
commit a21a6acaa8
8 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,6 @@ patchWorkspace() {
repopick -it n_asb_09-2018-qcom; repopick -it n_asb_09-2018-qcom;
repopick -it ibss-mode-nougat; repopick -it ibss-mode-nougat;
repopick -it n-asb-2020-11; repopick -it n-asb-2020-11;
repopick -fi 291725; #update webview
export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails

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

@ -76,6 +76,9 @@ enterAndClear "device/qcom/sepolicy";
patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/248649.patch"; #msm_irqbalance: Allow read for stats and interrupts patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/248649.patch"; #msm_irqbalance: Allow read for stats and interrupts
patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH
enterAndClear "external/freetype";
git pull "https://github.com/LineageOS/android_external_freetype" refs/changes/69/291969/1; #CVE-2020-15999
enterAndClear "external/sqlite"; enterAndClear "external/sqlite";
patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (CopperheadOS-13.0) patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (CopperheadOS-13.0)

1
Scripts/LineageOS-15.1/Functions.sh
View File

@ -109,7 +109,6 @@ patchWorkspace() {
source build/envsetup.sh; source build/envsetup.sh;
repopick -it O_asb_2020-11; repopick -it O_asb_2020-11;
repopick -fi 291725; #update webview
export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails

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

@ -81,6 +81,9 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #
enterAndClear "external/aac"; enterAndClear "external/aac";
git pull "https://github.com/LineageOS/android_external_aac" refs/changes/01/291401/1; #O_asb_2020-11 git pull "https://github.com/LineageOS/android_external_aac" refs/changes/01/291401/1; #O_asb_2020-11
enterAndClear "external/freetype";
git pull "https://github.com/LineageOS/android_external_freetype" refs/changes/67/291967/1; #CVE-2020-15999
enterAndClear "external/svox"; enterAndClear "external/svox";
git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles

2
Scripts/LineageOS-16.0/Functions.sh
View File

@ -133,8 +133,6 @@ patchWorkspace() {
repopick -it hh-p-sepolicy; repopick -it hh-p-sepolicy;
repopick -i 232948; #wahoo: liblight: close fd repopick -i 232948; #wahoo: liblight: close fd
#repopick -it CVE-2019-2306_P; #repopick -it CVE-2019-2306_P;
repopick -it P_asb_2020-11;
repopick -fi 291725; #update webview
source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";

6
Scripts/LineageOS-16.0/Patch.sh
View File

@ -77,12 +77,6 @@ enterAndClear "device/qcom/sepolicy-legacy";
patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH
echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices
enterAndClear "external/aac";
git pull "https://github.com/LineageOS/android_external_aac" refs/changes/75/291375/1; #P_asb_2020-11
enterAndClear "external/freetype";
git pull "https://github.com/LineageOS/android_external_freetype" refs/changes/65/291965/1; #CVE-2020-15999
enterAndClear "external/svox"; enterAndClear "external/svox";
git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie

6
Scripts/LineageOS-17.1/Functions.sh
View File

@ -90,8 +90,8 @@ buildAll() {
buildDevice sailfish verity; buildDevice sailfish verity;
#SD835 #SD835
buildDevice cheryl; buildDevice cheryl;
#buildDevice cheeseburger verity; #needs manual patching - vendor common makefile + wait on new kernel buildDevice cheeseburger verity; #needs manual patching - vendor common makefile
#buildDevice dumpling verity; buildDevice dumpling verity;
buildDevice mata verity; buildDevice mata verity;
buildDevice taimen avb; buildDevice taimen avb;
buildDevice walleye avb; buildDevice walleye avb;
@ -126,8 +126,6 @@ patchWorkspace() {
repopick -i 287339; #releasetools: python3 fix repopick -i 287339; #releasetools: python3 fix
#repopick -it CVE-2019-2306; #repopick -it CVE-2019-2306;
#repopick -i 289186; #repopick -i 289186;
repopick -it Q_asb_2020-11;
repopick -fi 291725; #update webview
source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";

12
Scripts/LineageOS-17.1/Patch.sh
View File

@ -74,15 +74,6 @@ enterAndClear "device/qcom/sepolicy-legacy";
patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH
echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices
enterAndClear "external/aac";
git pull "https://github.com/LineageOS/android_external_aac" refs/changes/45/291345/1; #Q_asb_2020-11
enterAndClear "external/freetype";
git pull "https://github.com/LineageOS/android_external_freetype" refs/changes/63/291963/1; #CVE-2020-15999
enterAndClear "external/libexif";
git pull "https://github.com/LineageOS/android_external_libexif" refs/changes/46/291346/1; #Q_asb_2020-11
enterAndClear "external/svox"; enterAndClear "external/svox";
git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie
@ -181,9 +172,6 @@ if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_sys
enterAndClear "system/extras" enterAndClear "system/extras"
patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS) patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS)
enterAndClear "system/nfc";
git pull "https://github.com/LineageOS/android_system_nfc" refs/changes/99/291399/1; #Q_asb_2020-11
enterAndClear "system/sepolicy"; enterAndClear "system/sepolicy";
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/29.0"; patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/29.0";