From 5b783483e6910984a0f4ca5155ac7b08632de4b7 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 11 Feb 2022 14:23:51 -0500 Subject: [PATCH] Cleanup Signed-off-by: Tad --- .../firmware_deblobber/firmware_deblobber.mk | 16 ---- .../firmware_deblobber/firmware_deblobber.sh | 90 ------------------- .../firmware_deblobber/updater-script | 20 ----- .../android_vendor_divested/packages.mk | 2 +- .../prebuilts/etc/additional_fdroid_repos.xml | 15 ---- 5 files changed, 1 insertion(+), 142 deletions(-) delete mode 100644 Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.mk delete mode 100644 Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.sh delete mode 100644 Patches/Common/android_vendor_divested/firmware_deblobber/updater-script diff --git a/Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.mk b/Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.mk deleted file mode 100644 index 1794c259..00000000 --- a/Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.mk +++ /dev/null @@ -1,16 +0,0 @@ -FD_PREBUILTS_PATH := vendor/divested/firmware_deblobber - -FD_INSTALL_OUT := $(PRODUCT_OUT)/firmware_deblobber/ -FD_INSTALL_TARGET := $(PRODUCT_OUT)/firmware_deblobber-$(TARGET_ARCH).zip - -$(FD_INSTALL_TARGET): $(ALL_MODULES.updater.BUILT) - $(hide) rm -rf $@ $(FD_INSTALL_OUT) - $(hide) mkdir -p $(FD_INSTALL_OUT)/META-INF/com/google/android/ - $(hide) cp $(ALL_MODULES.updater.BUILT) $(FD_INSTALL_OUT)/META-INF/com/google/android/update-binary - $(hide) cp $(FD_PREBUILTS_PATH)/firmware_deblobber.sh $(FD_INSTALL_OUT)/ - $(hide) cp $(FD_PREBUILTS_PATH)/updater-script $(FD_INSTALL_OUT)/META-INF/com/google/android/updater-script - $(hide) (cd $(FD_INSTALL_OUT) && zip -qr $@ *) - -.PHONY: firmware_deblobber -firmware_deblobber: $(FD_INSTALL_TARGET) - @echo "Done: $(FD_INSTALL_TARGET)" diff --git a/Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.sh b/Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.sh deleted file mode 100644 index 6177cc5a..00000000 --- a/Patches/Common/android_vendor_divested/firmware_deblobber/firmware_deblobber.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/sbin/sh -#Maintain "safe" parity with Deblob.sh -#Why so many lines? Why not make a fancy function? Because we'd rather not brick devices! - -deleteBlob() { - rm -f /firmware/$1; - rm -f /firmware/image/$1; -} - -deleteBlob alipay.b00 -deleteBlob alipay.b01 -deleteBlob alipay.b02 -deleteBlob alipay.b03 -deleteBlob alipay.b04 -deleteBlob alipay.b05 -deleteBlob alipay.b06 -deleteBlob alipay.mdt -echo "Removed Alibaba AliPay firmware" - -deleteBlob dxcprm.b00 -deleteBlob dxcprm.b01 -deleteBlob dxcprm.b02 -deleteBlob dxcprm.b03 -deleteBlob dxcprm.mdt -echo "Removed Discretix DRM (old) firmware" - -deleteBlob dxhdcp2.b00 -deleteBlob dxhdcp2.b01 -deleteBlob dxhdcp2.b02 -deleteBlob dxhdcp2.b03 -deleteBlob dxhdcp2.mdt -echo "Removed Discretix DRM (new) firmware" - -deleteBlob widevine.b00 -deleteBlob widevine.b01 -deleteBlob widevine.b02 -deleteBlob widevine.b03 -deleteBlob widevine.b04 -deleteBlob widevine.b05 -deleteBlob widevine.b06 -deleteBlob widevine.mdt -echo "Removed Google Widevine DRM firmware" - -deleteBlob tzwidevine.b00 -deleteBlob tzwidevine.b01 -deleteBlob tzwidevine.b02 -deleteBlob tzwidevine.b03 -deleteBlob tzwidevine.mdt -echo "Removed Google Widevine DRM (alternate 1) firmware" - -deleteBlob tzwvcpybuf.b00 -deleteBlob tzwvcpybuf.b01 -deleteBlob tzwvcpybuf.b02 -deleteBlob tzwvcpybuf.b03 -deleteBlob tzwvcpybuf.mdt -echo "Removed Google Widevine DRM (alternate 2) firmware" - -deleteBlob htc_drmprov.b00 -deleteBlob htc_drmprov.b01 -deleteBlob htc_drmprov.b02 -deleteBlob htc_drmprov.b03 -deleteBlob htc_drmprov.b04 -deleteBlob htc_drmprov.b05 -deleteBlob htc_drmprov.b06 -deleteBlob htc_drmprov.mdt -echo "Removed HTC DRM firmware" - -deleteBlob playread.b00 -deleteBlob playread.b01 -deleteBlob playread.b02 -deleteBlob playread.b03 -deleteBlob playread.mdt -echo "Removed Microsoft PlayReady DRM firmware" - -deleteBlob hdcp1.b00 -deleteBlob hdcp1.b01 -deleteBlob hdcp1.b02 -deleteBlob hdcp1.b03 -deleteBlob hdcp1.b04 -deleteBlob hdcp1.b05 -deleteBlob hdcp1.b06 -deleteBlob hdcp1.mdt -echo "Removed [Unknown 1] DRM firmware" - -deleteBlob tzhdcp.b00 -deleteBlob tzhdcp.b01 -deleteBlob tzhdcp.b02 -deleteBlob tzhdcp.b03 -deleteBlob tzhdcp.mdt -echo "Removed [Unknown 2] DRM firmware" diff --git a/Patches/Common/android_vendor_divested/firmware_deblobber/updater-script b/Patches/Common/android_vendor_divested/firmware_deblobber/updater-script deleted file mode 100644 index f970be01..00000000 --- a/Patches/Common/android_vendor_divested/firmware_deblobber/updater-script +++ /dev/null @@ -1,20 +0,0 @@ -ui_print("DivestOS Firmware Deblobber"); -ui_print("Based off of LineageOS's AddonSU"); - -ifelse(is_mounted("/firmware"), unmount("/firmware")); - -ifelse(!is_mounted("/firmware"), mount("ext4", "EMMC", "/dev/block/platform/msm_sdcc.1/by-name/modem", "/firmware", "")); -ifelse(!is_mounted("/firmware"), mount("ext4", "EMMC", "/dev/block/bootdevice/by-name/modem", "/firmware", "")); -ifelse(!is_mounted("/firmware"), mount("ext4", "EMMC", "/dev/block/platform/soc.0/f9824900.sdhci/by-name/modem", "/firmware", "")); - -if is_mounted("/firmware") then -package_extract_file("firmware_deblobber.sh", "/tmp/firmware_deblobber.sh"); -set_metadata("/tmp/firmware_deblobber.sh", "uid", 0, "gid", 0, "mode", 0755); -run_program("/tmp/firmware_deblobber.sh"); -unmount("/firmware"); -else -abort("Could not mount /firmware"); -endif; - -ui_print("Deblobbed!"); -set_progress(1.000000); diff --git a/Patches/Common/android_vendor_divested/packages.mk b/Patches/Common/android_vendor_divested/packages.mk index 74b1a9f0..e2cbbf98 100644 --- a/Patches/Common/android_vendor_divested/packages.mk +++ b/Patches/Common/android_vendor_divested/packages.mk @@ -7,8 +7,8 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ EtarPrebuilt \ FennecDOS \ - FairEmail \ SimpleGallery \ + FairEmail \ VanillaMusic ifeq ($(findstring flox,$(TARGET_PRODUCT)),) diff --git a/Patches/Common/android_vendor_divested/prebuilts/etc/additional_fdroid_repos.xml b/Patches/Common/android_vendor_divested/prebuilts/etc/additional_fdroid_repos.xml index c46fe037..6561188c 100644 --- a/Patches/Common/android_vendor_divested/prebuilts/etc/additional_fdroid_repos.xml +++ b/Patches/Common/android_vendor_divested/prebuilts/etc/additional_fdroid_repos.xml @@ -31,21 +31,6 @@ 308204f1308202d9a00302010202045423ae35300d06092a864886f70d01010b050030293110300e060355040b1307462d44726f6964311530130603550403130c6469766573746f732e78797a301e170d3137313130343035323531385a170d3435303332323035323531385a30293110300e060355040b1307462d44726f6964311530130603550403130c6469766573746f732e78797a30820222300d06092a864886f70d01010105000382020f003082020a02820201009dfa645e5bb572bfe496416a4affe8f934aa49ec0fcdfc7f562c1c3359ec4c9119c3fb49909dd0e65de6165a893d0317d9deeb7d605808bf793477dc36096ece24bdfd03217767ca96ada5706452bbe31aa0eb2576fb7088ffb6707f4af414c702c5e7418bb80bcc12c2a549e9bb24bf65f2b62126acf65110fc3c6b6c8888d12c7b62d4c2c530ecffbcebd8337a3701f84db9c1090f90b09739ac9a5d17ac24c8d58e0ec6a3f3a2570ac3ad6ca2075a9393e64da78ea147ad3604ba70206cf92086260e6d8d5dea9d0770035af441df7b14c7d0e01e3a866d35b75f0ac61f9d80ab8b22617ec4816942b9316c9296689acb6f3389c34a35f93cfec9af87a340dcfb7da2464f8ad7baf7e192537ac2431dd1b0ab74c734c0d510c023fe462bbd2414e565b53fe5a89b25be7163867d235023cb75db2fe5fc5794b586dc897488ae182f208cbb8ae94d10d3aeb4b9cfbdeac13ec9c39baa6dbe1877077417b4dd6b65cabd73e173d9eb09fcc65e6483244e1d572678ac7f2bb019e11640fcc024deedbaf868347956304b8365faf3319121aa86b82d0ad6494dc6ca27709fd7abee2c1afa9ad146e26a87b120eaf7ba60ee98d972ce2b6909d9f98aa6dfaf913b3048927a0f099793f26d1785c0c318abf610d47e1e50d93438f6ab081945ef3118325a49bc245f9362d57f5c73d9bb8f429cfdd9e73abdcdb150781f4a2036970203010001a321301f301d0603551d0e04160414f0f410806f6d62967fa247cfe16a10586b043b9d300d06092a864886f70d01010b0500038202010063b9a8ad30d5e4cf2291eb14c6b4b1e4ecd364d4d1a3ddfd07d14612e7cac71f0188e27c316efc1a396869ff390d2e06aa5b4dc97763dab2dcc69099528de0a75e4d0c50404e4d3db6f6e1dadc8b397ec3099dee482dc6884ca74527389add861d5c54c20177e313f3a305638225be4aa9ca6e9d79230b49b34e1871e0f0626d7164ec5be1c85679f641a0c12a8bf3d0bd88d16432993340ca642051757ed2c47fd62931974838f28f923faa4a65bb7a44b3f3f3d913e1f6c23397ec99d0b344119a61ec300e04ad99aed5030f660a236695ca9ba7ee58ff3440fa968813b123d03d8bc056d5a635c4f2ba16a4df12f5bc0bbab5996961f8d8173e53138c5be7413eba7a8b6f2efb9c3c58a5c6da81629c3f7b143f97f72afb739e04c48bcb10cdbcde6b96d2f4e238022dc55111b7b46a2db9893de76fe86fe914b4deda57e7dc5bf20d2f870bf689aeb0c9f6dac00214da4cbd287098cca83467ca9b4ad8d54f0dc7ecbb79162d558e14825c3b7f0bf71d45df27dbba8fc922fd2d6cb05ab7b284c0e39f6c3aa1f66eff0ce675801f6eb42d5acb65f37f72fb01fcda6e4b5f1ef6289fa51b77deeab7041fe1b85bdc13135d7562a44110b9d56439abb8f7968105ce1afe6cdcb5c2a25b4831302ba1d6abc62aefc2318422710e0fc514121a2545b35d89b3999f2c456df037e34eebd8ff223e2118da3653120068ade17d3b - -DivestOS Provisioner - -https://divestos.org/fdroid/provisioner - -This is an empty repo used to provision a device using the push install feature. Consider disabling after first use. - -20001 - -0 - -always - -308204f1308202d9a003020102020451e5840f300d06092a864886f70d01010b050030293110300e060355040b1307462d44726f6964311530130603550403130c6469766573746f732e78797a301e170d3138303631373232343731365a170d3435313130323232343731365a30293110300e060355040b1307462d44726f6964311530130603550403130c6469766573746f732e78797a30820222300d06092a864886f70d01010105000382020f003082020a0282020100bfcffa71432b068cea0673424251dd3f418f8a98cabd4ffac34ff96e60c2d258acc6b884d61ffd05a5d546761540551cf5b389bc763bbc9185e8051ed16149e9f8c0a649ce58d459184050c53e56baa7db815a58d7f86e32d687ceb67e3f0c4926024f562b59629cd3c70e0a8ff29a00a7cfb52fc9a16210ac380065637b201414c0c57438d4d51e0d484802796187911d9d5ee05ccd499968c9b469b2499ab5d0222dc4a67eb7fd5d4a875e76affea1610df4a2393c4d1987a0a9e1eca3f763b680d9fe8616303d82438f6d0a78c3f04af8ed25232e4b61ef3d46845b3680378e6977390a247278f2b53309c15c6ca588464efe380847e5de7a96251a5fb3968706f360cea2d7cd547d439706c2c557cce85858b30c4c967984debeaf6dcedcf1a61763bf56d49f6c141b5e209fc59980fb06cd391fb4dcde0956e175c980f9be97c97a97bca04436a122b07cb3adf15c214da9bb90e39736c8f2b53c5a46119aadfa679025c2b7e5df283743ddfcf71d78a703f10739a5f24df651430500af31816f8bbc867fce82d58dd9f229e51413c7e6f49e6aef7ad9bffa79a4b9fcedf2072847a4b7f17d1504448ae31e5994d9d4cbf98a3932eff8df127dca82eaa565609c8e217c87c0d17859a1d1cb3c65a47ae4a6682f6082041ae3afe879fc18c344df61a480c0d89e0b1fb2b7e7720cbc8e076a478747caded95b72cddbcbdd0203010001a321301f301d0603551d0e04160414a26c9ea5bb0d0556d4f7e7a5de592604f7cebb36300d06092a864886f70d01010b050003820201006d924266aebf0055127a21d104ce3078f2c785bea5c8013ee98449756a0e26940b1bbeba34eaf4408a10fb13f9ca47633fca26c993f0c699f4f4e3d64cb9bf6bb00177d8fafcbfc6ba76d532a1ccf82b7d9afee9dafd96a5f4c1e2a3e1f11827042b4b38729a39f01a9ff4195f3a444bd9b61b6d51650ae553c8db2611d165be1d9fa9a2d7bac87f9387425dd0f493b1d3efc71a6d8bf83d0685a0c71f6c943348636c458f14ea5d87fbbf1be065f333d81de6c0ac54502db7ee1484a0794a8b49fd45a149824414c71c6e72b04ff7b18a2d71b0f1fb085dbf9d0619b15a5f058a559510ef09834327bd3bfc4b24b9f23db0be765cac6866d0f89b347c7d2520d18e3b672960e20dcb7adc8cb673d2f76e3f8c0a5cb5a1635f1f029f9e392fa101b432eed033f814a0c7c84986f4c5a2d637b48fb5952c42f6acb3123e8c6ea14ee9b22fc831c28fd34a7fe8397392a8c1ed5794a14f933a567bcb5e443692ef374afbe0b6497c3c207ed8b0265e684e6806f8e55dadc4165c4139901b82d1340aea71971238efd931756da88796316c7f77ca77f932a9b64a4c2ed34fc9915df13fc1710126a65e905ec64a558c00913b5c9d01eed68b21d482d3dc1e397da9ea7a5866e65edc9b93257a5f18059ec8539a65c3c2edc95ea12385c595cb52471bde16ac4209701d9a15ee0c2943757ba90f6989aa2f44cec0f0032db76258fb - DivestOS WebView