wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 14:43:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

bcachefs-tools: update to 1.25.1.

Browse source
This commit is contained in:
Leah Neukirchen 2025-04-11 16:32:26 +02:00
parent 11a6d8c27d
commit 9d42458a16
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
srcpkgs/bcachefs-tools/patches/make.patch
View file

@ -1,6 +1,15 @@
--- a/Makefile --- a/Makefile
+++ b/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=release
# CARGO_PROFILE=debug # CARGO_PROFILE=debug
@ -9,7 +18,7 @@
CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS) CARGO_BUILD=$(CARGO) build $(CARGO_BUILD_ARGS)
CARGO_CLEAN=$(CARGO) clean $(CARGO_CLEAN_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, shift-overflow)
CFLAGS+=$(call cc-disable-warning, enum-conversion) CFLAGS+=$(call cc-disable-warning, enum-conversion)
CFLAGS+=$(call cc-disable-warning, gnu-variable-sized-type-not-at-end) 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" PKGCONFIG_LIBS="blkid uuid liburcu libsodium zlib liblz4 libzstd libudev libkeyutils"
ifdef BCACHEFS_FUSE ifdef BCACHEFS_FUSE
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,7 @@ @@ -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 .PHONY: install
install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs install: INITRAMFS_HOOK=$(INITRAMFS_DIR)/hooks/bcachefs
install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs install: INITRAMFS_SCRIPT=$(INITRAMFS_DIR)/scripts/local-premount/bcachefs
-install: bcachefs $(optional_install) -install: bcachefs $(optional_install)
+install: $(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) -m0644 -D bcachefs.8 -t $(DESTDIR)$(PREFIX)/share/man/man8/
$(INSTALL) -m0755 -D initramfs/script $(DESTDIR)$(INITRAMFS_SCRIPT) $(INSTALL) -m0755 -D initramfs/script $(DESTDIR)$(INITRAMFS_SCRIPT)

4
srcpkgs/bcachefs-tools/template
View file

@ -1,7 +1,7 @@
# Template file for 'bcachefs-tools' # Template file for 'bcachefs-tools'
pkgname=bcachefs-tools pkgname=bcachefs-tools
reverts="24_1" reverts="24_1"
version=1.25.0 version=1.25.1
revision=1 revision=1
build_style=gnu-makefile build_style=gnu-makefile
make_install_args="ROOT_SBINDIR=/usr/bin" make_install_args="ROOT_SBINDIR=/usr/bin"
@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only" license="GPL-2.0-only"
homepage="https://bcachefs.org/" homepage="https://bcachefs.org/"
distfiles="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${version}.tar.gz" distfiles="https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${version}.tar.gz"
checksum=01b9aff1e34a5b8b013e4cee7fac7574f3839b9b4044fe24127a73e77cc7d328 checksum=6717d33f588f55c41046f012b6ab4e2ffc1370aebd0316a512b44cc155bb3c41
export VERSION=v${version} export VERSION=v${version}
export RUST_TARGET export RUST_TARGET