From d962c6e4ea47d83b90e7d6daec7c6b9d09493714 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 31 Jul 2019 20:00:31 +0000 Subject: intel-ipmi-oem: srcrev bump edf25e6149..63efafacfa James Feist (1): Add Get / Set Dimm offset ipmi commands Jason M. Bills (2): Show chassis identify status in chassis status response Update the Get and Set Processor Error Config commands jayaprakash Mutyala (1): sensorcommands: move get SDR alloc info & res dev SDR repo to new API (From meta-intel rev: ef2f2b66846ea6cc5811794e9e527f260789a9b3) Change-Id: I4d48910812e5a5ad2a4995030d7314ceda5fdad6 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 286c398c7..e448d32e4 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "edf25e614919d0b379b885384bcdac987580b844" +SRCREV = "63efafacfad59550c9a7edd926fcb162747ec2d8" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 9204a2d1a1d4d5110a33003650ce849c2b2733c2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 9 Aug 2019 16:10:28 +0000 Subject: intel-ipmi-oem: srcrev bump 63efafacfa..09f6b60418 Deepak Kumar Sahu (1): SmbiosMdrv2Handler:Move mdr2GetDataBlock to new API James Feist (1): Support PCH TControl Jason M. Bills (1): Support IPMI command as last power event in chassis status Richard Marian Thomaiyar (4): [Mfg]: Fix the special mode path as per standard Add missed path in sm signal for identify button Add MTM keep alive command support [intel-ipmi-oem]: Fix instance number path for fan jayaprakash Mutyala (3): smbiosmdrv2handler: move mdr2 send dir to new API smbiosmdrv2handler: move mdr2 get & send data info smbioshandler:move bmc region complete,Write& Lock (From meta-intel rev: e67f8fd11397c6673854a4162250710490f880d5) Change-Id: I6c2ecbcca75b38e603f7ed84c5fb13faa3540d68 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index e448d32e4..de1520410 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "63efafacfad59550c9a7edd926fcb162747ec2d8" +SRCREV = "09f6b6041810554ba1200e4a001c624ec1850869" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 5f32fc3f8d19fdf1c35ac0b4a23bc91e7e97a533 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Wed, 14 Aug 2019 14:17:06 -0700 Subject: meta-intel: s2600wf: add machine suffix Add machine suffix to obmc-libobmc-intf recipe. This allows multi-machine distros based on OpenBMC to safely include the meta-intel layer. (From meta-intel rev: f3894c2a3603a9ca9821ee67e02b6a7db0447477) Signed-off-by: Patrick Venture Change-Id: Ic3e8377da6492538bf0e0b7d5e5bfdaa3273503d Signed-off-by: Brad Bishop --- .../meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 72d991c7e..410b21b4a 100644 --- a/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-intel/meta-s2600wf/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_s2600wf := "${THISDIR}/${PN}:" -- cgit v1.2.3 From 5cc308a23953d2884bfb869fed181948a7b2f936 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 15 Aug 2019 11:30:27 +0000 Subject: intel-ipmi-oem: srcrev bump 09f6b60418..159547cdfb Cheng C Yang (1): Implement Cold Redundancy Configuration Command James Feist (1): Revert "smbioshandler:move bmc region complete,Write& Lock" anil kumar appana (1): firmware-update: move FwMaxTransferSize to new API (From meta-intel rev: 5d3e3d8abb2479d2f67e33f4840d5eb59f02ba0d) Change-Id: I8eac9e9d503a0b27b3c6b2c731dd09072cd36dc4 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index de1520410..dda05f3ed 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "09f6b6041810554ba1200e4a001c624ec1850869" +SRCREV = "159547cdfbf1992737dcecbcb3888af7795f930b" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 62677fc8bf04816e01463de94b0481b67e2cf86e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 20 Aug 2019 18:40:28 +0000 Subject: intel-ipmi-oem: srcrev bump 159547cdfb..13b0039d21 Chen Yugang (1): Set Enabled to trigger NMI_OUT BSOD James Feist (1): Start turning on some warnings Jason M. Bills (2): Fix clearing of CPU error and crashdump counts Add command to control BMC system reset on SMI timeout (From meta-intel rev: 674a2533d4bb8d46214eb97a7f92b70aeccc51de) Change-Id: If933a608d9d7ca8bc034999af4c13d20eaf0ee24 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index dda05f3ed..c8affa2e2 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "159547cdfbf1992737dcecbcb3888af7795f930b" +SRCREV = "13b0039d21ccb60163d840a3b7c17c19fbad0b4d" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From e202893a904d19ff3f3af4587a29c018a4324334 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 22 Aug 2019 22:20:28 +0000 Subject: intel-ipmi-oem: srcrev bump 13b0039d21..74c50c648b Ayushi Smriti (1): Fix: Set SM Signal cmd check for optional byte James Feist (2): Fix build issue Add type 12h sdr records Richard Marian Thomaiyar (2): [Mfg]: Reset MTM timer for mfg cmds execution [Mfg]: Ethernet interface carrier status support anil kumar appana (1): firmware-update: fix for firmware update (From meta-intel rev: 95a5aa0a2145c712890445d31c25e562d51c2cbb) Change-Id: I87f5e296740f1ab71e9eaebcb31593eb4ae50170 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index c8affa2e2..8a3e131fe 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "13b0039d21ccb60163d840a3b7c17c19fbad0b4d" +SRCREV = "74c50c648b791c9427c6f7c14880c0710a94abf0" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 8e73d1dd102f215bfa6a747ace1e5e1818858914 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Mon, 26 Aug 2019 16:27:10 -0700 Subject: Remove pinned libxml2 This change has been in upstream for a long time. No need to keep it here. Tested: build succeeds. (From meta-intel rev: 42016a18f92c57df6d1644608a13bf170d4868eb) Change-Id: Id17ab88be1f8420f17260169ba2a593907a128d4 Signed-off-by: Ed Tanous Signed-off-by: Brad Bishop --- .../meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 meta-intel/meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend b/meta-intel/meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend deleted file mode 100644 index 60cfe5e9d..000000000 --- a/meta-intel/meta-common/recipes-intel/libtinyxml2/libtinyxml2_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# update libtinyxml2 to version 6.0.0 -SRCREV = "8c8293ba8969a46947606a93ff0cb5a083aab47a" -FILES_${PN}-dev += "${libdir}/cmake/tinyxml2/*" -- cgit v1.2.3 From cb8d89a37dfb6211c4918867949f0f8cc4bf6bf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 29 Aug 2019 01:20:29 +0000 Subject: intel-ipmi-oem: srcrev bump 74c50c648b..d801e46302 Chen,Yugang (1): Add set/get Http boot option OEM commands Cheng C Yang (1): Fix the incorrect completion code Richard Marian Thomaiyar (3): intel-ipmi-oem: cleanup - Removed duplicate OemCmd intel-ipmi-oem:Support for Set/Get Manf MAC data [oem-cmd]: Support for Get/Set security modes Yong Li (1): Add additional check for i2c master write read command (From meta-intel rev: 7f271d21d16ce468b112c1261a118d0a51d922af) Change-Id: I4300eae3d5ae556444a234d43abccfdb81d03153 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 8a3e131fe..347027441 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "74c50c648b791c9427c6f7c14880c0710a94abf0" +SRCREV = "d801e46302ee371c3461059e8c4e1e6982f495f8" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From b85cea4c51460792c2d9697d3ec6b86c2bd66acd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 30 Aug 2019 21:30:30 +0000 Subject: intel-ipmi-oem: srcrev bump d801e46302..f267a67dff Yong Li (1): intel-ipmi-oem: add slot I2C master RW command (From meta-intel rev: 8c1d853f88d08814a9b8fe444175944cd8148a3d) Change-Id: Ib95cf2121a56081bd3d9fd20999af06243454f2a Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 347027441..74ddf9f5a 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "d801e46302ee371c3461059e8c4e1e6982f495f8" +SRCREV = "f267a67dff88dc1bffeb52c533ba402874d1bfba" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From f559f725c4fbd3135e407c23231d93d07d2ab9ee Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 14:06:22 -0400 Subject: meta-intel: Remove references to INTELBASE INTELBASE is only used for pointing at licenses...point at the licenses in oe-core in meta/files/common-licenses instead. to match the defacto convention used in other oe layers like meta-openembedded. (From meta-intel rev: bbf062e439732ac0a9e62bdc02e7baab0967cae4) Change-Id: Ief59bb83ab71946dab61c04db7781ff9fd1b6e17 Signed-off-by: Brad Bishop --- meta-intel/conf/layer.conf | 3 --- .../dbus/intel-dbus-interfaces-mapper-config-native.bb | 2 +- .../recipes-phosphor/leds/intel-led-manager-config-native.bb | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'meta-intel') diff --git a/meta-intel/conf/layer.conf b/meta-intel/conf/layer.conf index 99a6df061..6605799ae 100644 --- a/meta-intel/conf/layer.conf +++ b/meta-intel/conf/layer.conf @@ -9,6 +9,3 @@ BBFILE_COLLECTIONS += "intel" BBFILE_PATTERN_intel = "" LAYERVERSION_intel = "1" LAYERSERIES_COMPAT_intel = "thud warrior" - -# Provide a variable that points the base of the intel layer. -INTELBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb b/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb index ce95082ce..0d1d016fe 100644 --- a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb +++ b/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb @@ -2,7 +2,7 @@ SUMMARY="Add /com/intel namespace to phosphor-mapper" DESCRIPTION="Add the /com/intel path namespace and \ com.intel interface prefix to the mapper watch list." LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit phosphor-mapper inherit native diff --git a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb b/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb index 8ef3a5dfa..20df1185b 100644 --- a/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb +++ b/meta-intel/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb @@ -5,7 +5,7 @@ inherit native inherit obmc-phosphor-utils LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" PROVIDES += "virtual/phosphor-led-manager-config-native" -- cgit v1.2.3 From db9f71e8a6da2f59ef631acea3dae06d57551c9c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 20 Sep 2019 20:20:29 +0000 Subject: intel-ipmi-oem: srcrev bump f267a67dff..068b4f2ca2 Ayushi Smriti (1): Add mfg filter to allow MTM cmds only in mfg mode Chen Yugang (1): Override Set Boot option command Cheng C Yang (1): Add parameter selector to CR config command resp James Feist (1): Fix build Vernon Mauery (2): remove unused file src/smbiosmdrv2.cpp update oemcommands.hpp to use new API Yong Li (2): Implement Get Message Flags Command intel-ipmi-oem: add clear CMOS command (From meta-intel rev: 940728fa2018e2669ca4a8c4beff2f81033ee930) Change-Id: Ia8ec20380f4655b1ee6d41f540a7abcb56418534 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 74ddf9f5a..68864fd31 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "f267a67dff88dc1bffeb52c533ba402874d1bfba" +SRCREV = "068b4f2ca2d9724ebe013c2567278fa0cf16e09f" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 10da9f4e16cb815550ce78c673558bb1c56311b3 Mon Sep 17 00:00:00 2001 From: James Feist Date: Mon, 23 Sep 2019 11:36:49 -0700 Subject: meta-intel: add zeus compatibility (From meta-intel rev: afeaa26538a9859e2475b323cb9c94363c1c6b80) Change-Id: Icb50d99bab3d5ae3cebe8bc874a292c0bbe7e655 Signed-off-by: James Feist Signed-off-by: Brad Bishop --- meta-intel/conf/layer.conf | 2 +- meta-intel/meta-s2600wf/conf/layer.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-intel') diff --git a/meta-intel/conf/layer.conf b/meta-intel/conf/layer.conf index 6605799ae..b43594da5 100644 --- a/meta-intel/conf/layer.conf +++ b/meta-intel/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "intel" BBFILE_PATTERN_intel = "" LAYERVERSION_intel = "1" -LAYERSERIES_COMPAT_intel = "thud warrior" +LAYERSERIES_COMPAT_intel = "warrior zeus" diff --git a/meta-intel/meta-s2600wf/conf/layer.conf b/meta-intel/meta-s2600wf/conf/layer.conf index 3fb9534dc..13dfe21f2 100644 --- a/meta-intel/meta-s2600wf/conf/layer.conf +++ b/meta-intel/meta-s2600wf/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "s2600wf" BBFILE_PATTERN_s2600wf = "" BBFILE_PRIORITY_s2600wf = "5" -LAYERSERIES_COMPAT_s2600wf = "thud warrior" +LAYERSERIES_COMPAT_s2600wf = "warrior zeus" -- cgit v1.2.3 From b2ceafb02ff5dc4dc28a0a0cece85ca03d80bf23 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Mon, 23 Sep 2019 17:32:39 -0700 Subject: meta-intel: add intel suffix to recipes Add a suffix, "intel" to all common intel recipe changes. The suffix is defined in intel.inc, which is included already in the s2600wf machine conf and likely any platform including meta-intel. (From meta-intel rev: 4fc52d948f7549472683ae26a10d5c60abde1537) Signed-off-by: Patrick Venture Change-Id: I3561dc40115894d5aa6a08fe723bf214100daefa Signed-off-by: Brad Bishop --- meta-intel/conf/machine/include/intel.inc | 2 ++ .../recipes-core/systemd/obmc-targets.bbappend | 16 ++++++++-------- .../dbus/phosphor-mapper-config-native.bbappend | 2 +- .../fans/phosphor-pid-control_%.bbappend | 6 +++--- .../recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 2 +- .../sel-logger/phosphor-sel-logger_%.bbappend | 2 +- .../recipes-phosphor/webui/phosphor-webui_%.bbappend | 6 +++--- 7 files changed, 19 insertions(+), 17 deletions(-) (limited to 'meta-intel') diff --git a/meta-intel/conf/machine/include/intel.inc b/meta-intel/conf/machine/include/intel.inc index db6b0c10e..738d103e5 100644 --- a/meta-intel/conf/machine/include/intel.inc +++ b/meta-intel/conf/machine/include/intel.inc @@ -19,3 +19,5 @@ 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" #PREFERRED_PROVIDER_virtual/obmc-gpio-monitor ?= "phosphor-gpio-monitor" + +OVERRIDES .= ":intel" diff --git a/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend b/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend index 3fe1c3f38..090b40e40 100644 --- a/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend +++ b/meta-intel/meta-common/recipes-core/systemd/obmc-targets.bbappend @@ -1,9 +1,9 @@ # Remove these files since they are provided by obmc-intel-targets -SYSTEMD_SERVICE_${PN}_remove += " obmc-host-start@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-host-stop@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-host-reboot@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-host-startmin@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-poweron@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-poweroff@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-hard-poweroff@.target" -SYSTEMD_SERVICE_${PN}_remove += " obmc-chassis-powerreset@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-start@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-stop@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-reboot@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-host-startmin@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-poweron@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-poweroff@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-hard-poweroff@.target" +SYSTEMD_SERVICE_${PN}_remove_intel += " obmc-chassis-powerreset@.target" diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend index 435531878..ef991a58b 100644 --- a/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend +++ b/meta-intel/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend @@ -1 +1 @@ -PHOSPHOR_MAPPER_CONFIGS_append = " intel-dbus-interfaces-mapper-config-native" +PHOSPHOR_MAPPER_CONFIGS_append_intel = " intel-dbus-interfaces-mapper-config-native" diff --git a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 3e89746bf..4521fe8f8 100644 --- a/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-intel/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd -SYSTEMD_SERVICE_${PN} = "phosphor-pid-control.service" -EXTRA_OECONF = "--enable-configure-dbus=yes" +SYSTEMD_SERVICE_${PN}_intel = "phosphor-pid-control.service" +EXTRA_OECONF_intel = "--enable-configure-dbus=yes" diff --git a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index e5f63fbda..876567f9a 100644 --- a/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-intel/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,4 +1,4 @@ -do_install_append(){ +do_install_append_intel(){ install -d ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/sensorhandler.hpp ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host diff --git a/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 4be8ddbd5..3e769e174 100644 --- a/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-intel/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,2 +1,2 @@ # Enable threshold monitoring -EXTRA_OECMAKE += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" +EXTRA_OECMAKE_intel += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend index ff1bfdb09..590e9e629 100644 --- a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend +++ b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_intel := "${THISDIR}/${PN}:" -SRC_URI_append = " file://config.json" +SRC_URI_append_intel = " file://config.json" -do_compile_prepend() { +do_compile_prepend_intel() { cp -r ${WORKDIR}/config.json ${S}/ } -- cgit v1.2.3 From 9132f289ee8ee5695dcb2345bc87dfaf12907fa4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 26 Sep 2019 16:40:29 +0000 Subject: intel-ipmi-oem: srcrev bump 068b4f2ca2..e615402719 Chen Yugang (1): Bug fixing for boot option Patrick Venture (15): sensorcommands: add map header storagecommands: pass by reference storagecommands: add functional header sensorcommands: zeroize some ints manufacturingcommands: pass string by const ref bugfix: smbiosmdrv2handler: sizeof(pointer) smbiosmdrv2handler: drop unused vars sensorcommands: add optional header sensorcommands: add utility header sensorcommands: add cstring header sensorcommands: add variant header sensorcommands: add algorithm header sensorcommands: add memory header sensorcommands: add array header sensorcommands: add stdexcept header Richard Marian Thomaiyar (2): intel-ipmi-oem: Replace yield with ctx for mfg cmd intel-ipmi-oem: Fix special mode path jayaprakash Mutyala (1): storagecommands: move Read and Write FRU data (From meta-intel rev: 18a346e8082b755b250e0a510b7783eb32882799) Change-Id: I87c38ec38f7ce69fbe9ba43614873fdb3c519c5e Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 68864fd31..cc39cf617 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "068b4f2ca2d9724ebe013c2567278fa0cf16e09f" +SRCREV = "e6154027196a9d5a6c34886f8dc8f3955467d534" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From ae9284a744c1bfe1b5e90ffb742a37877c2f4776 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 8 Oct 2019 16:50:30 +0000 Subject: intel-ipmi-oem: srcrev bump e615402719..bf124d462b Cheng C Yang (1): Implement a Command To Get PSU Version Jason M. Bills (1): Use the new RestartCause interface Patrick Venture (1): storagecommands: drop extra check range condition (From meta-intel rev: 89c40efd77fd8bb23b1b62af580b43baa29f1a9e) Change-Id: Ieca7ba4ca0cd592423e689b5b440be74c8eb6616 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index cc39cf617..e0f9d9867 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "e6154027196a9d5a6c34886f8dc8f3955467d534" +SRCREV = "bf124d462bc5a6cb76637b3a2439e564d11a95e9" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From b4239cdbf9185b90ebaea0f0cbb8b74580f95376 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 10 Oct 2019 18:00:32 +0000 Subject: x86-power-control: srcrev bump 2c714052d6..f61ca6fdcc Ed Tanous (1): Reinvent x86 power control application (From meta-intel rev: 917ed348d6620da818be73a0f9b7a039f5ba6a50) Change-Id: I98f14e28eefdace7664b24f1ae6cf8e995ea0422 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-intel') diff --git a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb b/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb index b2d8a1f9b..b04e20fed 100755 --- a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb +++ b/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/x86-power-control.git" -SRCREV = "2c714052d62b1e8fdd19951bbd340ec41fd7ac5b" +SRCREV = "f61ca6fdcc52beba485e014b5fad38a9e9a555ad" inherit cmake pkgconfig pythonnative systemd -- cgit v1.2.3