commit 1e710d04a61092b45ff4ccd58656cb5cee3cba5b
author William A. Kennington III <wak@google.com> Mon May 24 13:35:44 2021 -0700
committer William A. Kennington III <wak@google.com> Mon May 24 13:35:50 2021 -0700
tree 915be183f5b228a5da7d7acdfdca126005eb3350
parent 0a01b2a98137bfe358b6c41859d7dee623081514

build: Fix service and conf file quotation

The previous commit broke the autotools generation of D-Bus configs as
the strings being written into the XML were not correctly quoted.

Change-Id: Icf7ecbbd4ecd7f513721a578b8374df3ffae9649
Signed-off-by: William A. Kennington III <wak@google.com>

meson.build

diff --git a/meson.build b/meson.build
index fa989c3..2b3afba 100644
--- a/meson.build
+++ b/meson.build
@@ -8,9 +8,10 @@
     'cpp_std=c++20',
   ])
 
+default_busname = 'xyz.openbmc_project.Network'
+
 conf_data = configuration_data()
-conf_data.set_quoted('DEFAULT_BUSNAME', 'xyz.openbmc_project.Network')
-conf_data.set_quoted('SYSTEMD_TARGET', 'multi-user.target')
+conf_data.set_quoted('DEFAULT_BUSNAME', default_busname)
 conf_data.set('HAVE_UBOOT_ENV', get_option('uboot-env'))
 conf_data.set(
   'LINK_LOCAL_AUTOCONFIGURATION',
@@ -126,7 +127,10 @@
 configure_file(
   input: 'xyz.openbmc_project.Network.service.in',
   output: 'xyz.openbmc_project.Network.service',
-  configuration: conf_data,
+  configuration: {
+    'SYSTEMD_TARGET': 'multi-user.target',
+    'DEFAULT_BUSNAME': default_busname,
+  },
   install: true,
   install_dir: dependency('systemd').get_variable(
     pkgconfig: 'systemdsystemunitdir'))
@@ -134,7 +138,7 @@
 configure_file(
   input: 'xyz.openbmc_project.Network.conf.in',
   output: 'xyz.openbmc_project.Network.conf',
-  configuration: conf_data,
+  configuration: {'DEFAULT_BUSNAME': default_busname},
   install: true,
   install_dir: get_option('datadir') / 'dbus-1' / 'system.d')
 

xyz.openbmc_project.Network.conf.in

diff --git a/xyz.openbmc_project.Network.conf.in b/xyz.openbmc_project.Network.conf.in
index 6d10a3c..b34fe6c 100644
--- a/xyz.openbmc_project.Network.conf.in
+++ b/xyz.openbmc_project.Network.conf.in
@@ -2,7 +2,7 @@
         "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
         <policy user="root">
-                <allow own=@DEFAULT_BUSNAME@/>
-                <allow send_destination=@DEFAULT_BUSNAME@/>
+                <allow own="@DEFAULT_BUSNAME@"/>
+                <allow send_destination="@DEFAULT_BUSNAME@"/>
         </policy>
 </busconfig>