summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/classes
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-10-16 11:02:54 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-11-09 11:11:30 -0500
commit0f1b05da19559879a95e46133a762a2ead36bfc7 (patch)
tree10e2a0f56bd8f410c1abcc71a10cac56e84e5069 /meta-phosphor/classes
parentfc1c37304c6920dd9f32c3cdcdd65fad22faab7d (diff)
downloadtalos-openbmc-0f1b05da19559879a95e46133a762a2ead36bfc7.tar.gz
talos-openbmc-0f1b05da19559879a95e46133a762a2ead36bfc7.zip
meta-phosphor: master refresh c9d91120a2..1795f38b6f
Update meta-phosphor to master HEAD. Adriana Kobylak (2): rsyslog-policy: Add rsyslog-override.conf Move remote logging features to their own category Brad Bishop (2): phosphor: rsyslog: remove obmc-phosphor-license phosphor: mrw-api: fetch all of serverwiz Change-Id: Ic342bda5d19272b2806f65c7082189d4a79c69d8 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/classes')
-rw-r--r--meta-phosphor/classes/mrw-rev.bbclass2
-rw-r--r--meta-phosphor/classes/obmc-phosphor-image.bbclass3
2 files changed, 4 insertions, 1 deletions
diff --git a/meta-phosphor/classes/mrw-rev.bbclass b/meta-phosphor/classes/mrw-rev.bbclass
index b5f6e2505..6f5cf20a4 100644
--- a/meta-phosphor/classes/mrw-rev.bbclass
+++ b/meta-phosphor/classes/mrw-rev.bbclass
@@ -1,4 +1,4 @@
-MRW_API_SRC_URI ?= "git://github.com/open-power/serverwiz.git;subpath=scripts"
+MRW_API_SRC_URI ?= "git://github.com/open-power/serverwiz.git"
MRW_API_SRCREV ?= "60c8e10cbb11768cd1ba394b35cb1d6627efec42"
MRW_TOOLS_SRC_URI ?= "git://github.com/openbmc/phosphor-mrw-tools"
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index 7260b0e3e..575767324 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -14,6 +14,7 @@
# - obmc-inventory - OpenBMC inventory support
# - obmc-leds - OpenBMC LED support
# - obmc-logging-mgmt - OpenBMC logging management
+# - obmc-remote-logging-mgmt - OpenBMC remote logging management
# - obmc-sensors - OpenBMC sensor support
# - obmc-settings-mgmt - OpenBMC settings management
# - obmc-software - OpenBMC software management
@@ -38,6 +39,7 @@ FEATURE_PACKAGES_obmc-host-state-mgmt ?= "packagegroup-obmc-apps-host-state-mgmt
FEATURE_PACKAGES_obmc-inventory ?= "packagegroup-obmc-apps-inventory"
FEATURE_PACKAGES_obmc-leds ?= "packagegroup-obmc-apps-leds"
FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled(d, 'obmc-logging-mgmt', 'packagegroup-obmc-apps-logging')}"
+FEATURE_PACKAGES_obmc-remote-logging-mgmt ?= "packagegroup-obmc-apps-remote-logging"
FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net"
FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors"
FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software"
@@ -66,6 +68,7 @@ IMAGE_FEATURES += " \
obmc-inventory \
obmc-leds \
obmc-logging-mgmt \
+ obmc-remote-logging-mgmt \
obmc-net-ipmi \
obmc-sensors \
obmc-software \
OpenPOWER on IntegriCloud