summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnita Zhang <the.anitazha@gmail.com>2020-08-17 23:09:38 -0700
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-08-26 14:33:29 +0200
commit4cb4fb82f78ad933797f76c68f6700a4fca83f46 (patch)
treeac16a4f90fb15648aeaa71f541c9c0d702593523
parent76331f86f630bd884f2e16a36d66c55b2b22c8e1 (diff)
downloadsystemd-4cb4fb82f78ad933797f76c68f6700a4fca83f46.tar.gz
meson: add min version for libfdisk
Was trying to run src/partition/test-repart.sh on CentOS 8 and the first resize call kept failing with ERANGE. Turned out that CentOS 8 comes with libfdisk-devel-2.32.1 which is missing https://github.com/karelzak/util-linux/commit/2f35c1ead621f42f32f7777232568cb03185b473 (in libfdisk 2.33 and up). (cherry picked from commit e71f5585b9b0580428f9530d0a485265c9c25165)
-rw-r--r--README1
-rw-r--r--meson.build1
2 files changed, 2 insertions, 0 deletions
diff --git a/README b/README
index 558b8d9195..ff7774927c 100644
--- a/README
+++ b/README
@@ -151,6 +151,7 @@ REQUIREMENTS:
libcryptsetup (optional), >= 2.3.0 required for signed Verity images support
libaudit (optional)
libacl (optional)
+ libfdisk >= 2.33 (from util-linux) (optional)
libselinux (optional)
liblzma (optional)
liblz4 >= 1.3.0 / 130 (optional)
diff --git a/meson.build b/meson.build
index dbbddb68e2..56cf31f757 100644
--- a/meson.build
+++ b/meson.build
@@ -890,6 +890,7 @@ libmount = dependency('mount',
want_libfdisk = get_option('fdisk')
if want_libfdisk != 'false' and not skip_deps
libfdisk = dependency('fdisk',
+ version : '>= 2.33',
required : want_libfdisk == 'true')
have = libfdisk.found()
else