From 3b36ce7bed26cb5faf8f4ae805576ccc372d2686 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 23 Sep 2021 22:10:25 +0000 Subject: openpower-hw-diags: srcrev bump 96d5486c3c..5d63cefcad Zane Shelley (1): ConnectedCalloutResolution support Change-Id: I1e2e94b51e2e4ba781f9f4ae95e4ec189a2fc401 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 4602fba57..3333b8869 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "96d5486c3ca5c5037e6f74bd3a1d196d91b80829" +SRCREV = "5d63cefcada92a8588ab55fb2a741c898cb19a8b" S = "${WORKDIR}/git" -- cgit v1.2.3 From 71660fa4df66f9189c9d3e085b2b2bf0c71e01de Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 4 Oct 2021 19:30:28 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump 4c2386a575..a38f6e652e Adriana Kobylak (2): ubi: reset: Preserve the SECBOOT partition mmc: Handle missing pnor.toc file George Liu (1): Remove the last comma of the biosAttrStr value Change-Id: I1a5baa391993177b979218d92979d17af1c47050 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 820ebc222..1de0c55e1 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -61,7 +61,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "4c2386a575c9bd2f69d73af131cd635cc3c09b04" +SRCREV = "a38f6e652e7da6fc29e71adeeacfa8ae02c46ab8" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From 29d7bf0429c166006320d1ef5cd200d76e80a91c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 30 Sep 2021 13:40:30 +0000 Subject: openpower-proc-control: srcrev bump 61c8757c6b..4079f09d2f Jayanth Othayoth (3): PHAL:createPEL function signature update PHAL: added createSbePEL wrapper function PHAL: SBE boot failure support Change-Id: I9381a4d389e345ed027fefef6f6d09cf2e63fb51 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index dc405cec8..d7f82b9d1 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "61c8757c6b81d61ae158af002810cdbe7cdae7e2" +SRCREV = "4079f09d2fb03994b45fdf6af5f165dd18f39b1e" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From b1d062594d2a2184909f524d75fd94a571c353a1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 Sep 2021 18:30:26 +0000 Subject: openpower-hw-diags: srcrev bump 5d63cefcad..734185ae71 Zane Shelley (5): Prevent duplicate entries in callout list Bus callout resolution support Update action for all chiplet and global FIRs Update actions for FIR on the core target Update action files for all chiplet local FIRs Change-Id: I5943cc2b9df72f875456f07ee3590f83359361c2 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 3333b8869..be6ff6ca1 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "5d63cefcada92a8588ab55fb2a741c898cb19a8b" +SRCREV = "734185ae719eca8e184ef2759323023e371bd393" S = "${WORKDIR}/git" -- cgit v1.2.3 From cd2ca2686510fa62bfc3172d2451a78a623c935a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 29 Sep 2021 18:30:35 +0000 Subject: openpower-libhei: srcrev bump 91f1d3d2aa..cfa9bd1dcf Zane Shelley (8): Fix signature descriptions for global FIRs Fix signature descriptions for chiplet FIRs Clean up chiplet FIR register names for consistency Add handling for bit 2 in all recoverable chiplet FIRs Split remaining chiplet XML files by attn type Update chip data files for FIR on the core target Update chip data files for all chiplet local FIRs Chip data file updates for EQ chiplet Change-Id: Icc81da8f5db3eb9aa624884c2e09e4822b59f624 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc index 1d3d2e1c1..34f90688e 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -2,5 +2,5 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-libhei" -SRCREV = "91f1d3d2aaddc0ea1097f3b29dfb37df920f1719" +SRCREV = "cfa9bd1dcf7f58ed5c4f5a8a1a0791fc6c13bc1e" -- cgit v1.2.3 From bc98e50cc88e235bf2e71a4677cf2a30755c02c2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 7 Oct 2021 03:10:27 +0000 Subject: openpower-proc-control: srcrev bump 4079f09d2f..9e178b740a Patrick Williams (2): catch exceptions as const build: switch to C++20 Change-Id: Iaa974321822c2403c1c5ae9053bc74abf9b44971 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index d7f82b9d1..21b0d66da 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "4079f09d2fb03994b45fdf6af5f165dd18f39b1e" +SRCREV = "9e178b740af10ba6993ac55e59934b71a628dd09" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From 7072c5ec54278a375bbac3294b9cd6e4da2315bd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 7 Oct 2021 19:30:31 +0000 Subject: openpower-hw-diags: srcrev bump 734185ae71..88c6c6156d Zane Shelley (7): RAS action file updates for EQ chiplet RAS action files for PEC chiplet RAS file updates for PAUC chiplet RAS data files updates for IOHS chiplet RAS data files updates for OMIC chiplet RAS data file updates for MC chiplet RAS data file updates for MCC chiplet Change-Id: I6bbe84a117ae4fac84af99d0736222c6a50a788f Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index be6ff6ca1..8fa2a742a 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "734185ae719eca8e184ef2759323023e371bd393" +SRCREV = "88c6c6156dbf99fd33da50aad50a96de958215a1" S = "${WORKDIR}/git" -- cgit v1.2.3 From e2ddc37b58890f502493c0d2ce62843ee64ae01b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 7 Oct 2021 13:30:35 +0000 Subject: openpower-vpd-parser: srcrev bump b1e64bb6fa..4c3bf5bec1 Alpana Kumari (1): Correct the json keyword Change-Id: I6d9f48f3042d0e2970369a7dbedea5dbf90d39c7 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 39f3054e8..a9cfd03d5 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "b1e64bb6fa2605b41583a150c90812f756e2590b" +SRCREV = "4c3bf5bec160974ec167f5fa934c645c8b8fa9e0" -- cgit v1.2.3 From 3c87356cbc39671a0ec19f8b986769d8665fa8ee Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 5 Oct 2021 21:30:35 +0000 Subject: openpower-libhei: srcrev bump cfa9bd1dcf..5d731358d0 Zane Shelley (4): Chip data file updates for PAUC chiplet Chip data file updates for IOHS chiplet Chip data updates for MC chiplet Chip data file updates for MCC chiplet Change-Id: I09eb91e0ca4c2b18b761d263fbf02cfef35c2294 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc index 34f90688e..d127ebe67 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -2,5 +2,5 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-libhei" -SRCREV = "cfa9bd1dcf7f58ed5c4f5a8a1a0791fc6c13bc1e" +SRCREV = "5d731358d08a5d2f555aef7cb48d65094b339eec" -- cgit v1.2.3 From 1dc611fc34ccb5beba49d0e46e7479a1b729833e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Oct 2021 21:10:25 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump a38f6e652e..97a709b0c5 Patrick Williams (1): catch exceptions as const Change-Id: Iead74671298ce9b790e776d1af6886b0116d5bdb Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 1de0c55e1..b16784e39 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -61,7 +61,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "a38f6e652e7da6fc29e71adeeacfa8ae02c46ab8" +SRCREV = "97a709b0c572eb203b9f0954d884cf0e8551eef6" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From 22e52b4881649f302a29753dc9fdbde565b3a21a Mon Sep 17 00:00:00 2001 From: George Liu Date: Thu, 7 Oct 2021 14:24:19 +0800 Subject: openpower-software-manager: Add runtime dependencies It will build fail when enabled `vitrual_pnor` and compile with `bitbake openpower-software-manager`. error message: /usr/bin/obmc-vpnor-util contained in package openpower-software-manager requires /bin/bash, but no providers found in RDEPENDS:openpower-software-manager? [file-rdeps] Add the runtime dependency(bash) to the openpower-software-manager_git.bb file. Tested: enabled `vitrual_pnor` and built openpower-software-manager successfully. Signed-off-by: George Liu Change-Id: I215d4b215a205a492b4509bc6f208182f25ce1d2 --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index b16784e39..7c130f2c0 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -34,7 +34,7 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-virtual-pnor', \ PACKAGECONFIG[verify_pnor_signature] = "-Dverify-signature=enabled, -Dverify-signature=disabled" PACKAGECONFIG[ubifs_layout] = "-Ddevice-type=ubi,,,mtd-utils-ubifs" PACKAGECONFIG[mmc_layout] = "-Ddevice-type=mmc" -PACKAGECONFIG[virtual_pnor] = "-Dvpnor=enabled, -Dvpnor=disabled" +PACKAGECONFIG[virtual_pnor] = "-Dvpnor=enabled, -Dvpnor=disabled,,bash" EXTRA_OEMESON += " \ -Dtests=disabled \ -- cgit v1.2.3 From c617fe598f4240abe1330c6318666bce7986403d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 13 Oct 2021 15:10:28 +0000 Subject: openpower-debug-collector: srcrev bump 9b6f8474a4..09cf37962a Shantappa Teekappanavar (1): Remove checks for AutoReboot in watchdog timeout Change-Id: I49aa3ae4fa6b007965a6ddb1832189ac52da1f6f Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc index efeaf1f3d..7c6e22aea 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-debug-collector" -SRCREV = "9b6f8474a4e33dbfda233dedceedf4c030ffd0ec" +SRCREV = "09cf37962a1c0b53e226a6a04bdf2d0f1b4d77e8" -- cgit v1.2.3 From b560bc1c628ff9cbf84e5bf1ce62eebb7313198b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 12 Oct 2021 20:00:39 +0000 Subject: openpower-libhei: srcrev bump 5d731358d0..853765bf98 Zane Shelley (2): Chip data file updates for TP and N0 chiplet Chip data file updates for N1 chiplet Change-Id: I6a8c5aed1fe5eb536dc96c33670c8f6d3dd018df Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc index d127ebe67..0ed8c4cc9 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -2,5 +2,5 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-libhei" -SRCREV = "5d731358d08a5d2f555aef7cb48d65094b339eec" +SRCREV = "853765bf989a2789b4456faf8ea74b6ce0b30870" -- cgit v1.2.3 From 0fc8b58dedf08cf33953752fa18cd5c1d411ac3b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 12 Oct 2021 20:00:29 +0000 Subject: openpower-hw-diags: srcrev bump 88c6c6156d..ceb08b2b7d Zane Shelley (2): RAS data file updates for TP and N0 chiplets RAS data file updates for N1 chiplet Change-Id: I603d2f33abbfd93530b499c38a7246ba63a3cf61 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 8fa2a742a..875d28f20 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "88c6c6156dbf99fd33da50aad50a96de958215a1" +SRCREV = "ceb08b2b7dd1ae3b0ef791c432a2095f376f3594" S = "${WORKDIR}/git" -- cgit v1.2.3 From fc4bbb90ad53731fdfba04d974ef1e1fb41664c8 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 12 Oct 2021 10:00:26 +0000 Subject: openpower-proc-control: srcrev bump 9e178b740a..db8d46c033 Jayanth Othayoth (2): PHAL: createSbePEL API updates PHAL: enterMPIPL chip-op failure handling support Change-Id: I6ddf7def246da6aff4ef01a830fee09a82b20983 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 21b0d66da..086b02d09 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "9e178b740af10ba6993ac55e59934b71a628dd09" +SRCREV = "db8d46c03328aff5943aa848868fe0a07dd8f21d" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From 002f4b1d83681d63115f4f069f92458311587545 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 18 Oct 2021 21:40:26 +0000 Subject: openpower-occ-control: srcrev bump ff7afd9865..379234643e Matt Spinler (2): Add chassis association to sensors Change P10 poll rate to 5s Change-Id: Ie297c344fe57df7a7f168dacdef9ef6ef198a936 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index 8ce44fce5..182cf73e6 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "ff7afd98651862b9a78b53ad0ba4c3b085e4fbe4" +SRCREV = "379234643e8a9b10ca1b98ddfea1a23e4db01d19" -- cgit v1.2.3 From 9dc88a088eb9d5d436591050aaf27935e63495d6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 18 Oct 2021 15:30:24 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump 97a709b0c5..9c2ef681e3 Adriana Kobylak (1): op-pnor-msl.service: Remove RemainAfterExit Change-Id: I024bb3f72cdfb5883fd7bb6883bf70c29f6ab3ce Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 7c130f2c0..dcf8715e1 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -61,7 +61,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "97a709b0c572eb203b9f0954d884cf0e8551eef6" +SRCREV = "9c2ef681e33ef736e23ec9095bf6fa8d7eeb950e" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From d3d394eee01c30920cbf635fa7a5e2c4302c4ad0 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 18 Oct 2021 11:20:33 +0000 Subject: openpower-vpd-parser: srcrev bump 4c3bf5bec1..dacaa47f18 Andrew Geissler (1): reduce journal output from vpd app Patrick Williams (2): catch exceptions as const build: switch to C++20 Priyanga Ramasamy (1): vpd-tool:Pick xyz location code interface Santosh Puranik (1): Skip System VPD Collection if powered ON Change-Id: I8a4f5a34d8d88a9ada03b8699f6fbefabd4a4f53 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index a9cfd03d5..4c4f10e94 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "4c3bf5bec160974ec167f5fa934c645c8b8fa9e0" +SRCREV = "dacaa47f18c716a849af0528fca164a5d3d685c8" -- cgit v1.2.3 From 03631c1b768c70fb01a84a8e18bd5cd6b1ee0a55 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 18 Oct 2021 16:20:23 +0000 Subject: openpower-proc-control: srcrev bump db8d46c033..6263820071 Jayanth Othayoth (5): PHAL: dump utility functions support PHAL: collect sbe dump for the sbe boot timeout PHAL: improved boot failure reason code based logging PHAL: collect SBE dump for enterMPIPL chip-op timeout PHAL: execute enterMPIPL only on valid sbe state Change-Id: I891deb70cc02c126f1827e2fcb9efbc165e366ca Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 086b02d09..32a7d4778 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "db8d46c03328aff5943aa848868fe0a07dd8f21d" +SRCREV = "62638200712faa2b99e1dc6a4daae299469e01b5" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From a0a0912f41e6d54742a2efea1d41583f0d03d3bd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 20 Oct 2021 02:40:24 +0000 Subject: openpower-hw-diags: srcrev bump ceb08b2b7d..a7369f86a5 Zane Shelley (2): Move root cause filter support to separate source file Add root cause filters for clock errors Change-Id: I506da223f857604dd17108ec4cfdc5f800307912 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 875d28f20..6d9263b0f 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "ceb08b2b7dd1ae3b0ef791c432a2095f376f3594" +SRCREV = "a7369f86a55ecffc6024d2a6ccd0f53d13d3a2bb" S = "${WORKDIR}/git" -- cgit v1.2.3 From 6d8b8fe79040fadf6ab48dd2aa7036fbe43f52e1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 19 Oct 2021 15:40:27 +0000 Subject: openpower-software-manager: Add PLDM option to p10bmc openpower-pnor-code-mgmt: srcrev bump 9c2ef681e3..6fc7fcd6b1 Adriana Kobylak (2): Add a new pldm feature option Add support for the host PLDM transport that takes place of hiomap (mboxd). Add this new feature to p10bmc. Tested: Verified that tacoma (that doesn't support pldm) and p10bmc (supports pldm) reached runtime. Change-Id: I31e8beba5ff8a413b7b7fa7476f5f2403d3781dd Signed-off-by: Andrew Geissler Signed-off-by: Adriana Kobylak --- meta-ibm/conf/machine/p10bmc.conf | 1 + meta-openpower/classes/openpower-software-manager-mmc.bbclass | 2 -- meta-openpower/classes/openpower-software-manager-pldm.bbclass | 6 ++++++ meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc | 2 ++ .../recipes-phosphor/flash/openpower-software-manager_git.bb | 8 +++++++- 5 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 meta-openpower/classes/openpower-software-manager-pldm.bbclass create mode 100644 meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf index 4956f8772..1891129a4 100644 --- a/meta-ibm/conf/machine/p10bmc.conf +++ b/meta-ibm/conf/machine/p10bmc.conf @@ -10,6 +10,7 @@ require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc include conf/machine/include/ibm-power10-cpu.inc require conf/distro/include/openpower-virtual-pnor.inc +require conf/distro/include/openpower-hostfw-over-pldm.inc require conf/distro/include/phosphor-mmc.inc require conf/distro/include/ibm-mpreboot.inc require conf/distro/include/ibm-yaml.inc diff --git a/meta-openpower/classes/openpower-software-manager-mmc.bbclass b/meta-openpower/classes/openpower-software-manager-mmc.bbclass index afbee1a8f..fbf7c3b8b 100644 --- a/meta-openpower/classes/openpower-software-manager-mmc.bbclass +++ b/meta-openpower/classes/openpower-software-manager-mmc.bbclass @@ -3,6 +3,4 @@ PACKAGECONFIG:append = " mmc_layout" SYSTEMD_SERVICE:${PN} += " \ obmc-flash-bios-init.service \ obmc-flash-bios-patch.service \ - openpower-process-host-firmware.service \ - openpower-update-bios-attr-table.service \ " diff --git a/meta-openpower/classes/openpower-software-manager-pldm.bbclass b/meta-openpower/classes/openpower-software-manager-pldm.bbclass new file mode 100644 index 000000000..3cfa4a217 --- /dev/null +++ b/meta-openpower/classes/openpower-software-manager-pldm.bbclass @@ -0,0 +1,6 @@ +PACKAGECONFIG:append = " pldm" + +SYSTEMD_SERVICE:${PN} += " \ + openpower-process-host-firmware.service \ + openpower-update-bios-attr-table.service \ +" diff --git a/meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc b/meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc new file mode 100644 index 000000000..6c67b728b --- /dev/null +++ b/meta-openpower/conf/distro/include/openpower-hostfw-over-pldm.inc @@ -0,0 +1,2 @@ +DISTRO_FEATURES += "openpower-hostfw-over-pldm" +DISTROOVERRIDES .= ":df-openpower-hostfw-over-pldm" diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index dcf8715e1..633e031fc 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -31,10 +31,16 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-virtual-pnor', \ 'openpower-software-manager-virtual-pnor', \ '', d)} +# PLDM Support +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-hostfw-over-pldm', \ + 'openpower-software-manager-pldm', \ + '', d)} + PACKAGECONFIG[verify_pnor_signature] = "-Dverify-signature=enabled, -Dverify-signature=disabled" PACKAGECONFIG[ubifs_layout] = "-Ddevice-type=ubi,,,mtd-utils-ubifs" PACKAGECONFIG[mmc_layout] = "-Ddevice-type=mmc" PACKAGECONFIG[virtual_pnor] = "-Dvpnor=enabled, -Dvpnor=disabled,,bash" +PACKAGECONFIG[pldm] = "-Dpldm=enabled, -Dpldm=disabled" EXTRA_OEMESON += " \ -Dtests=disabled \ @@ -61,7 +67,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "9c2ef681e33ef736e23ec9095bf6fa8d7eeb950e" +SRCREV = "6fc7fcd6b12cdf11552468244ea4b61d0c339d11" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From 88f28f6685973b657d7312bbe399794455f91bd0 Mon Sep 17 00:00:00 2001 From: Eddie James Date: Wed, 20 Oct 2021 16:41:29 -0500 Subject: openpower: occ: Update recipe for meson build Adjust various parameters to build the repository with meson. Signed-off-by: Eddie James Change-Id: I27e0fe96efec83646ee8aa8328dd32755d3816ad --- .../recipes-phosphor/occ/openpower-occ-control.inc | 2 +- .../recipes-phosphor/occ/openpower-occ-control_git.bb | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index 182cf73e6..db1d06536 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "379234643e8a9b10ca1b98ddfea1a23e4db01d19" +SRCREV = "6b234c155431d4a1f721e347deeee0743ec7acb5" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index 440829175..b78b85bfb 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" PR = "r1" PV = "1.0+git${SRCPV}" -inherit autotools \ +inherit meson \ pkgconfig \ obmc-phosphor-dbus-service \ python3native \ @@ -39,11 +39,11 @@ DEPENDS += " \ RDEPENDS:${PN} += "phosphor-state-manager-obmc-targets" -EXTRA_OECONF = " \ - YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN} \ - PS_DERATING_FACTOR=${POWER_SUPPLY_DERATING_FACTOR} \ +EXTRA_OEMESON = " \ + -Dyamldir=${STAGING_DATADIR_NATIVE}/${PN} \ + -Dps-derating-factor=${POWER_SUPPLY_DERATING_FACTOR} \ " -EXTRA_OECONF:append = "${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'i2c-occ', ' --enable-i2c-occ', '', d)}" +EXTRA_OEMESON:append = "${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" OCC_ENABLE = "enable" OCC_DISABLE = "disable" @@ -91,8 +91,8 @@ RDEPENDS:${PN}:remove:class-nativesdk += "phosphor-state-manager-obmc-targets" # Provide a means to enable/disable install_error_yaml feature PACKAGECONFIG ??= "install_error_yaml" PACKAGECONFIG[install_error_yaml] = "\ - --enable-install_error_yaml,\ - --disable-install_error_yaml,\ + -Dinstall-error-yaml=enabled,\ + -Dinstall-error-yaml=disabled,\ ,\ " -- cgit v1.2.3 From 2ded481fe4b8b5a841b3f2440c683498c5e2bcae Mon Sep 17 00:00:00 2001 From: Ben Tyner Date: Tue, 12 Oct 2021 15:20:11 -0500 Subject: Added build time dependency on ipl Needed for getTiInfo() defined in libphal. Needed for openpower-hw-diags change 47306. Signed-off-by: Ben Tyner Change-Id: I4aca10ce19714bacae42eb50a2180953532d6498 --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 6d9263b0f..188273fcd 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -31,5 +31,5 @@ RDEPENDS:${PN} += "openpower-libhei" # Conditionally pull in PHAL APIs, if available. PACKAGECONFIG ??= "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" -PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata" +PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, ipl pdata" -- cgit v1.2.3 From 4f505518982b763b6e39b6c0017bedef2fe8b72c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 22 Oct 2021 16:40:27 +0000 Subject: openpower-hw-diags: srcrev bump a7369f86a5..b971517919 Ben Tyner (1): Attn: use phal library for get TI info calls Zane Shelley (1): Fix syntax errors in ras-data-schema-v01.json Change-Id: I75d0c2b0c786d2e86dbfffeb741bef663ab81495 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 188273fcd..4a61ba3bd 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "a7369f86a55ecffc6024d2a6ccd0f53d13d3a2bb" +SRCREV = "b971517919737064c1283aa8708768ec7b3e5f11" S = "${WORKDIR}/git" -- cgit v1.2.3 From 8c561eecb190655d51249c37286cc2c904dee7c0 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 22 Oct 2021 14:20:12 -0500 Subject: treewide: clean up recipe checks in OBMC_MACHINE_FEATURES OBMC_MACHINE_FEATURES is a variable that probably shouldn't even exist as all it does is provide a level of indirection to the real MACHINE_FEATURES (in phosphor-base.inc, OBMC_ is added to the base). There are a few recipes that have developed checks against OBMC_MACHINE_FEATURES for enabling recipe-level features when they should be checking the standard MACHINE_FEATURES variable. Clean up this recipe-level indirection. Signed-off-by: Patrick Williams Change-Id: Id437b93aa6c1de9a27726eea9b7e2c30e71ab3bf --- .../logging/phosphor-logging_%.bbappend | 2 +- meta-openpower/recipes-bsp/guard/guard_git.bb | 2 +- .../openpower-debug-collector-systemd-links.inc | 4 ++-- .../debug/openpower-debug-collector_git.bb | 2 +- .../host/op-proc-control-systemd-links.bb | 4 ++-- .../recipes-phosphor/host/op-proc-control_git.bb | 26 +++++++++++----------- .../logging/openpower-hw-diags_git.bb | 2 +- .../occ/openpower-occ-control_git.bb | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index 361417410..aa69617da 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -11,7 +11,7 @@ FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-4u_de FILES:${PN}:append:p10bmc = " ${datadir}/phosphor-logging/pels/ibm,everest_dev_callouts.json" #Enable phal feature, if available. -PACKAGECONFIG:append = " ${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG:append = " ${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata libekb pdbg" do_install:append:p10bmc() { diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index 8208a9cbb..30e7c6b75 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -15,5 +15,5 @@ SRCREV = "ebb9771055a3bb03ed753530870199607559ab63" DEPENDS = "cli11" -PACKAGECONFIG ??= "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Ddevtree=enabled, -Ddevtree=disabled, pdata pdbg" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc index 9c522c1cd..b252e6c11 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc @@ -15,7 +15,7 @@ pkg_postinst:${PN}:append() { TARGET="../openpower-debug-collector-watchdog@.service" ln -s $TARGET $LINK - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" TARGET="../openpower-debug-collector-watchdog-timeout@.service" ln -s $TARGET $LINK @@ -29,7 +29,7 @@ pkg_prerm:${PN}:append() { fi LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog@0.service" rm $LINK - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" rm $LINK fi diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index 68965af0a..cdb1da621 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -24,7 +24,7 @@ S = "${WORKDIR}/git" APPS = " \ checkstop \ watchdog \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', '', 'watchdog-timeout', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', '', 'watchdog-timeout', d)} \ " DEBUG_TMPL = "openpower-debug-collector-{0}@.service" diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb index 8cedb62a5..f3c63adad 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -48,7 +48,7 @@ pkg_postinst:${PN}() { ln -s $TARGET $LINK # Only install certain units if phal enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then mkdir -p $D$systemd_system_unitdir/obmc-host-start@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" TARGET="../phal-reinit-devtree.service" @@ -115,7 +115,7 @@ pkg_prerm:${PN}() { rm $LINK # Remove phal specific units if enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" rm $LINK diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 32a7d4778..92287f529 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -31,16 +31,16 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "${TEMPLATE} ${INSTANCES}" SYSTEMD_SERVICE:${PN} += " \ - xyz.openbmc_project.Control.Host.NMI.service \ - op-stop-instructions@.service \ - op-cfam-reset.service \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ - op-continue-mpreboot@.service \ - op-enter-mpreboot@.service \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ - " + op-cfam-reset.service \ + op-continue-mpreboot@.service \ + op-enter-mpreboot@.service \ + op-stop-instructions@.service \ + xyz.openbmc_project.Control.Host.NMI.service \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ + " diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 4a61ba3bd..fc7c39dfc 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -30,6 +30,6 @@ DEPENDS = "boost libgpiod pdbg phosphor-logging sdbusplus openpower-libhei \ RDEPENDS:${PN} += "openpower-libhei" # Conditionally pull in PHAL APIs, if available. -PACKAGECONFIG ??= "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, ipl pdata" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index b78b85bfb..804084e1d 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -43,7 +43,7 @@ EXTRA_OEMESON = " \ -Dyamldir=${STAGING_DATADIR_NATIVE}/${PN} \ -Dps-derating-factor=${POWER_SUPPLY_DERATING_FACTOR} \ " -EXTRA_OEMESON:append = "${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" +EXTRA_OEMESON:append = "${@bb.utils.contains('MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" OCC_ENABLE = "enable" OCC_DISABLE = "disable" -- cgit v1.2.3 From 060ad3ff7fcc30aff78a9e504efee9d8fa0d4526 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 22 Oct 2021 15:30:00 -0500 Subject: treewide: remove obmc-system-mgmt feature Every machine layer treats 'system-management' as either part of a package-group or removes the feature. The sample implementation in meta-phosphor is a do-nothing shell script (and up until recently was a Python script). There appears to be no useful purpose to this feature as a stand-alone concept, so remove it. Signed-off-by: Patrick Williams Change-Id: I20ca1fa8ff3cb01cac2d07d4ded84e0769e4514b --- meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 1 - .../packagegroups/packagegroup-amd-apps.bb | 2 -- .../packagegroups/packagegroup-ampere-apps.bb | 2 -- meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 - .../meta-e3c246d4i/conf/machine/e3c246d4i.conf | 1 - .../packagegroups/packagegroup-asrock-apps.bb | 2 -- meta-bytedance/meta-g220a/conf/machine/g220a.conf | 1 - .../packagegroups/packagegroup-bytedance-apps.bb | 2 -- meta-facebook/conf/machine/include/facebook.inc | 1 - .../packagegroups/packagegroup-fb-apps.bb | 2 -- meta-fii/meta-kudo/conf/machine/kudo.conf | 1 - .../packagegroups/packagegroup-kudo-apps.bb | 2 -- meta-hpe/conf/machine/include/hpe.inc | 1 - .../packagegroups/packagegroup-hpe-apps.bb | 2 -- .../meta-on5263m5/conf/machine/on5263m5.conf | 1 - .../packagegroups/packagegroup-inspur-apps.bb | 2 -- meta-intel-openbmc/conf/machine/include/intel.inc | 1 - .../packagegroups/packagegroup-intel-apps.bb | 2 -- meta-inventec/conf/machine/include/inventec.inc | 1 - .../packagegroups/packagegroup-inventec-apps.bb | 2 -- meta-openpower/conf/machine/include/openpower.inc | 1 - .../packagegroups/packagegroup-op-apps.bb | 2 -- meta-phosphor/classes/obmc-phosphor-image.bbclass | 2 -- .../conf/distro/include/phosphor-base.inc | 1 - .../conf/distro/include/phosphor-defaults.inc | 2 -- .../recipes-phosphor/images/obmc-phosphor-image.bb | 1 - .../recipes-phosphor/system/obmc-phosphor-sysd.bb | 18 ---------------- .../obmc-phosphor-sysd/obmc-phosphor-sysd.service | 10 --------- .../obmc-phosphor-sysd/obmc-phosphor-sysd.sh | 24 ---------------------- meta-quanta/meta-gbs/conf/machine/gbs.conf | 1 - meta-quanta/meta-gsj/conf/machine/gsj.conf | 1 - .../conf/machine/olympus-nuvoton.conf | 1 - .../packagegroup-olympus-nuvoton-apps.bb | 2 -- .../conf/machine/include/supermicro.inc | 1 - .../packagegroups/packagegroup-supermicro-apps.bb | 2 -- 35 files changed, 99 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb delete mode 100644 meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service delete mode 100644 meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index 91ca5bb1b..cc9f95673 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -31,7 +31,6 @@ PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ethanolx-led-manager-config-native" diff --git a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb index 06938055c..758e5b3ca 100644 --- a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb +++ b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "AMD Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb index ede8d9db5..ac820590f 100644 --- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb +++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb @@ -13,11 +13,9 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Ampere Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 633efa012..bd82e61c5 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -38,7 +38,6 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ " PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "mtjade-led-manager-config-native" diff --git a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf index 38fb811ff..b960c743d 100644 --- a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf +++ b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf @@ -9,7 +9,6 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps" VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control" VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control" diff --git a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb index e9f676dc8..c3af264a3 100644 --- a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb +++ b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb @@ -10,10 +10,8 @@ PACKAGES = " \ " PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-flash = "ASRock Flash" RDEPENDS:${PN}-flash = " \ diff --git a/meta-bytedance/meta-g220a/conf/machine/g220a.conf b/meta-bytedance/meta-g220a/conf/machine/g220a.conf index 516e31683..6e89d146d 100644 --- a/meta-bytedance/meta-g220a/conf/machine/g220a.conf +++ b/meta-bytedance/meta-g220a/conf/machine/g220a.conf @@ -30,7 +30,6 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed-sdk" PREFERRED_PROVIDER_u-boot = "u-boot-aspeed-sdk" diff --git a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb index 173805635..0de1880bc 100644 --- a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb +++ b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Bytedance Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 43a0c2222..415816db8 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -10,7 +10,6 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" IMAGE_FEATURES:remove = "obmc-ikvm" diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index d9c2abd53..febd160af 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -18,12 +18,10 @@ PACKAGES:append:fb-withhost = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Facebook Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index e065f2086..534df3581 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -30,7 +30,6 @@ MACHINE_FEATURES += " \ " PREFERRED_PROVIDER_virtual/obmc-fan-control = "phosphor-pid-control" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps" diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb index 800efde74..e916c0f5f 100644 --- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -12,11 +12,9 @@ PACKAGES = " \ " PROVIDES += "virtual/obmc-chassis-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" RPROVIDES:${PN}-kudo-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES:${PN}-kudo-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-kudo-fw += "virtual-obmc-flash-mgmt" RPROVIDES:${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" diff --git a/meta-hpe/conf/machine/include/hpe.inc b/meta-hpe/conf/machine/include/hpe.inc index 281d2d544..79896c713 100644 --- a/meta-hpe/conf/machine/include/hpe.inc +++ b/meta-hpe/conf/machine/include/hpe.inc @@ -15,7 +15,6 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-hpe-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" #PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" diff --git a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb index 3f16d41e7..9fdcd4b2e 100644 --- a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb +++ b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "HPE Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf index 1c217913e..6017a8885 100644 --- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf +++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf @@ -7,7 +7,6 @@ require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" UBOOT_MACHINE = "ast_g5_phy_config" diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb index 68a2184cf..2d95e2332 100644 --- a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Inspur Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-intel-openbmc/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc index 623cd7910..4287ddd80 100644 --- a/meta-intel-openbmc/conf/machine/include/intel.inc +++ b/meta-intel-openbmc/conf/machine/include/intel.inc @@ -14,7 +14,6 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-intel-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb index 303a04b3d..69a523475 100644 --- a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Intel Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc index 9a9e9f574..0f8419e42 100644 --- a/meta-inventec/conf/machine/include/inventec.inc +++ b/meta-inventec/conf/machine/include/inventec.inc @@ -17,7 +17,6 @@ VIRTUAL-RUNTIME_obmc-discover-system-state = "x86-power-control" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inventec-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb index 7996cda5b..374b279a9 100644 --- a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb +++ b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb @@ -15,13 +15,11 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-ipmi-oem" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-ipmi-oem += "virtual-obmc-ipmi-oem" SUMMARY:${PN}-chassis = "Inventec Chassis" diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc index f6c48bfb0..348361e87 100644 --- a/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openpower/conf/machine/include/openpower.inc @@ -18,7 +18,6 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-bt" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-op-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout ?= "openpower-fru-vpd-layout-native" diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index 890967f96..e20def697 100644 --- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "OpenPOWER Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 80c16d22e..572ec80f1 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -27,7 +27,6 @@ # - obmc-sensors - OpenBMC sensor support # - obmc-settings-mgmt - OpenBMC settings management # - obmc-software - OpenBMC software management -# - obmc-system-mgmt - OpenBMC system management # - obmc-telemetry - OpenBMC telemetry solution # - obmc-user-mgmt - OpenBMC user management # - obmc-user-mgmt-ldap - OpenBMC LDAP users @@ -59,7 +58,6 @@ FEATURE_PACKAGES_obmc-rng ?= "packagegroup-obmc-apps-rng" FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net" FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors" FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software" -FEATURE_PACKAGES_obmc-system-mgmt ?= "${@bb.utils.contains('DISTRO_FEATURES', 'obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', '', d)}" FEATURE_PACKAGES_obmc-debug-collector ?= "packagegroup-obmc-apps-debug-collector" FEATURE_PACKAGES_obmc-settings-mgmt ?= "packagegroup-obmc-apps-settings" FEATURE_PACKAGES_obmc-network-mgmt ?= "packagegroup-obmc-apps-network" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 64f293cf0..0e7e84945 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -91,7 +91,6 @@ DISTRO_FEATURES_OBMC = " \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ - obmc-phosphor-system-mgmt \ " DISTRO_FEATURES_DEFAULT = " \ diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 8673a15c1..948a09051 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -97,8 +97,6 @@ VIRTUAL-RUNTIME_obmc-dump-manager ?= "phosphor-debug-collector-manager" # Provide support for monitoring BMC core dumps VIRTUAL-RUNTIME_obmc-dump-monitor ?= "phosphor-debug-collector-monitor" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt ??= "obmc-phosphor-sysd" - # phosphor-hwmon-config # # The phosphor-hwmon package can have its configuration generated diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index 494b06c7c..85b7f0448 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -29,7 +29,6 @@ IMAGE_FEATURES += " \ obmc-net-ipmi \ obmc-sensors \ obmc-software \ - obmc-system-mgmt \ obmc-user-mgmt \ obmc-user-mgmt-ldap \ ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'read-only-rootfs', '', d)} \ diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb deleted file mode 100644 index 06eb55ec2..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Phosphor OpenBMC System Management" -DESCRIPTION = "Phosphor OpenBMC system management reference implementation." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit obmc-phosphor-dbus-service - -PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES:${PN} += "virtual-obmc-system-mgmt" - -S = "${WORKDIR}" -SRC_URI += "file://${BPN}.sh" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/${BPN}.sh ${D}${bindir}/${BPN} -} diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service deleted file mode 100644 index 246d985ba..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor System Manager - -[Service] -Restart=always -ExecStart=/usr/bin/env obmc-phosphor-sysd -SyslogIdentifier=obmc-phosphor-sysd - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh deleted file mode 100644 index 95488d04d..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# Contributors Listed Below - COPYRIGHT 2015 -# [+] International Business Machines Corp. -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. See the License for the specific language governing -# permissions and limitations under the License. - -echo "obmc-phosphor-sysd starting..." - -while true -do - sleep 60 -done diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 8fb72f286..4a65c5dcb 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -49,7 +49,6 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-net-ipmi" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-software" -IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-telemetry" IMAGE_FEATURES:remove = "obmc-debug-collector" IMAGE_FEATURES:remove = "obmc-settings-mgmt" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index ce58a91c3..8b9a1f823 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -44,7 +44,6 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-settings-mgmt" IMAGE_FEATURES:remove = "obmc-software" -IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap" IMAGE_FEATURES:remove = "obmc-debug-collector" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf index a90e77bf6..b45d74591 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf @@ -29,6 +29,5 @@ MACHINE_FEATURES += "\ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-olympus-nuvoton-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "olympus-nuvoton-led-manager-config-native" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb index d462d6905..6d69400e9 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-fans = "OLYMPUS NUVOTON Fans" RDEPENDS:${PN}-fans = " \ diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc index d663f445a..c8a762f77 100644 --- a/meta-supermicro/conf/machine/include/supermicro.inc +++ b/meta-supermicro/conf/machine/include/supermicro.inc @@ -14,7 +14,6 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-supermicro-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" diff --git a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb index 4549bf70f..6a24fadc6 100644 --- a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb +++ b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb @@ -14,12 +14,10 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Supermicro Chassis" RDEPENDS:${PN}-chassis = " \ -- cgit v1.2.3 From b6465fd9ebf26cf321b7e53711af3fdaf9159b26 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 25 Oct 2021 21:10:33 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump 6fc7fcd6b1..514a094e90 meta-openpower: mmc: add reference to new bios reset service Isaac Kurth (2): item_updater_mmc: Add service calls to bios reset openpower: mmc: physical reset triggers bios reset Change-Id: I98a64189e3ce2da59f858e8f37bdb1363e50f6de Signed-off-by: Andrew Geissler Signed-off-by: Isaac Kurth --- meta-openpower/classes/openpower-software-manager-mmc.bbclass | 1 + meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/classes/openpower-software-manager-mmc.bbclass b/meta-openpower/classes/openpower-software-manager-mmc.bbclass index fbf7c3b8b..b106fdeba 100644 --- a/meta-openpower/classes/openpower-software-manager-mmc.bbclass +++ b/meta-openpower/classes/openpower-software-manager-mmc.bbclass @@ -3,4 +3,5 @@ PACKAGECONFIG:append = " mmc_layout" SYSTEMD_SERVICE:${PN} += " \ obmc-flash-bios-init.service \ obmc-flash-bios-patch.service \ + openpower-bios-factory-reset.service \ " diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 633e031fc..455d2c290 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -67,7 +67,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "6fc7fcd6b12cdf11552468244ea4b61d0c339d11" +SRCREV = "514a094e90e7cfc47161aa59bba47c2b92bcf7c4" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From 105c1e43fd1da7d3a1ee5a0494871b725857878c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 25 Oct 2021 22:40:26 +0000 Subject: openpower-host-ipmi-flash: srcrev bump 955103869d..90eea43e3e Manojkiran Eda (1): Add OWNERS file Change-Id: I4a539cdf39a10747b0ddbfd800a3179a65b7bcec Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb index ab461ad62..6ff19052a 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb @@ -21,7 +21,7 @@ HOSTIPMI_PROVIDER_LIBRARY += "libhiomap.so" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-host-ipmi-flash" -SRCREV = "955103869df04cba4357ad0d5f45a868eb100399" +SRCREV = "90eea43e3e6a019344158766ac092acf2a240c24" FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From 1d224da3a3345dffd3d236a10d825be6aedf093d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 27 Oct 2021 00:30:32 +0000 Subject: openpower-occ-control: srcrev bump 6b234c1554..ea4ba179f0 Eddie James (2): Add FFDC collection Add SBE timeout handling George Liu (1): build: Remove autotools support Change-Id: I8801d79ddc0494568bb5d32bb9af67b0d2a4fe83 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index db1d06536..2db9b84e2 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "6b234c155431d4a1f721e347deeee0743ec7acb5" +SRCREV = "ea4ba179f072b42d292c93dc41a352687ac517df" -- cgit v1.2.3 From d45f17293c429d61e43a78edcc801133ed23600f Mon Sep 17 00:00:00 2001 From: Jayanth Othayoth Date: Fri, 15 Oct 2021 01:58:23 -0500 Subject: openpower: sbe-pel-parsers: Python parsers from sbe This recipe adds SBE UserData and SRC parsers in BMC images for use by peltool. Signed-off-by: Jayanth Othayoth Change-Id: Ia6d3e2296fa1b874341eeade3e518de1576e0e98 --- .../packagegroups/packagegroup-obmc-apps.bbappend | 4 +++- .../logging/python3-sbe-log-parsers_git.bb | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index acd8c6ba2..e40e15280 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -21,7 +21,9 @@ EXTRA_IBM_LOGGING_PKGS = "" EXTRA_IBM_LOGGING_PKGS:witherspoon = "ibm-logging" EXTRA_IBM_LOGGING_PKGS:witherspoon-tacoma = "" EXTRA_IBM_LOGGING_PKGS:mihawk = "ibm-logging" - +EXTRA_IBM_LOGGING_PKGS:p10bmc = " \ + python3-sbe-log-parsers \ +" RDEPENDS:${PN}-inventory:append:ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" RDEPENDS:${PN}-inventory:append:p10bmc = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" RDEPENDS:${PN}-inventory:append:mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" diff --git a/meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb b/meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb new file mode 100644 index 000000000..588f750df --- /dev/null +++ b/meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb @@ -0,0 +1,15 @@ +SUMMARY = "SBE log python parsers" +DESCRIPTION = "Used by peltool to parse SBE UserData sections and SRC details" +HOMEPAGE = "https://github.ibm.com/open-power/sbe" + +PR = "r1" +PV = "1.0+git${SRCPV}" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_PROLOG;md5=d8e5f403c98fd80dcea90b9cc8cd083c" + +S = "${WORKDIR}/git" +SRC_URI += "git://git@github.com/open-power/sbe;branch="master-p10";protocol=ssh" +SRCREV = "f8ee8cfad2cf2a53e78789633ddffc192f5a197e" + +inherit setuptools3 -- cgit v1.2.3 From 26f5f7fcd94e383f4ca8114408e638c9066b478f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 27 Oct 2021 15:10:22 +0000 Subject: openpower-host-ipmi-oem: srcrev bump 7bb95c3e23..531f8c5502 Brad Bishop (1): Add OWNERS file Change-Id: I4893c1e32b3c093261016f5f6047ece5306421a3 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc index eda8b91fd..0c9184fc6 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-host-ipmi-oem" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/openpower-host-ipmi-oem" -SRCREV = "7bb95c3e238a05d4ff1445f5e0f020e8e410213f" +SRCREV = "531f8c55023e7f91b9299b0158aca2769e89e066" -- cgit v1.2.3 From 0ad81722af943a4be3eecebc9d24a8171a9912d4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 27 Oct 2021 14:50:33 +0000 Subject: openpower-libhei: srcrev bump 853765bf98..90c37748c2 Manojkiran Eda (1): Add OWNERS file Change-Id: I238b9767950778b2ca895926346a36179218d7c2 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc index 0ed8c4cc9..41e4061a6 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -2,5 +2,5 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-libhei" -SRCREV = "853765bf989a2789b4456faf8ea74b6ce0b30870" +SRCREV = "90c37748c2f7284ee231e510c3ffd9471bddeb3c" -- cgit v1.2.3 From 1bb48dea9351abe281f985b843fc41e2ba4e32c1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 27 Oct 2021 14:50:24 +0000 Subject: openpower-hw-diags: srcrev bump b971517919..d94291aa2f Manojkiran Eda (1): Add OWNERS file Change-Id: Icfdb7eb69a9b61bd8fff5a28e7e9a6fdf8d50737 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index fc7c39dfc..cde863663 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "b971517919737064c1283aa8708768ec7b3e5f11" +SRCREV = "d94291aa2f3248cd829b29a91caa137b24aea5e1" S = "${WORKDIR}/git" -- cgit v1.2.3 From bad2fb73fbbe102eabed1e8fe551cbb49654b726 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 27 Oct 2021 05:10:26 +0000 Subject: openpower-vpd-parser: srcrev bump dacaa47f18..d1f64ca3db Manojkiran Eda (1): Add OWNERS file Change-Id: I747765564ad6ef52d52a878ce128bfe0f4d3372d Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 4c4f10e94..8b7c53350 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "dacaa47f18c716a849af0528fca164a5d3d685c8" +SRCREV = "d1f64ca3dba496934ee4baaf5bcc6c89dae6cfcc" -- cgit v1.2.3 From 3038ea211bde8191c83a693aa3ec4eed786a4a29 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 28 Oct 2021 17:10:38 +0000 Subject: openpower-libhei: srcrev bump 90c37748c2..5c4b0b1c73 Zane Shelley (1): update OWNERS file Change-Id: I4987e1b77543d4994c3dc6219e6860d6837bf341 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc index 41e4061a6..178c2963e 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -2,5 +2,5 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-libhei" -SRCREV = "90c37748c2f7284ee231e510c3ffd9471bddeb3c" +SRCREV = "5c4b0b1c73e2d794334c6987aedc730fba616528" -- cgit v1.2.3 From af4e37b628b019ee28797cbb0c599442b354faf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 28 Oct 2021 17:10:29 +0000 Subject: openpower-hw-diags: srcrev bump d94291aa2f..0f481a441f Ben Tyner (1): Attn: Properly handle hostboot TI with EID/PLID Zane Shelley (1): update OWNERS file Change-Id: I82be0e10d9778df9d222f654c0ae13a5b6dc8b22 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index cde863663..8efef0b47 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "d94291aa2f3248cd829b29a91caa137b24aea5e1" +SRCREV = "0f481a441fa8102602a2e34403e14716324b9e5e" S = "${WORKDIR}/git" -- cgit v1.2.3 From e35d826b26d63bab433965260eb3d93ae1d97048 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 28 Oct 2021 08:50:21 +0000 Subject: openpower-proc-control: srcrev bump 6263820071..ff27e3915c Andrew Geissler (1): op-continue-mpreboot: ensure it runs after start_host Manojkiran Eda (1): Add OWNERS file Change-Id: I50c38916c9ddf8de5fdd66572b76e713c2e620a4 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 92287f529..1974c7e51 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "62638200712faa2b99e1dc6a4daae299469e01b5" +SRCREV = "ff27e3915cd29be50b50892eb302abd218b18553" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From 8949deaf113ea8822792e49cc016db187c28f542 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Nov 2021 16:30:28 +0000 Subject: openpower-occ-control: srcrev bump ea4ba179f0..ace67d85e4 Eddie James (1): ffdc: Only proceed with PEL creation if there is an error Manojkiran Eda (1): Add OWNERS file Matt Spinler (1): Add proc IO Ring and core/IO ring DVFS sensors Change-Id: I6e031270eafdc116ced25fd499cca9837f87e9ab Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index 2db9b84e2..ceca3e9cd 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "ea4ba179f072b42d292c93dc41a352687ac517df" +SRCREV = "ace67d85e4206e15833c9c916a56aa3324b25cb3" -- cgit v1.2.3 From 78224244ca417262a3358ba440b519c660521ec1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 1 Nov 2021 15:00:43 +0000 Subject: openpower-hw-diags: srcrev bump 0f481a441f..f4792d6850 Zane Shelley (1): Temporary filtering for checkstop root cause attentions Change-Id: I6c1256fc2cecaac30e7183d7734e394b85ba178f Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 8efef0b47..4faf09dcd 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "0f481a441fa8102602a2e34403e14716324b9e5e" +SRCREV = "f4792d68505ca033ac01ff42b806d9d7569cf7ff" S = "${WORKDIR}/git" -- cgit v1.2.3 From 74f17f6ffd4b74f5e707f142aaa9ee8442ba596a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 2 Nov 2021 06:20:25 +0000 Subject: openpower-proc-control: srcrev bump ff27e3915c..ad3ff0fdf8 Jayanth Othayoth (1): PHAL: refactor startHostNormal procedure Change-Id: Ie2c9f09e236aaea2482cfe057d2ca298c5e5b73a Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 1974c7e51..d2d87c238 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "ff27e3915cd29be50b50892eb302abd218b18553" +SRCREV = "ad3ff0fdf8482231b8a793f17c401c6f501ca80e" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From 5d8fa235b76f9467a56026ad811368b82707146b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 2 Nov 2021 19:20:37 +0000 Subject: openpower-libhei: srcrev bump 5c4b0b1c73..33e46ac8c0 austinfcui (1): Update discord info in OWNERS file Change-Id: I7dfe9fde18f538de1e40fbe34838b8238f2e95bb Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc index 178c2963e..3fcaae4fa 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -2,5 +2,5 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-libhei" -SRCREV = "5c4b0b1c73e2d794334c6987aedc730fba616528" +SRCREV = "33e46ac8c00b2eed5a646bf9db76073b1fc3d515" -- cgit v1.2.3 From 33bd2b592584bc01a3184976ec2f4fd9a00406fc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 2 Nov 2021 21:50:38 +0000 Subject: openpower-hw-diags: srcrev bump f4792d6850..39fcf65dce Ben Tyner (1): Attn: Qualify MPIPL request with dump policy austinfcui (1): Update discord info in OWNERS file Change-Id: Icf537d43968e61dd2977fa929e95c1099a1cd696 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 4faf09dcd..4efdfce98 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "f4792d68505ca033ac01ff42b806d9d7569cf7ff" +SRCREV = "39fcf65dce4d91601951c146a543bf85d68f6b3c" S = "${WORKDIR}/git" -- cgit v1.2.3 From baf5ba7c52d366457831f44e06f2ac017c843377 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Nov 2021 10:01:23 -0500 Subject: meta-openpower:meson: pkgconfig inherit required Upstream yocto made a change recently that brought to light a bug in some of our recipes. If your meson makefiles utilize the dependency() function then the recipe must also include pkgconfig. Signed-off-by: Andrew Geissler Change-Id: I48c062226275c6e110bde27e815d2643c369c14c --- meta-openpower/recipes-bsp/guard/guard_git.bb | 2 +- meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb | 2 +- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-bsp/guard/guard_git.bb b/meta-openpower/recipes-bsp/guard/guard_git.bb index cda809e5c..ba649db9d 100644 --- a/meta-openpower/recipes-bsp/guard/guard_git.bb +++ b/meta-openpower/recipes-bsp/guard/guard_git.bb @@ -6,7 +6,7 @@ PV = "1.0+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit meson +inherit pkgconfig meson S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index cdb1da621..b9a2393d9 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Application to log error during host checkstop and watchdog timeo PR = "r1" PV = "1.0+git${SRCPV}" -inherit meson \ +inherit pkgconfig meson \ obmc-phosphor-systemd \ python3native \ phosphor-dbus-yaml diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 4efdfce98..e0affeda1 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -19,7 +19,7 @@ SRCREV = "39fcf65dce4d91601951c146a543bf85d68f6b3c" S = "${WORKDIR}/git" -inherit meson systemd +inherit pkgconfig meson systemd SYSTEMD_SERVICE:${PN} = "attn_handler.service" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb index 183e2ed5c..d45d95f3c 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb @@ -13,7 +13,7 @@ include openpower-libhei-rev.inc S = "${WORKDIR}/git" -inherit meson +inherit pkgconfig meson inherit perlnative DEPENDS = "libxml2-native libxml-simple-perl-native libjson-perl-native" -- cgit v1.2.3 From 5a5f33c729e6b5869362172b63595422eb84a418 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 3 Nov 2021 10:35:37 -0500 Subject: Partially revert "treewide: remove obmc-system-mgmt feature" The obmc-system-mgmt feature is currently used in the image to trigger inclusion of a virtual-provider which provides a number of packages many systems need. Partially revert the removal of this feature so that the outcome is: 1. The empty obmc-phosphor-sysd package is still removed. 2. By default the 'obmc-system-mgmt' feature is included, unless specifically exempted. 3. All EVB platforms remove the 'obmc-system-mgmt' feature since they have no system they are managing. This partially reverts commit 060ad3ff7fcc30aff78a9e504efee9d8fa0d4526. Tested: * Built `bletchley` and confirmed `packagegroup-fb-apps-system` and `entity-manager` are present. ``` entity-manager armv7ahf-vfpv4d16 0.1+git0+6bf41588ab-r0 packagegroup-fb-apps-system all 1.0-r1 ``` * Built `witherspoon` and confirmed `packagegroup-op-apps-system` and `pdbg` are present. ``` packagegroup-op-apps-system noarch 1.0 pdbg arm1176jzs 3.3 ``` * Ran `bitbake -p` on `evb-ast2600` to confirm the undefined `virtual-obmc-system-mgmt` is not being included in the image. Change-Id: I8b7804d5101cc84a2c57473b3f85672bf7767c67 Signed-off-by: Patrick Williams --- meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 1 + meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb | 2 ++ .../meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb | 2 ++ meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 + meta-aspeed/conf/machine/evb-ast2500.conf | 1 + meta-aspeed/conf/machine/evb-ast2600.conf | 1 + meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf | 1 + .../recipes-asrock/packagegroups/packagegroup-asrock-apps.bb | 2 ++ meta-bytedance/meta-g220a/conf/machine/g220a.conf | 1 + .../recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb | 2 ++ meta-evb/meta-evb-raspberrypi/conf/local.conf.sample | 1 + meta-facebook/conf/machine/include/facebook.inc | 1 + meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb | 2 ++ meta-fii/meta-kudo/conf/machine/kudo.conf | 1 + meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb | 2 ++ meta-hpe/conf/machine/include/hpe.inc | 1 + .../meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb | 2 ++ meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf | 1 + .../recipes-inspur/packagegroups/packagegroup-inspur-apps.bb | 2 ++ meta-intel-openbmc/conf/machine/include/intel.inc | 1 + .../meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb | 2 ++ meta-inventec/conf/machine/include/inventec.inc | 1 + .../recipes-inventec/packagegroups/packagegroup-inventec-apps.bb | 2 ++ meta-nuvoton/conf/machine/evb-npcm750.conf | 1 + meta-openpower/conf/machine/include/openpower.inc | 1 + meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb | 2 ++ meta-phosphor/classes/obmc-phosphor-image.bbclass | 2 ++ meta-phosphor/conf/distro/include/phosphor-base.inc | 1 + meta-phosphor/conf/machine/include/obmc-evb-common.inc | 2 ++ meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb | 1 + meta-quanta/meta-gbs/conf/machine/gbs.conf | 1 + meta-quanta/meta-gsj/conf/machine/gsj.conf | 1 + meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf | 1 + .../packagegroups/packagegroup-olympus-nuvoton-apps.bb | 2 ++ meta-supermicro/conf/machine/include/supermicro.inc | 1 + .../recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb | 2 ++ 36 files changed, 51 insertions(+) create mode 100644 meta-phosphor/conf/machine/include/obmc-evb-common.inc (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index cc9f95673..91ca5bb1b 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -31,6 +31,7 @@ PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ethanolx-led-manager-config-native" diff --git a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb index 758e5b3ca..06938055c 100644 --- a/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb +++ b/meta-amd/recipes-amd/packagegroups/packagegroup-amd-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "AMD Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb index ac820590f..ede8d9db5 100644 --- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb +++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb @@ -13,9 +13,11 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Ampere Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index bd82e61c5..633efa012 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -38,6 +38,7 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ " PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-ampere-apps" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "mtjade-led-manager-config-native" diff --git a/meta-aspeed/conf/machine/evb-ast2500.conf b/meta-aspeed/conf/machine/evb-ast2500.conf index e8aebd18f..1ee80f8be 100644 --- a/meta-aspeed/conf/machine/evb-ast2500.conf +++ b/meta-aspeed/conf/machine/evb-ast2500.conf @@ -2,5 +2,6 @@ KERNEL_DEVICETREE = "aspeed-ast2500-evb.dtb" UBOOT_MACHINE = "ast_g5_phy_config" require conf/machine/include/ast2500.inc +require conf/machine/include/obmc-evb-common.inc SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf index d3ee47b9c..e0aa2cdce 100644 --- a/meta-aspeed/conf/machine/evb-ast2600.conf +++ b/meta-aspeed/conf/machine/evb-ast2600.conf @@ -4,6 +4,7 @@ UBOOT_DEVICETREE = "ast2600a1-evb" SPL_BINARY = "spl/u-boot-spl.bin" require conf/machine/include/ast2600.inc +require conf/machine/include/obmc-evb-common.inc SERIAL_CONSOLES = "115200;ttyS4" diff --git a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf index b960c743d..38fb811ff 100644 --- a/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf +++ b/meta-asrock/meta-e3c246d4i/conf/machine/e3c246d4i.conf @@ -9,6 +9,7 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-asrock-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-asrock-apps" VIRTUAL-RUNTIME_obmc-host-state-manager = "x86-power-control" VIRTUAL-RUNTIME_obmc-chassis-state-manager = "x86-power-control" diff --git a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb index c3af264a3..e9f676dc8 100644 --- a/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb +++ b/meta-asrock/meta-e3c246d4i/recipes-asrock/packagegroups/packagegroup-asrock-apps.bb @@ -10,8 +10,10 @@ PACKAGES = " \ " PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-flash = "ASRock Flash" RDEPENDS:${PN}-flash = " \ diff --git a/meta-bytedance/meta-g220a/conf/machine/g220a.conf b/meta-bytedance/meta-g220a/conf/machine/g220a.conf index 6e89d146d..516e31683 100644 --- a/meta-bytedance/meta-g220a/conf/machine/g220a.conf +++ b/meta-bytedance/meta-g220a/conf/machine/g220a.conf @@ -30,6 +30,7 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-bytedance-apps" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-aspeed-sdk" PREFERRED_PROVIDER_u-boot = "u-boot-aspeed-sdk" diff --git a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb index 0de1880bc..173805635 100644 --- a/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb +++ b/meta-bytedance/recipes-phosphor/packagegroups/packagegroup-bytedance-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Bytedance Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample index 88b639111..b46503e67 100644 --- a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample +++ b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample @@ -20,3 +20,4 @@ CONF_VERSION = "2" # Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/obmc-evb-common.inc diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 415816db8..43a0c2222 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -10,6 +10,7 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" IMAGE_FEATURES:remove = "obmc-ikvm" diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index febd160af..d9c2abd53 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -18,10 +18,12 @@ PACKAGES:append:fb-withhost = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Facebook Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf index 534df3581..e065f2086 100644 --- a/meta-fii/meta-kudo/conf/machine/kudo.conf +++ b/meta-fii/meta-kudo/conf/machine/kudo.conf @@ -30,6 +30,7 @@ MACHINE_FEATURES += " \ " PREFERRED_PROVIDER_virtual/obmc-fan-control = "phosphor-pid-control" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-kudo-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-kudo-apps" diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb index e916c0f5f..800efde74 100644 --- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -12,9 +12,11 @@ PACKAGES = " \ " PROVIDES += "virtual/obmc-chassis-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" RPROVIDES:${PN}-kudo-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-kudo-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-kudo-fw += "virtual-obmc-flash-mgmt" RPROVIDES:${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" diff --git a/meta-hpe/conf/machine/include/hpe.inc b/meta-hpe/conf/machine/include/hpe.inc index 79896c713..281d2d544 100644 --- a/meta-hpe/conf/machine/include/hpe.inc +++ b/meta-hpe/conf/machine/include/hpe.inc @@ -15,6 +15,7 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-hpe-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-hpe-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "" #PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" diff --git a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb index 9fdcd4b2e..3f16d41e7 100644 --- a/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb +++ b/meta-hpe/meta-common/recipes-phosphor/packagegroups/packagegroup-hpe-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "HPE Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf index 6017a8885..1c217913e 100644 --- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf +++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf @@ -7,6 +7,7 @@ require conf/machine/include/obmc-bsp-common.inc PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" UBOOT_MACHINE = "ast_g5_phy_config" diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb index 2d95e2332..68a2184cf 100644 --- a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Inspur Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-intel-openbmc/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc index 4287ddd80..623cd7910 100644 --- a/meta-intel-openbmc/conf/machine/include/intel.inc +++ b/meta-intel-openbmc/conf/machine/include/intel.inc @@ -14,6 +14,7 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-intel-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb index 69a523475..303a04b3d 100644 --- a/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/packagegroups/packagegroup-intel-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Intel Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc index 0f8419e42..9a9e9f574 100644 --- a/meta-inventec/conf/machine/include/inventec.inc +++ b/meta-inventec/conf/machine/include/inventec.inc @@ -17,6 +17,7 @@ VIRTUAL-RUNTIME_obmc-discover-system-state = "x86-power-control" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inventec-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb index 374b279a9..7996cda5b 100644 --- a/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb +++ b/meta-inventec/meta-common/recipes-inventec/packagegroups/packagegroup-inventec-apps.bb @@ -15,11 +15,13 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" PROVIDES += "virtual/obmc-ipmi-oem" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" RPROVIDES:${PN}-ipmi-oem += "virtual-obmc-ipmi-oem" SUMMARY:${PN}-chassis = "Inventec Chassis" diff --git a/meta-nuvoton/conf/machine/evb-npcm750.conf b/meta-nuvoton/conf/machine/evb-npcm750.conf index 74f70adbc..f0216eada 100644 --- a/meta-nuvoton/conf/machine/evb-npcm750.conf +++ b/meta-nuvoton/conf/machine/evb-npcm750.conf @@ -8,5 +8,6 @@ FLASH_SIZE = "32768" require conf/machine/include/npcm7xx.inc require conf/machine/include/obmc-bsp-common.inc +require conf/machine/include/obmc-evb-common.inc IMAGE_FSTYPES = "cpio.${INITRAMFS_CTYPE}.u-boot mtd-static" diff --git a/meta-openpower/conf/machine/include/openpower.inc b/meta-openpower/conf/machine/include/openpower.inc index 348361e87..f6c48bfb0 100644 --- a/meta-openpower/conf/machine/include/openpower.inc +++ b/meta-openpower/conf/machine/include/openpower.inc @@ -18,6 +18,7 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-bt" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-op-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-op-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native" PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout ?= "openpower-fru-vpd-layout-native" diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index e20def697..890967f96 100644 --- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "OpenPOWER Chassis" RDEPENDS:${PN}-chassis = " \ diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 572ec80f1..80c16d22e 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -27,6 +27,7 @@ # - obmc-sensors - OpenBMC sensor support # - obmc-settings-mgmt - OpenBMC settings management # - obmc-software - OpenBMC software management +# - obmc-system-mgmt - OpenBMC system management # - obmc-telemetry - OpenBMC telemetry solution # - obmc-user-mgmt - OpenBMC user management # - obmc-user-mgmt-ldap - OpenBMC LDAP users @@ -58,6 +59,7 @@ FEATURE_PACKAGES_obmc-rng ?= "packagegroup-obmc-apps-rng" FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net" FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors" FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software" +FEATURE_PACKAGES_obmc-system-mgmt ?= "${@bb.utils.contains('DISTRO_FEATURES', 'obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', '', d)}" FEATURE_PACKAGES_obmc-debug-collector ?= "packagegroup-obmc-apps-debug-collector" FEATURE_PACKAGES_obmc-settings-mgmt ?= "packagegroup-obmc-apps-settings" FEATURE_PACKAGES_obmc-network-mgmt ?= "packagegroup-obmc-apps-network" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 0e7e84945..64f293cf0 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -91,6 +91,7 @@ DISTRO_FEATURES_OBMC = " \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ + obmc-phosphor-system-mgmt \ " DISTRO_FEATURES_DEFAULT = " \ diff --git a/meta-phosphor/conf/machine/include/obmc-evb-common.inc b/meta-phosphor/conf/machine/include/obmc-evb-common.inc new file mode 100644 index 000000000..34d52505f --- /dev/null +++ b/meta-phosphor/conf/machine/include/obmc-evb-common.inc @@ -0,0 +1,2 @@ +# EVBs don't have a managed system, so remove the feature. +IMAGE_FEATURES:remove = "obmc-system-mgmt" diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb index 85b7f0448..494b06c7c 100644 --- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb +++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb @@ -29,6 +29,7 @@ IMAGE_FEATURES += " \ obmc-net-ipmi \ obmc-sensors \ obmc-software \ + obmc-system-mgmt \ obmc-user-mgmt \ obmc-user-mgmt-ldap \ ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'read-only-rootfs', '', d)} \ diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 4a65c5dcb..8fb72f286 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -49,6 +49,7 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-net-ipmi" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-software" +IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-telemetry" IMAGE_FEATURES:remove = "obmc-debug-collector" IMAGE_FEATURES:remove = "obmc-settings-mgmt" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index 8b9a1f823..ce58a91c3 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -44,6 +44,7 @@ IMAGE_FEATURES:remove = "obmc-rng" IMAGE_FEATURES:remove = "obmc-sensors" IMAGE_FEATURES:remove = "obmc-settings-mgmt" IMAGE_FEATURES:remove = "obmc-software" +IMAGE_FEATURES:remove = "obmc-system-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt" IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap" IMAGE_FEATURES:remove = "obmc-debug-collector" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf index b45d74591..a90e77bf6 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/machine/olympus-nuvoton.conf @@ -29,5 +29,6 @@ MACHINE_FEATURES += "\ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-olympus-nuvoton-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-olympus-nuvoton-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "olympus-nuvoton-led-manager-config-native" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb index 6d69400e9..d462d6905 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-fans = "OLYMPUS NUVOTON Fans" RDEPENDS:${PN}-fans = " \ diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc index c8a762f77..d663f445a 100644 --- a/meta-supermicro/conf/machine/include/supermicro.inc +++ b/meta-supermicro/conf/machine/include/supermicro.inc @@ -14,6 +14,7 @@ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-supermicro-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" diff --git a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb index 6a24fadc6..4549bf70f 100644 --- a/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb +++ b/meta-supermicro/meta-common/recipes-supermicro/packagegroups/packagegroup-supermicro-apps.bb @@ -14,10 +14,12 @@ PACKAGES = " \ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" +PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" SUMMARY:${PN}-chassis = "Supermicro Chassis" RDEPENDS:${PN}-chassis = " \ -- cgit v1.2.3 From 5e586fd0865f9b28f155a9bd4ca9a678ea558025 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 5 Nov 2021 15:41:04 +0000 Subject: openpower-libhei: srcrev bump 33e46ac8c0..c0d0f36139 Zane Shelley (1): add .eslintignore to ignore meson log output files Change-Id: I14b2759cee3bfe97210342c979294f124b013bc1 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc index 3fcaae4fa..e2239125c 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -2,5 +2,5 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-libhei" -SRCREV = "33e46ac8c00b2eed5a646bf9db76073b1fc3d515" +SRCREV = "c0d0f36139346a28e79cdfd77905d8fa8fdefc71" -- cgit v1.2.3 From 2497952817d784cc2bacf224fe1a0ba450f4682d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 5 Nov 2021 15:40:55 +0000 Subject: openpower-hw-diags: srcrev bump 39fcf65dce..a00426f5e8 Zane Shelley (5): include config header for use of CONFIG_PHAL_API Updates to ClockCalloutResolution behavior add .eslintignore to ignore meson log output files Add Guarded/Deconfigured fields to callout resolutions Removed old guard design Change-Id: I5a9affe2c1bc27667053cd469a9e513af525cfc7 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index e0affeda1..d808391f1 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "39fcf65dce4d91601951c146a543bf85d68f6b3c" +SRCREV = "a00426f5e88b9d56a7e578971c3c0b7c21a58e1c" S = "${WORKDIR}/git" -- cgit v1.2.3 From 60a33d67f938e70844e06faaf33baf3ee06e1728 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 3 Nov 2021 07:30:29 +0000 Subject: openpower-vpd-parser: srcrev bump d1f64ca3db..a0cc5923f2 George Liu (1): build: Remove autotools support Change-Id: I1c9b644e46c6e63f7d631c3e005afd67b74f4335 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 8b7c53350..2f886517f 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "d1f64ca3dba496934ee4baaf5bcc6c89dae6cfcc" +SRCREV = "a0cc5923f27a4ce8c922c285958c08fe7c6f9e68" -- cgit v1.2.3 From 8d7c8b004db81bf4613f33289defad71838830bc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Nov 2021 15:40:27 +0000 Subject: openpower-occ-control: srcrev bump ace67d85e4..1725767357 Chris Cain (1): Send ambient and altitude to OCC Change-Id: I22e7ebade23064ceea6844e817caed529c248d1d Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index ceca3e9cd..0cac0da55 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "ace67d85e4206e15833c9c916a56aa3324b25cb3" +SRCREV = "17257673579b66c6e5c2769fc0a1ffd2decc71d2" -- cgit v1.2.3 From 7ad25053c123b12666527649b304497f6fac1dbb Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Nov 2021 15:00:26 +0000 Subject: openpower-hw-diags: srcrev bump a00426f5e8..135793a84b Ben Tyner (1): Attn: On TI with recoverable errors call analyzer Change-Id: I6a00f46bac3033e2d778d0df9a73119c75882d58 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index d808391f1..4e8d7ffcb 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "a00426f5e88b9d56a7e578971c3c0b7c21a58e1c" +SRCREV = "135793a84b6631127d791757f5003f8b54ccf472" S = "${WORKDIR}/git" -- cgit v1.2.3 From bcf2dec2a8611b09cd9b714e26af47bf5d1cb594 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 10 Nov 2021 10:00:26 +0000 Subject: openpower-vpd-parser: srcrev bump a0cc5923f2..88d2ae82af Alpana Kumari (1): fix for booting with correct dtb Change-Id: I3e5dea9e36feaf4445b61e9255b23ac338fd310f Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 2f886517f..c26dc27f6 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "a0cc5923f27a4ce8c922c285958c08fe7c6f9e68" +SRCREV = "88d2ae82af7fd97086c60fa9e39e0b4ee31a5974" -- cgit v1.2.3 From 962fa6a37db32335fb6584fe1746c426544fd0b4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Oct 2021 04:10:19 +0000 Subject: openpower-debug-collector: srcrev bump 09cf37962a..2bd4621871 Manojkiran Eda (1): Add OWNERS file Shantappa Teekappanavar (1): Watchdog timeout support in SBE boot window Change-Id: I26e2d03199ca2ad15d9f7dde930854b1de4442bd Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc | 2 +- meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc index 7c6e22aea..6d8f3f9fb 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-debug-collector" -SRCREV = "09cf37962a1c0b53e226a6a04bdf2d0f1b4d77e8" +SRCREV = "2bd4621871408c14728c9f90eb9ebf6552aa9fe7" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index b9a2393d9..bcf356eee 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -16,6 +16,7 @@ DEPENDS += " \ phosphor-logging \ ${PYTHON_PN}-sdbus++-native \ cli11 \ + ipl \ " S = "${WORKDIR}/git" @@ -34,4 +35,4 @@ SYSTEMD_SERVICE:${PN} += "${@compose_list(d, 'DEBUG_TMPL', 'APPS')}" DEPENDS:remove:class-native = "phosphor-logging" # Do not depend on phosphor-logging for native SDK build -DEPENDS:remove:class-nativesdk = "phosphor-logging" +DEPENDS:remove:class-nativesdk = "phosphor-logging ipl" -- cgit v1.2.3 From ddb69f4638e229171cb14cf7f1444040681c72f1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 15 Nov 2021 18:10:23 +0000 Subject: openpower-hw-diags: srcrev bump 135793a84b..bf3326fb84 Zane Shelley (1): Enable guard support Change-Id: Ia87abaec6a9291beed9cd34d4bb51fc547a31066 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 4e8d7ffcb..786e1a125 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "135793a84b6631127d791757f5003f8b54ccf472" +SRCREV = "bf3326fb84b86edecf8c20b46c548240bda4b980" S = "${WORKDIR}/git" -- cgit v1.2.3 From 0b7b7601123d7d137276f213e9b9ba39b58b1f49 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 16 Nov 2021 23:50:25 +0000 Subject: openpower-hw-diags: srcrev bump bf3326fb84..04f010abb7 Zane Shelley (2): use proper callout string for next level support procedure Design direction change for checkstop dumps Change-Id: I0f04a64fb0cd3007ef8898394daa21d65d2a7de8 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 786e1a125..9bbba105e 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "bf3326fb84b86edecf8c20b46c548240bda4b980" +SRCREV = "04f010abb7946c18d6bb68c714ca6a4417845d8d" S = "${WORKDIR}/git" -- cgit v1.2.3 From f521a25425104e83927a2406cfa36a4c6372d838 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 16 Nov 2021 21:10:20 +0000 Subject: openpower-pnor-code-mgmt: srcrev bump 514a094e90..9cbc06b10d Adriana Kobylak (1): functions: Add runtime entries to bios attr string Change-Id: I18e8400fe5f92cecb986348e96c01557e155c45d Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 455d2c290..7b44d7840 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -67,7 +67,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "514a094e90e7cfc47161aa59bba47c2b92bcf7c4" +SRCREV = "9cbc06b10d2738f7c2e3472cd447612768739f1d" DBUS_SERVICE:${PN} += "org.open_power.Software.Host.Updater.service" -- cgit v1.2.3 From 4386a828e5e1c9f9390f5340899bbcd83f4f03f9 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 16 Nov 2021 09:50:26 +0000 Subject: openpower-proc-control: srcrev bump ad3ff0fdf8..de9092593c Jayanth Othayoth (4): PHAL: Guard related service action support for PHAL logs PHAL: Remove HWAS_STATE updates from sbe ffdc processing api PHAL: Add location code information support for sub FRUs PHAL: Fix pdbg target traversal error path issues Change-Id: Ida574984a4591fb825bce9c1cefbd8a26cb79507 Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index d2d87c238..2e9598ada 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "ad3ff0fdf8482231b8a793f17c401c6f501ca80e" +SRCREV = "de9092593ca5de65181445250d1a6a59b5b4aab7" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From d19f05475e6dab814ecf074bc6108248ba688f03 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 17 Nov 2021 04:40:23 +0000 Subject: openpower-proc-control: srcrev bump de9092593c..0ac7c38f64 Jayanth Othayoth (3): PHAL: added createErrorPEL wrapper function PHAL: Add BMC0001 procedure callout for SBE boot error PHAL: Add procedure callout for hwp errors Change-Id: Id06437e5c1e766f8c533c65b7b0f087e0a74963d Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 2e9598ada..1a3fde452 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "de9092593ca5de65181445250d1a6a59b5b4aab7" +SRCREV = "0ac7c38f64ce2c5a170ab6fe219d26e599713da3" DEPENDS += " \ phosphor-logging \ -- cgit v1.2.3 From 95bc6f4fd7968102b25dd85f01e18d2e89a00e97 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 18 Nov 2021 14:40:25 +0000 Subject: openpower-occ-control: srcrev bump 1725767357..a7b74dc310 Chris Cain (1): Clean up error cases on boot or when app restarted Change-Id: I0a79be52f2457f7d301b4b9af3613ae56fe70b4f Signed-off-by: Andrew Geissler --- meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openpower/recipes-phosphor') diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index 0cac0da55..93c2ae5bd 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "17257673579b66c6e5c2769fc0a1ffd2decc71d2" +SRCREV = "a7b74dc31001884243556e4433d0bbfda3c09083" -- cgit v1.2.3