diff options
author | Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com> | 2017-10-18 13:17:54 +0300 |
---|---|---|
committer | Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com> | 2017-10-24 09:48:00 +0300 |
commit | 0ea6f63c6de7a750700878d659bb05312c7cd376 (patch) | |
tree | d2a69115bbe4f266272830920fc49d2a31d15c9e /meta-phosphor/common/recipes-phosphor/users | |
parent | db5a6c4241133b754ba21d7fd80cf1089852c06a (diff) | |
download | openbmc-0ea6f63c6de7a750700878d659bb05312c7cd376.tar.xz |
Add recipe for phosphor-user-manager
Removed the obmc-phosphor-user and put the new one
Also, removed the usage of PREFERRED_PROVIDER and replaced by
VIRTUAL_RUNTIME for this feature
Change-Id: I6f0825f8d51eecb9c666a95d9fd702a8ea8bb08b
Signed-off-by: Vishwanatha Subbanna <vishwa@linux.vnet.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/users')
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb | 37 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager.bb | 23 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service (renamed from meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service) | 5 |
3 files changed, 25 insertions, 40 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 deleted file mode 100644 index 83b702430..000000000 --- a/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "User DBUS object" -DESCRIPTION = "User DBUS object" -HOMEPAGE = "http://github.com/openbmc/phosphor-networkd" -PR = "r1" - -inherit allarch -inherit obmc-phosphor-license -inherit obmc-phosphor-dbus-service -inherit phosphor-networkd-rev - -PROVIDES += "virtual/obmc-user-mgmt" -RPROVIDES_${PN} += "virtual-obmc-user-mgmt" - -RDEPENDS_${PN} += " \ - python-dbus \ - python-pygobject \ - python-subprocess \ - python-pexpect" - -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. -do_compile() { - : -} - -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/phosphor-user-manager.bb b/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager.bb new file mode 100644 index 000000000..390c51a0b --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager.bb @@ -0,0 +1,23 @@ +SUMMARY = "Phosphor User Manager Daemon" +DESCRIPTION = "Daemon that does user management" +HOMEPAGE = "http://github.com/openbmc/phosphor-user-manager" +PR = "r1" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" +inherit autotools pkgconfig +inherit obmc-phosphor-dbus-service + +DEPENDS += "autoconf-archive-native" +DEPENDS += "sdbusplus" +DEPENDS += "phosphor-logging" +DEPENDS += "phosphor-dbus-interfaces" +RDEPENDS_${PN} += "libsystemd" +RDEPENDS_${PN} += "phosphor-logging" + + +DBUS_SERVICE_${PN} += "xyz.openbmc_project.User.Manager.service" + +SRC_URI += "git://github.com/openbmc/phosphor-user-manager" +SRCREV = "035a96983cdf8a11a1c2380106c11c94cb8418b2" +S = "${WORKDIR}/git" diff --git a/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service b/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service index 64408b7d4..f8926e77c 100644 --- a/meta-phosphor/common/recipes-phosphor/users/obmc-phosphor-user/org.openbmc.UserManager.service +++ b/meta-phosphor/common/recipes-phosphor/users/phosphor-user-manager/xyz.openbmc_project.User.Manager.service @@ -2,9 +2,8 @@ Description=Phosphor User Manager [Service] -ExecStart=/usr/bin/env obmc-phosphor-userd -SyslogIdentifier=obmc-phosphor-userd -Environment="PYTHONUNBUFFERED=1" +ExecStart=/usr/bin/env phosphor-user-manager +SyslogIdentifier=phosphor-user-manager Restart=always Type=dbus BusName={BUSNAME} |