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

Many changes

Browse Source 
- 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
This commit is contained in:
Tad 2018-04-12 06:40:10 -04:00
parent a914c813b0
commit df7979a214
7 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,7 @@
Signing_Keys/
Builds/
Build/
Repos/
.Trash-1000
Misc/Features/LNL.txt

16
Manifests/Manifest_LAOS-14.1.xml
View File

@ -12,22 +12,16 @@
<remove-project name="LineageOS/android_external_ant-wireless_ant_native" />
<remove-project name="LineageOS/android_external_ant-wireless_ant_service" />
<remove-project name="LineageOS/android_external_bash" />
<remove-project name="LineageOS/android_external_exfat" />
<remove-project name="LineageOS/android_external_htop" />
<remove-project name="LineageOS/android_external_libncurses" />
<remove-project name="LineageOS/android_external_nano" />
<remove-project name="LineageOS/android_external_openssh" />
<remove-project name="LineageOS/android_external_p7zip" />
<remove-project name="LineageOS/android_external_powertop" />
<remove-project name="LineageOS/android_external_rsync" />
<remove-project name="LineageOS/android_external_unrar" />
<remove-project name="LineageOS/android_external_vim" />
<!-- Untested
<remove-project name="LineageOS/android_external_libtar" />
<remove-project name="LineageOS/android_external_ntfs-3g" />
<remove-project name="LineageOS/android_external_p7zip" />
<remove-project name="LineageOS/android_external_pigz" />
<remove-project name="LineageOS/android_external_unzip" />
<remove-project name="LineageOS/android_external_yaffs2" />
<remove-project name="LineageOS/android_external_zip" />-->
<remove-project name="LineageOS/android_hardware_intel_common_libmix" />
<remove-project name="LineageOS/android_hardware_intel_common_libva" />
<remove-project name="LineageOS/android_hardware_intel_common_libwsbm" />
@ -59,7 +53,9 @@
<remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_aarch64_aarch64-linux-android-4.9" />
<remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_arm_arm-linux-androideabi-4.9" />
<remove-project name="LineageOS/android_prebuilts_gcc_darwin-x86_x86_x86_64-linux-android-4.9" />
<remove-project name="LineageOS/android_system_extras_su" />
<remove-project name="LineageOS/ansible" />
<remove-project name="LineageOS/charter" />
<remove-project name="LineageOS/cm_crowdin" />
<remove-project name="LineageOS/contributors-cloud-generator" />
<remove-project name="LineageOS/cve_tracker" />
@ -212,14 +208,10 @@
<project path="vendor/amazon" name="TheMuppets/proprietary_vendor_amazon" remote="github" />
<project path="vendor/asus" name="TheMuppets/proprietary_vendor_asus" remote="github" />
<project path="vendor/fairphone" name="TheMuppets/proprietary_vendor_fairphone" remote="github" />
<project path="vendor/google" name="TheMuppets/proprietary_vendor_google" remote="github" />
<project path="vendor/htc" name="TheMuppets/proprietary_vendor_htc" remote="github" />
<project path="vendor/huawei" name="TheMuppets/proprietary_vendor_huawei" remote="github" />
<project path="vendor/lge" name="TheMuppets/proprietary_vendor_lge" remote="github" />
<project path="vendor/motorola" name="TheMuppets/proprietary_vendor_motorola" remote="github" />
<project path="vendor/nextbit" name="TheMuppets/proprietary_vendor_nextbit" remote="github" />
<project path="vendor/oneplus" name="TheMuppets/proprietary_vendor_oneplus" remote="github" />
<project path="vendor/oppo" name="TheMuppets/proprietary_vendor_oppo" remote="github" />
<project path="vendor/samsung" name="TheMuppets/proprietary_vendor_samsung" remote="github" />
<!-- END OF DEVICE REPOS -->

26
Manifests/Manifest_LAOS-15.1.xml
View File

