phosphor-logging: install config from the own repo

This change required is a part of privilege separation work:
  https://github.com/openbmc/openbmc/issues/3383

This change should be merged after individual repo change:
  https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-logging/+/41835

Signed-off-by: Anton D. Kachalov <gmouse@google.com>
Change-Id: I6243736cd0ce1ecccb2b164068dccf05d01ab6ad
diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service b/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
deleted file mode 100644
index 77936c7..0000000
--- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Phosphor Log Manager
-
-[Service]
-ExecStart=/usr/bin/env phosphor-log-manager
-SyslogIdentifier=phosphor-log-manager
-Restart=always
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service b/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service
deleted file mode 100644
index e1b1d66..0000000
--- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Rsyslog config updater
-
-[Service]
-ExecStart=/usr/bin/env phosphor-rsyslog-conf
-SyslogIdentifier=phosphor-rsyslog-conf
-Restart=always
-Type=dbus
-BusName={BUSNAME}
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
index 895cf9d..c861fd4 100644
--- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
+++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb
@@ -38,8 +38,11 @@
 PACKAGE_BEFORE_PN += "${LOGGING_PACKAGES}"
 SYSTEMD_PACKAGES = "${LOGGING_PACKAGES}"
 DBUS_PACKAGES = "${LOGGING_PACKAGES}"
+USERADD_PACKAGES = "${PN}-base"
+GROUPADD_PARAM_${PN}-base = "-r phosphor-logging"
 
 FILES_${PN}-base += " \
+        ${sysconfdir}/dbus-1 \
         ${bindir}/phosphor-log-manager \
         ${libdir}/libphosphor_logging.so.* \
 "