From a45347f29195ccca97efd25e5d77f991564d7cd5 Mon Sep 17 00:00:00 2001 From: Ocin4ever <85343782+Ocin4ever@users.noreply.github.com> Date: Sat, 6 Sep 2025 13:00:07 +0200 Subject: [PATCH 1/2] trying again --- scripts/internal/build_flashable_zip.sh | 27 ++++++------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/scripts/internal/build_flashable_zip.sh b/scripts/internal/build_flashable_zip.sh index 36f1d1d9ec..48080cd70c 100755 --- a/scripts/internal/build_flashable_zip.sh +++ b/scripts/internal/build_flashable_zip.sh @@ -705,28 +705,13 @@ LOG "- Generating OTA metadata" GENERATE_OTA_METADATA LOG "- Creating zip" -EVAL "rm -f \"$OUT_DIR/rom.zip\"" || exit 1 -pushd "$TMP_DIR" > /dev/null - -# 1. Compressed files (everything except zips, special dat files, META-INF) -find . -type f ! -name "*.new.dat.br" ! -name "*.patch.dat" > compressed.txt - -# 2. Stored files (special dat files + META-INF folder) -find . -type f \( -name "*.new.dat.br" -o -name "*.patch.dat" -o -name "META-INF" \) > stored.txt -META_INF="./META-INF" - -# Add batches -EVAL "7z a -tzip -mx=6 -mmt=$(nproc --all) \"$TMP_DIR/rom.zip\" @\"compressed.txt\"" -EVAL "7z a -tzip -mx=0 -mmt=$(nproc --all) \"$TMP_DIR/rom.zip\" @\"stored.txt\" \"$META_INF\"" - -if ! $DEBUG; then - LOG "- Signing zip" - EVAL "signapk -w \"$PUBLIC_KEY_PATH\" \"$PRIVATE_KEY_PATH\" \"$TMP_DIR/rom.zip\" \"$OUT_DIR/$FILE_NAME\"" || exit 1 - rm -f "$TMP_DIR/rom.zip" +[ -f "$OUT_DIR/$ZIP_FILE_NAME" ] && rm -f "$OUT_DIR/$ZIP_FILE_NAME" +cd "$TMP_DIR" +if [ "$NO_COMPRESSION" = "false" ]; then + zip -rq ../$ZIP_FILE_NAME ./* else - mv -f "$TMP_DIR/rom.zip" "$OUT_DIR/$FILE_NAME" + zip -rq0 --store ../$ZIP_FILE_NAME ./* fi - -popd > /dev/null +cd - &> /dev/null exit 0 From c5ac11a1917ac6111fc0054588334e9bdda025ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Sep 2025 11:04:50 +0000 Subject: [PATCH 2/2] build(deps): bump external/erofs-utils from `760a051` to `eba6e68` Bumps [external/erofs-utils](https://github.com/sekaiacg/erofs-utils) from `760a051` to `eba6e68`. - [Release notes](https://github.com/sekaiacg/erofs-utils/releases) - [Commits](https://github.com/sekaiacg/erofs-utils/compare/760a051fef12d52deff18e3174d56f1f0cd86fbf...eba6e688c6b8ff3154c0b6adf7ab386a53e4bb05) --- updated-dependencies: - dependency-name: external/erofs-utils dependency-version: eba6e688c6b8ff3154c0b6adf7ab386a53e4bb05 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- external/erofs-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/erofs-utils b/external/erofs-utils index fa88a7abbc..eba6e688c6 160000 --- a/external/erofs-utils +++ b/external/erofs-utils @@ -1 +1 @@ -Subproject commit fa88a7abbcdfe01dc19258c9c2c82c3afb45c196 +Subproject commit eba6e688c6b8ff3154c0b6adf7ab386a53e4bb05