diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-04-06 23:33:31 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-04-06 23:33:31 +0300 |
| commit | ee6f67609223ac24c3e4f55ae7cc78c60a3fdb34 (patch) | |
| tree | bd1d54ebe254cd845372cf2dec425f077afb0e13 /meta-facebook | |
| parent | 38e3aafdebeed3bf185faba0e17d8ad0ca04b879 (diff) | |
| parent | 81e9ee0bf0a3cf373ed354fb1687b5ddebc6150c (diff) | |
| download | openbmc-ee6f67609223ac24c3e4f55ae7cc78c60a3fdb34.tar.xz | |
Merge tag 'wht-0.47' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-facebook')
4 files changed, 2 insertions, 25 deletions
diff --git a/meta-facebook/meta-yosemitev2/recipes-fbyv2/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/meta-yosemitev2/recipes-fbyv2/packagegroups/packagegroup-fb-apps.bb deleted file mode 100644 index 49cf44c24..000000000 --- a/meta-facebook/meta-yosemitev2/recipes-fbyv2/packagegroups/packagegroup-fb-apps.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "OpenBMC for Facebook - Applications" -PR = "r1" - -inherit packagegroup - -PROVIDES = "${PACKAGES}" -PACKAGES = " \ - ${PN}-system \ - " - -PROVIDES += "virtual/obmc-system-mgmt" - -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" - -SUMMARY_${PN}-system = "Facebook system for Yosemite platform" -RDEPENDS_${PN}-system = " \ - entity-manager \ - dbus-sensors \ - phosphor-pid-control \ - " diff --git a/meta-facebook/meta-yosemitev2/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-yosemitev2/recipes-phosphor/fans/phosphor-pid-control_%.bbappend deleted file mode 100644 index 02e2b16cc..000000000 --- a/meta-facebook/meta-yosemitev2/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -EXTRA_OECONF_append_yosemitev2 = " --enable-configure-dbus=yes" diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index 77d1e4570..012186da0 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem" -SRCREV = "317999d3ac917654950e1288171b0cd546754880" +SRCREV = "dd14c0f75d9af7783afb3e9e124ca5c015a8609b" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index b70a42957..83567e906 100644 --- a/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,3 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -EXTRA_OECONF_append_tiogapass = " --enable-configure-dbus=yes" +EXTRA_OECONF_append = " --enable-configure-dbus=yes" |