Merge pull request #32505 from mrc0mmand/fix-build-without-importd

import: skip the whole subdir when building with -Dimportd=false

src/import/meson.build

@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+if conf.get('ENABLE_IMPORTD') != 1
+        subdir_done()
+endif
+
 systemd_importd_sources = files(
         'importd.c',
 )
@@ -117,15 +121,13 @@ executables += [
         },
 ]
 
-if conf.get('ENABLE_IMPORTD') == 1
-        install_data('org.freedesktop.import1.conf',
-                     install_dir : dbuspolicydir)
-        install_data('org.freedesktop.import1.service',
-                     install_dir : dbussystemservicedir)
-        install_data('org.freedesktop.import1.policy',
-                     install_dir : polkitpolicydir)
+install_data('org.freedesktop.import1.conf',
+             install_dir : dbuspolicydir)
+install_data('org.freedesktop.import1.service',
+             install_dir : dbussystemservicedir)
+install_data('org.freedesktop.import1.policy',
+             install_dir : polkitpolicydir)
 
-        install_data('import-pubring.gpg',
-                     install_dir : libexecdir)
-        # TODO: shouldn't this be in pkgdatadir?
-endif
+install_data('import-pubring.gpg',
+             install_dir : libexecdir)
+# TODO: shouldn't this be in pkgdatadir?

src/mountfsd/meson.build

@@ -19,8 +19,6 @@ executables += [
                 'name' : 'systemd-mountwork',
                 'conditions' : ['ENABLE_MOUNTFSD'],
                 'sources' : systemd_mountwork_sources,
-                'link_with' : common_libs,
-                'dependencies' : common_deps,
         },
 ]
 

test/units/testsuite-50.mountfsd.sh

@@ -13,7 +13,7 @@ if [[ ! -f /usr/lib/systemd/system/systemd-mountfsd.socket ]] || \
    ! find /usr/lib* -name libbpf.so.1 2>/dev/null | grep . || \
    systemd-analyze compare-versions "$(uname -r)" lt 6.5 || \
    systemd-analyze compare-versions "$(pkcheck --version | awk '{print $3}')" lt 124; then
-    echo "Skipping mountnfsd/nsresourced tests"
+    echo "Skipping mountfsd/nsresourced tests"
     exit 0
 fi
 
@@ -56,7 +56,7 @@ if (SYSTEMD_LOG_TARGET=console varlinkctl call \
         io.systemd.NamespaceResource.AllocateUserRange \
         '{"name":"test-supported","size":65536,"userNamespaceFileDescriptor":0}' 2>&1 || true) |
             grep -q "io.systemd.NamespaceResource.UserNamespaceInterfaceNotSupported"; then
-    echo "User namespace interface not supported, skipping mountnfsd/nsresourced tests"
+    echo "User namespace interface not supported, skipping mountfsd/nsresourced tests"
     exit 0
 fi