From b1c405c46fca9f9f63a2f035eb25f4513ec01da7 Mon Sep 17 00:00:00 2001 From: Kron4ek Date: Sun, 16 Jul 2023 16:33:06 +0500 Subject: [PATCH] Update integrated utils --- conty-start.sh | 2 +- create-utils.sh | 12 ++---------- utils.tar.gz | 4 ++-- utils_dwarfs.tar.gz | 4 ++-- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/conty-start.sh b/conty-start.sh index beae299..e76c694 100755 --- a/conty-start.sh +++ b/conty-start.sh @@ -30,7 +30,7 @@ init_size=50000 bash_size=1490760 script_size=37193 busybox_size=1161112 -utils_size=4321630 +utils_size=4327795 # Full path to the script if [ -n "${BASH_SOURCE[0]}" ]; then diff --git a/create-utils.sh b/create-utils.sh index e2cba4b..895b213 100755 --- a/create-utils.sh +++ b/create-utils.sh @@ -6,7 +6,7 @@ # # Dwarfs build dependencies: fuse2 (or fuse3) openssl jemalloc # xxhash boost lz4 xz zstd libarchive libunwind google-glod gtest fmt -# gflags double-conversion cmake ruby-ronn libevent libdwarf git +# gflags double-conversion cmake ruby-ronn libevent libdwarf git utf8cpp # # Dwarfs compilation is optional and disabled by default. @@ -15,7 +15,7 @@ script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" # Set to true to compile dwarfs instead of squashfuse build_dwarfs="${build_dwarfs:-false}" -squashfuse_version="0.1.105" +squashfuse_version="0.2.0" bwrap_version="0.8.0" lz4_version="1.9.4" zstd_version="1.5.5" @@ -136,15 +136,7 @@ if [ "${build_dwarfs}" = "true" ]; then git clone https://github.com/mhx/dwarfs.git --recursive - # Revert commit aeeddae, because otherwise dwarfs might use - # /usr/lib/locale/locale-archive file, which would break it - # on systems using musl libc - # - # This can also be worked around by setting LC_ALL=C, but for now - # let's revert the commit cd dwarfs || exit 1 - git revert --no-commit aeeddaecab5d4648780b0e11dc03fca19e23409a - mkdir build cd build || exit 1 cmake .. -DCMAKE_BUILD_TYPE=Release \ diff --git a/utils.tar.gz b/utils.tar.gz index e5444b0..4e13fbe 100644 --- a/utils.tar.gz +++ b/utils.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23d1e5f1ab90362435c26376f7072ccd9734c0169e5de78799ea9c9170cd277e -size 4321630 +oid sha256:e7b623d090dda275c91cf1bd9711324c279114825b9b993614316349349856c4 +size 4327795 diff --git a/utils_dwarfs.tar.gz b/utils_dwarfs.tar.gz index 3d90f37..a8e8f30 100644 --- a/utils_dwarfs.tar.gz +++ b/utils_dwarfs.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f77f6e120728642b503b185d1cefa7b8ff1126f578486f991f52fe66f37c255 -size 11628797 +oid sha256:f872cf7fe51c233b566ffa9535f02db50c6a5677cfcebd8c793a17289a9881c4 +size 11808152