diff --git a/.github/workflows/utils.yml b/.github/workflows/utils.yml index 88526c1..ae0c084 100644 --- a/.github/workflows/utils.yml +++ b/.github/workflows/utils.yml @@ -25,7 +25,7 @@ jobs: zstd libarchive libunwind google-glog gtest fmt gflags \ double-conversion cmake ruby-ronn libevent libdwarf git \ clang libsodium liburing libaio musl kernel-headers-musl utf8cpp \ - chrono-date python python-mistletoe range-v3 nlohmann-json + chrono-date python python-mistletoe range-v3 nlohmann-json meson build_dwarfs=false ./create-utils.sh tar xf utils.tar.gz mv utils utils-bak diff --git a/create-utils.sh b/create-utils.sh index db724dd..5e44263 100755 --- a/create-utils.sh +++ b/create-utils.sh @@ -58,9 +58,8 @@ if [ "${build_dwarfs}" != "true" ]; then fi cd bubblewrap-"${bwrap_version}" || exit 1 -./autogen.sh -./configure --disable-selinux --disable-man -make -j"$(nproc)" DESTDIR="${script_dir}"/build-utils/bin install +meson -Dselinux=disabled -Dman=disabled build +DESTDIR="${script_dir}"/build-utils/bin meson install -C build cd ../unionfs-fuse-"${unionfs_fuse_version}" || exit 1 mkdir build-fuse3 diff --git a/utils.tar.gz b/utils.tar.gz index fa3760d..9794108 100644 --- a/utils.tar.gz +++ b/utils.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61736ab37fdfd421f778bc7f5a331bb162b3a5e3a4ea692b1817cab4fa2397c1 -size 4392469 +oid sha256:94671d1d9507e0a00e7294ca72362554a37559210904afe9fbc66d793b789f38 +size 4393102 diff --git a/utils_dwarfs.tar.gz b/utils_dwarfs.tar.gz index c948b87..4694b82 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:4ac02187038959dcdc15c2fc3f4fc8a2890524bb97114591f680b4f53a6736c9 -size 26443204 +oid sha256:6cf523317238c6651ec4c500676e70e41198d3e8b431ad97d467d12552c9a610 +size 26533400