pyrox.dev
bcache-tools: 1.0.7 -> 1.0.8
https://github.com/g2p/bcache-tools/compare/v1.0.7...v1.0.8
+10
-20
pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch
+10
-20
pkgs/tools/filesystems/bcache-tools/bcache-udev-modern.patch
···
1
1
This patch does two things:
2
-
1) Drops probe-bcache, so now new util-linux detecting functionality is used.
3
-
2) Drops bcache-register, using kmod (built in udev) and moving registering device
4
-
into rule using 'sh'.
5
-
This reduces things that need to be present in initrd, replacing them with already
6
-
existing functionality and reducing overall initrd size.
2
+
1) Drops probe-bcache, so now util-linux detecting functionality is used.
3
+
2) Drops bcache-register, moving registering device functionality into rule
4
+
using 'sh'.
5
+
This reduces things that need to be present in initrd, replacing them with
6
+
already existing functionality and reducing overall initrd size.
7
7
8
8
diff --git a/69-bcache.rules b/69-bcache.rules
9
-
index 5d28e70..6a52893 100644
9
+
index 9cc7f0d..6a52893 100644
10
10
--- a/69-bcache.rules
11
11
+++ b/69-bcache.rules
12
-
@@ -10,15 +10,11 @@ KERNEL=="fd*|sr*", GOTO="bcache_end"
12
+
@@ -10,16 +10,11 @@ KERNEL=="fd*|sr*", GOTO="bcache_end"
13
13
# It recognised bcache (util-linux 2.24+)
14
14
ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found"
15
15
# It recognised something else; bail
···
22
22
+GOTO="bcache_backing_end"
23
23
24
24
LABEL="bcache_backing_found"
25
+
RUN{builtin}+="kmod load bcache"
25
26
-RUN+="bcache-register $tempnode"
26
-
+RUN{builtin}+="kmod load bcache"
27
27
+RUN+="/bin/sh -c 'echo $tempnode > /sys/fs/bcache/register_quiet'"
28
28
LABEL="bcache_backing_end"
29
29
30
30
# Cached devices: symlink
31
31
diff --git a/Makefile b/Makefile
32
-
index 3f8d87b..15638a7 100644
32
+
index c824ae3..c5f7309 100644
33
33
--- a/Makefile
34
34
+++ b/Makefile
35
-
@@ -9,7 +9,7 @@ all: make-bcache probe-bcache bcache-super-show
35
+
@@ -9,7 +9,6 @@ all: make-bcache probe-bcache bcache-super-show bcache-register
36
36
37
37
install: make-bcache probe-bcache bcache-super-show
38
38
$(INSTALL) -m0755 make-bcache bcache-super-show $(DESTDIR)${PREFIX}/sbin/
39
39
- $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/
40
-
+# $(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/
41
40
$(INSTALL) -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/
42
41
$(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/
43
42
$(INSTALL) -D -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
44
-
diff --git a/bcache-register b/bcache-register
45
-
index 9b592bc..75b4faf 100755
46
-
--- a/bcache-register
47
-
+++ b/bcache-register
48
-
@@ -1,4 +1,3 @@
49
-
#!/bin/sh
50
-
-/sbin/modprobe -qba bcache
51
-
test -f /sys/fs/bcache/register_quiet && echo "$1" > /sys/fs/bcache/register_quiet
52
-
+2
-2
pkgs/tools/filesystems/bcache-tools/default.nix
+2
-2
pkgs/tools/filesystems/bcache-tools/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "bcache-tools";
5
-
version = "1.0.7";
5
+
version = "1.0.8";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "g2p";
9
9
repo = "bcache-tools";
10
10
rev = "v${version}";
11
-
hash = "sha256-Ors2xXRrVTf8Cq3BYnSVSfJy/nyGjT5BGLSNpxOcHR4=";
11
+
hash = "sha256-6gy0ymecMgEHXbwp/nXHlrUEeDFnmFXWZZPlzP292g4=";
12
12
};
13
13
14
14
nativeBuildInputs = [ pkg-config ];