network: Allow to configure VLan egress qos maps

[thirdparty/systemd.git] / meson.build

diff --git a/meson.build b/meson.build
index 70696a724b06e9d4c67e592f4c8f02ea7e801c50..aedde9b94e9dc289b858650c04f3ccc00577bef0 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1056,6 +1056,8 @@ if want_libcryptsetup != 'false' and not skip_deps
                    have and cc.has_function('crypt_set_metadata_size', dependencies : libcryptsetup))
         conf.set10('HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY',
                    have and cc.has_function('crypt_activate_by_signed_key', dependencies : libcryptsetup))
+        conf.set10('HAVE_CRYPT_TOKEN_MAX',
+                   have and cc.has_function('crypt_token_max', dependencies : libcryptsetup))
 else
         have = false
         libcryptsetup = []
@@ -2382,6 +2384,7 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1
                 src/cryptsetup/cryptsetup-keyfile.c
                 src/cryptsetup/cryptsetup-keyfile.h
                 src/cryptsetup/cryptsetup-pkcs11.h
+                src/cryptsetup/cryptsetup-tpm2.h
                 src/cryptsetup/cryptsetup.c
 '''.split())
 
@@ -2393,6 +2396,10 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1
                 systemd_cryptsetup_sources += files('src/cryptsetup/cryptsetup-fido2.c')
         endif
 
+        if conf.get('HAVE_TPM2') == 1
+                systemd_cryptsetup_sources += files('src/cryptsetup/cryptsetup-tpm2.c')
+        endif
+
         executable(
                 'systemd-cryptsetup',
                 systemd_cryptsetup_sources,
@@ -2434,13 +2441,18 @@ if conf.get('HAVE_LIBCRYPTSETUP') == 1
 
         systemd_cryptenroll_sources = files('''
                 src/cryptenroll/cryptenroll-fido2.h
+                src/cryptenroll/cryptenroll-list.c
+                src/cryptenroll/cryptenroll-list.h
                 src/cryptenroll/cryptenroll-password.c
                 src/cryptenroll/cryptenroll-password.h
                 src/cryptenroll/cryptenroll-pkcs11.h
                 src/cryptenroll/cryptenroll-recovery.c
                 src/cryptenroll/cryptenroll-recovery.h
                 src/cryptenroll/cryptenroll-tpm2.h
+                src/cryptenroll/cryptenroll-wipe.c
+                src/cryptenroll/cryptenroll-wipe.h
                 src/cryptenroll/cryptenroll.c
+                src/cryptenroll/cryptenroll.h
 '''.split())
 
         if conf.get('HAVE_P11KIT') == 1 and conf.get('HAVE_OPENSSL') == 1
@@ -3639,10 +3651,11 @@ endforeach
 
 if git.found()
         all_files = run_command(
+                'env', '-u', 'GIT_WORK_TREE',
                 git,
-                ['--git-dir=@0@/.git'.format(project_source_root),
-                 'ls-files',
-                 ':/*.[ch]'])
+                '--git-dir=@0@/.git'.format(project_source_root),
+                'ls-files', ':/*.[ch]')
+
         all_files = files(all_files.stdout().split())
 
         custom_target(