From 974cc3b3f8f29842aacbcb35955503dc0e3124bd Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 4 Apr 2019 23:33:10 -0400 Subject: [PATCH] 16.0: recovery has been updated but leave it disabled because it doesn't boot --- .../android_bootable_recovery/0001-Remove_Logo.patch | 0 Scripts/LineageOS-14.1/Functions.sh | 3 ++- Scripts/LineageOS-15.1/Rebrand.sh | 2 +- .../CVE_Patchers/android_kernel_moto_shamu.sh | 3 +-- Scripts/LineageOS-16.0/Functions.sh | 1 - Scripts/LineageOS-16.0/Patch.sh | 5 ++++- Scripts/LineageOS-16.0/Rebrand.sh | 7 +++++++ 7 files changed, 15 insertions(+), 6 deletions(-) rename Patches/{LineageOS-15.1 => Common}/android_bootable_recovery/0001-Remove_Logo.patch (100%) diff --git a/Patches/LineageOS-15.1/android_bootable_recovery/0001-Remove_Logo.patch b/Patches/Common/android_bootable_recovery/0001-Remove_Logo.patch similarity index 100% rename from Patches/LineageOS-15.1/android_bootable_recovery/0001-Remove_Logo.patch rename to Patches/Common/android_bootable_recovery/0001-Remove_Logo.patch diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 711605d2..07d0d250 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -103,7 +103,8 @@ patchWorkspace() { repopick -it bt-sbc-hd-dualchannel-nougat; repopick 201113; #wifi country code fix repopick 244387 244388; #loopback fixes - repopick -it n-asb-2019-04; + repopick -it n-tzdata2019a; + #repopick -it n-asb-2019-04; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index 7aa300a3..6633bf85 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -22,7 +22,7 @@ echo "Rebranding..."; enter "bootable/recovery"; git revert bc57208dfcd0958d03a00bbcf5345be6ceac9988 6ac3bb48f9d10e604d4b2d6c4152be9d35d17ea0; -patch -p1 < "$DOS_PATCHES/android_bootable_recovery/0001-Remove_Logo.patch"; #Remove logo rendering code +patch -p1 < "$DOS_PATCHES_COMMON/android_bootable_recovery/0001-Remove_Logo.patch"; #Remove logo rendering code rm res*/images/logo_image.png; #Remove logo images mogrify -format png -fill "#FF5722" -opaque "#167C80" -fuzz 10% res-*/images/*sel.png; #Recolor icons sed -i 's|grid_h \* 2 / 3|grid_h * 0.25|' screen_ui.cpp; #Center icons diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh index f378ad4f..74128450 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh @@ -55,7 +55,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5972/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6345/^4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11286/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch @@ -65,5 +64,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p65" +editKernelLocalversion "-dos.p64" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index b414b61c..4451b954 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -65,7 +65,6 @@ patchWorkspace() { source build/envsetup.sh; #repopick -it bt-sbc-hd-dualchannel-pie; repopick 244148; #log spam fix - #repopick -it recovery-p; repopick 245252; #update webview #repopick -it android-9.0.0_r35; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 9f04c878..f5750bc7 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -65,6 +65,9 @@ cp -r "$DOS_PATCHES_COMMON""android_vendor_divested/." "$DOS_BUILD_BASE""vendor/ enterAndClear "bionic"; if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch"; fi; +enterAndClear "bootable/recovery"; +sed -i 's|install(Device|install(__attribute__ ((unused)) Device|' recovery.cpp; #Fix: error: unused parameter 'device' + enterAndClear "build/make"; git revert 271f6ffa045064abcac066e97f2cb53ccb3e5126 61f7ee9386be426fd4eadc2c8759362edb5bef8; #Add back PicoTTS and language files patch -p1 < "$DOS_PATCHES/android_build/0001-Automated_Build_Signing.patch"; #Automated build signing (CopperheadOS-13.0) @@ -162,7 +165,7 @@ patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; enterAndClear "system/core"; if [ "$DOS_HOSTS_BLOCKING" = true ]; then cat "$DOS_HOSTS_FILE" >> rootdir/etc/hosts; fi; #Merge in our HOSTS file -#git revert b3609d82999d23634c5e6db706a3ecbc5348309a; #Always update recovery XXX: Wait until recovery-p topic is merged +#git revert b3609d82999d23634c5e6db706a3ecbc5348309a; #Always update recovery XXX: recovery doesn't boot patch -p1 < "$DOS_PATCHES/android_system_core/0001-Harden_Mounts.patch"; #Harden mounts with nodev/noexec/nosuid (CopperheadOS-13.0) if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES_COMMON/android_system_core/0001-HM-Increase_vm_mmc.patch"; fi; diff --git a/Scripts/LineageOS-16.0/Rebrand.sh b/Scripts/LineageOS-16.0/Rebrand.sh index fd6d7e45..a0310f2a 100644 --- a/Scripts/LineageOS-16.0/Rebrand.sh +++ b/Scripts/LineageOS-16.0/Rebrand.sh @@ -21,7 +21,14 @@ echo "Rebranding..."; enter "bootable/recovery"; +git revert c9ab109b6b6c502238ec88badc1fbed2644480f2 cb5b7cc0b04c445dbc189e28575bba50638433b5; +patch -p1 < "$DOS_PATCHES_COMMON/android_bootable_recovery/0001-Remove_Logo.patch"; #Remove logo rendering code +rm res*/images/logo_image.png; #Remove logo images +mogrify -format png -fill "#FF5722" -opaque "#167C80" -fuzz 10% res-*/images/*sel.png; #Recolor icons +sed -i 's|grid_h \* 2 / 3|grid_h * 0.25|' screen_ui.cpp; #Center icons +sed -i 's|0x16, 0x7c, 0x80|0x03, 0xa9, 0xf4|' screen_ui.cpp; #Recolor text sed -i 's|Android Recovery|'"$DOS_BRANDING_NAME"' Recovery|' ./*_ui.cpp; +sed -i 's|LineageOS|'"$DOS_BRANDING_NAME"'|' ui.cpp; enter "build/make"; sed -i 's|echo "ro.build.user=$USER"|echo "ro.build.user=emy"|' tools/buildinfo.sh; #Override build user