From 240fba5c8ca2e2620557b9e2d10c360757d74a3e Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Sun, 23 Dec 2018 15:53:26 +0100 Subject: [PATCH] systemd: Put configuration in new conf recipe --- ...stemd_%.bbappend => systemd-conf.bbappend} | 1 - .../am335x-nmhw21/system.conf | 0 .../armada-385-nbhw14/system.conf | 0 .../armada-385-nbhw17/system.conf | 0 .../armada-385-nrhw18/system.conf | 0 .../{systemd => systemd-conf}/system.conf | 0 .../0001-Gettextize-the-policy-files.patch | 897 ------------------ 7 files changed, 898 deletions(-) rename recipes-core/systemd/{systemd_%.bbappend => systemd-conf.bbappend} (78%) rename recipes-core/systemd/{systemd => systemd-conf}/am335x-nmhw21/system.conf (100%) rename recipes-core/systemd/{systemd => systemd-conf}/armada-385-nbhw14/system.conf (100%) rename recipes-core/systemd/{systemd => systemd-conf}/armada-385-nbhw17/system.conf (100%) rename recipes-core/systemd/{systemd => systemd-conf}/armada-385-nrhw18/system.conf (100%) rename recipes-core/systemd/{systemd => systemd-conf}/system.conf (100%) delete mode 100644 recipes-core/systemd/systemd/0001-Gettextize-the-policy-files.patch diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd-conf.bbappend similarity index 78% rename from recipes-core/systemd/systemd_%.bbappend rename to recipes-core/systemd/systemd-conf.bbappend index 5c451ec..09b4def 100644 --- a/recipes-core/systemd/systemd_%.bbappend +++ b/recipes-core/systemd/systemd-conf.bbappend @@ -2,7 +2,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}/${PN}:${THISDIR}/${PN}:" SRC_URI_append = " \ file://system.conf \ - file://0001-Gettextize-the-policy-files.patch \ " do_install_append() { diff --git a/recipes-core/systemd/systemd/am335x-nmhw21/system.conf b/recipes-core/systemd/systemd-conf/am335x-nmhw21/system.conf similarity index 100% rename from recipes-core/systemd/systemd/am335x-nmhw21/system.conf rename to recipes-core/systemd/systemd-conf/am335x-nmhw21/system.conf diff --git a/recipes-core/systemd/systemd/armada-385-nbhw14/system.conf b/recipes-core/systemd/systemd-conf/armada-385-nbhw14/system.conf similarity index 100% rename from recipes-core/systemd/systemd/armada-385-nbhw14/system.conf rename to recipes-core/systemd/systemd-conf/armada-385-nbhw14/system.conf diff --git a/recipes-core/systemd/systemd/armada-385-nbhw17/system.conf b/recipes-core/systemd/systemd-conf/armada-385-nbhw17/system.conf similarity index 100% rename from recipes-core/systemd/systemd/armada-385-nbhw17/system.conf rename to recipes-core/systemd/systemd-conf/armada-385-nbhw17/system.conf diff --git a/recipes-core/systemd/systemd/armada-385-nrhw18/system.conf b/recipes-core/systemd/systemd-conf/armada-385-nrhw18/system.conf similarity index 100% rename from recipes-core/systemd/systemd/armada-385-nrhw18/system.conf rename to recipes-core/systemd/systemd-conf/armada-385-nrhw18/system.conf diff --git a/recipes-core/systemd/systemd/system.conf b/recipes-core/systemd/systemd-conf/system.conf similarity index 100% rename from recipes-core/systemd/systemd/system.conf rename to recipes-core/systemd/systemd-conf/system.conf diff --git a/recipes-core/systemd/systemd/0001-Gettextize-the-policy-files.patch b/recipes-core/systemd/systemd/0001-Gettextize-the-policy-files.patch deleted file mode 100644 index 204820c..0000000 --- a/recipes-core/systemd/systemd/0001-Gettextize-the-policy-files.patch +++ /dev/null @@ -1,897 +0,0 @@ -From d996f53753be01b31e42a09f7942808536eed4d0 Mon Sep 17 00:00:00 2001 -From: Gunnar Hjalmarsson -Date: Thu, 15 Feb 2018 21:21:58 +0100 -Subject: [PATCH] Gettextize the policy files - -* Don't merge translations into the files -* Add gettext-domain="systemd" to description and message - -https://github.com/systemd/systemd/issues/8162 ---- - src/core/meson.build | 15 +-- - src/core/org.freedesktop.systemd1.policy.in.in | 20 ++-- - src/hostname/meson.build | 10 +- - src/hostname/org.freedesktop.hostname1.policy.in | 12 +-- - src/import/meson.build | 10 +- - src/import/org.freedesktop.import1.policy.in | 12 +-- - src/locale/meson.build | 10 +- - src/locale/org.freedesktop.locale1.policy.in | 8 +- - src/login/meson.build | 10 +- - src/login/org.freedesktop.login1.policy.in | 128 +++++++++++------------ - src/machine/meson.build | 10 +- - src/machine/org.freedesktop.machine1.policy.in | 32 +++--- - src/resolve/meson.build | 10 +- - src/resolve/org.freedesktop.resolve1.policy.in | 8 +- - src/timedate/meson.build | 10 +- - src/timedate/org.freedesktop.timedate1.policy.in | 16 +-- - 16 files changed, 150 insertions(+), 171 deletions(-) - -diff --git a/src/core/meson.build b/src/core/meson.build -index a89a12232..256082561 100644 ---- a/src/core/meson.build -+++ b/src/core/meson.build -@@ -212,19 +212,12 @@ install_data('org.freedesktop.systemd1.conf', - install_data('org.freedesktop.systemd1.service', - install_dir : dbussystemservicedir) - --policy_in = configure_file( -+policy = configure_file( - input : 'org.freedesktop.systemd1.policy.in.in', -- output : 'org.freedesktop.systemd1.policy.in', -- configuration : substs) -- --i18n.merge_file( -- 'org.freedesktop.systemd1.policy', -- input : policy_in, - output : 'org.freedesktop.systemd1.policy', -- po_dir : po_dir, -- data_dirs : po_dir, -- install : install_polkit, -- install_dir : polkitpolicydir) -+ configuration : substs) -+install_data(policy, -+ install_dir : polkitpolicydir) - - install_data('user.conf', - install_dir : pkgsysconfdir) -diff --git a/src/core/org.freedesktop.systemd1.policy.in.in b/src/core/org.freedesktop.systemd1.policy.in.in -index 2c6ed749f..648221b85 100644 ---- a/src/core/org.freedesktop.systemd1.policy.in.in -+++ b/src/core/org.freedesktop.systemd1.policy.in.in -@@ -19,8 +19,8 @@ - http://www.freedesktop.org/wiki/Software/systemd - - -- Send passphrase back to system -- Authentication is required to send the entered passphrase back to the system. -+ Send passphrase back to system -+ Authentication is required to send the entered passphrase back to the system. - - no - no -@@ -30,8 +30,8 @@ - - - -- Manage system services or other units -- Authentication is required to manage system services or other units. -+ Manage system services or other units -+ Authentication is required to manage system services or other units. - - auth_admin - auth_admin -@@ -40,8 +40,8 @@ - - - -- Manage system service or unit files -- Authentication is required to manage system service or unit files. -+ Manage system service or unit files -+ Authentication is required to manage system service or unit files. - - auth_admin - auth_admin -@@ -50,8 +50,8 @@ - - - -- Set or unset system and service manager environment variables -- Authentication is required to set or unset system and service manager environment variables. -+ Set or unset system and service manager environment variables -+ Authentication is required to set or unset system and service manager environment variables. - - auth_admin - auth_admin -@@ -60,8 +60,8 @@ - - - -- Reload the systemd state -- Authentication is required to reload the systemd state. -+ Reload the systemd state -+ Authentication is required to reload the systemd state. - - auth_admin - auth_admin -diff --git a/src/hostname/meson.build b/src/hostname/meson.build -index 75cc94874..c35c6688b 100644 ---- a/src/hostname/meson.build -+++ b/src/hostname/meson.build -@@ -21,12 +21,10 @@ if conf.get('ENABLE_HOSTNAMED') == 1 - install_data('org.freedesktop.hostname1.service', - install_dir : dbussystemservicedir) - -- i18n.merge_file( -- 'org.freedesktop.hostname1.policy', -+ policy = configure_file( - input : 'org.freedesktop.hostname1.policy.in', - output : 'org.freedesktop.hostname1.policy', -- po_dir : po_dir, -- data_dirs : po_dir, -- install : install_polkit, -- install_dir : polkitpolicydir) -+ configuration : substs) -+ install_data(policy, -+ install_dir : polkitpolicydir) - endif -diff --git a/src/hostname/org.freedesktop.hostname1.policy.in b/src/hostname/org.freedesktop.hostname1.policy.in -index b10ca31ac..4ac82c659 100644 ---- a/src/hostname/org.freedesktop.hostname1.policy.in -+++ b/src/hostname/org.freedesktop.hostname1.policy.in -@@ -19,8 +19,8 @@ - http://www.freedesktop.org/wiki/Software/systemd - - -- Set host name -- Authentication is required to set the local host name. -+ Set host name -+ Authentication is required to set the local host name. - - auth_admin_keep - auth_admin_keep -@@ -29,8 +29,8 @@ - - - -- Set static host name -- Authentication is required to set the statically configured local host name, as well as the pretty host name. -+ Set static host name -+ Authentication is required to set the statically configured local host name, as well as the pretty host name. - - auth_admin_keep - auth_admin_keep -@@ -40,8 +40,8 @@ - - - -- Set machine information -- Authentication is required to set local machine information. -+ Set machine information -+ Authentication is required to set local machine information. - - auth_admin_keep - auth_admin_keep -diff --git a/src/import/meson.build b/src/import/meson.build -index 2dcc0bcc0..e5088b343 100644 ---- a/src/import/meson.build -+++ b/src/import/meson.build -@@ -71,14 +71,12 @@ if conf.get('ENABLE_IMPORTD') == 1 - install_data('org.freedesktop.import1.service', - install_dir : dbussystemservicedir) - -- i18n.merge_file( -- 'org.freedesktop.import1.policy', -+ policy = configure_file( - input : 'org.freedesktop.import1.policy.in', - output : 'org.freedesktop.import1.policy', -- po_dir : po_dir, -- data_dirs : po_dir, -- install : install_polkit, -- install_dir : polkitpolicydir) -+ configuration : substs) -+ install_data(policy, -+ install_dir : polkitpolicydir) - - install_data('import-pubring.gpg', - install_dir : rootlibexecdir) -diff --git a/src/import/org.freedesktop.import1.policy.in b/src/import/org.freedesktop.import1.policy.in -index d96ca2d06..beea5fea6 100644 ---- a/src/import/org.freedesktop.import1.policy.in -+++ b/src/import/org.freedesktop.import1.policy.in -@@ -19,8 +19,8 @@ - http://www.freedesktop.org/wiki/Software/systemd - - -- Import a VM or container image -- Authentication is required to import a VM or container image -+ Import a VM or container image -+ Authentication is required to import a VM or container image - - auth_admin - auth_admin -@@ -29,8 +29,8 @@ - - - -- Export a VM or container image -- Authentication is required to export a VM or container image -+ Export a VM or container image -+ Authentication is required to export a VM or container image - - auth_admin - auth_admin -@@ -39,8 +39,8 @@ - - - -- Download a VM or container image -- Authentication is required to download a VM or container image -+ Download a VM or container image -+ Authentication is required to download a VM or container image - - auth_admin - auth_admin -diff --git a/src/locale/meson.build b/src/locale/meson.build -index dca2c51d2..30882cc02 100644 ---- a/src/locale/meson.build -+++ b/src/locale/meson.build -@@ -29,14 +29,12 @@ if conf.get('ENABLE_LOCALED') == 1 - install_data('org.freedesktop.locale1.service', - install_dir : dbussystemservicedir) - -- i18n.merge_file( -- 'org.freedesktop.locale1.policy', -+ policy = configure_file( - input : 'org.freedesktop.locale1.policy.in', - output : 'org.freedesktop.locale1.policy', -- po_dir : po_dir, -- data_dirs : po_dir, -- install : install_polkit, -- install_dir : polkitpolicydir) -+ configuration : substs) -+ install_data(policy, -+ install_dir : polkitpolicydir) - endif - - # If you know a way that allows the same variables to be used -diff --git a/src/locale/org.freedesktop.locale1.policy.in b/src/locale/org.freedesktop.locale1.policy.in -index 4c1c34da0..f9241749e 100644 ---- a/src/locale/org.freedesktop.locale1.policy.in -+++ b/src/locale/org.freedesktop.locale1.policy.in -@@ -19,8 +19,8 @@ - http://www.freedesktop.org/wiki/Software/systemd - - -- Set system locale -- Authentication is required to set the system locale. -+ Set system locale -+ Authentication is required to set the system locale. - - auth_admin_keep - auth_admin_keep -@@ -30,8 +30,8 @@ - - - -- Set system keyboard settings -- Authentication is required to set the system keyboard settings. -+ Set system keyboard settings -+ Authentication is required to set the system keyboard settings. - - auth_admin_keep - auth_admin_keep -diff --git a/src/login/meson.build b/src/login/meson.build -index e8e4f7bd7..599c44ea9 100644 ---- a/src/login/meson.build -+++ b/src/login/meson.build -@@ -88,14 +88,12 @@ if conf.get('ENABLE_LOGIND') == 1 - install_data('org.freedesktop.login1.service', - install_dir : dbussystemservicedir) - -- i18n.merge_file( -- 'org.freedesktop.login1.policy', -+ policy = configure_file( - input : 'org.freedesktop.login1.policy.in', - output : 'org.freedesktop.login1.policy', -- po_dir : po_dir, -- data_dirs : po_dir, -- install : install_polkit, -- install_dir : polkitpolicydir) -+ configuration : substs) -+ install_data(policy, -+ install_dir : polkitpolicydir) - - install_data('70-power-switch.rules', install_dir : udevrulesdir) - -diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy.in -index 47162022d..f1d1f956d 100644 ---- a/src/login/org.freedesktop.login1.policy.in -+++ b/src/login/org.freedesktop.login1.policy.in -@@ -19,8 +19,8 @@ - http://www.freedesktop.org/wiki/Software/systemd - - -- Allow applications to inhibit system shutdown -- Authentication is required for an application to inhibit system shutdown. -+ Allow applications to inhibit system shutdown -+ Authentication is required for an application to inhibit system shutdown. - - no - yes -@@ -30,8 +30,8 @@ - - - -- Allow applications to delay system shutdown -- Authentication is required for an application to delay system shutdown. -+ Allow applications to delay system shutdown -+ Authentication is required for an application to delay system shutdown. - - yes - yes -@@ -41,8 +41,8 @@ - - - -- Allow applications to inhibit system sleep -- Authentication is required for an application to inhibit system sleep. -+ Allow applications to inhibit system sleep -+ Authentication is required for an application to inhibit system sleep. - - no - yes -@@ -52,8 +52,8 @@ - - - -- Allow applications to delay system sleep -- Authentication is required for an application to delay system sleep. -+ Allow applications to delay system sleep -+ Authentication is required for an application to delay system sleep. - - yes - yes -@@ -62,8 +62,8 @@ - - - -- Allow applications to inhibit automatic system suspend -- Authentication is required for an application to inhibit automatic system suspend. -+ Allow applications to inhibit automatic system suspend -+ Authentication is required for an application to inhibit automatic system suspend. - - yes - yes -@@ -72,8 +72,8 @@ - - - -- Allow applications to inhibit system handling of the power key -- Authentication is required for an application to inhibit system handling of the power key. -+ Allow applications to inhibit system handling of the power key -+ Authentication is required for an application to inhibit system handling of the power key. - - no - yes -@@ -83,8 +83,8 @@ - - - -- Allow applications to inhibit system handling of the suspend key -- Authentication is required for an application to inhibit system handling of the suspend key. -+ Allow applications to inhibit system handling of the suspend key -+ Authentication is required for an application to inhibit system handling of the suspend key. - - no - yes -@@ -94,8 +94,8 @@ - - - -- Allow applications to inhibit system handling of the hibernate key -- Authentication is required for an application to inhibit system handling of the hibernate key. -+ Allow applications to inhibit system handling of the hibernate key -+ Authentication is required for an application to inhibit system handling of the hibernate key. - - no - yes -@@ -104,8 +104,8 @@ - - - -- Allow applications to inhibit system handling of the lid switch -- Authentication is required for an application to inhibit system handling of the lid switch. -+ Allow applications to inhibit system handling of the lid switch -+ Authentication is required for an application to inhibit system handling of the lid switch. - - no - yes -@@ -114,8 +114,8 @@ - - - -- Allow non-logged-in user to run programs -- Explicit request is required to run programs as a non-logged-in user. -+ Allow non-logged-in user to run programs -+ Explicit request is required to run programs as a non-logged-in user. - - yes - yes -@@ -124,8 +124,8 @@ - - - -- Allow non-logged-in users to run programs -- Authentication is required to run programs as a non-logged-in user. -+ Allow non-logged-in users to run programs -+ Authentication is required to run programs as a non-logged-in user. - - auth_admin_keep - auth_admin_keep -@@ -134,8 +134,8 @@ - - - -- Allow attaching devices to seats -- Authentication is required for attaching a device to a seat. -+ Allow attaching devices to seats -+ Authentication is required for attaching a device to a seat. - - auth_admin_keep - auth_admin_keep -@@ -145,8 +145,8 @@ - - - -- Flush device to seat attachments -- Authentication is required for resetting how devices are attached to seats. -+ Flush device to seat attachments -+ Authentication is required for resetting how devices are attached to seats. - - auth_admin_keep - auth_admin_keep -@@ -155,8 +155,8 @@ - - - -- Power off the system -- Authentication is required for powering off the system. -+ Power off the system -+ Authentication is required for powering off the system. - - auth_admin_keep - auth_admin_keep -@@ -166,8 +166,8 @@ - - - -- Power off the system while other users are logged in -- Authentication is required for powering off the system while other users are logged in. -+ Power off the system while other users are logged in -+ Authentication is required for powering off the system while other users are logged in. - - auth_admin_keep - auth_admin_keep -@@ -177,8 +177,8 @@ - - - -- Power off the system while an application asked to inhibit it -- Authentication is required for powering off the system while an application asked to inhibit it. -+ Power off the system while an application asked to inhibit it -+ Authentication is required for powering off the system while an application asked to inhibit it. - - auth_admin_keep - auth_admin_keep -@@ -188,8 +188,8 @@ - - - -- Reboot the system -- Authentication is required for rebooting the system. -+ Reboot the system -+ Authentication is required for rebooting the system. - - auth_admin_keep - auth_admin_keep -@@ -199,8 +199,8 @@ - - - -- Reboot the system while other users are logged in -- Authentication is required for rebooting the system while other users are logged in. -+ Reboot the system while other users are logged in -+ Authentication is required for rebooting the system while other users are logged in. - - auth_admin_keep - auth_admin_keep -@@ -210,8 +210,8 @@ - - - -- Reboot the system while an application asked to inhibit it -- Authentication is required for rebooting the system while an application asked to inhibit it. -+ Reboot the system while an application asked to inhibit it -+ Authentication is required for rebooting the system while an application asked to inhibit it. - - auth_admin_keep - auth_admin_keep -@@ -221,8 +221,8 @@ - - - -- Halt the system -- Authentication is required for halting the system. -+ Halt the system -+ Authentication is required for halting the system. - - auth_admin_keep - auth_admin_keep -@@ -232,8 +232,8 @@ - - - -- Halt the system while other users are logged in -- Authentication is required for halting the system while other users are logged in. -+ Halt the system while other users are logged in -+ Authentication is required for halting the system while other users are logged in. - - auth_admin_keep - auth_admin_keep -@@ -243,8 +243,8 @@ - - - -- Halt the system while an application asked to inhibit it -- Authentication is required for halting the system while an application asked to inhibit it. -+ Halt the system while an application asked to inhibit it -+ Authentication is required for halting the system while an application asked to inhibit it. - - auth_admin_keep - auth_admin_keep -@@ -254,8 +254,8 @@ - - - -- Suspend the system -- Authentication is required for suspending the system. -+ Suspend the system -+ Authentication is required for suspending the system. - - auth_admin_keep - auth_admin_keep -@@ -264,8 +264,8 @@ - - - -- Suspend the system while other users are logged in -- Authentication is required for suspending the system while other users are logged in. -+ Suspend the system while other users are logged in -+ Authentication is required for suspending the system while other users are logged in. - - auth_admin_keep - auth_admin_keep -@@ -275,8 +275,8 @@ - - - -- Suspend the system while an application asked to inhibit it -- Authentication is required for suspending the system while an application asked to inhibit it. -+ Suspend the system while an application asked to inhibit it -+ Authentication is required for suspending the system while an application asked to inhibit it. - - auth_admin_keep - auth_admin_keep -@@ -286,8 +286,8 @@ - - - -- Hibernate the system -- Authentication is required for hibernating the system. -+ Hibernate the system -+ Authentication is required for hibernating the system. - - auth_admin_keep - auth_admin_keep -@@ -296,8 +296,8 @@ - - - -- Hibernate the system while other users are logged in -- Authentication is required for hibernating the system while other users are logged in. -+ Hibernate the system while other users are logged in -+ Authentication is required for hibernating the system while other users are logged in. - - auth_admin_keep - auth_admin_keep -@@ -307,8 +307,8 @@ - - - -- Hibernate the system while an application asked to inhibit it -- Authentication is required for hibernating the system while an application asked to inhibit it. -+ Hibernate the system while an application asked to inhibit it -+ Authentication is required for hibernating the system while an application asked to inhibit it. - - auth_admin_keep - auth_admin_keep -@@ -318,8 +318,8 @@ - - - -- Manage active sessions, users and seats -- Authentication is required for managing active sessions, users and seats. -+ Manage active sessions, users and seats -+ Authentication is required for managing active sessions, users and seats. - - auth_admin_keep - auth_admin_keep -@@ -328,8 +328,8 @@ - - - -- Lock or unlock active sessions -- Authentication is required to lock or unlock active sessions. -+ Lock or unlock active sessions -+ Authentication is required to lock or unlock active sessions. - - auth_admin_keep - auth_admin_keep -@@ -338,8 +338,8 @@ - - - -- Allow indication to the firmware to boot to setup interface -- Authentication is required to indicate to the firmware to boot to setup interface. -+ Allow indication to the firmware to boot to setup interface -+ Authentication is required to indicate to the firmware to boot to setup interface. - - auth_admin_keep - auth_admin_keep -@@ -348,8 +348,8 @@ - - - -- Set a wall message -- Authentication is required to set a wall message -+ Set a wall message -+ Authentication is required to set a wall message - - auth_admin_keep - auth_admin_keep -diff --git a/src/machine/meson.build b/src/machine/meson.build -index 7ea5d9de8..0f2944c8f 100644 ---- a/src/machine/meson.build -+++ b/src/machine/meson.build -@@ -44,14 +44,12 @@ if conf.get('ENABLE_MACHINED') == 1 - install_data('org.freedesktop.machine1.service', - install_dir : dbussystemservicedir) - -- i18n.merge_file( -- 'org.freedesktop.machine1.policy', -+ policy = configure_file( - input : 'org.freedesktop.machine1.policy.in', - output : 'org.freedesktop.machine1.policy', -- po_dir : po_dir, -- data_dirs : po_dir, -- install : install_polkit, -- install_dir : polkitpolicydir) -+ configuration : substs) -+ install_data(policy, -+ install_dir : polkitpolicydir) - endif - - tests += [ -diff --git a/src/machine/org.freedesktop.machine1.policy.in b/src/machine/org.freedesktop.machine1.policy.in -index eeeeb4c0f..039c3d451 100644 ---- a/src/machine/org.freedesktop.machine1.policy.in -+++ b/src/machine/org.freedesktop.machine1.policy.in -@@ -19,8 +19,8 @@ - http://www.freedesktop.org/wiki/Software/systemd - - -- Log into a local container -- Authentication is required to log into a local container. -+ Log into a local container -+ Authentication is required to log into a local container. - - auth_admin - auth_admin -@@ -29,8 +29,8 @@ - - - -- Log into the local host -- Authentication is required to log into the local host. -+ Log into the local host -+ Authentication is required to log into the local host. - - auth_admin - auth_admin -@@ -39,8 +39,8 @@ - - - -- Acquire a shell in a local container -- Authentication is required to acquire a shell in a local container. -+ Acquire a shell in a local container -+ Authentication is required to acquire a shell in a local container. - - auth_admin - auth_admin -@@ -50,8 +50,8 @@ - - - -- Acquire a shell on the local host -- Authentication is required to acquire a shell on the local host. -+ Acquire a shell on the local host -+ Authentication is required to acquire a shell on the local host. - - auth_admin - auth_admin -@@ -61,8 +61,8 @@ - - - -- Acquire a pseudo TTY in a local container -- Authentication is required to acquire a pseudo TTY in a local container. -+ Acquire a pseudo TTY in a local container -+ Authentication is required to acquire a pseudo TTY in a local container. - - auth_admin - auth_admin -@@ -71,8 +71,8 @@ - - - -- Acquire a pseudo TTY on the local host -- Authentication is required to acquire a pseudo TTY on the local host. -+ Acquire a pseudo TTY on the local host -+ Authentication is required to acquire a pseudo TTY on the local host. - - auth_admin - auth_admin -@@ -81,8 +81,8 @@ - - - -- Manage local virtual machines and containers -- Authentication is required to manage local virtual machines and containers. -+ Manage local virtual machines and containers -+ Authentication is required to manage local virtual machines and containers. - - auth_admin - auth_admin -@@ -92,8 +92,8 @@ - - - -- Manage local virtual machine and container images -- Authentication is required to manage local virtual machine and container images. -+ Manage local virtual machine and container images -+ Authentication is required to manage local virtual machine and container images. - - auth_admin - auth_admin -diff --git a/src/resolve/meson.build b/src/resolve/meson.build -index 15752d24f..7e7876d19 100644 ---- a/src/resolve/meson.build -+++ b/src/resolve/meson.build -@@ -165,14 +165,12 @@ if conf.get('ENABLE_RESOLVE') == 1 - install_data('resolv.conf', - install_dir : rootlibexecdir) - -- i18n.merge_file( -- 'org.freedesktop.resolve1.policy', -+ policy = configure_file( - input : 'org.freedesktop.resolve1.policy.in', - output : 'org.freedesktop.resolve1.policy', -- po_dir : po_dir, -- data_dirs : po_dir, -- install : install_polkit, -- install_dir : polkitpolicydir) -+ configuration : substs) -+ install_data(policy, -+ install_dir : polkitpolicydir) - endif - - tests += [ -diff --git a/src/resolve/org.freedesktop.resolve1.policy.in b/src/resolve/org.freedesktop.resolve1.policy.in -index da948eb0b..b65ba3e56 100644 ---- a/src/resolve/org.freedesktop.resolve1.policy.in -+++ b/src/resolve/org.freedesktop.resolve1.policy.in -@@ -19,8 +19,8 @@ - http://www.freedesktop.org/wiki/Software/systemd - - -- Register a DNS-SD service -- Authentication is required to register a DNS-SD service -+ Register a DNS-SD service -+ Authentication is required to register a DNS-SD service - - auth_admin - auth_admin -@@ -30,8 +30,8 @@ - - - -- Unregister a DNS-SD service -- Authentication is required to unregister a DNS-SD service -+ Unregister a DNS-SD service -+ Authentication is required to unregister a DNS-SD service - - auth_admin - auth_admin -diff --git a/src/timedate/meson.build b/src/timedate/meson.build -index 80e5cd21b..6892596b2 100644 ---- a/src/timedate/meson.build -+++ b/src/timedate/meson.build -@@ -21,12 +21,10 @@ if conf.get('ENABLE_TIMEDATED') == 1 - install_data('org.freedesktop.timedate1.service', - install_dir : dbussystemservicedir) - -- i18n.merge_file( -- 'org.freedesktop.timedate1.policy', -+ policy = configure_file( - input : 'org.freedesktop.timedate1.policy.in', - output : 'org.freedesktop.timedate1.policy', -- po_dir : po_dir, -- data_dirs : po_dir, -- install : install_polkit, -- install_dir : polkitpolicydir) -+ configuration : substs) -+ install_data(policy, -+ install_dir : polkitpolicydir) - endif -diff --git a/src/timedate/org.freedesktop.timedate1.policy.in b/src/timedate/org.freedesktop.timedate1.policy.in -index cc2e1652d..d488572ae 100644 ---- a/src/timedate/org.freedesktop.timedate1.policy.in -+++ b/src/timedate/org.freedesktop.timedate1.policy.in -@@ -19,8 +19,8 @@ - http://www.freedesktop.org/wiki/Software/systemd - - -- Set system time -- Authentication is required to set the system time. -+ Set system time -+ Authentication is required to set the system time. - - auth_admin_keep - auth_admin_keep -@@ -30,8 +30,8 @@ - - - -- Set system timezone -- Authentication is required to set the system timezone. -+ Set system timezone -+ Authentication is required to set the system timezone. - - auth_admin_keep - auth_admin_keep -@@ -40,8 +40,8 @@ - - - -- Set RTC to local timezone or UTC -- Authentication is required to control whether -+ Set RTC to local timezone or UTC -+ Authentication is required to control whether - the RTC stores the local or UTC time. - - auth_admin_keep -@@ -51,8 +51,8 @@ - - - -- Turn network time synchronization on or off -- Authentication is required to control whether -+ Turn network time synchronization on or off -+ Authentication is required to control whether - network time synchronization shall be enabled. - - auth_admin_keep --- -2.15.1 -