diff --git a/srcpkgs/bcachefs-tools/patches/32bit.patch b/srcpkgs/bcachefs-tools/patches/32bit.patch deleted file mode 100644 index e03ffac99b6..00000000000 --- a/srcpkgs/bcachefs-tools/patches/32bit.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/include/linux/atomic.h -+++ b/include/linux/atomic.h -@@ -300,6 +300,12 @@ - DEF_ATOMIC_OPS(atomic64, s64) - #else - s64 atomic64_read(const atomic64_t *v); -+static inline s64 atomic64_read_acquire(const atomic64_t *v) \ -+{ \ -+ s64 ret = atomic64_read(&v->counter); \ -+ smp_mb__after_atomic(); \ -+ return ret; \ -+} \ - void atomic64_set(atomic64_t *v, s64); - - s64 atomic64_add_return(s64, atomic64_t *); diff --git a/srcpkgs/bcachefs-tools/patches/pwritev2.patch b/srcpkgs/bcachefs-tools/patches/pwritev2.patch new file mode 100644 index 00000000000..e99047d6840 --- /dev/null +++ b/srcpkgs/bcachefs-tools/patches/pwritev2.patch @@ -0,0 +1,18 @@ +--- a/linux/blkdev.c ++++ b/linux/blkdev.c +@@ -256,6 +256,15 @@ + sync_check(bio, ret); + } + ++#ifndef __GLIBC__ ++/* musl lacks this */ ++ssize_t pwritev2(int fd, const struct iovec *iov, int count, off_t ofs, int flags) ++{ ++ return syscall(SYS_pwritev2, fd, iov, count, ++ (long)(ofs), (long)(ofs>>32), flags); ++} ++#endif ++ + static void sync_write(struct bio *bio, struct iovec * iov, unsigned i) + { + ssize_t ret = pwritev2(bio->bi_bdev->bd_fd, iov, i, diff --git a/srcpkgs/bcachefs-tools/template b/srcpkgs/bcachefs-tools/template index 3c567cbee6b..a0e22dea2cb 100644 --- a/srcpkgs/bcachefs-tools/template +++ b/srcpkgs/bcachefs-tools/template @@ -1,7 +1,7 @@ # Template file for 'bcachefs-tools' pkgname=bcachefs-tools reverts="24_1" -version=1.4.0 +version=1.4.1 revision=1 build_style=gnu-makefile make_install_args="ROOT_SBINDIR=/usr/bin" @@ -15,7 +15,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://bcachefs.org/" distfiles="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${version}.tar.gz" -checksum=3fea7aba076d1400eba29317c8b1de0b8ed83012ab004afaa948fc0750807f58 +checksum=682777c2391a718c34a5b8992954eba38b5916bdc5fc33f036d55562f4c45d72 export VERSION=v${version} export RUST_TARGET