summaryrefslogtreecommitdiff
path: root/meta-intel-openbmc/meta-common
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2021-06-24 01:22:00 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2021-06-24 01:22:00 +0300
commit5565c9abcc817b88098b849b2de5c017a8fb559f (patch)
tree2d2a10f694c3793a003a3cb1e2f9db52173cd3cb /meta-intel-openbmc/meta-common
parent2a64b8ae9b952b18b4aef38cb7c41ce6dba16c50 (diff)
parent000fd965915b31e7e613f7e9dfe7042f76dcc951 (diff)
downloadopenbmc-5565c9abcc817b88098b849b2de5c017a8fb559f.tar.xz
Merge tag '0.57' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-intel-openbmc/meta-common')
-rwxr-xr-xmeta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb2
-rw-r--r--meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
index 3a86b5657..9466b22a8 100755
--- a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb
+++ b/meta-intel-openbmc/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 = "01fbd0176c403feb29bf2a9ddd17469d0a27c3ef"
+SRCREV = "fb9f1aa1ea3c944fbba17b51ab26264af1c67a25"
S = "${WORKDIR}/git"
PV = "0.1+git${SRCPV}"
diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb b/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
index 20df1185b..0d6bfd367 100644
--- a/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
+++ b/meta-intel-openbmc/meta-common/recipes-phosphor/leds/intel-led-manager-config-native.bb
@@ -1,8 +1,8 @@
SUMMARY = "Phosphor LED Group Management for Intel"
PR = "r1"
-inherit native
inherit obmc-phosphor-utils
+inherit native
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"