From 9d42458a16fd18631894fcb4cb52f1b16c322209 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 11 Apr 2025 16:32:26 +0200
Subject: [PATCH] bcachefs-tools: update to 1.25.1.
---
srcpkgs/bcachefs-tools/patches/make.patch | 28 ++++++++++-------------
srcpkgs/bcachefs-tools/template | 4 ++--
2 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/bcachefs-tools/patches/make.patch b/srcpkgs/bcachefs-tools/patches/make.patch
index cfe1961c3a5..3f05ff8dd16 100644
--- a/srcpkgs/bcachefs-tools/patches/make.patch
+++ b/srcpkgs/bcachefs-tools/patches/make.patch
@@ -1,6 +1,15 @@
--- a/Makefile
+++ b/Makefile
-@@ -57,7 +57,7 @@
+@@ -26,7 +26,7 @@
+ ifdef CARGO_BUILD_TARGET
+ BUILT_BIN = target/$(CARGO_BUILD_TARGET)/release/bcachefs
+ else
+- BUILT_BIN = target/release/bcachefs
++ BUILT_BIN = target/$(RUST_TARGET)/release/bcachefs
+ endif
+
+ # Prevent recursive expansions of $(CFLAGS) to avoid repeatedly performing
+@@ -65,7 +65,7 @@
CARGO_PROFILE=release
# CARGO_PROFILE=debug
@@ -9,7 +18,7 @@
CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS)
CARGO_CLEAN=$(CARGO) clean $(CARGO_CLEAN_ARGS)
-@@ -73,7 +73,6 @@
+@@ -80,7 +80,6 @@
CFLAGS+=$(call cc-disable-warning, shift-overflow)
CFLAGS+=$(call cc-disable-warning, enum-conversion)
CFLAGS+=$(call cc-disable-warning, gnu-variable-sized-type-not-at-end)
@@ -17,25 +26,12 @@
PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev libkeyutils"
ifdef BCACHEFS_FUSE
---- a/Makefile
-+++ b/Makefile
@@ -200,7 +200,7 @@
- install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs
- install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs
- install: bcachefs $(optional_install)
-- $(INSTALL) -m0755 -D target/release/bcachefs -t $(DESTDIR)$(ROOT_SBINDIR)
-+ $(INSTALL) -m0755 -D target/*/release/bcachefs -t $(DESTDIR)$(ROOT_SBINDIR)
- $(INSTALL) -m0644 -D bcachefs.8 -t $(DESTDIR)$(PREFIX)/share/man/man8/
- $(INSTALL) -m0755 -D initramfs/script $(DESTDIR)$(INITRAMFS_SCRIPT)
- $(INSTALL) -m0755 -D initramfs/hook $(DESTDIR)$(INITRAMFS_HOOK)
---- a/Makefile
-+++ b/Makefile
-@@ -199,7 +199,7 @@
.PHONY: install
install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs
install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs
-install: bcachefs $(optional_install)
+install: $(optional_install)
- $(INSTALL) -m0755 -D target/*/release/bcachefs -t $(DESTDIR)$(ROOT_SBINDIR)
+ $(INSTALL) -m0755 -D $(BUILT_BIN) -t $(DESTDIR)$(ROOT_SBINDIR)
$(INSTALL) -m0644 -D bcachefs.8 -t $(DESTDIR)$(PREFIX)/share/man/man8/
$(INSTALL) -m0755 -D initramfs/script $(DESTDIR)$(INITRAMFS_SCRIPT)
diff --git a/srcpkgs/bcachefs-tools/template b/srcpkgs/bcachefs-tools/template
index 9a2b415d92a..c10766c2cba 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.25.0
+version=1.25.1
revision=1
build_style=gnu-makefile
make_install_args="ROOT_SBINDIR=/usr/bin"
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
homepage="https://bcachefs.org/"
distfiles="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${version}.tar.gz"
-checksum=01b9aff1e34a5b8b013e4cee7fac7574f3839b9b4044fe24127a73e77cc7d328
+checksum=6717d33f588f55c41046f012b6ab4e2ffc1370aebd0316a512b44cc155bb3c41
export VERSION=v${version}
export RUST_TARGET