From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 24 Sep 2025 08:13:35 +0000 (+0200)
Subject: meson: drop libblkid dep from components not using it directly
X-Git-Tag: v259-rc1~450^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d71f2899bded6bc7eb38dc079324f4dbcaa8f9b1;p=thirdparty%2Fsystemd.git

meson: drop libblkid dep from components not using it directly
---

diff --git a/src/bless-boot/meson.build b/src/bless-boot/meson.build
index 003f110664d..ae814f1b29d 100644
--- a/src/bless-boot/meson.build
+++ b/src/bless-boot/meson.build
@@ -19,7 +19,6 @@ executables += [
                 ],
                 'sources' : files('bless-boot.c'),
                 'link_with' : boot_link_with,
-                'dependencies' : libblkid,
         },
         generator_template + {
                 'name' : 'systemd-bless-boot-generator',
diff --git a/src/bootctl/meson.build b/src/bootctl/meson.build
index ae1f32292b5..7522cd10a92 100644
--- a/src/bootctl/meson.build
+++ b/src/bootctl/meson.build
@@ -20,6 +20,6 @@ executables += [
                 ],
                 'sources' : bootctl_sources,
                 'link_with' : boot_link_with,
-                'dependencies' : [libblkid, libopenssl],
+                'dependencies' : [libopenssl],
         },
 ]
diff --git a/src/core/meson.build b/src/core/meson.build
index c561f04a55b..1879af4da41 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -132,7 +132,6 @@ libcore_static = static_library(
         implicit_include_directories : false,
         c_args : ['-fvisibility=default'],
         dependencies : [libaudit_cflags,
-                        libblkid,
                         libdl,
                         libm,
                         libmount,
diff --git a/src/gpt-auto-generator/meson.build b/src/gpt-auto-generator/meson.build
index c7cbfbb3f3e..a57ff28a713 100644
--- a/src/gpt-auto-generator/meson.build
+++ b/src/gpt-auto-generator/meson.build
@@ -5,6 +5,5 @@ executables += [
                 'name' : 'systemd-gpt-auto-generator',
                 'conditions' : ['HAVE_BLKID'],
                 'sources' : files('gpt-auto-generator.c'),
-                'dependencies' : libblkid,
         },
 ]
diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build
index f49ccc71ede..b49d7153384 100644
--- a/src/nspawn/meson.build
+++ b/src/nspawn/meson.build
@@ -47,7 +47,6 @@ executables += [
                 ],
                 'extract' : nspawn_extract_sources,
                 'dependencies' : [
-                        libblkid,
                         libseccomp,
                         libselinux,
                 ],
diff --git a/src/pcrextend/meson.build b/src/pcrextend/meson.build
index 05c53508068..3a8824eaa84 100644
--- a/src/pcrextend/meson.build
+++ b/src/pcrextend/meson.build
@@ -11,7 +11,6 @@ executables += [
                 ],
                 'sources' : files('pcrextend.c'),
                 'dependencies' : [
-                        libblkid,
                         libopenssl,
                         tpm2,
                 ],
diff --git a/src/sysupdate/meson.build b/src/sysupdate/meson.build
index 3f733c79332..5076504764d 100644
--- a/src/sysupdate/meson.build
+++ b/src/sysupdate/meson.build
@@ -32,7 +32,6 @@ executables += [
                         libshared_fdisk,
                 ],
                 'dependencies' : [
-                        libblkid,
                         libfdisk,
                         libopenssl,
                         threads,
diff --git a/src/test/meson.build b/src/test/meson.build
index a966fc4ab14..d6e840abe56 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -215,7 +215,6 @@ simple_tests += files(
 ############################################################
 
 common_test_dependencies = [
-        libblkid,
         libmount,
         librt,
         libseccomp,
@@ -550,7 +549,7 @@ executables += [
         },
         core_test_template + {
                 'sources' : files('test-loop-block.c'),
-                'dependencies' : [threads, libblkid],
+                'dependencies' : [threads],
                 'parallel' : false,
         },
         core_test_template + {
@@ -559,7 +558,6 @@ executables += [
         core_test_template + {
                 'sources' : files('test-namespace.c'),
                 'dependencies' : [
-                        libblkid,
                         threads,
                 ],
         },
diff --git a/src/vmspawn/meson.build b/src/vmspawn/meson.build
index 4ba56b71f1e..89f2bca1dee 100644
--- a/src/vmspawn/meson.build
+++ b/src/vmspawn/meson.build
@@ -21,7 +21,6 @@ executables += [
                 'public' : true,
                 'sources' : vmspawn_sources + vmspawn_extract_sources,
                 'extract' : vmspawn_extract_sources,
-                'dependencies' : [libblkid]
         },
         test_template + {
                 'sources' : files('test-vmspawn-util.c'),