diff options
author | jmbills <42755197+jmbills@users.noreply.github.com> | 2019-12-17 22:28:35 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-17 22:28:35 +0300 |
commit | e0a95aa4bacb4a023254e673d2cb9b0cc3c1a64f (patch) | |
tree | 2b1448d35f422dfc4762616a1b9adbb8ff9d6ca0 /meta-phosphor/recipes-phosphor | |
parent | cd104f432570b6317d5125299620d0ae9af12b8b (diff) | |
parent | 4aeb24cf629a60980d4ad270fc1750754826613d (diff) | |
download | openbmc-e0a95aa4bacb4a023254e673d2cb9b0cc3c1a64f.tar.xz |
Merge pull request #28 from Intel-BMC/update
Update
Diffstat (limited to 'meta-phosphor/recipes-phosphor')
17 files changed, 13 insertions, 65 deletions
diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 88cef960d..40a991e39 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -14,7 +14,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "sdbus++-native" SRC_URI += "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "2d3b637f21f642afbe3d1193fd6cc4ab3a5e0d6c" +SRCREV = "1b02c38979ab4fa2649699a26266367b115eee7c" DEPENDS_remove_class-native = "sdbus++-native" DEPENDS_remove_class-nativesdk = "sdbus++-native" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index e72b2ef3d..2edf117b4 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "22848eceb4f19c93b1e3331e52005ce09523637d" +SRCREV = "ec4eec346011a5fa6882e0b020200b0c51f02cb0" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 5e4768a29..720b068c1 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "2658d9859a89d2d3c02326e5e2b944480119e0c3" +SRCREV = "7166bf0fd7453f2b5d6bfb3afbdad5eb00f74990" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb index 0f6c433e3..55bac7d77 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -16,7 +16,7 @@ DEPENDS += "ipmi-blob-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs" -SRCREV = "fea1d8115bace4bedae2523a9d9389a990adb09f" +SRCREV = "9cd8f76d3a786645ba6e21e146f66f5f27a6290c" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb index a3180402d..e702d2481 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-bt_git.bb @@ -20,7 +20,3 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/btbridge" SRCREV="aa5511d28ff9acee4a404c6397d09f5187812ed8" - -# This is how linux-libc-headers says to include custom uapi headers -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 100552978..3c11d85e6 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -44,7 +44,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "1290198fb84fc136ff33cb79f1333fd06977d847" +SRCREV = "2aa55347312c400f9dd61a32c8c1e37b1691bb1c" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 465aa6a1e..f9cd1b775 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "4d22640a64b74c11b2cbdadc88d0ffd60d09e274" +SRCREV = "225dec858e52f0e8319acfe72d7b3630adcc7a0d" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb index eb39439b1..3cb163077 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb @@ -31,7 +31,3 @@ DEPENDS += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/kcsbridge.git" SRCREV = "46525ae48db23333493ac927c12ed13a0e663de5" - -# This is how linux-libc-headers says to include custom uapi headers -CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" -do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb index 733bbf503..3f9313ab6 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -16,7 +16,7 @@ DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-host" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "49a94b2f82fb1aa68d608f28c4863bb36661a3a4" +SRCREV = "b0a81f665fb76dab9ef2af174ac64de99211f2f8" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 061124c09..f2c1f6288 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -54,7 +54,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "53407be367f112649cae10ebd6152f9bfd62b79b" +SRCREV = "57686b65b58e247858df228de8889ae30104ecdf" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch b/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch deleted file mode 100644 index 122594e9f..000000000 --- a/meta-phosphor/recipes-phosphor/mboxd/files/aspeed-lpc-ctrl-h.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- /dev/null 2017-01-17 09:45:47.987442339 +1030 -+++ include/linux/aspeed-lpc-ctrl.h 2017-01-17 11:12:17.711635876 +1030 -@@ -0,0 +1,36 @@ -+/* -+ * Copyright 2017 IBM Corp. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#ifndef _LINUX_ASPEED_LPC_CTRL_H -+#define _LINUX_ASPEED_LPC_CTRL_H -+ -+#include <linux/ioctl.h> -+ -+/* Window types */ -+#define ASPEED_LPC_CTRL_WINDOW_FLASH 1 -+#define ASPEED_LPC_CTRL_WINDOW_MEMORY 2 -+ -+struct aspeed_lpc_ctrl_mapping { -+ __u8 window_type; -+ __u8 window_id; -+ __u16 flags; -+ __u32 addr; -+ __u32 offset; -+ __u32 size; -+}; -+ -+#define __ASPEED_LPC_CTRL_IOCTL_MAGIC 0xb2 -+ -+#define ASPEED_LPC_CTRL_IOCTL_GET_SIZE _IOWR(__ASPEED_LPC_CTRL_IOCTL_MAGIC, \ -+ 0x00, struct aspeed_lpc_ctrl_mapping) -+ -+#define ASPEED_LPC_CTRL_IOCTL_MAP _IOW(__ASPEED_LPC_CTRL_IOCTL_MAGIC, \ -+ 0x01, struct aspeed_lpc_ctrl_mapping) -+ -+#endif /* _LINUX_ASPEED_LPC_CTRL_H */ diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index b33df921d..b5ee156a0 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -17,7 +17,6 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/mboxbridge.git" SRC_URI += "file://99-aspeed-lpc-ctrl.rules" -SRC_URI += "file://aspeed-lpc-ctrl-h.patch" SRCREV="0acc669979cc5b1b66c2c4e5d975c60779bedd81" @@ -26,10 +25,6 @@ PROVIDES += "mboxctl" MBOXD_FLASH_SIZE ??= "32M" SYSTEMD_SUBSTITUTIONS += "FLASH_SIZE:${MBOXD_FLASH_SIZE}:${PN}.service" -# Hacks because ${STAGING_KERNEL_DIR} points to the kernel source tree, not the -# installed, pre-processed headers. Requires the aspeed-lpc-ctrl-h patch above. -CFLAGS_append = " -I include" - do_install_append() { install -d ${D}/lib/udev/rules.d install -m 0644 ${WORKDIR}/99-aspeed-lpc-ctrl.rules ${D}/lib/udev/rules.d diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 6787dea8a..951bc298d 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "4de4d00f3ab06eaf2ac15719c27ce21603c88369" +SRCREV = "9a26f89f45c3753c9059505506da9f02460122ab" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index f062cd0a7..52e8c045d 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "6d5977375f5ca0a8676c6337e465bf7c92f3a765" +SRCREV = "575ed139220d7a694893f8b1a1e2d4c3b69317fe" diff --git a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb index 459ca82f1..0c078574f 100644 --- a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS += "systemd sdbusplus boost phosphor-ipmi-host" SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=git" -SRCREV = "7d5054ac15bee9945ac00c470c36c94b565ac8fa" +SRCREV = "151b7c1fc62971b7d319146e5ea129d44eadd9d7" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index f6ecb7c0d..8c884ab85 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "14f0ad806c3e92b5aee23632534698fbca18014b" +SRCREV = "73c363ff2d131b59149baaa0bc9bff41a3cfb125" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 21c5fe6d8..950ae6e9e 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "1ab0f7c1d59e3ccae14d92ba865ec52c53772ca2" +SRCREV = "86f4056a2dfee6fced5b5b03de04a7ef9c33d74f" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " |