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 003f110664d92b90e0c90c2b251294a36ae58e3c..ae814f1b29d1ac32f7a33d777575d17da5860e04 100644 (file)
--- 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 ae1f32292b5083a4f43f04ff8e0b165eddfda0d0..7522cd10a92caa4cc481acb4a4f4f07fe6f6d655 100644 (file)
--- 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 c561f04a55bb74d99679b65b64c6ecc80fa54cd5..1879af4da41c91e152ff3625c559dd5385a8d7a5 100644 (file)
--- 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 c7cbfbb3f3e6189a6e2536f258cff0c68acf6f8a..a57ff28a7131807392cdef048269c0cf0a213236 100644 (file)
--- 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 f49ccc71edee9c5f6f6e730055fe4f841c0a83a3..b49d7153384b23b0874f806fe0eb15f8504946f1 100644 (file)
--- 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 05c5350806857a9b339b711aba05880b332642cc..3a8824eaa84444288b0494740cbe7bd69acd4f54 100644 (file)
--- 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 3f733c7933287b092d82e767edcad6d2e2d87610..5076504764dc421fa5ccc99d278f67f25853479a 100644 (file)
--- 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 a966fc4ab148b8adfc847b874c543e969dd0b0f2..d6e840abe56c9240db687d8a3667f169c2ead6bc 100644 (file)
--- 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 4ba56b71f1ecd899bc0533607c09919ff18401db..89f2bca1deed0ecc6ff9411893c0a3e4fa1d5ece 100644 (file)
--- 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'),