From aa3d0aeac59fbbd37ab8cfabece31e5dbf71d9bf Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 20 Mar 2021 14:03:01 -0400 Subject: [PATCH] 16.0: drop support for all devices compiling on 17.1 --- Manifests/Manifest_LAOS-16.0.xml | 73 ----------------------------- Scripts/LineageOS-16.0/Functions.sh | 47 +++---------------- Scripts/LineageOS-16.0/Patch.sh | 32 ------------- 3 files changed, 7 insertions(+), 145 deletions(-) diff --git a/Manifests/Manifest_LAOS-16.0.xml b/Manifests/Manifest_LAOS-16.0.xml index 4aed54d6..c73e2a7d 100644 --- a/Manifests/Manifest_LAOS-16.0.xml +++ b/Manifests/Manifest_LAOS-16.0.xml @@ -101,46 +101,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -149,14 +114,6 @@ - - - - - - - - @@ -165,24 +122,6 @@ - - - - - - - - - - - - - - - - - - @@ -197,26 +136,14 @@ - - - - - - - - - - - - diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index b21f41cc..5dddf44c 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -18,7 +18,7 @@ #Last verified: 2018-04-27 patchAllKernels() { - startPatcher "kernel_asus_fugu kernel_asus_msm8953 kernel_cyanogen_msm8916 kernel_cyanogen_msm8974 kernel_fairphone_sdm632 kernel_fxtec_msm8998 kernel_google_bonito kernel_google_crosshatch kernel_google_msm kernel_google_wahoo kernel_google_yellowstone kernel_lge_hammerhead kernel_lge_msm8974 kernel_motorola_msm8974 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_razer_msm8998 kernel_samsung_smdk4412 kernel_xiaomi_sdm845 kernel_yandex_sdm660 kernel_zuk_msm8996"; + startPatcher "kernel_asus_fugu kernel_asus_msm8953 kernel_cyanogen_msm8916 kernel_cyanogen_msm8974 kernel_google_msm kernel_google_yellowstone kernel_lge_hammerhead kernel_oneplus_msm8998 kernel_samsung_smdk4412 kernel_xiaomi_sdm845"; } export -f patchAllKernels; @@ -67,50 +67,17 @@ buildAll() { buildDevice kipper; #SD625 buildDevice zenfone3; #broken - ninja: error: 'android.hidl.base@1.0.so', missing and no known rule to make it + #SD835 + buildDevice cheeseburger verity; #needs manual patching - vendor common makefile #17.1 isn't booting + buildDevice dumpling verity; + #SD845 + buildDevice beryllium; #Samsung buildDeviceUserDebug i9100; #broken - many errors in hardware/samsung/exynos4 #Intel buildDevice fugu; #broken - ninja: error: 'libpcre2.so' missing and no known rule to make it - - buildDevice cheeseburger verity; #needs manual patching - vendor common makefile #17.1 isn't booting - buildDevice dumpling verity; + #Tegra buildDevice yellowstone; #broken sepolicy? - if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then - #SD410 - buildDevice crackling; - #SD600 - buildDevice jfltexx; - #SD800 - buildDevice d802; - #SD801 - buildDevice victara; - #SD808 - buildDevice ether; - #SD810 - buildDevice oneplus2; - #SD820 - buildDevice oneplus3 verity; - buildDevice griffin; - buildDevice z2_plus verity; - #SD632 - buildDevice FP3 avb; - #SD835 - buildDevice cheryl verity; - #SD845 - buildDevice beryllium; - buildDevice crosshatch avb; - buildDevice blueline avb; - buildDevice enchilada avb; - buildDevice fajita avb; - buildDevice pro1 avb; - #SD855 - buildDevice guacamole avb; - #SD660 - buildDevice Amber verity; - #SD670 - buildDevice bonito avb; - buildDevice sargo avb; - fi; } export -f buildAll; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 98cd354f..68b651f2 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -234,45 +234,16 @@ echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All enterAndClear "device/asus/zenfone3"; rm -rf libhidl; #breaks other devices -enterAndClear "device/fairphone/FP3"; -enableVerity; #Resurrect dm-verity - -enterAndClear "device/fxtec/pro1"; -enableVerity; #Resurrect dm-verity - -enterAndClear "device/google/bonito"; -enableVerity; #Resurrect dm-verity - -enterAndClear "device/google/crosshatch"; -enableVerity; #Resurrect dm-verity - -enterAndClear "device/google/wahoo"; -patch -p1 < "$DOS_PATCHES/android_device_google_wahoo/232948.patch"; #liblight: close fd - -enterAndClear "device/lge/g2-common"; -sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te; - enterAndClear "device/lge/hammerhead"; git am $DOS_PATCHES/android_device_lge_hammerhead/*.patch; #hh-p-sepolicy rm -rf bdAddrLoader; #duplicate with mako echo "SELINUX_IGNORE_NEVERALLOWS := true" >> BoardConfig.mk; #qcom-legacy sepolicy -enterAndClear "device/oneplus/oneplus2"; -sed -i 's|etc/permissions/qti_libpermissions.xml|vendor/etc/permissions/qti_libpermissions.xml|' proprietary-files.txt; enterAndClear "device/oneplus/msm8998-common"; patch -p1 < "$DOS_PATCHES_COMMON/android_device_audio/0001-No_Vorbis_Offload.patch"; #Fix Ogg Vorbis playback awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation -enterAndClear "device/oneplus/sm8150-common"; -enableVerity; #Resurrect dm-verity - -enterAndClear "device/zuk/msm8996-common"; -awk -i inplace '!/WfdCommon/' msm8996.mk; #fix breakage - -enterAndClear "kernel/google/wahoo"; -sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO - #Make changes to all devices cd "$DOS_BUILD_BASE"; if [ "$DOS_LOWRAM_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'enableLowRam "{}"'; fi; @@ -292,9 +263,6 @@ removeBuildFingerprints; sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/asus/msm8953/arch/arm64/configs/*_defconfig; #Breaks on compile sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/msm/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/yellowstone/arch/arm*/configs/*_defconfig; #Breaks on compile -sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/motorola/msm8974/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile -sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/motorola/msm8996/arch/arm64/configs/*_defconfig; #Breaks on compile -sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/oneplus/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10 rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk;