diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml
index 4c7c57b7..271f95d8 100644
--- a/Manifests/Manifest_LAOS-14.1.xml
+++ b/Manifests/Manifest_LAOS-14.1.xml
@@ -91,6 +91,10 @@
+
+
+
+
@@ -123,12 +127,6 @@
-
-
-
-
-
-
diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml
index dce13144..608df996 100644
--- a/Manifests/Manifest_LAOS-15.1.xml
+++ b/Manifests/Manifest_LAOS-15.1.xml
@@ -81,6 +81,10 @@
+
+
+
+
diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh
index 4a118a1a..a0b89075 100755
--- a/Scripts/Common/Deblob.sh
+++ b/Scripts/Common/Deblob.sh
@@ -200,7 +200,7 @@ echo "Deblobbing..."
#Vulkan [Qualcomm]
#blobs=$blobs"|libllvm-qgl.so|vulkan.msm.*.so";
- #Wfd (Wireless Display) [Qualcomm]
+ #Wfd (Wireless Display? Wi-Fi Direct?) [Qualcomm]
blobs=$blobs"|libmmparser_lite.so|libmmrtpdecoder.so|libmmrtpencoder.so|libmmwfdinterface.so|libmmwfdsinkinterface.so|libmmwfdsrcinterface.so|libwfdavenhancements.so|libwfdcommonutils.so|libwfdhdcpcp.so|libwfdmmsink.so|libwfdmmsrc.so|libwfdmmutils.so|libwfdnative.so|libwfdrtsp.so|libwfdservice.so|libwfdsm.so|libwfduibcinterface.so|libwfduibcsinkinterface.so|libwfduibcsink.so|libwfduibcsrcinterface.so|libwfduibcsrc.so|WfdCommon.jar|wfdconfigsink.xml|wfdconfig.xml|wfdservice|WfdService.apk";
#Widevine (DRM) [Google]
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 7c95f8a5..38348b8a 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -54,7 +54,7 @@ buildAll() {
brunch lineage_thor-userdebug; #deprecated
brunch lineage_clark-user;
brunch lineage_FP2-user;
-# brunch lineage_h815-user; #deprecated (UPSTREAM) drivers/input/touchscreen/DS5/RefCode_CustomerImplementation.c:147:1: warning: the frame size of 2064 bytes is larger than 2048 bytes
+ brunch lineage_h815-user; #deprecated (UPSTREAM) drivers/input/touchscreen/DS5/RefCode_CustomerImplementation.c:147:1: warning: the frame size of 2064 bytes is larger than 2048 bytes
brunch lineage_h850-userdebug;
brunch lineage_hammerhead-user;
brunch lineage_herolte-user;
diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh
index 90747373..9ca46e49 100755
--- a/Scripts/LineageOS-14.1/Patch.sh
+++ b/Scripts/LineageOS-14.1/Patch.sh
@@ -188,7 +188,6 @@ 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";
sed -i '3iinclude vendor/cm/config/sce.mk' config/common.mk; #Include extra apps
cp $patches"android_vendor_cm/sce.mk" config/sce.mk;
if [ "$MICROG_INCLUDED" = true ]; then cp $patches"android_vendor_cm/sce-microG.mk" config/sce-microG.mk; fi;
@@ -236,6 +235,7 @@ cd $base;
#Fix broken options enabled by hardenDefconfig()
sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/lge/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile
sed -i "s/CONFIG_PARTIALRESUME=y/# CONFIG_PARTIALRESUME is not set/" kernel/motorola/msm8992/arch/arm64/configs/*defconfig; #Breaks on compile
+sed -i "s/CONFIG_CRYPTO_DEV_QCRYPTO=y/# CONFIG_CRYPTO_DEV_QCRYPTO is not set/" kernel/samsung/jf/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile
#
#END OF DEVICE CHANGES
#
diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh
index 6d2d7a16..df99d2a2 100644
--- a/Scripts/LineageOS-14.1/Rebrand.sh
+++ b/Scripts/LineageOS-14.1/Rebrand.sh
@@ -44,7 +44,7 @@ sed -i 's|>LineageOS|>DivestOS|' res/values*/strings.xml;
enter "vendor/cm";
sed -i 's|https://lineageos.org/legal|https://divestos.xyz/index.php?page=about|' config/common.mk;
-sed -i '/.*ZIPPATH=/s/lineage/coverage/' build/envsetup.sh;
+sed -i '/.*ZIPPATH=/s/lineage/divested/' build/envsetup.sh;
rm -rf bootanimation #TODO: Create a boot animation
cd $base;
diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh
index 56ee7915..04b61612 100644
--- a/Scripts/LineageOS-15.1/Rebrand.sh
+++ b/Scripts/LineageOS-15.1/Rebrand.sh
@@ -53,7 +53,7 @@ sed -i 's|>LineageOS|>DivestOS|' res/values*/strings.xml;
enter "vendor/lineage";
sed -i 's|https://lineageos.org/legal|https://divestos.xyz/index.php?page=about|' build/core/main_version.mk
-sed -i '/.*ZIPPATH=/s/lineage/coverage/' build/envsetup.sh;
+sed -i '/.*ZIPPATH=/s/lineage/divested/' build/envsetup.sh;
sed -i '/LINEAGE_TARGET_PACKAGE/s/lineage/coverage/' build/tasks/bacon.mk;
rm -rf bootanimation; #TODO: Create a boot animation
diff --git a/TODO b/TODO
index 36d4739f..14d7ce94 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-Last updated: 2018-06-10
+Last updated: 2018-06-12
High Priority (Release blockers)
Build
@@ -16,6 +16,7 @@ High Priority (Release blockers)
- 2x Mirror slaves on an OVH VPS (SSD2: 2x$7.80 = $15.60/mo)
- 1x Mirror slave on a 1/10Gbps server for high-speed incrementals
Website
+ - Switch from Shadow to Piwik and update Privacy Policy
- mod_removeip for GDPR and update Privacy Policy
- Update cryptocurrency addresses
@@ -33,10 +34,6 @@ Medium Priority
Servers
- Dedicated build servers
- Ejabberd on an OVH VPS (SSD1: $4.50/mo)
- Signoffs
- - Get signoff from Copperhead on inclusion of disabled patches
- Website
- - Switch from Shadow to Piwik and update Privacy Policy
Low Priority
Build