diff --git a/conty-start.sh b/conty-start.sh index 4b38691..9ccdaff 100755 --- a/conty-start.sh +++ b/conty-start.sh @@ -46,7 +46,7 @@ mount_point="${working_dir}"/mnt scriptsize=24870 # The size of the utils archive -utilssize=2505629 +utilssize=2537833 # Offset where the image is stored offset=$((scriptsize+utilssize)) diff --git a/create-utils.sh b/create-utils.sh index 87a7b67..7787b03 100755 --- a/create-utils.sh +++ b/create-utils.sh @@ -15,15 +15,15 @@ script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" build_dwarfs="false" squashfuse_version="0.1.104" -bwrap_version="0.6.1" +bwrap_version="0.6.2" lz4_version="1.9.3" zstd_version="1.5.2" -squashfs_tools_version="4.5" +squashfs_tools_version="4.5.1" export CC=gcc export CXX=g++ -export CFLAGS="-msse3 -O2" +export CFLAGS="-O2" export CXXFLAGS="${CFLAGS}" export LDFLAGS="-Wl,-O1,--sort-common,--as-needed" @@ -87,7 +87,11 @@ if [ ! "$(ldd utils/squashfuse | grep libfuse.so.2)" ]; then fi if [ "${build_dwarfs}" = "true" ]; then - git clone https://github.com/mhx/dwarfs.git --recursive + git clone https://github.com/mhx/dwarfs.git -b wip --recursive + + # Fix compilation with Boost 1.79 + wget -q --show-progress -O boost.patch "https://github.com/facebook/fbthrift/commit/5bd55f11e1b6cc2cb08a0001f9c77f56fb8ac649.patch" + patch -d dwarfs/fbthrift -Np1 < boost.patch mkdir dwarfs/build cd dwarfs/build diff --git a/utils.tar.gz b/utils.tar.gz index fbcef25..9228e5a 100644 --- a/utils.tar.gz +++ b/utils.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef837bbb09c4cf84edfa4522c2d62a7ceb6b4d5ef03e3c9dd4e169c3df8ded7f -size 2505629 +oid sha256:c95caa280b46ed8d65aa2d6acca18dcf0365d6db5bc359dd7ab53b8a8a0e57e8 +size 2537833 diff --git a/utils_dwarfs.tar.gz b/utils_dwarfs.tar.gz index 330c66c..6bf477e 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:6c150cd17c623606ae7e2bf18fb27c3b26477e8c36b4344bcc2eaeafd98485f2 -size 8700916 +oid sha256:8b55e68b622c894bb44ba22b2d74d88762b4e0ba612fcdc154ba904fec633ff0 +size 8785371