diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 975154d2..80623ffc 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -187,6 +187,7 @@ processRelease() { $OUT_DIR/obj/PACKAGING/target_files_intermediates/*$DEVICE-target_files-*.zip \ $OUT_DIR/$PREFIX-target_files.zip; sha512sum $OUT_DIR/$PREFIX-target_files.zip > $OUT_DIR/$PREFIX-target_files.zip.sha512sum; + local INCREMENTAL_ID=$(grep "ro.build.version.incremental" $OUT_DIR/system/build.prop | cut -f2 -d "=" | sed 's/\.//g'); echo $INCREMENTAL_ID > $OUT_DIR/$PREFIX-target_files.zip.id; @@ -237,6 +238,9 @@ processRelease() { # mv $OUT_DIR/rec_tmp/IMAGES/boot.img $OUT_DIR/$PREFIX-boot.img; fi; + sed -i "s|$OUT_DIR/||" $OUT_DIR/*.md5sum; + sed -i "s|$OUT_DIR/||" $OUT_DIR/*.sha512sum; + #Copy to archive if [ "$DOS_AUTO_ARCHIVE_BUILDS" = true ]; then echo -e "\e[0;32mCopying files to archive\e[0m"; @@ -265,6 +269,19 @@ 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; + rsync -Pau fastboot/divested-*-dos-$1-*.zip* root@divestos.org:/var/www/divestos.org/builds/LineageOS/$1/ || true; +} +export -f pushToServer; + disableDexPreOpt() { cd "$DOS_BUILD_BASE$1"; if [ -f BoardConfig.mk ]; then diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 4e9f09dd..3bc5a409 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -119,7 +119,6 @@ patchWorkspace() { repopick -it n_asb_09-2018-qcom; repopick -it ibss-mode-nougat; repopick -it n-netd; - repopick -it n-asb-2020-06; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index da1369e7..ec247bc2 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -104,8 +104,7 @@ export -f buildAll; patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - source build/envsetup.sh; - repopick -it O_asb_2020-06; + #source build/envsetup.sh; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index cce74612..c99c112a 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -126,7 +126,6 @@ patchWorkspace() { source build/envsetup.sh; repopick -i 232948; #wahoo: liblight: close fd - repopick -it P_asb_2020-06; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh";