Update integrated utils

Update bubblewrap to 0.7.0
Update dwarfs to the latest git revision (3dfad5a)
Update zstd to 1.5.4
Update glibc to 2.37
Update boost to 1.81
Update all other outdated dependencies
This commit is contained in:
Kron4ek 2023-02-10 16:11:08 +05:00
parent a8745a96e6
commit c86cba4af3
4 changed files with 19 additions and 10 deletions

View file

@ -46,7 +46,7 @@ mount_point="${working_dir}"/mnt
scriptsize=26260 scriptsize=26260
# The size of the utils archive # The size of the utils archive
utilssize=2482019 utilssize=2507588
# Offset where the image is stored # Offset where the image is stored
offset=$((scriptsize+utilssize)) offset=$((scriptsize+utilssize))

View file

@ -15,9 +15,9 @@ script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
build_dwarfs="false" build_dwarfs="false"
squashfuse_version="0.1.105" squashfuse_version="0.1.105"
bwrap_version="0.6.2" bwrap_version="0.7.0"
lz4_version="1.9.4" lz4_version="1.9.4"
zstd_version="1.5.2" zstd_version="1.5.4"
squashfs_tools_version="4.5.1" squashfs_tools_version="4.5.1"
export CC=gcc export CC=gcc
@ -89,11 +89,20 @@ fi
if [ "${build_dwarfs}" = "true" ]; then if [ "${build_dwarfs}" = "true" ]; then
git clone https://github.com/mhx/dwarfs.git --recursive git clone https://github.com/mhx/dwarfs.git --recursive
mkdir dwarfs/build # Revert commit aeeddae, because otherwise dwarfs might use
cd dwarfs/build # /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
git revert --no-commit aeeddaecab5d4648780b0e11dc03fca19e23409a
mkdir build
cd build
cmake .. -DCMAKE_BUILD_TYPE=Release \ cmake .. -DCMAKE_BUILD_TYPE=Release \
-DPREFER_SYSTEM_ZSTD=ON -DPREFER_SYSTEM_XXHASH=ON \ -DPREFER_SYSTEM_ZSTD=ON -DPREFER_SYSTEM_XXHASH=ON \
-DPREFER_SYSTEM_GTEST=ON -DPREFER_SYSTEM_GTEST=ON -DPREFER_SYSTEM_LIBFMT=ON
make -j$(nproc) make -j$(nproc)
make DESTDIR="${script_dir}"/build-utils/bin install make DESTDIR="${script_dir}"/build-utils/bin install

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:369f485a88fbb96408cbe3c11d51aa746aba21d9093972157bb84028c6e428d9 oid sha256:0d19f1a6fe7e74c6508b8a3a9b4438da37cb080aec764f43ed509fc22946563f
size 2482019 size 2507588

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:15db42a859bfb7c8fac9ebbf32aad6db726564dbd927edd1437dda7f396e1129 oid sha256:0cb2619109c3869c2cf7367a5bca8547dbf1c48f5c8c83645aa0b33348236f29
size 8352404 size 9365818