From df7979a21477cdd72d16be3759e282da55979000 Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 12 Apr 2018 06:40:10 -0400 Subject: [PATCH] Many changes - Manifests: Cleanup and remove more repos - Remove Lineage recovery keys - 15.1: Switch to 14.1 recovery - 15.1: Enable recovery updating - 15.1: d852: fix updater denial - Misc cleanup --- .gitignore | 2 ++ Manifests/Manifest_LAOS-14.1.xml | 16 ++++------------ Manifests/Manifest_LAOS-15.1.xml | 26 +++++++++++++++----------- Scripts/LineageOS-14.1/Patch.sh | 5 +++-- Scripts/LineageOS-15.1/Functions.sh | 2 +- Scripts/LineageOS-15.1/Patch.sh | 10 +++++----- Scripts/LineageOS-15.1/Rebrand.sh | 1 - 7 files changed, 30 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index fb99d810..15224bde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ + Signing_Keys/ Builds/ Build/ Repos/ .Trash-1000 +Misc/Features/LNL.txt diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml index 5d91664d..5db820c7 100644 --- a/Manifests/Manifest_LAOS-14.1.xml +++ b/Manifests/Manifest_LAOS-14.1.xml @@ -12,22 +12,16 @@ + + - @@ -59,7 +53,9 @@ + + @@ -212,14 +208,10 @@ - - - - diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml index fb30ca6d..de1e6e33 100644 --- a/Manifests/Manifest_LAOS-15.1.xml +++ b/Manifests/Manifest_LAOS-15.1.xml @@ -12,21 +12,15 @@ + + - @@ -43,7 +37,9 @@ + + @@ -53,6 +49,7 @@ + @@ -69,6 +66,16 @@ + + + + + + + + + + @@ -79,9 +86,6 @@ - - - diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 191ac3d7..c377b963 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -140,6 +140,7 @@ cp -r $patches"android_packages_apps_Trebuchet/default_workspace/." "res/xml/"; enterAndClear "packages/apps/Updater" patch -p1 < $patches"android_packages_apps_Updater/0001-Server.patch" #Switch to our server +#TODO: Remove changelog enterAndClear "packages/apps/WallpaperPicker" rm res/drawable-nodpi/{*.png,*.jpg} res/values-nodpi/wallpapers.xml; #Remove old ones @@ -171,6 +172,8 @@ patch -p1 < $patches"android_system_vold/0001-AES256.patch" #Add a variable for enterAndClear "vendor/cm" rm -rf overlay/common/vendor/cmsdk/packages #Remove analytics awk -i inplace '!/50-cm.sh/' config/common.mk; #Make sure our hosts is always used +awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/common.mk; #Remove extra keys +awk -i inplace '!/security\/lineage/' config/common.mk; #Remove extra keys patch -p1 < $patches"android_vendor_cm/0001-SCE.patch" #Include our extras such as MicroG and F-Droid cp $patches"android_vendor_cm/sce.mk" config/sce.mk cp $patches"android_vendor_cm/config.xml" overlay/common/vendor/cmsdk/cm/res/res/values/config.xml; #Per app performance profiles @@ -178,8 +181,6 @@ cp -r $patches"android_vendor_cm/firmware_deblobber" .; cp $patches"android_vendor_cm/firmware_deblobber.mk" build/tasks/firmware_deblobber.mk; sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence -#sed -i 's/config_enableRecoveryUpdater">false/config_enableRecoveryUpdater">true/' overlay/common/packages/apps/Settings/res/values/config.xml; #Expose option to update recovery -#sed -i 's/mka bacon/mka bacon target-files-package dist/' build/envsetup.sh; #Create target-files for incrementals enterAndClear "vendor/cmsdk" awk -i inplace '!/WeatherManagerServiceBroker/' cm/res/res/values/config.xml; #Disable Weather diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 08bd1164..c1916dfc 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -44,7 +44,7 @@ buildAll() { brunch lineage_flo-user; brunch lineage_flounder-user; #brunch lineage_h850-userdebug; #prot_sect_kernel undefined - #brunch lineage_hammerhead-user; #find: `hardware/cyanogen/cmhw': No such file or directory + #brunch lineage_hammerhead-user; brunch lineage_marlin-user; brunch lineage_m8-user; brunch lineage_sailfish-user; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 2f07f31b..d4a78eb1 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -58,9 +58,6 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a cp -r $prebuiltApps"Fennec_DOS-Shim" $base"packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK cp -r $prebuiltApps"android_vendor_FDroid_PrebuiltApps/." $base"vendor/fdroid_prebuilt/"; #Add the prebuilt apps -#enterAndClear "bootable/recovery" -#optipng -strip all res*/images/*.png; - enterAndClear "build/make" patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch" #Automated build signing. Disclaimer: From CopperheadOS 13.0 awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' core/product.mk; @@ -141,6 +138,7 @@ cp -r $patches"android_packages_apps_Trebuchet/default_workspace/." "res/xml/"; enterAndClear "packages/apps/Updater" patch -p1 < $patches"android_packages_apps_Updater/0001-Server.patch" #Switch to our server +#TODO: Remove changelog enterAndClear "packages/apps/WallpaperPicker" #TODO: Add back wallpapers @@ -156,7 +154,7 @@ patch -p1 < $patches"android_packages_services_Telephony/0001-LTE_Only.patch" #L enterAndClear "system/core" cat /tmp/ar/hosts >> rootdir/etc/hosts #Merge in our HOSTS file -#git revert a6a4ce8e9a6d63014047a447c6bb3ac1fa90b3f4 #Always update recovery +git revert a6a4ce8e9a6d63014047a447c6bb3ac1fa90b3f4 #Always update recovery patch -p1 < $patches"android_system_core/0001-Harden_Mounts.patch" #Harden mounts with nodev/noexec/nosuid. Disclaimer: From CopperheadOS 13.0 enterAndClear "system/vold" @@ -165,6 +163,8 @@ patch -p1 < $patches"android_system_vold/0001-AES256.patch" #Add a variable for enterAndClear "vendor/lineage" rm -rf overlay/common/vendor/lineage-sdk/packages #Remove analytics awk -i inplace '!/50-lineage.sh/' config/common.mk; #Make sure our hosts is always used +awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/common.mk; #Remove extra keys +awk -i inplace '!/security\/lineage/' config/common.mk; #Remove extra keys patch -p1 < $patches"android_vendor_lineage/0001-SCE.patch" #Include our extras such as MicroG and F-Droid cp $patches"android_vendor_lineage/sce.mk" config/sce.mk cp -r $patches"android_vendor_lineage/firmware_deblobber" .; @@ -172,7 +172,6 @@ cp $patches"android_vendor_lineage/firmware_deblobber.mk" build/tasks/firmware_d sed -i 's/LINEAGE_BUILDTYPE := UNOFFICIAL/LINEAGE_BUILDTYPE := dos/' config/common.mk; #Change buildtype sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence sed -i 's/config_enableRecoveryUpdater">false/config_enableRecoveryUpdater">true/' overlay/common/packages/apps/Settings/res/values/config.xml; #Expose option to update recovery -#sed -i 's/mka bacon/mka bacon target-files-package dist/' build/envsetup.sh; #Create target-files for incrementals # #END OF ROM CHANGES # @@ -182,6 +181,7 @@ sed -i 's/config_enableRecoveryUpdater">false/config_enableRecoveryUpdater">true # enterAndClear "device/lge/g3-common" echo "allow wcnss_service block_device:dir search;" >> sepolicy/wcnss_service.te; #fix incorrect Wi-Fi MAC address +echo "/dev/block/platform/msm_sdcc\.1/by-name/pad u:object_r:misc_block_device:s0" >> sepolicy/file_contexts; #fix uncrypt denial enterAndClear "device/lge/mako" cp $patches"android_device_lge_mako/proprietary-blobs.txt" proprietary-blobs.txt; #update that? nah diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index 81787b06..f9cf92f8 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -22,7 +22,6 @@ echo "Rebranding..." enter "bootable/recovery" sed -i 's|Android Recovery|DivestOS Recovery|' *_ui.cpp; sed -i 's|LineageOS|DivestOS|' ui.cpp; -#TODO: Rebrand the rest of the recovery enter "build/make" sed -i 's|echo "ro.build.user=$USER"|echo "ro.build.user=emy"|' tools/buildinfo.sh; #Override build user