diff options
-rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 3 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb (renamed from meta-phosphor/common/recipes-phosphor/settings/settings.bb) | 10 | ||||
-rwxr-xr-x | meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/phosphor-settings.service (renamed from meta-phosphor/common/recipes-phosphor/settings/settings/settings.service) | 0 | ||||
-rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-defaults.inc | 1 | ||||
-rw-r--r-- | meta-phosphor/conf/distro/openbmc-phosphor.conf | 1 |
6 files changed, 10 insertions, 7 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 3b4ab5698..0462a1f3b 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -8,6 +8,7 @@ # - obmc-phosphor-flash-mgmt - Phosphor OpenBMC flash management # - obmc-phosphor-event-mgmt - Phosphor OpenBMC event management # - obmc-phosphor-user-mgmt - Phosphor OpenBMC user management +# - obmc-settings-mgmt - OpenBMC settings management # - obmc-phosphor-system-mgmt - Phosphor OpenBMC system management # - obmc-host-ipmi - OpenBMC Host IPMI @@ -21,6 +22,7 @@ FEATURE_PACKAGES_obmc-sensor-mgmt ?= "${@cf_enabled('obmc-phosphor-sensor-mgmt', FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@cf_enabled('obmc-phosphor-flash-mgmt', 'virtual-obmc-flash-mgmt', d)}" FEATURE_PACKAGES_obmc-event-mgmt ?= "${@df_enabled('obmc-phosphor-event-mgmt', 'virtual-obmc-event-mgmt', d)}" FEATURE_PACKAGES_obmc-user-mgmt ?= "${@df_enabled('obmc-phosphor-user-mgmt', 'virtual-obmc-user-mgmt', d)}" +FEATURE_PACKAGES_obmc-settings-mgmt ?= "${@df_enabled('obmc-settings-mgmt', 'virtual-obmc-settings-mgmt', d)}" FEATURE_PACKAGES_obmc-system-mgmt ?= "${@df_enabled('obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', d)}" FEATURE_PACKAGES_obmc-host-ipmi ?= "${@cf_enabled('obmc-host-ipmi', 'virtual-obmc-host-ipmi-hw', d)}" @@ -32,6 +34,7 @@ IMAGE_FEATURES += " \ obmc-flash-mgmt \ obmc-event-mgmt \ obmc-user-mgmt \ + obmc-settings-mgmt \ obmc-system-mgmt \ obmc-host-ipmi \ ssh-server-dropbear \ diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb index aae4af869..3638df986 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb @@ -15,9 +15,9 @@ DEPENDS += "obmc-mapper" DEPENDS += "autoconf-archive-native" RDEPENDS_${PN}-dev += "obmc-mapper-dev" RDEPENDS_${PN} += "clear-once" -RDEPENDS_${PN} += "settings" RDEPENDS_${PN} += "network" RDEPENDS_${PN} += "libmapper" +RRECOMMENDS_${PN} += "virtual-obmc-settings-mgmt" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" SRCREV = "00b1e5be1ce0d74541e371790e36a53146cb3b44" diff --git a/meta-phosphor/common/recipes-phosphor/settings/settings.bb b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb index 6627ee13a..09d685077 100644 --- a/meta-phosphor/common/recipes-phosphor/settings/settings.bb +++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings.bb @@ -5,8 +5,12 @@ PR = "r1" inherit obmc-phosphor-license inherit obmc-phosphor-systemd +inherit setuptools +DEPENDS += "python-pyyaml-native" RDEPENDS_${PN} += "python-dbus python-pygobject" +PROVIDES += "virtual/obmc-settings-mgmt" +RPROVIDES_${PN} += "virtual-obmc-settings-mgmt" SRC_URI += "git://github.com/openbmc/phosphor-settingsd" @@ -14,9 +18,3 @@ SRCREV = "54be910bd0af885217adc7dfcd95b7db9a13886d" S = "${WORKDIR}/git" -do_install() { - install -d ${D}/${sbindir} - install ${S}/settings_file.py ${D}/${sbindir} - install ${S}/settings_manager.py ${D}/${sbindir} -} - diff --git a/meta-phosphor/common/recipes-phosphor/settings/settings/settings.service b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/phosphor-settings.service index b88cf0401..b88cf0401 100755 --- a/meta-phosphor/common/recipes-phosphor/settings/settings/settings.service +++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings/phosphor-settings.service diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 601275e74..522a639d6 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -17,3 +17,4 @@ PREFERRED_PROVIDER_virtual/obmc-fan-mgmt ?= "obmc-phosphor-fand" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt ?= "obmc-phosphor-flashd" PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt ?= "obmc-phosphor-sensord" PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd" +PREFERRED_PROVIDER_virtual/obmc-settings-mgmt ?= "phosphor-settings" diff --git a/meta-phosphor/conf/distro/openbmc-phosphor.conf b/meta-phosphor/conf/distro/openbmc-phosphor.conf index 97667ea46..0b6278398 100644 --- a/meta-phosphor/conf/distro/openbmc-phosphor.conf +++ b/meta-phosphor/conf/distro/openbmc-phosphor.conf @@ -26,6 +26,7 @@ DISTRO_FEATURES = "\ obmc-phosphor-flash-mgmt \ obmc-phosphor-event-mgmt \ obmc-phosphor-user-mgmt \ + obmc-settings-mgmt \ obmc-phosphor-system-mgmt \ obmc-host-ipmi \ ${DISTRO_FEATURES_LIBC} \ |