[systemd-devel] [PATCH 1/6] pstore: Add new pstore tool/service to the build

[Eric DeVolder]

This change adds the src/pstore directory to the build files.

Signed-off-by: Eric DeVolder <eric.devolder at oracle.com>
---
 meson.build       | 29 +++++++++++++++++++++++++++++
 meson_options.txt |  2 ++
 units/meson.build |  1 +
 3 files changed, 32 insertions(+)

diff --git a/meson.build b/meson.build
index eaf0edd..4a9ebc1 100644
--- a/meson.build
+++ b/meson.build
@@ -1258,6 +1258,7 @@ foreach term : ['utmp',
                 'environment-d',
                 'binfmt',
                 'coredump',
+                'pstore',
                 'resolve',
                 'logind',
                 'hostnamed',
@@ -1469,6 +1470,7 @@ subdir('src/network')
 subdir('src/analyze')
 subdir('src/journal-remote')
 subdir('src/coredump')
+subdir('src/pstore')
 subdir('src/hostname')
 subdir('src/import')
 subdir('src/kernel-install')
@@ -2240,6 +2242,32 @@ if conf.get('ENABLE_COREDUMP') == 1
         public_programs += exe
 endif
 
+if conf.get('ENABLE_PSTORE') == 1
+        executable('systemd-pstore',
+                   systemd_pstore_sources,
+                   include_directories : includes,
+                   link_with : [libshared],
+                   dependencies : [threads,
+                                   libacl,
+                                   libdw,
+                                   libxz,
+                                   liblz4],
+                   install_rpath : rootlibexecdir,
+                   install : true,
+                   install_dir : rootlibexecdir)
+
+#       exe = executable('pstorectl',
+#                        pstorectl_sources,
+#                        include_directories : includes,
+#                        link_with : [libshared],
+#                        dependencies : [threads,
+#                                        libxz,
+#                                        liblz4],
+#                        install_rpath : rootlibexecdir,
+#                        install : true)
+        public_programs += exe
+endif
+
 if conf.get('ENABLE_BINFMT') == 1
         exe = executable('systemd-binfmt',
                          'src/binfmt/binfmt.c',
@@ -3143,6 +3171,7 @@ foreach tuple : [
         ['DNS-over-TLS(gnutls)',  conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1],
         ['DNS-over-TLS(openssl)', conf.get('DNS_OVER_TLS_USE_OPENSSL') == 1],
         ['coredump'],
+        ['pstore'],
         ['polkit'],
         ['legacy pkla',      install_polkit_pkla],
         ['efi'],
diff --git a/meson_options.txt b/meson_options.txt
index c1cb461..564250a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -79,6 +79,8 @@ option('binfmt', type : 'boolean',
        description : 'support for custom binary formats')
 option('coredump', type : 'boolean',
        description : 'install the coredump handler')
+option('pstore', type : 'boolean',
+       description : 'install the pstore handler')
 option('logind', type : 'boolean',
        description : 'install the systemd-logind stack')
 option('hostnamed', type : 'boolean',
diff --git a/units/meson.build b/units/meson.build
index a561050..3365e8d 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -136,6 +136,7 @@ in_units = [
         ['systemd-bless-boot.service',           'ENABLE_EFI HAVE_BLKID'],
         ['systemd-boot-check-no-failures.service', ''],
         ['systemd-coredump at .service',            'ENABLE_COREDUMP'],
+        ['systemd-pstore.service',               'ENABLE_PSTORE'],
         ['systemd-firstboot.service',            'ENABLE_FIRSTBOOT',
          'sysinit.target.wants/'],
         ['systemd-fsck-root.service',            ''],
-- 
2.7.4