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>
diff --git a/meta-phosphor/common/recipes-phosphor/network/network.bb b/meta-phosphor/common/recipes-phosphor/network/network.bb
index 7a749a8..b792472 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-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-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 73b4605..0000000
--- 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}