diff --git a/Patches/Linux b/Patches/Linux index dcbf3465..c204a21b 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit dcbf3465dbd96f5a700d185ab2fa3c9aadf412d2 +Subproject commit c204a21b1e0e307b73ceaf4f72ab84df0979d014 diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 48601379..b5c1cc79 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -327,8 +327,7 @@ echo "Deblobbing..." #blobs=$blobs"|dbvc_atvc_property_set"; blobs=$blobs"|com.motorola.motosignature.jar|com.motorola.motosignature.xml|MotoSignatureApp.apk"; blobs=$blobs"|TriggerEnroll.apk|TriggerTrainingService.apk|com.motorola.triggerenroll.xml"; - blobs=$blobs"|audio.motvr.default.so"; - #blobs=$blobs"|libmotaudioutils.so"; #breaks phone call audio + blobs=$blobs"|audio.motvr.default.so|libmotaudioutils.so"; blobs=$blobs"|libcce-socketjni.so|libmotocare.so"; #blobs=$blobs"|qmi_motext_hook|libmdmcutback.so|libqmimotext.so|libmotext_inf.so"; #necessary for radio makes=$makes"|com.motorola.cameraone.xml"; diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 6f7a5dfe..f1d953ee 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -177,7 +177,7 @@ processRelease() { #Malware Scan if [ "$DOS_MALWARE_SCAN_BEFORE_SIGN" = true ]; then echo -e "\e[0;32mScanning files for malware before signing\e[0m"; - scanForMalware false "$OUT_DIR/system"; + scanForMalware false "$OUT_DIR/obj/PACKAGING/target_files_intermediates/*$DEVICE-target_files-*.zip"; fi; #Target Files @@ -243,7 +243,10 @@ processRelease() { # sha512sum $OUT_DIR/$PREFIX-boot.img > $OUT_DIR/$PREFIX-boot.img.sha512sum; fi; + #File name fixes sed -i "s|$OUT_DIR/||" $OUT_DIR/*.md5sum $OUT_DIR/*.sha512sum; + sed -i 's/-ota\././' $OUT_DIR/*.md5sum $OUT_DIR/*.sha512sum; + sed -i 's/-incremental_/-/' $OUT_DIR/*.md5sum $OUT_DIR/*.sha512sum; #GPG signing if [ "$DOS_GPG_SIGNING" = true ]; then @@ -269,6 +272,9 @@ processRelease() { cp -v $OUT_DIR/$PREFIX-ota.zip* $ARCHIVE/; cp -v $OUT_DIR/$PREFIX-incremental_*.zip* $ARCHIVE/incrementals/ || true; cp -v $OUT_DIR/$PREFIX-recovery.img* $ARCHIVE/ || true; + + rename -- "-ota." "." $ARCHIVE/$PREFIX-ota.zip*; + rename -- "-incremental_" "-" $ARCHIVE/incrementals/$PREFIX-incremental_*.zip*; sync; #Remove to make space for next build @@ -285,11 +291,6 @@ processRelease() { export -f processRelease; pushToServer() { - rename -- "-ota." "." *zip*; - rename -- "-incremental_" "-" incrementals/*zip*; - sed -i 's/-ota\././' *.md5sum *.sha512sum; - sed -i 's/-incremental_/-/' incrementals/*.md5sum incrementals/*.sha512sum; - rsync -Pau incrementals/divested-*-dos-$1-*.zip* root@divestos.org:/var/www/divestos.org/builds/LineageOS/$1/incrementals/ || true; rsync -Pau divested-*-dos-$1.zip* root@divestos.org:/var/www/divestos.org/builds/LineageOS/$1/ || true; rsync -Pau divested-*-dos-$1-recovery.img root@divestos.org:/var/www/divestos.org/builds/LineageOS/$1/ || true;