From: Anita Zhang <the.anitazha@gmail.com>
Date: Tue, 18 Aug 2020 06:09:38 +0000 (-0700)
Subject: meson: add min version for libfdisk
X-Git-Tag: v247-rc1~412
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e71f5585b9b0580428f9530d0a485265c9c25165;p=thirdparty%2Fsystemd.git

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).
---

diff --git a/README b/README
index 8da8b5fc3c1..b1fbf284a12 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 227fe097a81..79cb512e73e 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