cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

bcache-tools: 1.0.7 -> 1.0.8

Browse source 
https://github.com/g2p/bcache-tools/compare/v1.0.7...v1.0.8
This commit is contained in:
Simon Hollingshead 2024-03-10 04:01:50 +00:00
parent 298957b767
commit a6d61a9667
2 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch
View file

@ -1,15 +1,15 @@
This patch does two things: This patch does two things:
1) Drops probe-bcache, so now new util-linux detecting functionality is used. 1) Drops probe-bcache, so now util-linux detecting functionality is used.
2) Drops bcache-register, using kmod (built in udev) and moving registering device 2) Drops bcache-register, moving registering device functionality into rule
into rule using 'sh'. using 'sh'.
This reduces things that need to be present in initrd, replacing them with already This reduces things that need to be present in initrd, replacing them with
existing functionality and reducing overall initrd size. already existing functionality and reducing overall initrd size.
diff --git a/69-bcache.rules b/69-bcache.rules diff --git a/69-bcache.rules b/69-bcache.rules
index 5d28e70..6a52893 100644 index 9cc7f0d..6a52893 100644
--- a/69-bcache.rules --- a/69-bcache.rules
+++ b/69-bcache.rules +++ b/69-bcache.rules
@@ -10,15 +10,11 @@ KERNEL=="fd*|sr*", GOTO="bcache_end" @@ -10,16 +10,11 @@ KERNEL=="fd*|sr*", GOTO="bcache_end"
# It recognised bcache (util-linux 2.24+) # It recognised bcache (util-linux 2.24+)
ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found" ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found"
# It recognised something else; bail # It recognised something else; bail
@ -22,31 +22,21 @@ index 5d28e70..6a52893 100644
+GOTO="bcache_backing_end" +GOTO="bcache_backing_end"
LABEL="bcache_backing_found" LABEL="bcache_backing_found"
RUN{builtin}+="kmod load bcache"
-RUN+="bcache-register $tempnode" -RUN+="bcache-register $tempnode"
+RUN{builtin}+="kmod load bcache"
+RUN+="/bin/sh -c 'echo $tempnode > /sys/fs/bcache/register_quiet'" +RUN+="/bin/sh -c 'echo $tempnode > /sys/fs/bcache/register_quiet'"
LABEL="bcache_backing_end" LABEL="bcache_backing_end"
# Cached devices: symlink # Cached devices: symlink
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 3f8d87b..15638a7 100644 index c824ae3..c5f7309 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -9,7 +9,7 @@ all: make-bcache probe-bcache bcache-super-show @@ -9,7 +9,6 @@ all: make-bcache probe-bcache bcache-super-show bcache-register
install: make-bcache probe-bcache bcache-super-show install: make-bcache probe-bcache bcache-super-show
$(INSTALL) -m0755 make-bcache bcache-super-show $(DESTDIR)${PREFIX}/sbin/ $(INSTALL) -m0755 make-bcache bcache-super-show $(DESTDIR)${PREFIX}/sbin/
- $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/ - $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/
+# $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/
$(INSTALL) -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/ $(INSTALL) -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/
$(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/ $(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/
$(INSTALL) -D -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache $(INSTALL) -D -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
diff --git a/bcache-register b/bcache-register
index 9b592bc..75b4faf 100755
--- a/bcache-register
+++ b/bcache-register
@@ -1,4 +1,3 @@
#!/bin/sh
-/sbin/modprobe -qba bcache
test -f /sys/fs/bcache/register_quiet && echo "$1" > /sys/fs/bcache/register_quiet

4
pkgs/tools/filesystems/bcache-tools/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bcache-tools"; pname = "bcache-tools";
version = "1.0.7"; version = "1.0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "g2p"; owner = "g2p";
repo = "bcache-tools"; repo = "bcache-tools";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Ors2xXRrVTf8Cq3BYnSVSfJy/nyGjT5BGLSNpxOcHR4="; hash = "sha256-6gy0ymecMgEHXbwp/nXHlrUEeDFnmFXWZZPlzP292g4=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];