Commit e5c560fd authored by nkskjames's avatar nkskjames

Merge pull request #177 from anoo1/feb11

Recipe update: User management, systemd patch, IPMI net functions
parents 010f08de 2745eaf2
......@@ -30,3 +30,4 @@ PREFERRED_PROVIDER_virtual/obmc-phosphor-flash-mgmt = "skeleton"
PREFERRED_PROVIDER_virtual/obmc-phosphor-policy-mgmt = "skeleton"
PREFERRED_PROVIDER_virtual/obmc-phosphor-sensor-mgmt = "skeleton"
PREFERRED_PROVIDER_virtual/obmc-phosphor-system-mgmt = "skeleton"
PREFERRED_PROVIDER_virtual/obmc-phosphor-user-mgmt = "obmc-phosphor-user"
......@@ -8,6 +8,7 @@
# - obmc-phosphor-flash-mgmt - Phosphor OpenBMC flash management
# - obmc-phosphor-event-mgmt - Phosphor OpenBMC event management
# - obmc-phosphor-policy-mgmt - Phosphor OpenBMC policy management
# - obmc-phosphor-user-mgmt - Phosphor OpenBMC user management
# - obmc-phosphor-system-mgmt - Phosphor OpenBMC system management
inherit core-image
......@@ -19,6 +20,7 @@ FEATURE_PACKAGES_obmc-phosphor-sensor-mgmt ?= "packagegroup-obmc-phosphor-apps-s
FEATURE_PACKAGES_obmc-phosphor-flash-mgmt ?= "packagegroup-obmc-phosphor-apps-flash-mgmt"
FEATURE_PACKAGES_obmc-phosphor-event-mgmt ?= "packagegroup-obmc-phosphor-apps-event-mgmt"
FEATURE_PACKAGES_obmc-phosphor-policy-mgmt ?= "packagegroup-obmc-phosphor-apps-policy-mgmt"
FEATURE_PACKAGES_obmc-phosphor-user-mgmt ?= "packagegroup-obmc-phosphor-apps-user-mgmt"
FEATURE_PACKAGES_obmc-phosphor-system-mgmt ?= "packagegroup-obmc-phosphor-apps-system-mgmt"
# Install entire Phosphor application stack by default
......@@ -29,6 +31,7 @@ IMAGE_FEATURES += " \
obmc-phosphor-flash-mgmt \
obmc-phosphor-event-mgmt \
obmc-phosphor-policy-mgmt \
obmc-phosphor-user-mgmt \
obmc-phosphor-system-mgmt \
ssh-server-dropbear \
"
......
# Common code for recipes that implement Phosphor OpenBMC user management.
RPROVIDES_${PN} += "virtual/obmc-phosphor-user-mgmt"
PROVIDES += "virtual/obmc-phosphor-user-mgmt"
......@@ -18,7 +18,7 @@ RDEPENDS_${PN} += "settings"
RDEPENDS_${PN} += "network"
SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
SRCREV = "bec22bb7cf730147bf4b036fa9237b8495be4e75"
SRCREV = "5d8c424a5c125b3cc5dcf67238e174b9dcaf22e6"
S = "${WORKDIR}/git"
INSTALL_NAME = "ipmid"
......
[Unit]
Description=User DBUS object
Requires=skeleton.service
After=skeleton.service
Description=Phosphor OpenBMC user management daemon
[Service]
ExecStart=/usr/sbin/userman.py
ExecStart=/usr/sbin/obmc-phosphor-userd
[Install]
WantedBy=multi-user.target
......@@ -4,18 +4,21 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-networkd"
PR = "r1"
inherit obmc-phosphor-license
inherit obmc-phosphor-user-mgmt
inherit obmc-phosphor-systemd
RDEPENDS_${PN} += "python-dbus python-pygobject python-pexpect"
SRC_URI += "git://github.com/openbmc/phosphor-networkd"
SRCREV = "9f804290dd0bf200a1ba28e107eae55bdb4076da"
SRCREV = "cb3613575fd6fb18a7d2f7e7d86e7b6fd75f4269"
S = "${WORKDIR}/git"
INSTALL_NAME = "userman.py"
do_install() {
echo "***installing $INSTALL_NAME"
install -d ${D}/${sbindir}
install ${S}/userman.py ${D}/${sbindir}
install ${S}/${INSTALL_NAME} ${D}/${sbindir}/obmc-phosphor-userd
}
......@@ -19,6 +19,7 @@ PACKAGES = " \
${@mf_enabled("obmc-phosphor-flash-mgmt", "packagegroup-obmc-phosphor-apps-flash-mgmt", d)} \
${@df_enabled("obmc-phosphor-event-mgmt", "packagegroup-obmc-phosphor-apps-event-mgmt", d)} \
${@df_enabled("obmc-phosphor-policy-mgmt", "packagegroup-obmc-phosphor-apps-policy-mgmt", d)} \
${@df_enabled("obmc-phosphor-user-mgmt", "packagegroup-obmc-phosphor-apps-user-mgmt", d)} \
${@df_enabled("obmc-phosphor-system-mgmt", "packagegroup-obmc-phosphor-apps-system-mgmt", d)} \
"
......@@ -69,6 +70,12 @@ RDEPENDS_packagegroup-obmc-phosphor-apps-policy-mgmt = " \
virtual/obmc-phosphor-policy-mgmt \
", d)}"
SUMMARY_packagegroup-obmc-phosphor-apps-user-mgmt = "User management support"
RDEPENDS_packagegroup-obmc-phosphor-apps-user-mgmt = " \
${@df_enabled("obmc-phosphor-user-mgmt", " \
virtual/obmc-phosphor-user-mgmt \
", d)}"
SUMMARY_packagegroup-obmc-phosphor-apps-system-mgmt = "System management support"
RDEPENDS_packagegroup-obmc-phosphor-apps-system-mgmt = " \
${@df_enabled("obmc-phosphor-system-mgmt", " \
......
......@@ -26,6 +26,7 @@ DISTRO_FEATURES = "\
obmc-phosphor-flash-mgmt \
obmc-phosphor-event-mgmt \
obmc-phosphor-policy-mgmt \
obmc-phosphor-user-mgmt \
obmc-phosphor-system-mgmt \
${DISTRO_FEATURES_LIBC} \
"
......
......@@ -30,3 +30,4 @@ PREFERRED_PROVIDER_virtual/obmc-phosphor-flash-mgmt = "obmc-phosphor-flashd"
PREFERRED_PROVIDER_virtual/obmc-phosphor-policy-mgmt = "obmc-phosphor-policyd"
PREFERRED_PROVIDER_virtual/obmc-phosphor-sensor-mgmt = "obmc-phosphor-sensord"
PREFERRED_PROVIDER_virtual/obmc-phosphor-system-mgmt = "obmc-phosphor-sysd"
PREFERRED_PROVIDER_virtual/obmc-phosphor-user-mgmt = "obmc-phosphor-userd"
......@@ -41,6 +41,7 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
file://0012-implment-systemd-sysv-install-for-OE.patch \
file://0014-Revert-rules-remove-firmware-loading-rules.patch \
file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
file://0100-systemd_networkd_dbus_setaddress.patch \
file://touchscreen.rules \
file://00-create-volatile.conf \
file://init \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment