diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-06 20:58:07 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-06 21:11:45 +0300 |
commit | fc81e38aed2df98ed8c83b3ce7970f6434765a41 (patch) | |
tree | 0ed58adcb31a230146652e2d2e37f14f5906b333 /meta-phosphor/recipes-phosphor/network | |
parent | 9d8e46dcee0a07bc206e8980c7d9df0027935121 (diff) | |
download | openbmc-fc81e38aed2df98ed8c83b3ce7970f6434765a41.tar.xz |
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/network')
3 files changed, 3 insertions, 4 deletions
diff --git a/meta-phosphor/recipes-phosphor/network/inarp/inarp.service b/meta-phosphor/recipes-phosphor/network/inarp/inarp.service index 5d26559f0..6e85131e1 100644 --- a/meta-phosphor/recipes-phosphor/network/inarp/inarp.service +++ b/meta-phosphor/recipes-phosphor/network/inarp/inarp.service @@ -7,4 +7,4 @@ SyslogIdentifier=inarp Restart=always [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/network/network_git.bb b/meta-phosphor/recipes-phosphor/network/network_git.bb index 82c276fe0..aa6addbb9 100644 --- a/meta-phosphor/recipes-phosphor/network/network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/network_git.bb @@ -25,8 +25,7 @@ S = "${WORKDIR}/git" SERVICE_FILE = "xyz.openbmc_project.Network.service" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "${SERVICE_FILE}" -SYSTEMD_DEFAULT_TARGET ?= "obmc-standby.target" EXTRA_OECONF = " \ - SYSTEMD_TARGET="${SYSTEMD_DEFAULT_TARGET}" \ + SYSTEMD_TARGET="multi-user.target" \ " diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service b/meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service index f5a1d7274..6b7ffcd1d 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp/xyz.openbmc_project.Network.SNMP.service @@ -10,4 +10,4 @@ Type=dbus BusName=xyz.openbmc_project.Network.SNMP [Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} +WantedBy=multi-user.target |