From 877bb743df657b88806c94504b88cd2cced1ec5d Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Tue, 28 May 2019 10:12:28 -0500 Subject: witherspoon-128: Use ${MACHINE} for device tree file name Replace "witherspoon-128" with ${MACHINE} for the device tree file name as it's better practice to use bitbake variables instead of hard-coding values. Tested: Output of "bitbake obmc-phosphor-image -e": # pre-expansion value: # "${KMACHINE}-bmc-opp-${MACHINE}.dtb" KERNEL_DEVICETREE="aspeed-bmc-opp-witherspoon-128.dtb" (From meta-ibm rev: 8bbd213225ea5d6e3d1eb8537308f398dc85b6a2) Change-Id: I46e72947ddf47d3cbc20ab04f2b949ee717423cf Signed-off-by: Adriana Kobylak Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf index 284340d9f..a3981cc4f 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf @@ -1,7 +1,7 @@ require conf/machine/witherspoon.conf MACHINEOVERRIDES .= ":witherspoon" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-witherspoon-128.dtb" +KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" MRW_XML = "witherspoon.xml" -- cgit v1.2.3 From c745faa233a7c11f2fcad3cf2fbdc614ffa65545 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 28 May 2019 21:32:34 +0000 Subject: phosphor-state-manager: srcrev bump 3a30b0542b..5b95027528 Andrew Geissler (1): Replace call_noreply() with call() (From meta-phosphor rev: 8ef61410d00e16ff72525ac28fcac5e00cd87923) Change-Id: Iba7a66b7d45009e73f35a6c1e25045a3866f6397 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 9da5475c7..5ba755456 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -132,6 +132,6 @@ HOST_RST_RBT_ATTEMPTS_SVC_FMT = "../${HOST_RST_RBT_ATTEMPTS_SVC}:${HOST_START_TG SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_RST_RBT_ATTEMPTS_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "3a30b0542b602e0fe42d033c5e0fb1330988b840" +SRCREV = "5b95027528483ec7ce8761a2fdd018d671979d0b" S = "${WORKDIR}/git" -- cgit v1.2.3 From 713e7e6af036ef4289e8fd14e29de89e05d43f52 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 28 May 2019 22:32:00 +0000 Subject: phosphor-ipmi-flash: srcrev bump 0c642fd04b..072a7dd6b5 Patrick Venture (3): test: firmware notYetStarted: add missing comment test: add state check helper method test: firmware uploadInProgress: minor cleanup (From meta-phosphor rev: bc33553a6591335fae45602332b8b8fcbf4ca889) Change-Id: I218be064f080de23c6d27a77e0247faa2bba6aa1 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 37caeab99..ed25ba156 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -20,7 +20,7 @@ EXTRA_OECONF = "--disable-tests --disable-build-host-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "0c642fd04b8f004deff7e3ebaf5613435c2177ea" +SRCREV = "072a7dd6b58bdb6c5ce11f3e941646f7c5467442" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From cf7807f084b02ffb18e34fcbe6929cdd423d958a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 01:02:30 +0000 Subject: phosphor-webui: srcrev bump 44da471fce..1a606bee74 Derick Montague (1): Add .ng-leave and .ng-enter rulesets for page transition Gunnar Mills (5): Firmware: Remove unused interpolate Remove unused server_status Remove unused activateErrorModal Remove unused chassis_state Remove unused errors.html (From meta-phosphor rev: 7757c122967b8011609aec5d5d60fd6ffe036726) Change-Id: Ifdca2b71cb4f6b985211ff94a990f046ab6f8d86 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 1595121c7..d3887f6fd 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "44da471fceb3790b49a43bc023781f62b19f9fde" +SRCREV = "1a606bee74ab53f2d9c18b38bbc637620260799b" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 3d7dfa8ac4678523c79f43b8caac2ea55dba349f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 22 May 2019 19:27:14 -0400 Subject: meta-ibm: witherspoon: remove unused inventory recipes With the transition to target class recipes for phosphor-inventory a couple files are now dead code and can be removed. (From meta-ibm rev: 2728c26b8515a86d9c773948faa4b750e6d3e448) Change-Id: I4dc355349a7ad34e87314ea021963816f0ebe50e Signed-off-by: Brad Bishop --- .../inventory/inventory-cleanup-native.bb | 16 ---------------- .../phosphor-inventory-manager-config-native.bbappend | 1 - 2 files changed, 17 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup-native.bb delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup-native.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup-native.bb deleted file mode 100644 index 80e6e6de5..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup-native.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Copy Witherspoon inventory cleanup yaml for inventory manager" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-inventory-manager - -SRC_URI += "file://inventory-cleanup.yaml" - -S = "${WORKDIR}" - -do_install() { - install -d ${D}${base_datadir}/events.d/ - install ${S}/inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml -} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bbappend deleted file mode 100644 index d9304c045..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -PHOSPHOR_INVENTORY_MANAGER_CONFIGS += "inventory-cleanup-native" -- cgit v1.2.3 From 3e264b0f9ef78d60e27aef09724f131000dbd29b Mon Sep 17 00:00:00 2001 From: Santosh Puranik Date: Wed, 22 May 2019 07:37:24 -0500 Subject: rsyslogd: Install default server config This reverts commit 37bc1a3568f2e87987be05243627a984dc051de1. In addition, it changes the default rsyslog server config to ignore all messages. Also bumps up phosphor-logging: phosphor-logging: srcrev bump f59854e94b..0a0b5ea558 Santosh Puranik (1): rsyslod: Change disable action Tested: Verified that the default rsyslog behavior is to now ignore all messages. (From meta-phosphor rev: 138108a05f68ada8b990024bbaa8b68b135d6aeb) Signed-off-by: Santosh Puranik Change-Id: Iba11dfa153eaeef17417c82ab26f9a26fe5f9125 Signed-off-by: Brad Bishop --- meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf | 3 --- meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf | 1 + meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend | 6 ++++++ meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 +- .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 1 - 5 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf create mode 100644 meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf diff --git a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf b/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf deleted file mode 100644 index 458f52f27..000000000 --- a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -# This file exists only if remote logging has been configured -ConditionPathExists=/etc/rsyslog.d/server.conf diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf new file mode 100644 index 000000000..cf47ba306 --- /dev/null +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf @@ -0,0 +1 @@ +*.* ~ diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend index 3901844ae..0a2fb3334 100644 --- a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -2,9 +2,15 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://rsyslog.conf \ + file://server.conf \ " PACKAGECONFIG ??= " \ rsyslogd rsyslogrt inet regexp uuid \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ " + +do_install_append(){ + install -m 0644 -D ${WORKDIR}/server.conf \ + ${D}${sysconfdir}/rsyslog.d/server.conf +} diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 89d71ae3c..f710ed087 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -53,7 +53,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "f59854e94b077630200117b390c4e943d588be31" +SRCREV = "0a0b5ea558adeb109a3ac52e55ad720e188adb90" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index c783d00ce..238ee293e 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -92,7 +92,6 @@ RDEPENDS_${PN}-logging = " \ SUMMARY_${PN}-remote-logging = "Remote logging applications" RDEPENDS_${PN}-remote-logging = " \ rsyslog \ - rsyslog-policy \ phosphor-rsyslog-config \ " -- cgit v1.2.3 From 1cd444bccb30dea393baa0f19e2b860c225e70dc Mon Sep 17 00:00:00 2001 From: Santosh Puranik Date: Wed, 22 May 2019 08:02:38 -0500 Subject: Revert "meta-phosphor: rsyslog: turn off remote logging" This reverts commit b2c81a4dbdb409e1fae7fdefda99adb97f40d912. With changes made to the default rsyslog.conf, rsyslog discards all messages. This prevents the scenario where systemd would try to launch rsyslog on socket activation, causing slowness during boot. (From meta-phosphor rev: e989a6ba8103be2116ba4159e93b910dfc7555ca) Signed-off-by: Santosh Puranik Change-Id: I7eb5511fc0109bc661a0e837f5bc11a636c7d36a Signed-off-by: Brad Bishop --- meta-phosphor/classes/obmc-phosphor-image.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 5981066b8..b428205ab 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -68,6 +68,7 @@ IMAGE_FEATURES += " \ obmc-inventory \ obmc-leds \ obmc-logging-mgmt \ + obmc-remote-logging-mgmt \ obmc-net-ipmi \ obmc-sensors \ obmc-software \ -- cgit v1.2.3 From 8ba9dc50a90887e6ef4f4934e7d8c821973bf7da Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 28 May 2019 17:50:52 +0000 Subject: intel-ipmi-oem: srcrev bump 52ce662cab..de750c6aca Jason M. Bills (1): Improve SEL entry parsing Vernon Mauery (1): Move commands from ipmi-providers Yong Li (1): Static code analysis scan issue fix Yu Guohui (1): Static code analysis scan issue fix (From meta-intel rev: 0f7e0fba7a246a907cfa9c679044f83c8c830639) Change-Id: I2a79176f75f4a2df963d504f11c3ed9a8679fd21 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 2d8b6f531..a2938ffba 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "52ce662cab6e5646170c4092a4553e2208eef98d" +SRCREV = "de750c6aca98a7444579e5a6c51bdf10247371a3" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 36c69bf34220d075b7d83cc83da1b4197592f6c0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 16:20:55 +0000 Subject: intel-ipmi-oem: srcrev bump de750c6aca..b1cc61d2a0 Richard Marian Thomaiyar (1): Build Fix: In repo build failure fix (From meta-intel rev: 720ee658132bb0c00939a343834fae9416ff299f) Change-Id: I3aaa73f025c9bed0c7e08d7ebf6a9adea1127bae Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index a2938ffba..139be0251 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "de750c6aca98a7444579e5a6c51bdf10247371a3" +SRCREV = "b1cc61d2a0f0d36169915349476e96b006d058a5" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 681099eafb8b436218f53d585f9601d2e4e9a89f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 13:52:22 +0000 Subject: phosphor-webui: srcrev bump 1a606bee74..21f8cb9439 Yoshie Muranaka (1): Fix the tabbing order in the primary and secondary navigation (From meta-phosphor rev: 98917f40c7057615c45bac9295b157b4e02db86b) Change-Id: Idd121ec05d7002bd32c70d989431ac53a24bad0b Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index d3887f6fd..c525f23e0 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "1a606bee74ab53f2d9c18b38bbc637620260799b" +SRCREV = "21f8cb9439e876108c00d80346cae1f89fd1a45e" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 59776b1be0e132522cbfddb215e73e2c24b562a0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 15:52:19 +0000 Subject: phosphor-webui: srcrev bump 21f8cb9439..6a3b3b2cdd Yoshie Muranaka (1): Fix tablet alignment issues for event logs (From meta-phosphor rev: 340d0dec947db765589fa2177b665e44b453a2a7) Change-Id: I4b2588aec68817df84a2bbaef1eea1c5ee3c5c36 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index c525f23e0..59b00a885 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "21f8cb9439e876108c00d80346cae1f89fd1a45e" +SRCREV = "6a3b3b2cdd8e92265997fe66f6c8489caf1dd403" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From a54f63e0828502e370ca88e949e26941e3eedb88 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 22 May 2019 19:28:52 -0400 Subject: meta-phosphor: inventory: drop config-native With the switch of phosphor-inventory-manager to target class configuration recipes, this recipe is no longer used. Drop. (From meta-phosphor rev: 921266cc8ecd2bb5b04adff91007f9c1438fd32b) Change-Id: I5ba6a47b61cf2164ac9b58bdfaabd9a7393a1e02 Signed-off-by: Brad Bishop --- .../phosphor-inventory-manager-config-native.bb | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb deleted file mode 100644 index a776e5bd8..000000000 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager-config-native.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Phosphor Inventory Manager Configuration" -DESCRIPTION = "Meta-recipe, pulling in native recipes that wish to add \ -data to the native /usr/share/phosphor-inventory-manager filesystem." -HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native - -PHOSPHOR_INVENTORY_MANAGER_CONFIGS += "phosphor-inventory-manager-assettag-native" - -# To add additional managed inventory items, create a recipe in your layer, -# and add it to PHOSPHOR_INVENTORY_MANAGER_CONFIGS with a bbappend to this recipe. - -DEPENDS += "${PHOSPHOR_INVENTORY_MANAGER_CONFIGS}" -- cgit v1.2.3 From fdcc46c93e5eb69acd6fc9c9d2e07b381b907afb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 21:31:49 +0000 Subject: bmcweb: srcrev bump 22c33710fe..c72aa4757b Ed Tanous (2): Fix a trailing slash on LogServices Add security headers to websockets Jason M. Bills (1): Add ClearLog support for the Redfish Event Log Service Jennifer Lee (1): [Redfish] Enable PATCH for DHCPv4 properties in EthernetInterface schema Lei YU (1): REST: PUT: return DBus error description Santosh Puranik (1): Set GraphicalConsole to enabled (From meta-phosphor rev: 954b962f092ae9da443eef49916bcf8427034e16) Change-Id: Ic13bc06762927c625506bcb05206070264051e91 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 181ef9c62..30da37c49 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "22c33710fed78a5c47446ee91ececf8b8ab104db" +SRCREV = "c72aa4757b57da6e4dae2325b7d0570c6be3d89b" S = "${WORKDIR}/git" -- cgit v1.2.3 From 3106189751ea1c6c7b18a0c8cc2ad69114406e35 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 21:42:13 +0000 Subject: phosphor-ipmi-flash: srcrev bump 072a7dd6b5..615c69ef59 Patrick Venture (11): test: firmware verificationPending: minor fixes tools: updater: cppcheck fixups test: firmware verificationStarted: canHandle, getBlobIds, open test: firmware verificationCompleted: stat(activehash) bmc: cleanup stat(blob) handler test: firmware verificationCompleted: canHandleBlob,getBlobIds test: firmware verificationCompleted: read(session) test: firmware verificationCompleted: write test: firmware verificationCompleted: writeMeta test: firmware verificationCompleted: open test: firmware verificationCompleted: stat(session) (From meta-phosphor rev: dccba1f0ba0dc06809601cfa1eca52b9a40f2fd5) Change-Id: I542850064c2ad933f774f793c3be021073e3f678 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index ed25ba156..ccea00c88 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -20,7 +20,7 @@ EXTRA_OECONF = "--disable-tests --disable-build-host-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "072a7dd6b58bdb6c5ce11f3e941646f7c5467442" +SRCREV = "615c69ef597a044c0d3e7747d9603263f8e462dc" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From e83680404ac019e5c070505c0c51b15cfa6d46d6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 May 2019 21:41:56 +0000 Subject: ipmi-blob-tool: srcrev bump 444746495a..ef5e09252d Patrick Venture (1): ipmi exceptions: add method to grab code (From meta-phosphor rev: 4e246b5b7ed91443a565425c4c2f524ec9a521b1) Change-Id: I4c99336a7a146ea7f9e4015c3bf75f278b201773 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index 0125d730c..30b540b7d 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -14,4 +14,4 @@ EXTRA_OECONF = "--disable-tests" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" -SRCREV = "444746495ad3f951cb093c7144b7cb9218b8599f" +SRCREV = "ef5e09252dba451acda30e53e8f5b28f08eac0cb" -- cgit v1.2.3 From 2115ac10bc51a9414cf1175d93f797184ea8a3d0 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 29 May 2019 16:07:53 -0400 Subject: meta-phosphor: ipmi: drop channel.yaml This file isn't used by ipmid anymore, so don't bother passing it in. See ipmid change 41ac50530a for details. (From meta-phosphor rev: 2bda2f162fdb25d2d77f7845157ff70d94af44d4) Change-Id: I1a0b02a6aa7c1767254b94e91b80ed92c3e99d16 Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 4e69c2d36..0654cfeb0 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -75,7 +75,6 @@ EXTRA_OECONF = " \ SENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/sensor.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/invsensor.yaml \ FRU_YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/fru_config.yaml \ - CHANNEL_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/channel.yaml \ ENTITY_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/entity.yaml \ POWER_READING_SENSOR=${datadir}/ipmi-providers/power_reading.json\ " -- cgit v1.2.3 From ec3a9710860c0842b71c08d0aa4dbc5e9871b64e Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 29 May 2019 15:55:54 -0400 Subject: meta-ibm: witherspoon: drop channel.yaml These files aren't used by ipmid anymore, so drop. See host-ipmid change 41ac50530a for details. (From meta-ibm rev: 19be7dbb08bb6c4e9a992a41972148240f955b75) Change-Id: I648cb8b7f1dba2a5a32ed1a1b05c18a15334763a Signed-off-by: Brad Bishop --- .../recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml | 4 ---- .../recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 5 ----- 2 files changed, 9 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml deleted file mode 100644 index 627f4965f..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host/channel.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# Channel Number (must be unique) is the key -1: - # ifName the ethernet device name (used in the dbus path) - ifName: eth0 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index eec3999f2..bb28054c6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -2,14 +2,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append = " \ file://occ_sensors.hardcoded.yaml \ file://hwmon_sensors.hardcoded.yaml \ - file://channel.yaml \ " # System-specific sensors SRC_URI_append_witherspoon = " \ file://witherspoon_hwmon_sensors.hardcoded.yaml \ " - -EXTRA_OECONF_append = " \ - CHANNEL_YAML_GEN=${WORKDIR}/channel.yaml \ - " -- cgit v1.2.3 From e8d650aaba430baa5df8d31cd1364a15ffeba82c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 28 May 2019 16:07:50 -0700 Subject: sdeventplus: Depend on function2 An upcoming change will require this dependency for sdeventplus, so that we can store functions containing move-only types for callbacks. (From meta-phosphor rev: c345eb3b55f168f17e7025eaeed5ad603af6745f) Change-Id: I30b3caa38f26414b82493301bd7acd466f9814bc Signed-off-by: William A. Kennington III Signed-off-by: Brad Bishop --- meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb index d1ddff9f4..2f2ce3568 100644 --- a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb +++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit meson pkgconfig DEPENDS += " \ + function2 \ stdplus \ systemd \ " -- cgit v1.2.3 From d216c789aa0fc202448e6bf9fc95f3bc5206f8ea Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Wed, 29 May 2019 13:35:22 -0500 Subject: Revert "Accelerator interface for sensorinventory items" This reverts commit f510f7b6b708b22db1f08faf369994f01edd0ddc. The change causes a compilation error when building the swift machine, reverting until a fix is submitted. Tested: Built swift successfully. (From meta-phosphor rev: 7fb0c049d3a290c8f9d7f7c9690cdef9a97b3c52) Change-Id: I690ff08d233ff9e654cfc6fbf1b466f39b447360 Signed-off-by: Adriana Kobylak Signed-off-by: Brad Bishop --- .../recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py | 7 ------- .../ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml | 1 - 2 files changed, 8 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py index 877e3eb57..5e6c4b5e6 100755 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py @@ -12,11 +12,6 @@ import sys import yaml import copy -# Custom representer for None types. This is to handle empty dictionaries. -# By default Pyyaml outputs these as "null", whereas we want an empty character. -def represent_none(self, _): - return self.represent_scalar('tag:yaml.org,2002:null', '') - def dict_merge(target, source): """Deep merge for dicts. @@ -48,8 +43,6 @@ if len(sys.argv) == 2: # No overrides to handle sys.exit(0) -yaml.add_representer(type(None), represent_none) - target_filename = sys.argv[1] with open(target_filename) as target_file: data = yaml.safe_load(target_file) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml index 8188612b3..ec82afed6 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-config/config.yaml @@ -207,7 +207,6 @@ gpu_func_sensor: type: "bool" assert: true deassert: false - xyz.openbmc_project.Inventory.Item.Accelerator: # Field replaceable doesn't come as a sensor data # but we know that GPU is Field replaceable so setting # true in both cases. -- cgit v1.2.3 From 85b484ca342da7732cf3ca9f602a4a49531bfe50 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Fri, 3 May 2019 14:34:40 -0500 Subject: meta-ibm: Swift: Add inventory config YAML It will create the xyz.openbmc_project.Inventory.Item.Chassis interface on the chassis. (From meta-ibm rev: 8074814d81f5bd8b3b9467e2392f1888059ec897) Change-Id: I40c3d94bfdce7388e6c525b253d6b456b10b8604 Signed-off-by: Matt Spinler Signed-off-by: Brad Bishop --- .../inventory/inventory-cleanup.bb | 2 +- .../inventory-cleanup/inventory-cleanup.yaml | 51 ---------------------- .../inventory-cleanup/swift/inventory-cleanup.yaml | 16 +++++++ .../witherspoon/inventory-cleanup.yaml | 51 ++++++++++++++++++++++ .../phosphor-inventory-manager_%.bbappend | 2 +- 5 files changed, 69 insertions(+), 53 deletions(-) delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb index cdb146c50..f68edcb62 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb @@ -1,4 +1,4 @@ -SUMMARY = "Copy Witherspoon inventory cleanup yaml for inventory manager" +SUMMARY = "Copy the inventory cleanup yaml for inventory manager" PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml deleted file mode 100644 index a363bda8d..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml +++ /dev/null @@ -1,51 +0,0 @@ -description: > - Witherspoon inventory fixups - -events: - - name: Remove power_supplies - description: > - Remove the deprecated 'power_supply' objects - type: startup - actions: - - name: destroyObjects - paths: - - /system/chassis/power_supply0 - - /system/chassis/power_supply1 - - /system/chassis/powersupply0 - - /system/chassis/powersupply1 - - - name: Remove fan1 - description: > - Remove all fan1 associated objects and have fan presence and - fan monitor create it based on cooling type. - type: startup - filters: - - name: propertyIs - service: xyz.openbmc_project.Inventory.Manager - path: /system/chassis - interface: xyz.openbmc_project.Inventory.Decorator.CoolingType - property: WaterCooled - value: - value: true - type: boolean - dbusMember: "sdbusplus::xyz::openbmc_project::Inventory::\ - Decorator::server::CoolingType" - actions: - - name: destroyObjects - paths: - - /system/chassis/motherboard/fan1/fan1_0 - - /system/chassis/motherboard/fan1/fan1_1 - - /system/chassis/motherboard/fan1 - - - name: Add Chassis interface - description: > - Add the chassis interface on the chassis inventory path - type: startup - actions: - - name: createObjects - objs: - /system/chassis: - xyz.openbmc_project.Inventory.Item.Chassis: - Type: - value: "RackMount" - type: string diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml new file mode 100644 index 000000000..a2ff9d177 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml @@ -0,0 +1,16 @@ +description: > + Swift inventory fixups + +events: + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis: + xyz.openbmc_project.Inventory.Item.Chassis: + Type: + value: "RackMount" + type: string diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml new file mode 100644 index 000000000..a363bda8d --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml @@ -0,0 +1,51 @@ +description: > + Witherspoon inventory fixups + +events: + - name: Remove power_supplies + description: > + Remove the deprecated 'power_supply' objects + type: startup + actions: + - name: destroyObjects + paths: + - /system/chassis/power_supply0 + - /system/chassis/power_supply1 + - /system/chassis/powersupply0 + - /system/chassis/powersupply1 + + - name: Remove fan1 + description: > + Remove all fan1 associated objects and have fan presence and + fan monitor create it based on cooling type. + type: startup + filters: + - name: propertyIs + service: xyz.openbmc_project.Inventory.Manager + path: /system/chassis + interface: xyz.openbmc_project.Inventory.Decorator.CoolingType + property: WaterCooled + value: + value: true + type: boolean + dbusMember: "sdbusplus::xyz::openbmc_project::Inventory::\ + Decorator::server::CoolingType" + actions: + - name: destroyObjects + paths: + - /system/chassis/motherboard/fan1/fan1_0 + - /system/chassis/motherboard/fan1/fan1_1 + - /system/chassis/motherboard/fan1 + + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis: + xyz.openbmc_project.Inventory.Item.Chassis: + Type: + value: "RackMount" + type: string diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 9b5b948fa..39f87342e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -3,7 +3,7 @@ PACKAGECONFIG_append = " associations" SRC_URI += "file://associations.json" -DEPENDS_append_witherspoon = " inventory-cleanup" +DEPENDS_append = " inventory-cleanup" do_install_append() { install -d ${D}${base_datadir} -- cgit v1.2.3