Skip to content

Commit af13404

Browse files
committed
WiP cryptsetup 2.6.1 version bump : lvm2 (dmsetup, libdevmapper), util-linux (blkid) version bump and patches
Well that was a deeper rabbit holde then initially thought. - cryptsetup required different locking mechanisms, provided by dmsetup and libdevmapper - cryptsetup required newer blkid.h functions provided by newer util-linux.... Now let's see. Last tests, in ramfs from initrd/test_reencrypt_ram.sh showed really poor performances: - dmsetup calls were unable to take advantage of kernel backend correctly - consequently, raw device was constently closed and reopened with loopback created devices - as a result, even ramfs raw disk reencrypting operations were slower then 200MiB/s - If ram operations are slow.... then forget about IO ops without directio! TODO: - revisit kernel backend additions that are probably not required at all. Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent 01ddfd3 commit af13404

5 files changed

Lines changed: 303 additions & 168 deletions

File tree

modules/lvm2

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ lvm2_hash := 74e794a9e9dee1bcf8a2065f65b9196c44fdf321e22d63b98ed7de8c9aa17a5d
1010
# so we force it via the configure cache.
1111
lvm2_configure := \
1212
$(CROSS_TOOLS) \
13-
PKG_CONFIG=/bin/false \
14-
MODPROBE_CMD=/bin/false \
1513
ac_cv_func_malloc_0_nonnull=yes \
1614
ac_cv_func_realloc_0_nonnull=yes \
1715
./configure \
1816
--host $(MUSL_ARCH)-elf-linux \
19-
--prefix "$(INSTALL)" \
17+
--prefix "" \
2018
--libexecdir "/bin" \
2119
--with-optimisation=-Os \
2220
--enable-devmapper \
@@ -30,7 +28,6 @@ lvm2_configure := \
3028
--disable-use-lvmlockd \
3129
--disable-use-lvmpolld \
3230
--disable-dmfilemapd \
33-
--disable-blkid_wiping \
3431
--disable-cmirrord \
3532
--disable-cache_check_needs_check \
3633
--disable-thin_check_needs_check \
@@ -52,7 +49,7 @@ lvm2_target := \
5249
lvm2_libraries := libdm/ioctl/libdevmapper.so.1.02
5350

5451
lvm2_output := \
55-
tools/dmsetup \
52+
./libdm/dm-tools/dmsetup \
5653
tools/lvm \
5754

5855
lvm2_depends := util-linux libaio $(musl_dep)

modules/util-linux

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
modules-$(CONFIG_UTIL_LINUX) += util-linux
22

3-
util-linux_version := 2.29.2
3+
util-linux_version := 2.39
44
util-linux_dir := util-linux-$(util-linux_version)
55
util-linux_tar := util-linux-$(util-linux_version).tar.xz
6-
util-linux_url := https://www.kernel.org/pub/linux/utils/util-linux/v2.29/$(util-linux_tar)
7-
util-linux_hash := accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3
6+
util-linux_url := https://www.kernel.org/pub/linux/utils/util-linux/v2.39/$(util-linux_tar)
7+
util-linux_hash := 32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb
88

99
util-linux_configure := \
1010
$(CROSS_TOOLS) \

patches/lvm2-2.03.23.patch

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -96,27 +96,6 @@
9696
buflen += id_len + 1; /* range end plus "-" */
9797
}
9898
buflen++;
99-
--- ./make.tmpl.in.orig 2023-11-27 14:10:06.603000000 -0500
100-
+++ ./make.tmpl.in 2023-11-27 14:12:04.139000000 -0500
101-
@@ -210,7 +210,7 @@
102-
M_INSTALL_PROGRAM = -m 555
103-
M_INSTALL_DATA = -m 444
104-
endif
105-
-INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP)
106-
+INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP_ARG)
107-
INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA)
108-
INSTALL_WDATA = $(INSTALL) -p -m 644
109-
110-
@@ -330,8 +330,8 @@
111-
#CFLAGS += -pg
112-
#LDFLAGS += -pg
113-
114-
-STRIP=
115-
-#STRIP = -s
116-
+STRIP_ARG=
117-
+#STRIP_ARG = -s
118-
119-
LVM_VERSION := $(shell cat $(top_srcdir)/VERSION)
12099

121100
--- ./tools/lvmcmdline.c.orig 2023-11-27 14:12:46.649000000 -0500
122101
+++ ./tools/lvmcmdline.c 2023-11-27 14:15:47.563000000 -0500
@@ -147,3 +126,25 @@
147126
return_NULL;
148127
}
149128

129+
--- ./make.tmpl.orig 2023-11-28 13:29:11.744000000 -0500
130+
+++ ./make.tmpl.in 2023-11-28 13:29:36.716000000 -0500
131+
@@ -210,7 +210,7 @@
132+
M_INSTALL_PROGRAM = -m 555
133+
M_INSTALL_DATA = -m 444
134+
endif
135+
-INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP)
136+
+INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM)
137+
INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA)
138+
INSTALL_WDATA = $(INSTALL) -p -m 644
139+
140+
--- ./libdm/make.tmpl.orig 2023-11-28 13:29:52.760000000 -0500
141+
+++ ./libdm/make.tmpl.in 2023-11-28 13:30:22.336000000 -0500
142+
@@ -173,7 +173,7 @@
143+
M_INSTALL_PROGRAM = -m 555
144+
M_INSTALL_DATA = -m 444
145+
endif
146+
-INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM) $(STRIP)
147+
+INSTALL_PROGRAM = $(INSTALL) $(M_INSTALL_PROGRAM)
148+
INSTALL_DATA = $(INSTALL) -p $(M_INSTALL_DATA)
149+
INSTALL_WDATA = $(INSTALL) -p -m 644
150+

patches/util-linux-2.29.2.patch

Lines changed: 0 additions & 139 deletions
This file was deleted.

0 commit comments

Comments
 (0)