aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKARBOWSKI Piotr <piotr.karbowski@gmail.com>2020-04-12 21:04:47 +0200
committerKARBOWSKI Piotr <piotr.karbowski@gmail.com>2020-04-12 21:04:47 +0200
commit9d6543474c52b8357055ed894cf12f7639c9c616 (patch)
tree78a453f1cd07da55b727a0020a31b28a2bb0e5e7
parentlibaio 0.3.112 added. (diff)
downloadbetter-initramfs-9d6543474c52b8357055ed894cf12f7639c9c616.tar.xz
better-initramfs-9d6543474c52b8357055ed894cf12f7639c9c616.zip
lvm2 2.02.177 -> 2.02.186 bump
-rw-r--r--ChangeLog2
-rwxr-xr-xbootstrap/lebuilds/lvm2.lebuild8
-rw-r--r--bootstrap/patches/lvm2/mlockall-default-config.patch22
3 files changed, 29 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0efa9a1..93c5ec4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,7 +25,7 @@ devel branch:
- Version bumps:
sysroot Aboriginal Linux 1.2.0 -> Alpine Linux 3.7.0
dropbear 2015.71 -> 2017.75
- lvm2 2.02.103 -> 2.02.177
+ lvm2 2.02.103 -> 2.02.186
busybox 1.21.1 -> 1.31.1
zlib 1.2.8 -> 1.2.11
libuuid 2.21.2 -> 2.31.1
diff --git a/bootstrap/lebuilds/lvm2.lebuild b/bootstrap/lebuilds/lvm2.lebuild
index eb0f419..9602e03 100755
--- a/bootstrap/lebuilds/lvm2.lebuild
+++ b/bootstrap/lebuilds/lvm2.lebuild
@@ -1,13 +1,17 @@
#!/bin/sh
name='lvm2'
-version='2.02.177'
+version='2.02.186'
sources=( "https://bitbucket.org/piotrkarbowski/better-initramfs/downloads/LVM2.${version}.tgz" )
homepage='http://sources.redhat.com/lvm2/'
license='GPLv2'
+# The reason why CPPFLAGS is appended to CFLAGS is that lvm2 build system
+# ignores CPPFLAGS resulting in being unable to find libaio.h.
+
build_cmd="
+ export CFLAGS=\"\$CFLAGS \$CPPFLAGS\" && \
cd /source/${name}-${version} && \
- ln -snfv ioctl/libdevmapper.a libdm/libdevmapper.a &&
+ ln -snfv ioctl/libdevmapper.a libdm/libdevmapper.a && \
./configure --prefix=/binit/prefix --enable-static_link && \
make -j ${cores_num:-1} all device-mapper && \
make install
diff --git a/bootstrap/patches/lvm2/mlockall-default-config.patch b/bootstrap/patches/lvm2/mlockall-default-config.patch
new file mode 100644
index 0000000..305ddee
--- /dev/null
+++ b/bootstrap/patches/lvm2/mlockall-default-config.patch
@@ -0,0 +1,22 @@
+--- ./conf/example.conf.in.orig
++++ ./conf/example.conf.in
+@@ -1352,7 +1352,7 @@
+ # Use the old behavior of mlockall to pin all memory.
+ # Prior to version 2.02.62, LVM used mlockall() to pin the whole
+ # process's memory while activating devices.
+- use_mlockall = 0
++ use_mlockall = 1
+
+ # Configuration option activation/monitoring.
+ # Monitor LVs that are activated.
+--- ./lib/config/defaults.h.orig
++++ ./lib/config/defaults.h
+@@ -55,7 +55,7 @@
+ #define DEFAULT_LVMLOCKD_LOCK_RETRIES 3
+ #define DEFAULT_LVMETAD_UPDATE_WAIT_TIME 10
+ #define DEFAULT_PRIORITISE_WRITE_LOCKS 1
+-#define DEFAULT_USE_MLOCKALL 0
++#define DEFAULT_USE_MLOCKALL 1
+ #define DEFAULT_METADATA_READ_ONLY 0
+ #define DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH 0
+ #define DEFAULT_UNKNOWN_DEVICE_NAME "[unknown]"