diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-06 13:58:07 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-06 14:11:45 -0400 |
| commit | fc81e38aed2df98ed8c83b3ce7970f6434765a41 (patch) | |
| tree | 0ed58adcb31a230146652e2d2e37f14f5906b333 /meta-phosphor/recipes-phosphor/logging | |
| parent | 9d8e46dcee0a07bc206e8980c7d9df0027935121 (diff) | |
| download | talos-openbmc-fc81e38aed2df98ed8c83b3ce7970f6434765a41.tar.gz talos-openbmc-fc81e38aed2df98ed8c83b3ce7970f6434765a41.zip | |
update upstream subtrees
A number of corequisites exist so squashing these all into one patch.
meta-ingrasys - refresh master bc513127f4..67bcaf389f
meta-hxt - refresh master 86a4df514f..8fe0d38bbb
meta-phosphor - refresh master 06c09d7cce..df6ddae3d2
meta-quanta - refresh master 4f126361a1..53f3025271
Change-Id: I3daeef2a0467d8ea4f1fd1c617e526f8b11258af
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor/logging')
3 files changed, 3 insertions, 4 deletions
diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index 97a3f94f9..5a6a4d2fe 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -26,14 +26,13 @@ RRECOMMENDS_${PN} += "phosphor-debug-collector" # systemd service setup SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "hostlogger.service" -SYSTEMD_DEFAULT_TARGET ?= "multi-user.target" # Host TTY setup OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0" # Extra parameters for 'configure' script EXTRA_OECONF = "HOST_TTY=${OBMC_CONSOLE_HOST_TTY} \ - SYSTEMD_TARGET=${SYSTEMD_DEFAULT_TARGET}" + SYSTEMD_TARGET=multi-user.target" # Source code repository S = "${WORKDIR}/git" 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 index 946c3bf16..77936c72d 100644 --- 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 @@ -9,4 +9,4 @@ Type=dbus BusName={BUSNAME} [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +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 index 240839fd7..e1b1d667a 100644 --- 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 @@ -9,4 +9,4 @@ Type=dbus BusName={BUSNAME} [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target |
