diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2018-02-20 00:17:05 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-27 16:47:21 +0300 |
commit | 13836853303bbee3dbc986c98d6889e8c5bca474 (patch) | |
tree | 077d3285be89ae0bc9763f18000f86fbcc576bbc | |
parent | 0abc43339ee8d4ada9bb3385d201179b81567f42 (diff) | |
download | openbmc-13836853303bbee3dbc986c98d6889e8c5bca474.tar.xz |
Remove netman.py from the image
All functions are now provided by xyz.openbmc_project.Network
and this python application can be removed
Resolves openbmc/openbmc#2921
Testing: Verified network functions as expected in QEMU
in DHCP mode. Will let HW CI validate the static config.
Change-Id: I2de022adb43603c8df0eca6fa0b234aac608c035
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/network/network.bb | 8 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/network/network/org.openbmc.NetworkManager.service | 13 |
2 files changed, 0 insertions, 21 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/network/network.bb b/meta-phosphor/common/recipes-phosphor/network/network.bb index 7a749a840..b792472e3 100644 --- a/meta-phosphor/common/recipes-phosphor/network/network.bb +++ b/meta-phosphor/common/recipes-phosphor/network/network.bb @@ -9,7 +9,6 @@ inherit obmc-phosphor-license inherit obmc-phosphor-dbus-service inherit phosphor-networkd-rev -DBUS_SERVICE_${PN} += "org.openbmc.NetworkManager.service" DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.service" DEPENDS += "systemd" @@ -19,14 +18,7 @@ DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "phosphor-logging" RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "python-dbus python-pygobject python-ipy python-subprocess" -RDEPENDS_${PN} += "python-shell" RDEPENDS_${PN} += "sdbusplus phosphor-dbus-interfaces" RDEPENDS_${PN} += "phosphor-logging" S = "${WORKDIR}/git" - -do_install_append() { - install -d ${D}/${sbindir} - install ${S}/netman.py ${D}/${sbindir} -} diff --git a/meta-phosphor/common/recipes-phosphor/network/network/org.openbmc.NetworkManager.service b/meta-phosphor/common/recipes-phosphor/network/network/org.openbmc.NetworkManager.service deleted file mode 100644 index 73b46055e..000000000 --- a/meta-phosphor/common/recipes-phosphor/network/network/org.openbmc.NetworkManager.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Network Manager - -[Service] -ExecStart=/usr/bin/env netman.py -SyslogIdentifier=netman.py -Environment="PYTHONUNBUFFERED=1" -Restart=always -Type=dbus -BusName={BUSNAME} - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} |