From f6e49d4e52dbd8f67e76689103a59d524423cbf1 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 15 Apr 2017 00:56:05 -0400
Subject: meson: add journal-install and hwdb-update hooks

v2:
- ignore errors in chown/chmod/setfacl
- obey -Dadm-group=false, -Dwheel-group=false
- fix reversed condition for systemd-hwdb update hook
---
 hwdb/meson.build               |  4 ++++
 src/journal-remote/meson.build |  4 ++--
 src/journal/meson.build        | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/hwdb/meson.build b/hwdb/meson.build
index 4498d5e08b..1e859fd20d 100644
--- a/hwdb/meson.build
+++ b/hwdb/meson.build
@@ -25,6 +25,10 @@ if conf.get('ENABLE_HWDB', 0) == 1
 
   meson.add_install_script('sh', '-c',
                            mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d')))
+
+  meson.add_install_script('sh', '-c',
+                           'test -n "$DESTDIR" || @0@/systemd-hwdb update'
+                           .format(rootbindir))
 endif
 
 ############################################################
diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 35342755d3..c182e7c477 100644
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -47,5 +47,5 @@ install_data('browse.html',
 meson.add_install_script('sh', '-c',
                          mkdir_p.format('/var/log/journal/remote'))
 meson.add_install_script('sh', '-c',
-                         '''chown 0:0 $DESTDIR/var/log/journal/remote;
-                            chmod 755 $DESTDIR/var/log/journal/remote''')
+                         'chown 0:0 $DESTDIR/var/log/journal/remote &&
+                          chmod 755 $DESTDIR/var/log/journal/remote || :')
diff --git a/src/journal/meson.build b/src/journal/meson.build
index a1d33d0810..2457bc7234 100644
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -93,3 +93,17 @@ endif
 
 install_data('journald.conf',
              install_dir : pkgsysconfdir)
+
+meson.add_install_script('sh', '-c',
+                         mkdir_p.format('/var/log/journal'))
+meson.add_install_script('sh', '-c',
+                         'chown 0:0 $DESTDIR/var/log/journal &&
+                          chmod 755 $DESTDIR/var/log/journal || :')
+if get_option('adm-group')
+  meson.add_install_script('sh', '-c',
+                           'setfacl -nm g:adm:rx,d:g:adm:rx $DESTDIR/var/log/journal || :')
+endif
+if get_option('wheel-group')
+  meson.add_install_script('sh', '-c',
+                           'setfacl -nm g:wheel:rx,d:g:wheel:rx $DESTDIR/var/log/journal || :')
+endif
-- 
cgit v1.2.3-54-g00ecf