@ -12,21 +12,15 @@
<remove-project name="LineageOS/android_external_ant-wireless_ant_native" />
<remove-project name="LineageOS/android_external_ant-wireless_ant_service" />
<remove-project name="LineageOS/android_external_bash" />
<remove-project name="LineageOS/android_external_exfat" />
<remove-project name="LineageOS/android_external_htop" />
<remove-project name="LineageOS/android_external_libncurses" />
<remove-project name="LineageOS/android_external_nano" />
<remove-project name="LineageOS/android_external_p7zip" />
<remove-project name="LineageOS/android_external_powertop" />
<remove-project name="LineageOS/android_external_rsync" />
<remove-project name="LineageOS/android_external_unrar" />
<remove-project name="LineageOS/android_external_vim" />
<!-- Untested
<remove-project name="LineageOS/android_external_libtar" />
<remove-project name="LineageOS/android_external_ntfs-3g" />
<remove-project name="LineageOS/android_external_p7zip" />
<remove-project name="LineageOS/android_external_pigz" />
<remove-project name="LineageOS/android_external_unzip" />
<remove-project name="LineageOS/android_external_yaffs2" />
<remove-project name="LineageOS/android_external_zip" />-->
<remove-project name="LineageOS/android_packages_apps_Jelly" />
<remove-project name="LineageOS/android_packages_apps_LockClock" />
<remove-project name="LineageOS/android_packages_apps_ManagedProvisioning" />
@ -43,7 +37,9 @@
<remove-project name="LineageOS/android_packages_screensavers_Basic" />
<remove-project name="LineageOS/android_packages_screensavers_PhotoTable" />
<remove-project name="LineageOS/android_packages_screensavers_WebView" />
<remove-project name="LineageOS/android_system_extras_su" />
<remove-project name="LineageOS/ansible" />
<remove-project name="LineageOS/charter" />
<remove-project name="LineageOS/cm_crowdin" />
<remove-project name="LineageOS/contributors-cloud-generator" />
<remove-project name="LineageOS/cve_tracker" />
@ -53,6 +49,7 @@
<remove-project name="LineageOS/scripts" />
<remove-project name="LineageOS/slackbot" />
<remove-project name="LineageOS/www" />
<remove-project name="platform/external/openssh" />
<remove-project name="platform/hardware/intel/audio_media" />
<remove-project name="platform/hardware/intel/bootstub" />
<remove-project name="platform/hardware/intel/common/bd_prov" />
@ -69,6 +66,16 @@
<remove-project name="platform/prebuilts/python/darwin-x86/2.7.5" />
<!-- END OF UNNECESSARY REPO REMOVAL -->
<!-- START OF BRANCH SWITCHING -->
<!-- new recovery is overly large -->
<remove-project name="bootable/recovery" />
<project path="bootable/recovery" name="LineageOS/android_bootable_recovery" groups="pdk" revision="cm-14.1" />
<!-- master contains some necessary fixes -->
<remove-project name="platform/external/svox" />
<project path="external/svox" name="platform/external/svox" groups="pdk" remote="aosp" revision="master" />
<!-- END OF BRANCH SWITCHING -->
<!-- START OF ADDITIONAL REPOS -->
<!-- MicroG -->
<project path="packages/apps/GmsCore" name="microg/android_packages_apps_GmsCore" remote="github" revision="master" />
@ -79,9 +86,6 @@
<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
<project path="packages/apps/FDroidPrivilegedExtension" name="privileged-extension.git" remote="fdroid" revision="master" />
<project path="packages/apps/FDroid" name="fdroidclient.git" remote="fdroid" revision="master" />
<remove-project name="platform/external/svox" />
<project path="external/svox" name="platform/external/svox" groups="pdk" remote="aosp" revision="master" />
<!-- END OF ADDITIONAL REPOS -->

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

@ -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

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

@ -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;

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

@ -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

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

@ -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