summaryrefslogtreecommitdiff
path: root/meta-intel-openbmc
diff options
context:
space:
mode:
authorJason M. Bills <jason.m.bills@linux.intel.com>2021-11-04 00:19:32 +0300
committerJason M. Bills <jason.m.bills@linux.intel.com>2021-11-04 00:19:32 +0300
commit901ced0812b458fdc599fe40b0a4233d422d6df9 (patch)
treeb0918e0606da0b1925b5fc9aba5e065e0a5a2f0e /meta-intel-openbmc
parentffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff)
parent459d47e59bfb3f80542f17c7eb54ba1f6c1a44f3 (diff)
downloadopenbmc-901ced0812b458fdc599fe40b0a4233d422d6df9.tar.xz
Merge tag '0.77' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-intel-openbmc')
-rwxr-xr-xmeta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb2
-rw-r--r--meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample4
2 files changed, 3 insertions, 3 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 b77109de3..44838fdc2 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 = "98cb6186e77fb820dd26666118964897d36730be"
+SRCREV = "e83c70aab0479a8103638166b330a06e499f4449"
S = "${WORKDIR}/git"
PV = "0.1+git${SRCPV}"
diff --git a/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample b/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample
index c1a28e0b6..94e161238 100644
--- a/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample
+++ b/meta-intel-openbmc/meta-s2600wf/conf/local.conf.sample
@@ -83,8 +83,8 @@ DISTRO ?= "openbmc-phosphor"
# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
# - 'package_rpm' for rpm style packages
# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
-# We default to rpm:
-PACKAGE_CLASSES ?= "package_rpm"
+# We default to ipk:
+PACKAGE_CLASSES ?= "package_ipk"
#
# SDK target architecture