From 913fbcd1092f34146eb2c0d362f9699d3ad4ab77 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 5 Mar 2019 05:42:34 -0500 Subject: [PATCH] ASB cherry picks + minor tweaks --- Scripts/Common/Functions.sh | 2 +- Scripts/LineageOS-11.0/Functions.sh | 6 +---- .../android_kernel_motorola_msm8916.sh | 2 +- Scripts/LineageOS-14.1/Functions.sh | 26 ++++++++++--------- Scripts/LineageOS-15.1/Functions.sh | 1 + Scripts/LineageOS-16.0/Functions.sh | 5 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 22754acb..a5399490 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -391,7 +391,7 @@ hardenDefconfig() { fi; done #Disable supported options - declare -a optionsNo=("CONFIG_ACPI_CUSTOM_METHOD" "CONFIG_BINFMT_MISC" "CONFIG_COMPAT_BRK" "CONFIG_COMPAT_VDSO" "CONFIG_CP_ACCESS64" "CONFIG_DEVKMEM" "CONFIG_DEVMEM" "CONFIG_DEVPORT" "CONFIG_HIBERNATION" "CONFIG_INET_DIAG" "CONFIG_KEXEC" "CONFIG_LEGACY_PTYS" "CONFIG_MSM_BUSPM_DEV" "CONFIG_OABI_COMPAT" "CONFIG_PROC_KCORE" "CONFIG_PROC_VMCORE" "CONFIG_SECURITY_SELINUX_DISABLE" "CONFIG_SLAB_MERGE_DEFAULT" "CONFIG_WLAN_FEATURE_MEMDUMP" "CONFIG_EARJACK_DEBUGGER" "CONFIG_IOMMU_NON_SECURE" "CONFIG_MSM_DLOAD_MODE"); + declare -a optionsNo=("CONFIG_ACPI_CUSTOM_METHOD" "CONFIG_BINFMT_MISC" "CONFIG_COMPAT_BRK" "CONFIG_COMPAT_VDSO" "CONFIG_CP_ACCESS64" "CONFIG_DEVKMEM" "CONFIG_DEVMEM" "CONFIG_DEVPORT" "CONFIG_HIBERNATION" "CONFIG_INET_DIAG" "CONFIG_KEXEC" "CONFIG_LEGACY_PTYS" "CONFIG_MSM_BUSPM_DEV" "CONFIG_OABI_COMPAT" "CONFIG_PROC_KCORE" "CONFIG_PROC_VMCORE" "CONFIG_SECURITY_SELINUX_DISABLE" "CONFIG_SLAB_MERGE_DEFAULT" "CONFIG_WLAN_FEATURE_MEMDUMP" "CONFIG_EARJACK_DEBUGGER" "CONFIG_IOMMU_NON_SECURE"); if [[ "$1" != *"kernel/htc/msm8994"* ]] && [[ "$1" != *"kernel/samsung/smdk4412"* ]] && [[ "$1" != *"kernel/htc/flounder"* ]]; then optionsNo+=("CONFIG_DIAG_CHAR" "CONFIG_DIAG_OVER_USB" "CONFIG_USB_QCOM_DIAG_BRIDGE" "CONFIG_DIAGFWD_BRIDGE_CODE" "CONFIG_DIAG_SDIO_PIPE" "CONFIG_DIAG_HSIC_PIPE"); fi; diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh index 42a25da3..7f1c70ed 100644 --- a/Scripts/LineageOS-11.0/Functions.sh +++ b/Scripts/LineageOS-11.0/Functions.sh @@ -57,13 +57,9 @@ patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi; sed -i "s/'git', 'show', '-q'/'git', 'show'/" build/tools/repopick.py; #fix for old git versions source build/envsetup.sh; - #repopick -it asb-2018.09-cm11 -e 228457; #merged except for level repopick -it asb-2018.09-cm11-qcom; - #repopick -it asb-2018.10-cm11 -e 234585; #merged except for level - #repopick -it asb-2018.11-cm11 -e 234695; #merged except for level repopick -it cm.service.adb.root; #security fix for -userdebug - #repopick -it asb-2018.12-cm11 -e 240072; #merged except for level - #repopick -it asb-2019.01-cm11 -e 240073; #merged except for level + repopick -it asb-2019.02-cm11; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh index 71ae78f4..41e8fe8e 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/motorola/msm8916" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0050-0051.patch --exclude=Makefile +#git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0050-0051.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0052-0053.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0053-0054.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0087-0088.patch --exclude=Makefile diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 038cd356..adce9cce 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -50,21 +50,21 @@ buildAll() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; #Select devices are userdebug due to SELinux policy issues brunch lineage_clark-user; - brunch lineage_thor-userdebug; #deprecated - brunch lineage_grouper-user; #deprecated and needs manual patching (one-repo vendor blob patch) - brunch lineage_h815-user; #deprecated - brunch lineage_herolte-user; #deprecated - brunch lineage_himaul-user; #deprecated + brunch lineage_thor-userdebug; + brunch lineage_grouper-user; #needs manual patching - one-repo vendor blob patch + brunch lineage_h815-user; + brunch lineage_herolte-user; + brunch lineage_himaul-user; brunch lineage_i9100-userdebug; - brunch lineage_i9305-user; #deprecated? + brunch lineage_i9305-user; brunch lineage_jfltexx-user; - brunch lineage_maguro-user; #deprecated - brunch lineage_manta-user; #deprecated + brunch lineage_maguro-user; + brunch lineage_manta-user; brunch lineage_n5110-user; brunch lineage_osprey-user; - #brunch lineage_toro-user; #deprecated - #brunch lineage_toroplus-user; #deprecated - brunch lineage_Z00T-user; #deprecated + #brunch lineage_toro-user; + #brunch lineage_toroplus-user; + brunch lineage_Z00T-user; #The following are all superseded, and should only be enabled if the newer version is broken (not building/booting/etc.) #brunch lineage_angler-user; @@ -90,7 +90,7 @@ buildAll() { #brunch lineage_shamu-user; #brunch lineage_us996-user; #brunch lineage_us997-user; - #brunch lineage_victara-user; #needs manual patching (fwb xml: fused: dangling tag) + #brunch lineage_victara-user; #needs manual patching - fwb xml: fused: dangling tag } export -f buildAll; @@ -98,6 +98,8 @@ patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi; source build/envsetup.sh; repopick -it n_asb_09-2018-qcom; + repopick -i 243457; + repopick -it asb-2019.03-cm14; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 5075c8f0..4bdbf860 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -83,6 +83,7 @@ patchWorkspace() { source build/envsetup.sh; #repopick 219020; #ab-neverallow-user repopick 241694 241695 241696 241697 241698 241699 241700 241701; #mako cves + repopick -it O_asb_2019-03; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 7be38e26..96a034ff 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -52,14 +52,15 @@ buildAll() { brunch lineage_bacon-userdebug; brunch lineage_griffin-userdebug; brunch lineage_klte-userdebug; - brunch lineage_shamu-userdebug; + brunch lineage_shamu-userdebug; #broken - needs synced proprietary-files.txt } export -f buildAll; patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - #source build/envsetup.sh; + source build/envsetup.sh; + repopick -it android-9.0.0_r34; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh";