Skip to content

Commit

Permalink
Update integrated utils
Browse files Browse the repository at this point in the history
Update bubblewrap to 0.6.2
Update squashfs-tools to 4.5.1
Update dwarfs to the latest git revision of the wip branch (which should speed up mount times on HDDs)
Update all other outdated libraries
  • Loading branch information
Kron4ek committed Jun 1, 2022
1 parent b51b89a commit 53e64b6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion conty-start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
12 changes: 8 additions & 4 deletions create-utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions utils.tar.gz
Git LFS file not shown
4 changes: 2 additions & 2 deletions utils_dwarfs.tar.gz
Git LFS file not shown

0 comments on commit 53e64b6

Please sign in to comment.