userman: recipe/service update

Use dbus and systemd class features.

Change-Id: I4567237a1badaa2d79a2b133de5bffbd3b1ccda5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

2 files changed, 7 insertions, 2 deletions

diff --git a/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb b/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb
index 3357edbac..5f63b6209 100644
--- a/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb
+++ b/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb
@@ -3,9 +3,10 @@ DESCRIPTION = "User DBUS object"
 HOMEPAGE = "http://github.com/openbmc/phosphor-networkd"
 PR = "r1"
 
+inherit allarch
 inherit obmc-phosphor-license
 inherit obmc-phosphor-user-mgmt
-inherit obmc-phosphor-systemd
+inherit obmc-phosphor-dbus-service
 
 RDEPENDS_${PN} += "python-dbus python-pygobject python-pexpect"
 
@@ -16,6 +17,8 @@ SRCREV = "15d498e2568b6e104de75e7423caab0c9a487485"
 S = "${WORKDIR}/git"
 INSTALL_NAME = "userman.py"
 
+DBUS_SERVICE_${PN} += "org.openbmc.UserManager.service"
+
 # Since base_do_compile finds a makefile (from networkd) it tries to
 # compile.  Short-circuit that because we just need to copy a python
 # file in this package.
@@ -23,7 +26,7 @@ do_compile() {
     :
 }
 
-do_install() {
+do_install_append() {
 echo "***installing $INSTALL_NAME"
         install -d ${D}/${sbindir}
         install ${S}/${INSTALL_NAME} ${D}/${sbindir}/obmc-phosphor-userd
diff --git a/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user/obmc-phosphor-user.service b/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service
index 1c79f519a..d83599063 100644
--- a/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user/obmc-phosphor-user.service
+++ b/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service
@@ -5,6 +5,8 @@ Description=Phosphor User Manager
 ExecStart={sbindir}/obmc-phosphor-userd
 Environment="PYTHONUNBUFFERED=1"
 Restart=always
+Type=dbus
+BusName={BUSNAME}
 
 [Install]
 WantedBy={SYSTEMD_DEFAULT_TARGET}