diff options
| author | Patrick Venture <venture@google.com> | 2019-01-07 08:47:42 -0800 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-02-14 12:27:13 -0500 |
| commit | b49077c0d47d24ee31638add990c684125ffbe3d (patch) | |
| tree | 0fea10cd45f12670866d75256f28d12cac940ed2 /meta-phosphor/recipes-phosphor/network | |
| parent | 35245de96c21fa9b0f291e9f664fd8c53ba269fd (diff) | |
| download | talos-openbmc-b49077c0d47d24ee31638add990c684125ffbe3d.tar.gz talos-openbmc-b49077c0d47d24ee31638add990c684125ffbe3d.zip | |
meta-phosphor: drop service from network recipe
Drop the service file from the network recipe and use the one in the
source repository.
Patrick Venture (2):
build: drop duplicate LT_INIT line from configure_ac
move service file, dbus conf into repo
(From meta-phosphor rev: 58dbbcf8c4b8a3cbb09965b7cf54d744f05e3243)
Change-Id: I1921750cacdb158c05286fb02c75fcdf595a9536
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-phosphor/network')
| -rw-r--r-- | meta-phosphor/recipes-phosphor/network/network/xyz.openbmc_project.Network.service | 16 | ||||
| -rw-r--r-- | meta-phosphor/recipes-phosphor/network/network_git.bb | 12 |
2 files changed, 10 insertions, 18 deletions
diff --git a/meta-phosphor/recipes-phosphor/network/network/xyz.openbmc_project.Network.service b/meta-phosphor/recipes-phosphor/network/network/xyz.openbmc_project.Network.service deleted file mode 100644 index 3fe2dca53..000000000 --- a/meta-phosphor/recipes-phosphor/network/network/xyz.openbmc_project.Network.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Phosphor Network Manager -After=obmc-mapper.target - -[Service] -ExecStart=/usr/bin/env phosphor-network-manager -SyslogIdentifier=phosphor-network-manager -Restart=always -Type=dbus -BusName={BUSNAME} -RuntimeDirectory = network -RuntimeDirectoryPreserve = yes -StateDirectory = network - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/recipes-phosphor/network/network_git.bb b/meta-phosphor/recipes-phosphor/network/network_git.bb index aa49cabc2..3d80c7e6f 100644 --- a/meta-phosphor/recipes-phosphor/network/network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/network_git.bb @@ -8,10 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" inherit autotools pkgconfig inherit pythonnative -inherit obmc-phosphor-dbus-service inherit phosphor-networkd-rev +inherit systemd -DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.service" DEPENDS += "systemd" DEPENDS += "autoconf-archive-native" @@ -28,3 +27,12 @@ RDEPENDS_${PN} += "libnl" RDEPENDS_${PN} += "libnl-genl" 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}" \ +" |
