commit: 878c2dec571bfa1a0a9200f0e007fcfc85a77ffd Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja> AuthorDate: Tue Dec 12 22:11:09 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 13 02:04:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878c2dec
sys-fs/bcachefs-tools: add 1.3.5_p20231210 This snapshot includes build fixes for musl (there were some malloc-related glibc-specific shenanigans) as well as the new online fsck capability. Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja> Signed-off-by: Sam James <sam <AT> gentoo.org> sys-fs/bcachefs-tools/Manifest | 1 + .../bcachefs-tools-1.3.5_p20231210.ebuild | 261 +++++++++++++++++++++ 2 files changed, 262 insertions(+) diff --git a/sys-fs/bcachefs-tools/Manifest b/sys-fs/bcachefs-tools/Manifest index 52fd169a3f86..48b43b7cd7bb 100644 --- a/sys-fs/bcachefs-tools/Manifest +++ b/sys-fs/bcachefs-tools/Manifest @@ -12,6 +12,7 @@ DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f DIST bcachefs-tools-1.2_p20230813.tar.gz 1014471 BLAKE2B 2daf56f8155dd7a8847501a34ab11e40bf92f9eb7eca28ea835ad6837731147d19ed00edbfca14f4f037cf9492aae4666d50137d16df86fd6823c9cea11d6ccd SHA512 6895fc55c69df5cbb418e3827ced8ad7e6227073111c3320ac9228373025c5501e871a50e2a3daef9ea0fd7b94ce1d0448dd7498a62445dd272d940f5c28d654 DIST bcachefs-tools-1.3.5.tar.gz 1039686 BLAKE2B 5599218dea4957d3bca8eeaebb1f9cc16004b24b1af1b6ce7c22a263dd4bedfe1193fe05d9ea38e082eb2af26ff026119e82cd946ab979ad8902bb752eeb0bbc SHA512 df32673566fc8872da3823599ba131465944889ca5fb5dc3b584b137bf75203b9bdcc690fd9744dd3030779e1ac3f1a5e71435fd7d883e3082111ff334e156a0 +DIST bcachefs-tools-1.3.5_p20231210.tar.gz 1050695 BLAKE2B d371e9ade41f535bce5e35334f2798e01291eb6d64c0903388ac68745843b1edb717ae6852039860196acbda8f6dbf9440220439b959c6b21b232d8880e6243f SHA512 f9b2584afb054f4b2cf6a8827e8ed83765f2ffc1b3302444c7b550da633e2cc16312812dbb9493147ae496e2b4f820c393603234ad15f9d2cead9464dd4c1281 DIST bitfield-0.14.0.crate 16776 BLAKE2B abca546581d912133e7344f049d93b8d793de323eba7780fab162c53a244b845582ec2bd14b529b9491c363c2da6228b7de58407afc554cc718a9df8370f5535 SHA512 703d534f0684b19af68a18048ecff37367ccbe5a52a3e8d987f2420b980e4a20da9640019ca610b1a73841cbe45dbf4d6a1cfb10cf0e7d09f53199b1fcd141fe DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.3.5_p20231210.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.3.5_p20231210.ebuild new file mode 100644 index 000000000000..72f411b9d45e --- /dev/null +++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.3.5_p20231210.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + aho-corasick@1.1.2 + anstream@0.3.2 + anstyle-parse@0.2.1 + anstyle-query@1.0.0 + anstyle-wincon@1.0.2 + anstyle@1.0.2 + anyhow@1.0.75 + atty@0.2.14 + autocfg@1.1.0 + bitfield@0.14.0 + bitflags@1.3.2 + bitflags@2.4.1 + byteorder@1.5.0 + cc@1.0.83 + cexpr@0.6.0 + cfg-if@1.0.0 + chrono@0.4.31 + clang-sys@1.6.1 + clap_builder@4.3.24 + clap_complete@4.3.2 + clap_derive@4.3.12 + clap_lex@0.5.0 + clap@4.3.24 + colorchoice@1.0.0 + colored@2.0.4 + either@1.9.0 + errno-dragonfly@0.1.2 + errno@0.2.8 + errno@0.3.7 + fastrand@2.0.1 + filedescriptor@0.8.2 + gag@1.0.0 + getset@0.1.2 + glob@0.3.1 + heck@0.4.1 + hermit-abi@0.1.19 + hermit-abi@0.3.3 + io-lifetimes@1.0.11 + is-terminal@0.4.9 + itertools@0.9.0 + lazy_static@1.4.0 + lazycell@1.3.0 + libc@0.2.150 + libudev-sys@0.1.4 + linux-raw-sys@0.3.8 + linux-raw-sys@0.4.11 + log@0.4.20 + memchr@2.6.4 + memoffset@0.8.0 + minimal-lexical@0.2.1 + nom@7.1.3 + num-traits@0.2.17 + once_cell@1.18.0 + parse-display-derive@0.1.2 + parse-display@0.1.2 + paste@1.0.14 + peeking_take_while@0.1.2 + pkg-config@0.3.27 + proc-macro-error-attr@1.0.4 + proc-macro-error@1.0.4 + proc-macro2@1.0.69 + quote@1.0.33 + redox_syscall@0.4.1 + regex-automata@0.4.3 + regex-syntax@0.6.29 + regex-syntax@0.8.2 + regex@1.10.2 + rpassword@4.0.5 + rustc-hash@1.1.0 + rustix@0.37.27 + rustix@0.38.25 + shlex@1.2.0 + strsim@0.10.0 + syn@1.0.109 + syn@2.0.39 + tempfile@3.8.1 + terminal_size@0.2.6 + thiserror-impl@1.0.50 + thiserror@1.0.50 + udev@0.7.0 + unicode-ident@1.0.12 + utf8parse@0.2.1 + uuid@1.6.1 + version_check@0.9.4 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_msvc@0.48.5 + windows_i686_gnu@0.48.5 + windows_i686_msvc@0.48.5 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_msvc@0.48.5 + windows-sys@0.48.0 + windows-targets@0.48.5 +" + +# Upstream have a fork of bindgen and use cgit +declare -A GIT_CRATES=( + [bindgen]="https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs;f773267b090bf16b9e8375fcbdcd8ba5e88806a8;rust-bindgen-bcachefs-%commit%/bindgen"; +) + +LLVM_MAX_SLOT=17 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cargo flag-o-matic llvm multiprocessing python-any-r1 toolchain-funcs unpacker + +DESCRIPTION="Tools for bcachefs" +HOMEPAGE="https://bcachefs.org/"; +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://evilpiepirate.org/git/bcachefs-tools.git"; +else + MY_COMMIT=b44629a3dbe35f9ef84d3fa61b9d9f1a08b47075 + SRC_URI="https://github.com/koverstreet/bcachefs-tools/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS}" + S="${WORKDIR}/${PN}-${MY_COMMIT}" + KEYWORDS="~amd64" +fi + +LICENSE="Apache-2.0 BSD GPL-2 MIT" +SLOT="0" +IUSE="fuse test" +RESTRICT="!test? ( test )" + +DEPEND=" + fuse? ( >=sys-fs/fuse-3.7.0 ) + app-arch/lz4:= + dev-libs/libaio + dev-libs/libsodium:= + dev-libs/userspace-rcu:= + sys-apps/keyutils + sys-apps/util-linux + sys-libs/zlib + virtual/udev +" + +RDEPEND="${DEPEND}" + +# Clang is required for bindgen +BDEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/docutils[${PYTHON_USEDEP}] + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) + ') + $(unpacker_src_uri_depends) + <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)) + virtual/pkgconfig + virtual/rust +" + +llvm_check_deps() { + has_version -b "sys-devel/clang:${LLVM_SLOT}" +} + +python_check_deps() { + if use test; then + python_has_version \ + "dev-python/pytest[${PYTHON_USEDEP}]" \ + "dev-python/pytest-xdist[${PYTHON_USEDEP}]" + fi + python_has_version "dev-python/docutils[${PYTHON_USEDEP}]" +} + +pkg_setup() { + llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == "9999" ]]; then + git-r3_src_unpack + S="${S}/rust-src" cargo_live_src_unpack + else + unpack ${P}.tar.gz + cargo_src_unpack + fi +} + +src_prepare() { + default + tc-export CC + sed \ + -e '/^CFLAGS/s:-O2::' \ + -e '/^CFLAGS/s:-g::' \ + -i Makefile || die + # Patch our cargo-ebuild patch definition to pretend that our GIT_CRATE is upstream's URI. + if ! [[ ${PV} == "9999" ]]; then + sed -e 's https://gitlab.com/Matt.Jolly/rust-bindgen-bcachefs https://evilpiepirate.org/git/rust-bindgen.git ' \ + -i "${WORKDIR}/cargo_home/config" || die + fi + append-lfs-flags +} + +src_compile() { + use fuse && export BCACHEFS_FUSE=1 + export BUILD_VERBOSE=1 + export VERSION=${PV} + + default + + use test && emake tests +} + +src_test() { + if ! use fuse; then + EPYTEST_IGNORE=( tests/test_fuse.py ) + fi + EPYTEST_DESELECT=( + # Valgrind + 'tests/test_fixture.py::test_read_after_free' + 'tests/test_fixture.py::test_undefined' + 'tests/test_fixture.py::test_write_after_free' + 'tests/test_fixture.py::test_undefined_branch' + 'tests/test_fixture.py::test_leak' + 'tests/test_fixture.py::test_check' + # Fails in portage because of usersandbox; ensure that these pass before bumping! + 'tests/test_basic.py::test_format' + 'tests/test_basic.py::test_fsck' + 'tests/test_basic.py::test_list' + 'tests/test_basic.py::test_list_inodes' + 'tests/test_basic.py::test_list_dirent' + ) + epytest -v -n "$(makeopts_jobs)" +} + +src_install() { + into / + dosbin bcachefs + + dosym bcachefs /sbin/fsck.bcachefs + dosym bcachefs /sbin/mkfs.bcachefs + dosym bcachefs /sbin/mount.bcachefs + + if use fuse; then + dosym bcachefs /sbin/fsck.fuse.bcachefs + dosym bcachefs /sbin/mkfs.fuse.bcachefs + dosym bcachefs /sbin/mount.fuse.bcachefs + fi + + doman bcachefs.8 +} + +pkg_postinst() { + if use fuse; then + ewarn "FUSE support is experimental." + ewarn "Please only use it for development purposes at the risk of losing your data." + ewarn "You have been warned." + fi +}
