summaryrefslogtreecommitdiff
path: root/meta-phosphor
diff options
context:
space:
mode:
authorAnton D. Kachalov <gmouse@google.com>2021-03-31 10:13:02 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-05-13 20:03:28 +0300
commit8e2f55de9148065559a27268ce07d79009b9892a (patch)
treedb54828fececbce3fcfa7753ae7742cbffba6f1a /meta-phosphor
parentf9f61e42f30fb7c05437af9e553740f7147c66f3 (diff)
downloadopenbmc-8e2f55de9148065559a27268ce07d79009b9892a.tar.xz
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
Diffstat (limited to 'meta-phosphor')
-rw-r--r--meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Logging.service12
-rw-r--r--meta-phosphor/recipes-phosphor/logging/phosphor-logging/xyz.openbmc_project.Syslog.Config.service12
-rw-r--r--meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb3
3 files changed, 3 insertions, 24 deletions
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 77936c72d..000000000
--- 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 e1b1d667a..000000000
--- 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 895cf9d6e..c861fd4b8 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 @@ ALLOW_EMPTY_${PN} = "1"
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.* \
"