From 6c5fa3f8f97c881b391748bfd46986824a9f6f3d Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Mon, 25 Feb 2019 13:33:30 -0600 Subject: packagegroups: Remove obmc-mgr-system The system manager (obmc-mgr-system) which provided GPIO functionality is being deprecated and it's not in use anymore: * GPIOs have moved out of D-Bus (see openbmc/openbmc#3332). * Tools depending on its GPIO functions have been updated to call local functions instead. * The systemd service files have been updated to not depend on system manager. (From meta-inspur rev: dd16cd4cce9956f5a7e1115bc268bcac4a3647f5) Change-Id: Id87ff99546c55947be3db006583a99edf2b171e7 Signed-off-by: Adriana Kobylak Signed-off-by: Andrew Geissler --- .../meta-common/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-inspur/meta-common/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-common/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb index 4c48369aa..366bfd3f1 100644 --- a/meta-inspur/meta-common/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb +++ b/meta-inspur/meta-common/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb @@ -44,7 +44,6 @@ RDEPENDS_${PN}-flash = " \ SUMMARY_${PN}-system = "Inspur System" RDEPENDS_${PN}-system = " \ - obmc-mgr-system \ bmcweb \ entity-manager \ phosphor-webui \ -- cgit v1.2.3 From 5f3956a6a8529cff11da6504c3830db95bda842b Mon Sep 17 00:00:00 2001 From: Artem Senichev Date: Mon, 25 Feb 2019 16:27:48 +0300 Subject: pdbg: srcrev bump 59ebe397a3..deb577949a Alistair Popple (20): pdbg/gdbserver: Make ragel optional libpdbg: Add api to get 32-bit device tree property libpdbg: fix a bug in get_class_target_addr libpdbg: Add API to get device tree path and find target via path libpdbg: Add indirect address translation via callback libpdbg: Add xbus hardware unit libpdbg: Remove unused code libpdbg: Make more declarations static libpdbg: Move property code into libpdbg/device.c libpdbg: Rename property functions libpdbg: Rework chip-id functions libpdbg: Rework target addressing libpdbg: Remove old dt_prop functions libpdbg: Rework target compatible libpdbg: Make dt_root private libpdbg: Remove device.h device.c: Fix pdbg_target_address libpdbg: Remove zalloc macro optcmd: Add parser for 8-bit power of 2 integers adu: Add arugments for block size Amitay Isaacs (49): Makefile: Install libpdbg header libpdbg.h Makefile: Keep libfdt sources sorted Makefile: Keep libpdbg sources sorted Makefile: Add missing header file in libpdbg_SOURCES Makefile: Keep pdbg sources sorted Makefile: Add missing headers to pdbg_SOURCES Makefile: Define arch dependent sources explicitly Makefile: Redefine sources required for gdbserver Makefile: Package src/gdb_parser.rl Makefile: Order the libraries for make install to work build: Allow device tree headers to be generated in subdirs tests: Fix the condition to check if bmc is up tests: Update driver to pass test_wrapper argument tests: Exit on first test failure tests: Ensure tests can be run from builddir tests: Log stderr output (if any) on test failure libpdbg: Convert printf to DEBUG statements main: Convert target_selection() to return a boolean util: Move parse_list() into a separate file path: Add device tree path based targeting main: Add an option for path based targetting main: Add explicit probing of selected targets main: Convert -p/-c/-t/-a/-l to path based targets main: Switch to path based target selection main: Fix probe() to print targets correctly tests: Add path based selection tests main: Do not use argv[0] for progname main: Update probe output to display device names libpdbg: Add an api for address translation main: Convert getcfam/putcfam to use path based targeting main: Convert getscom/putscom to use path based targeting main: Convert register functions to path based targeting main: Ignore nodes that do not have class names libpdbg: Split nhtm hardware units for p8 and p9 main: Move device_node setting before parse_options main: Mark print_target static main: Convert getring to path based targeting main: Convert thread commands start/stop/step/sreset main: Convert threadstatus command to path based targeting main: Convert regs command to path based targeting main: Drop unused iterators with callbacks main: Convert htm commands to path based targeting main: Convert gdbserver command to path based targeting main: Drop unused target_select/target_selected functions libpdbg: Fix probing of pib libpdbg: Use index instead of chip-id for id libpdbg: Drop pdbg_target_chip_id() dtc: Drop chip-id property README: Add information about target selection Artem Senichev (1): main: Set I2C backend device specified in arguments Joel Stanley (1): Fix build failure in target detection Nicholas Piggin (1): stack: guess endian for stack frame walking Rashmica Gupta (3): pdbg/gdbserver: Add in basic skeleton for a gdbserver on p8 pdbg/gdbserver: Make gdbserver optional README: Add some gdbserver info (From meta-openpower rev: 16c5b8f97176373b8e91ab2f8e86b6b3dea314d9) Change-Id: Ic03552fc25a7cf4c64796347d38acb50209ea30e Signed-off-by: Artem Senichev Signed-off-by: Andrew Geissler --- meta-openpower/recipes-bsp/pdbg/pdbg_2.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openpower/recipes-bsp/pdbg/pdbg_2.0.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_2.0.bb index bd5c46be8..8995da79f 100644 --- a/meta-openpower/recipes-bsp/pdbg/pdbg_2.0.bb +++ b/meta-openpower/recipes-bsp/pdbg/pdbg_2.0.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" PV = "2.0+git${SRCPV}" -SRC_URI += "git://github.com/open-power/pdbg.git;branch=master" -SRCREV = "59ebe397a34570daca3aa296f8cedc7bd3d940de" +SRC_URI += "git://github.com/open-power/pdbg.git" +SRCREV = "deb577949a3505064f471e7b7c692e37c38ec8a4" DEPENDS += "dtc-native" -- cgit v1.2.3 From 4019e98dc59160d0ec06ad524a8afe8fdb2f4732 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Mon, 4 Mar 2019 08:54:12 -0800 Subject: meta-quanta: q71l: drop spictrl script Drop the spimaster python script. This script let one, via devmem accesses, change the SPI control to let the BMC access the BIOS flash chip. OpenBMC is aiming to drop python support, and this script was only a proof-of-concept. If required, a linux driver should be written to handle this. (From meta-quanta rev: fa279684ea0fa59cd106c6955c92d2f9f539c3a0) Change-Id: I74e4e62054b914013d230b834e882353eb70a67e Signed-off-by: Patrick Venture Signed-off-by: Andrew Geissler --- .../recipes-phosphor/spictrl/files/spimaster.py | 148 --------------------- .../meta-q71l/recipes-phosphor/spictrl/spictrl.bb | 19 --- 2 files changed, 167 deletions(-) delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/spictrl/files/spimaster.py delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/spictrl/spictrl.bb diff --git a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/files/spimaster.py b/meta-quanta/meta-q71l/recipes-phosphor/spictrl/files/spimaster.py deleted file mode 100644 index dd08372b7..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/files/spimaster.py +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright (C) 2017 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#!/usr/bin/env python -"""Basic utility for reading and writing registers on an ASPEED BMC. - -The values hardcoded are for the ASPEED AST2400. -""" - -import subprocess -import sys - -IO_TOOL = 'devmem' -PROTECTION_KEY = '0x1E6E2000' -HWTRAP = '0x1E6E2070' -# The AST2400 SCU Password (as int for write_register) -SCU_PASSWORD = 0x1688A8A8 - -# Bits 13:12 -SPI_MASK = 0xffffcfff -# Enable SPI Master -SPI_MASTER = 0x1000 -# Enable SPI Master and SPI Slave to AHB Bridge -SPI_MASTER_SLAVE = 0x2000 -# Enable SPI Pass-through -SPI_BYPASS = 0x3000 - - -def read_register(address): - """Run a tool to read a register value. - - This will convert it to an integer. - """ - - output = subprocess.check_output([IO_TOOL, address]).replace('\n', '') - value = int(output, 16) - return value - - -def write_register(address, value): - """Run a tool to write the 32-bit register value.""" - - subprocess.check_output([IO_TOOL, address, '32', '0x%x' % value]) - return - - -def set_master(value): - """Set Hardware Strapping to SPI Master.""" - - print 'Setting to "SPI Master"' - - masked = value & SPI_MASK - masked |= SPI_MASTER - - print 'setting: 0x%x' % masked - write_register(HWTRAP, masked) - - -def set_ahb_bridge(value): - """Set hardware strapping to spi master and spi-slave to ahb.""" - - print 'Setting to "SPI Master and SPI Slave to AHB Bridge"' - masked = value & SPI_MASK - masked |= SPI_MASTER_SLAVE - - print 'setting: 0x%x' % masked - write_register(HWTRAP, masked) - - -def set_bypass(value): - """Set hardware strappign to spi bypass.""" - - print 'Setting to "Enable SPI Pass-through"' - masked = value & SPI_MASK - masked |= SPI_BYPASS - - print 'setting: 0x%x' % masked - write_register(HWTRAP, masked) - - -def usage(): - """Print usage string.""" - - print 'usage: %s master|bridge|bypass' % sys.argv[0] - print 'master sets the BMC SPI to Master.' - print ('bridge sets the BMC SPI to Master-Slave bridge to AHB (for BIOS ' + - 'Update).') - print 'bypass sets the BMC SPI to Bypass (default).' - - -def main(): - """Main entry point for execution.""" - - if len(sys.argv) != 2: - usage() - sys.exit(-1) - - ctrl = sys.argv[1].lower() - if ctrl not in ('master', 'bridge', 'bypass'): - usage() - sys.exit(-1) - - locked = False - # Check if locked - value = read_register(PROTECTION_KEY) - if value == 1: - print 'Presently unlocked' - else: - print 'Presently locked' - locked = True - - # if Locked we need to unlock it. - if locked: - write_register(PROTECTION_KEY, SCU_PASSWORD) - - # Read the value. - value = read_register(HWTRAP) - if value & SPI_BYPASS == SPI_BYPASS: - print 'Presently set to bypass' - elif value & SPI_MASTER == SPI_MASTER: - print 'Presently set to master' - elif value & SPI_MASTER_SLAVE == SPI_MASTER_SLAVE: - print 'Presently set to master-slave' - - if ctrl == 'master': - set_master(value) - elif ctrl == 'bridge': - set_ahb_bridge(value) - elif ctrl == 'bypass': - set_bypass(value) - - # We leave it unlocked in case it was locked. - # we could lock it. - # TODO(venture): lock it by writing any non-password value. - -if __name__ == '__main__': - main() diff --git a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/spictrl.bb b/meta-quanta/meta-q71l/recipes-phosphor/spictrl/spictrl.bb deleted file mode 100644 index 5b2fcf26c..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/spictrl/spictrl.bb +++ /dev/null @@ -1,19 +0,0 @@ -# Should RDEPENDS on python at the very least. -FILESEXTRAPATHS_append := "${THISDIR}/files:" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://spimaster.py;beginline=1;endline=13;md5=b86c59990b35609be34a0ec322a3cfff" - -S = "${WORKDIR}/" - -SRC_URI = "file://spimaster.py" - -DEPENDS = "python" - -FILES_${PN} += "*" - -do_install() { - install -d ${D}/home - install -d ${D}/home/root - install -m 0755 ${S}/spimaster.py ${D}/home/root/. -} -- cgit v1.2.3 From 645fa200d84f2e11b542d0fe60838ab1c9cda394 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Mon, 25 Feb 2019 13:33:59 -0600 Subject: packagegroups: Remove obmc-mgr-system The system manager (obmc-mgr-system) which provided GPIO functionality is being deprecated and it's not in use anymore: * GPIOs have moved out of D-Bus (see openbmc/openbmc#3332). * Tools depending on its GPIO functions have been updated to call local functions instead. * The systemd service files have been updated to not depend on system manager. (From meta-quanta rev: 602f74d56aeabe7c30748576ad6085ed761498fe) Change-Id: I76e683ed246bc055c54754bfc9d819f50e708eb3 Signed-off-by: Adriana Kobylak Signed-off-by: Andrew Geissler --- meta-quanta/meta-gsj/conf/machine/gsj.conf | 1 - .../meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb | 8 -------- 2 files changed, 9 deletions(-) diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index 08e9078fc..96db9907b 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -23,4 +23,3 @@ OBMC_MACHINE_FEATURES += "\ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gsj-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gsj-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-gsj-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-gsj-apps" diff --git a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb index cca66390c..322ba35f5 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb @@ -8,18 +8,15 @@ PACKAGES = " \ ${PN}-chassis \ ${PN}-fans \ ${PN}-flash \ - ${PN}-system \ " PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -PROVIDES += "virtual/obmc-system-mgmt" RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" SUMMARY_${PN}-chassis = "GSJ Chassis" RDEPENDS_${PN}-chassis = " \ @@ -37,8 +34,3 @@ RDEPENDS_${PN}-flash = " \ obmc-mgr-download \ obmc-control-bmc \ " - -SUMMARY_${PN}-system = "GSJ System" -RDEPENDS_${PN}-system = " \ - obmc-mgr-system \ - " -- cgit v1.2.3 From 19a08bc48196cb6c239bc2f759bbd892aa8a0b90 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Fri, 22 Feb 2019 09:57:29 -0800 Subject: meta-quanta: q71l: drop ipmi-channel-config Drop the ipmi-channel-config as it's no longer used by phosphor-host-ipmid. (From meta-quanta rev: d92f64f7e750210582f9d0828ef82c2007d5ef89) Change-Id: I9fb8640386cbf9b5cd8f5213e9f63be221031faa Signed-off-by: Patrick Venture Signed-off-by: Andrew Geissler --- meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf | 1 - .../ipmi/q71l-ipmi-channel-config-native.bb | 19 ------------------- .../ipmi/q71l-ipmi-channel-config/channel.yaml | 5 ----- 3 files changed, 25 deletions(-) delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb delete mode 100644 meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config/channel.yaml diff --git a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf index b36a09821..ef127e967 100644 --- a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf +++ b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf @@ -31,7 +31,6 @@ PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_wo # These are meant to include the inventory config.yaml and so on. PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-inventory = "q71l-ipmi-inventory-map-native" PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory = "q71l-ipmi-sensor-map-native" -PREFERRED_PROVIDER_virtual/phosphor-ipmi-channel-config = "q71l-ipmi-channel-config-native" PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-merge-config = "q71l-ipmi-fru-merge-config-native" diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb deleted file mode 100644 index 215683bcd..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Quanta Q71l IPMI Channel to if_name mapping." -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-host - -PROVIDES += "virtual/phosphor-ipmi-channel-config" - -SRC_URI += "file://channel.yaml" - -S = "${WORKDIR}" - -do_install() { - DEST=${D}${sensor_datadir} - install -d ${DEST} - install channel.yaml ${DEST}/channel.yaml -} diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config/channel.yaml b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config/channel.yaml deleted file mode 100644 index 3cc2cd242..000000000 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-channel-config/channel.yaml +++ /dev/null @@ -1,5 +0,0 @@ -1: - ifName: eth0 -2: - ifName: eth1 - -- cgit v1.2.3 From fd87f1b7e8640348ab38effacd6f5082df6ae228 Mon Sep 17 00:00:00 2001 From: Qiang XU Date: Fri, 1 Feb 2019 08:41:36 +0800 Subject: meta-phosphor: dbus-sensors: Enable new service of intrusion sensor Enable chassis intrusion sensor service file and add "i2c-tools" to link Tested-by: Build passed and chassis intrusion sensor value is available via dbus or redfish (From meta-phosphor rev: f7617ee0e9302bd1fb0a23243ca378752dab1cb3) Change-Id: I611967de369d6f7581f68480ed39acc8c35d0d9d Signed-off-by: Qiang XU Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 7a1195819..3a6742757 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -15,8 +15,9 @@ SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.hwmontempsensor.service" SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.cpusensor.service" SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.exitairsensor.service" SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.ipmbsensor.service" +SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.intrusionsensor.service" -DEPENDS = "boost nlohmann-json sdbusplus" +DEPENDS = "boost nlohmann-json sdbusplus i2c-tools" inherit cmake systemd S = "${WORKDIR}/git/" -- cgit v1.2.3 From 56e35711b2431ff54ad3428fb72b019615244eac Mon Sep 17 00:00:00 2001 From: manojkiraneda Date: Tue, 5 Feb 2019 12:58:00 +0530 Subject: Adding pam_ldap.so by masking pam load errors Absence of ldap distro feature will not generate pam_ldap.so because of which we might see some unwanted error messages regarding the failure in opening the pam_ldap.so in journalctl incase if pam_ldap is present in PAM Configuration. This commit would: - Leverage '-' option before the 'type' in pam configuration, by which the PAM library will not log any errors in the syslog if it is not able to load the module beacause it is missing in the system.By using this we don't need two pam configuration files for ldap and unix. - Leverages ignore_unknown_user & ignore_authinfo_unavail options of pam_ldap.so, which forces the PAM framework to ignore pam_ldap incase if the user is not present in LDAP server or if the client cannot connect to LDAP Server. (From meta-phosphor rev: 2c7efc937785a76e35a06b6807e12765ad40d99d) Change-Id: Ic1044989ccae4e6e442de9865cf00cea33f75262 Signed-off-by: manojkiraneda Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account | 3 ++- meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account index 10cfc73ea..82449cad0 100644 --- a/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account +++ b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account @@ -14,7 +14,8 @@ # # here are the per-package modules (the "Primary" block) -account [success=1 new_authtok_reqd=done default=ignore] pam_unix.so +account [success=2 new_authtok_reqd=done default=ignore] pam_unix.so +-account [success=1 new_authtok_reqd=done default=ignore] pam_ldap.so ignore_unknown_user ignore_authinfo_unavail # here's the fallback if no module succeeds account requisite pam_deny.so account required pam_tally2.so diff --git a/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth index 4ac58fb54..7bebd9a6a 100644 --- a/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth +++ b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth @@ -8,8 +8,10 @@ # traditional Unix authentication mechanisms. # here are the per-package modules (the "Primary" block) -auth [success=ok default=1] pam_tally2.so deny=0 unlock_time=0 -auth [success=1 default=ignore] pam_unix.so nullok_secure +auth [success=ok default=2] pam_tally2.so deny=0 unlock_time=0 +# Try for local user first, and then try for ldap +auth [success=2 default=ignore] pam_unix.so nullok_secure +-auth [success=1 default=ignore] pam_ldap.so ignore_unknown_user ignore_authinfo_unavail # here's the fallback if no module succeeds auth requisite pam_deny.so # prime the stack with a positive return value if there isn't one already; -- cgit v1.2.3 From dab1ed2929b77cf47f0286b8aef2038ee4fe9693 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Fri, 22 Feb 2019 10:00:51 -0800 Subject: meta-phosphor: drop ipmi-channel-config phosphor-host-ipmid no longer does anything with the information specified by the ipmi-channel-config, therefore drop it. (From meta-phosphor rev: 14e259d7b53de1bae200ee5c5dbf201ffd105543) Change-Id: I74057fd68ba7e46e5cf5850eaf6434cb6bb37ec9 Signed-off-by: Patrick Venture Signed-off-by: Andrew Geissler --- .../conf/distro/include/phosphor-defaults.inc | 7 ------- .../ipmi/phosphor-ipmi-channel-inventory-native.bb | 22 ---------------------- .../phosphor-ipmi-channel-inventory/channel.yaml | 6 ------ .../ipmi/phosphor-ipmi-host_git.bb | 1 - 4 files changed, 36 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb delete mode 100644 meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index b1ccbcdae..f1bc7ea27 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -160,13 +160,6 @@ PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-read-inventory ?= \ PREFERRED_PROVIDER_virtual/phosphor-ipmi-sensor-inventory ?= \ "phosphor-ipmi-sensor-inventory-native" -# The phosphor-host-ipmid application is data-driven and requires an input -# mapping of IPMI channel to DBus objects interfaces and properties. -# This virtual is a native recipe that provides that mapping by installing -# configuration files in the format and native sysroot location expected by -# the phosphor-host-ipmid build process in the native sysroot. -PREFERRED_PROVIDER_virtual/phosphor-ipmi-channel-config ?= "phosphor-ipmi-channel-inventory-native" - # The phosphor-host-ipmid application is data-driven and requires an input # yaml of entity association record metadata. # This virtual is a native recipe that provides that mapping by installing diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb deleted file mode 100644 index 043200a71..000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory-native.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Sample channel configuration for phosphor-host-ipmid" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-ipmi-host - -PROVIDES += "virtual/phosphor-ipmi-channel-config" - -SRC_URI += "file://channel.yaml" - -S = "${WORKDIR}" - -do_install() { - # This recipe is supposed to create an output yaml file with - # a sample output file. - - DEST=${D}${sensor_datadir} - install -d ${DEST} - install channel.yaml ${DEST}/channel.yaml -} diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml deleted file mode 100644 index 819f25198..000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory/channel.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# Channel Number (must be unique) is the key -1: - # ifName the ethernet device name (used in the dbus path) - ifName: eth0 -2: - ifName: eth1 diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 574d03b77..ceb3c0d7a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -33,7 +33,6 @@ DEPENDS += "sdbus++-native" DEPENDS += "virtual/phosphor-ipmi-inventory-sel" DEPENDS += "virtual/phosphor-ipmi-fru-merge-config" DEPENDS += "virtual/phosphor-ipmi-sensor-inventory" -DEPENDS += "virtual/phosphor-ipmi-channel-config" DEPENDS += "virtual/phosphor-ipmi-entity-config" DEPENDS += "boost" DEPENDS += "sdeventplus" -- cgit v1.2.3 From 3c40116a1c64fad9bf9321b481380d618a784f37 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Tue, 26 Feb 2019 18:19:00 -0800 Subject: meta-phosphor: pid-control class: delete extra slash Delete the extra slash in the phosphor-pid-control configuration file path. (From meta-phosphor rev: 679e1486fd91ec1ae423addd34e861967213736c) Change-Id: I40ecf06f68609ad7d5a9b847b63b3870d5d11ffa Signed-off-by: Patrick Venture Signed-off-by: Andrew Geissler --- meta-phosphor/classes/phosphor-pid-control.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/classes/phosphor-pid-control.bbclass b/meta-phosphor/classes/phosphor-pid-control.bbclass index 482b218db..3f69338aa 100644 --- a/meta-phosphor/classes/phosphor-pid-control.bbclass +++ b/meta-phosphor/classes/phosphor-pid-control.bbclass @@ -1,5 +1,5 @@ config_datadir="${datadir}/swampd/" # config_path is the location swampd expects to find a json configuration. # the file is expected to be named config.json -config_path="${config_datadir}/config.json" +config_path="${config_datadir}config.json" -- cgit v1.2.3 From a4ec3d8d416442eef95d173a0afdfb8e208cb670 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Mon, 25 Feb 2019 13:35:37 -0600 Subject: Remove obmc-mgr-system This package has been deprecated and not being used on any layer anymore. (From meta-phosphor rev: 44b0e50169be04b2780ad26346f1ff02922d2163) Change-Id: If4e22c1db5f104008b4af8ec12ab14739a87c562 Signed-off-by: Adriana Kobylak Signed-off-by: Andrew Geissler --- .../org.openbmc.managers.System.service | 16 --------------- .../recipes-phosphor/system/obmc-mgr-system_git.bb | 23 ---------------------- 2 files changed, 39 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service delete mode 100644 meta-phosphor/recipes-phosphor/system/obmc-mgr-system_git.bb diff --git a/meta-phosphor/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service b/meta-phosphor/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service deleted file mode 100644 index 9d1761fd8..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-mgr-system/org.openbmc.managers.System.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Phosphor System Manager -Wants=obmc-mapper.target -After=obmc-mapper.target - -[Service] -Restart=always -ExecStart=/usr/bin/env system_manager.py -SyslogIdentifier=system_manager.py -Type=dbus -BusName={BUSNAME} -Environment="PYTHONUNBUFFERED=1" -TimeoutStartSec=180s - -[Install] -WantedBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-phosphor/recipes-phosphor/system/obmc-mgr-system_git.bb b/meta-phosphor/recipes-phosphor/system/obmc-mgr-system_git.bb deleted file mode 100644 index fa80d0a68..000000000 --- a/meta-phosphor/recipes-phosphor/system/obmc-mgr-system_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "OpenBMC system manager" -DESCRIPTION = "OpenBMC system manager." -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit skeleton-python -inherit obmc-phosphor-dbus-service - -VIRTUAL-RUNTIME_skeleton_workbook ?= "" - -RDEPENDS_${PN} += "\ - python-dbus \ - python-json \ - python-subprocess \ - python-pygobject \ - pyphosphor \ - pyphosphor-dbus \ - ${VIRTUAL-RUNTIME_skeleton_workbook} \ - " - -SKELETON_DIR = "pysystemmgr" - -DBUS_SERVICE_${PN} += "org.openbmc.managers.System.service" -- cgit v1.2.3 From 33f1efdb1e8c6d347f9197585f134ec0f6bb35a3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 5 Mar 2019 11:42:34 +0000 Subject: phosphor-snmp: srcrev bump 9d18e56285..7f1c6e1d2e Patrick Venture (1): build: pkg anti-pattern: use defaults (From meta-phosphor rev: 228633b17dd7c684ca2f6044881e46a2f4f8011a) Change-Id: Ib52260c7341d4dfb6eea31a208fef477d9f3d6ca Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb index e011a5a90..b00067f3f 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb @@ -12,7 +12,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/phosphor-snmp" -SRCREV = "9d18e562853f522d12fcdfeea59436a848b66c50" +SRCREV = "7f1c6e1d2e0f3d149574edb610b303aa26bc2078" DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.SNMP.service" -- cgit v1.2.3 From b5d66e004501d5ee7fea9ab2d0cbf85f278772d8 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 5 Mar 2019 11:41:24 +0000 Subject: phosphor-networkd: srcrev bump 639cfe1f50..3f19a51e5f Patrick Venture (1): test: use mocked sdbus interface for sdbusplus (From meta-phosphor rev: 9b6de0f019b6d9f4bba4da30ccdc096fac724b20) Change-Id: Idc968d05d479695ec9949a692ed3cffb29739281 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/classes/phosphor-networkd-rev.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index a828f0693..1273e6537 100644 --- a/meta-phosphor/classes/phosphor-networkd-rev.bbclass +++ b/meta-phosphor/classes/phosphor-networkd-rev.bbclass @@ -1,2 +1,2 @@ SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "639cfe1f509657547d594b4d38bb215b85110c50" +SRCREV = "3f19a51e5fcf369645585818b282a1c381b6d92c" -- cgit v1.2.3 From 3568828cae94f5a4e2f0da85867bf12f32127998 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 5 Mar 2019 02:12:25 +0000 Subject: phosphor-debug-collector: srcrev bump 6d7f753ba7..fa180596fe Patrick Venture (1): build: pkg anti-pattern: use defaults (From meta-phosphor rev: 6e5e407d9b3336b56932b09fbd14775ceecc6905) Change-Id: I8184b8a4cd5a161675c3507cd9893dbab32b4fed Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/logging/ffdc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb index 3ebc8e35d..c97afb73b 100644 --- a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb @@ -14,7 +14,7 @@ RDEPENDS_${PN} += " \ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "6d7f753ba7ecc2dd062758a46ef77ce5c44b9bdb" +SRCREV = "fa180596fe2a3c6fe65e48055e02e0c3e4ef5977" do_install() { install -d ${D}${bindir} -- cgit v1.2.3 From 0e088eb9feffaac199ed84927afed37d408cd937 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 5 Mar 2019 02:11:47 +0000 Subject: phosphor-debug-collector: srcrev bump 6d7f753ba7..fa180596fe Patrick Venture (1): build: pkg anti-pattern: use defaults (From meta-phosphor rev: 8f64091684be16f5b3cf404e1a3a4fef849d4025) Change-Id: Ic5107fc354fdd4dd90cf1aacd0efef75f5db220e Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 2899824db..f49201721 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "6d7f753ba7ecc2dd062758a46ef77ce5c44b9bdb" +SRCREV = "fa180596fe2a3c6fe65e48055e02e0c3e4ef5977" -- cgit v1.2.3 From fbd9a468825eebe70bbcd0f165d2eafdd64f97f5 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 5 Mar 2019 01:32:03 +0000 Subject: rest-dbus: srcrev bump 403ce23066..9273a302e8 James Feist (1): Make bools correctly display as booleans (From meta-phosphor rev: 47cb162fb2cda6479c140206508867276112a9e7) Change-Id: Ib632dcc2ba4d1baac223b5a63597a4e75f43c7d1 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb index 96e76e6f3..7037ef92b 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb @@ -22,6 +22,6 @@ SYSTEMD_SERVICE_${PN} += "rest-dbus.service rest-dbus.socket" SRC_URI += "git://github.com/openbmc/rest-dbus.git" -SRCREV = "403ce23066a8b0f0dca23220530b8760748b168e" +SRCREV = "9273a302e8f2b3c3e939dff77758e90f163bf6a1" S = "${WORKDIR}/git" -- cgit v1.2.3 From 6ff91cab64029204c5182f81cdf95b88d252b29b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 4 Mar 2019 22:11:32 +0000 Subject: sdbusplus: srcrev bump 3a3bb9e932..b5982abaa8 Waqar Hameed (1): message: Add constructor with an int parameter for unix_fd (From meta-phosphor rev: 3701643d8d0610ddd61b15d02159daff10503268) Change-Id: I5ea27ea02f0dc4afca5233c33c6c1e982fa19e9d Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index c650fb650..4dbf8d0d6 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -37,7 +37,7 @@ DEPENDS_append_class-native = " \ " SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "3a3bb9e932b2306dafd33ddd2eb31d61ff89b3fb" +SRCREV = "b5982abaa8c73698089a2d8d49f371f07198683e" PACKAGECONFIG ??= "libsdbusplus transaction" PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd" -- cgit v1.2.3 From d67a12373b4fbbe3453b3f9ca9b1d86407dfcfd1 Mon Sep 17 00:00:00 2001 From: Joseph Reynolds Date: Thu, 3 Jan 2019 16:42:18 -0600 Subject: Docs: Update features This updates the list of OpenBMC features and links to the feature TOC in the docs repository. Tested: via copy/paste into: https://dillinger.io Change-Id: I3c9fdbb0fb87b3524550ee95ae7e37f623885bed Signed-off-by: Joseph Reynolds --- README.md | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index e27a9fb0c..301f612e2 100644 --- a/README.md +++ b/README.md @@ -96,38 +96,31 @@ a new one. ## Features of OpenBMC **Feature List** -* REST Management -* IPMI -* SSH based SOL -* Power and Cooling Management -* Event Logs -* Zeroconf discoverable -* Sensors -* Inventory -* LED Management -* Host Watchdog -* Simulation +* Host management: Power, Cooling, LEDs, Inventory, Events, Watchdog +* Full IPMI 2.0 Compliance with DCMI * Code Update Support for multiple BMC/BIOS images +* Web-based user interface +* REST interfaces +* D-Bus based interfaces +* SSH based SOL +* Remote KVM +* Hardware Simulation +* Automated Testing **Features In Progress** -* Full IPMI 2.0 Compliance with DCMI +* OpenCompute Redfish Compliance +* User management +* Virtual media * Verified Boot -* HTML5 Java Script Web User Interface -* BMC RAS **Features Requested but need help** -* OpenCompute Redfish Compliance * OpenBMC performance monitoring -* cgroup user management and policies -* Remote KVM -* Remote USB -* OpenStack Ironic Integration -* QEMU enhancements ## Finding out more -Dive deeper in to OpenBMC by opening the [docs](https://github.com/openbmc/docs) -repository. + +Dive deeper into OpenBMC by opening the +[docs](https://github.com/openbmc/docs) repository. ## Contact - Mail: openbmc@lists.ozlabs.org [https://lists.ozlabs.org/listinfo/openbmc](https://lists.ozlabs.org/listinfo/openbmc) -- cgit v1.2.3 From 889dcc3da248b1fe6d841f249f1afc5f5a164b49 Mon Sep 17 00:00:00 2001 From: Gunnar Mills Date: Fri, 1 Mar 2019 17:28:42 -0600 Subject: Add Stale bot config Added .github/stale.yml which Stale bot, https://github.com/apps/stale, uses as a config. 6 months of inactivity must pass to mark an issue as stale and 1 month of inactivity before a stale issue is closed. See https://lists.ozlabs.org/pipermail/openbmc/2019-February/015022.html Tested: Changed to 1 day and 1 day and pushed this config to a private repo where I had installed Stale bot. See https://github.com/gtmills/test-stale-bot/issues/1 Change-Id: Ibc124913ed471bff6d52ca1e6c39b16584310ee5 Signed-off-by: Gunnar Mills --- .github/stale.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 000000000..55b152a8c --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,23 @@ +# Stale bot config https://github.com/apps/stale + +# Number of days of inactivity before an issue becomes stale (6 months) +daysUntilStale: 183 + +# Number of days of inactivity before a stale issue is closed +daysUntilClose: 30 + +# Label to use when marking an issue as stale +staleLabel: stale + +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because no activity has + occurred in the last 6 months. It will be closed if no activity occurs in the + next 30 days. If this issue should not be closed please add a comment. + Thank you for your understanding and contributions. + +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: > + This issue has been closed because no activity has occurred in the last 7 + months. Please reopen if this issue should not have been closed. Thank you + for your contributions. -- cgit v1.2.3 From ef7893b26574be01a98bbc52cb453067e9bd7658 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Mar 2019 19:05:14 -0600 Subject: poky: refresh thud: 7c76c5d78b..f5a57e939e Update poky to thud HEAD. Denys Dmytriyenko (1): openssl10: Fix mutliple include assumptions for des.h in opensslconf.h Hongxu Jia (1): rng-tools: Fix crazy defaults Ross Burton (1): mesa: ship /etc/drirc in mesa-megadriver Change-Id: Ia0e006f99bd56df0a2fa09fc6fffc5c8347e1288 Signed-off-by: Andrew Geissler --- .../openssl10/0001-Fix-DES_LONG-breakage.patch | 35 ++++++++++++++++++++++ .../openssl/openssl10_1.0.2q.bb | 1 + poky/meta/recipes-graphics/mesa/mesa.inc | 6 ++-- .../rng-tools/rng-tools/rngd.service | 2 +- 4 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 poky/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch diff --git a/poky/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch b/poky/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch new file mode 100644 index 000000000..7243fb417 --- /dev/null +++ b/poky/meta/recipes-connectivity/openssl/openssl10/0001-Fix-DES_LONG-breakage.patch @@ -0,0 +1,35 @@ +From 1aec49cc45e7cf5ebc059a77081ac3ea2a5aff7b Mon Sep 17 00:00:00 2001 +From: Denys Dmytriyenko +Date: Fri, 1 Mar 2019 13:14:56 -0500 +Subject: [PATCH] Fix DES_LONG breakage + +Mimic previous BN_LLONG fix by Khem Raj here. Re-use its description: + +opensslconf.h is defining DES_LONG only when included from des.h which +is not robust at all, especially when include guards are used and +multiple inclusions of a given header is not allowed. so lets take out +the nesting constraint and add OPENSSL_SYS_UEFI constraint instead + +Upstream-Status: Inappropriate [ fixed differently with OpenSSL 1.1+ ] + +Signed-off-by: Denys Dmytriyenko +--- + crypto/opensslconf.h.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in +index a10c10f..0147a4d 100644 +--- a/crypto/opensslconf.h.in ++++ b/crypto/opensslconf.h.in +@@ -48,7 +48,7 @@ + #endif + #endif + +-#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) ++#if !defined(OPENSSL_SYS_UEFI) && !defined(DES_LONG) + /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a + * %20 speed up (longs are 8 bytes, int's are 4). */ + #ifndef DES_LONG +-- +2.7.4 + diff --git a/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb b/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb index 355dbdcc6..54af100f9 100644 --- a/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb +++ b/poky/meta/recipes-connectivity/openssl/openssl10_1.0.2q.bb @@ -41,6 +41,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \ file://0001-allow-manpages-to-be-disabled.patch \ file://0001-Fix-BN_LLONG-breakage.patch \ + file://0001-Fix-DES_LONG-breakage.patch \ " SRC_URI_append_class-target = " \ diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index 0cc0a82de..f47f1aa20 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -141,8 +141,6 @@ do_install_append () { rm -f ${D}${libdir}/gallium-pipe/*.la rm -f ${D}${libdir}/gbm/*.la - # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used - rm -f ${D}${sysconfdir}/drirc chrpath --delete ${D}${libdir}/dri/*_dri.so || true # libwayland-egl has been moved to wayland 1.15+ @@ -209,8 +207,8 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " PACKAGES_DYNAMIC += "^mesa-driver-.*" -FILES_${PN} += "${sysconfdir}/drirc" -FILES_mesa-megadriver = "${libdir}/dri/*" +FILES_${PN} = "" +FILES_mesa-megadriver = "${libdir}/dri/* ${sysconfdir}" FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" FILES_libegl-mesa = "${libdir}/libEGL.so.*" FILES_libgbm = "${libdir}/libgbm.so.*" diff --git a/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service b/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service index cb8102442..f0355db14 100644 --- a/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service +++ b/poky/meta/recipes-support/rng-tools/rng-tools/rngd.service @@ -5,7 +5,7 @@ After=systemd-udev-settle.service Before=sysinit.target [Service] -ExecStart=@SBINDIR@/rngd -f -r /dev/urandom +ExecStart=@SBINDIR@/rngd -f -r /dev/hwrng SuccessExitStatus=66 [Install] -- cgit v1.2.3 From 36ee1976b77bc6731e94ffabaedaed66128429a4 Mon Sep 17 00:00:00 2001 From: FranHsu Date: Fri, 22 Feb 2019 19:25:01 +0800 Subject: meta-gsj: Add kernel configuration for GSJ board. Tested: Build Quanta GSJ board and load on the EVB. Ensure that BMC boots to console. (From meta-quanta rev: 6e899862f90575f772dff209f8cd3da0cb4a85c2) Change-Id: I016b3992032ca72932260793870d3d1e6c710ff0 Signed-off-by: FranHsu Signed-off-by: Andrew Geissler --- .../recipes-kernel/linux/linux-nuvoton/gsj.cfg | 48 ++++++++++++++++++++++ .../recipes-kernel/linux/linux-nuvoton_%.bbappend | 2 + 2 files changed, 50 insertions(+) create mode 100644 meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton/gsj.cfg create mode 100644 meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend diff --git a/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton/gsj.cfg b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton/gsj.cfg new file mode 100644 index 000000000..9435516b4 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton/gsj.cfg @@ -0,0 +1,48 @@ +CONFIG_HWMON=y +CONFIG_SENSORS_LM75=y +CONFIG_SENSORS_FAN=y + +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y + +CONFIG_OVERLAY_FS=y +CONFIG_SQUASHFS=y +CONFIG_SQUASHFS_XZ=y +CONFIG_JFFS2_FS=y + +CONFIG_MTD_M25P80=y +CONFIG_SPI_NPCM_FIU=y +CONFIG_SPI=y +CONFIG_SPI_NPCM_PSPI=y + +CONFIG_NET_NCSI=y + +CONFIG_EEPROM_AT24=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y +CONFIG_I2C_SLAVE_EEPROM=y +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_GPIO_PCF857X=y +CONFIG_PMBUS=y +CONFIG_SENSORS_PMBUS=y +CONFIG_SENSORS_ADM1275=y +CONFIG_MUX_MMIO=y +CONFIG_USB_U_ETHER=y +CONFIG_USB_F_ECM=y +CONFIG_USB_F_EEM=y +CONFIG_USB_F_SUBSET=y +CONFIG_USB_F_RNDIS=y +CONFIG_USB_F_MASS_STORAGE=y +CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_HID=y diff --git a/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend new file mode 100644 index 000000000..e4ccc6cca --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/linux-nuvoton:" +SRC_URI += "file://gsj.cfg" -- cgit v1.2.3 From 193d0c5881b2a612dffce3b77f54241b9e6d3a96 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Mar 2019 01:52:04 +0000 Subject: ipmbbridge: srcrev bump a8c77dc857..25e85c7925 Jae Hyun Yoo (1): Suppress I2C error logs while it's retrying (From meta-phosphor rev: ff0cb84fb574a84e8dbd78d342804d816df8a856) Change-Id: Iaf643981871cf3c21824cb19ff3059cb1538a23a Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb index 3c04d82ec..1fe13d7e3 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "The IPMB bridge implements a Dbus compliant interface for \ implementing IPMB interfaces" SRC_URI = "git://github.com/openbmc/ipmbbridge.git" -SRCREV = "a8c77dc857fdf7fc049b975c3b3a6be11e7ea4c0" +SRCREV = "25e85c79257723b1cb754c20299196685373ce24" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From e023b91a5cc7bcc42454a11c4a934405f5a00fd7 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 5 Mar 2019 22:32:25 +0000 Subject: phosphor-webui: srcrev bump 6d1d6005ab..eedf0b929e Gunnar Mills (1): Hardware: Filter out associations (From meta-phosphor rev: e4b7748c9a12e5c1ebe4494608505f817cc4b176) Change-Id: I294244c1e06611b16122e4ea92d9ca81eaf61d8e Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index d8453fe9b..7e0c31d2c 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 = "6d1d6005abc6cb48144ad5be9cd8fb094f8ff3c2" +SRCREV = "eedf0b929ea5e8e0c638ffe569f680b08dc6f6a5" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From 6c687ba384c3faa95bab64a8026771cfec9fcae6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Mar 2019 22:02:04 +0000 Subject: bmcweb: srcrev bump be12c72919..f1eebf06f7 Ed Tanous (2): Move some include headers to a less specific folder Fix some static analysis bugs beccabroek (1): Redfish remove buildDate property from system raviteja-b (1): Redfish(Network): Support the PATCH operation of HostName property (From meta-phosphor rev: 48208ebdf280938f2ca08ef20dda2d089b23172a) Change-Id: Ifbcceca61df44ec115a43ef18a8c79f8243e5f69 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index dc3665ebe..16c50de3a 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "be12c7291914b8a6dd7d6e78f1a500708b0f20f9" +SRCREV = "f1eebf06f717d8561ff9bef2828c420ef051cb05" S = "${WORKDIR}/git" -- cgit v1.2.3 From 3821fce557fd422b9ec47a413161e6597b58a5b7 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Mar 2019 21:52:47 +0000 Subject: phosphor-watchdog: srcrev bump 976764158a..b933771042 William A. Kennington III (1): meson: Add alternate build system (From meta-phosphor rev: 32db1be03f67120ccaa21a2b0c77a9305c1491f1) Change-Id: I7fd312f0615f0756d128e9cbbc8d4cda2825b908 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb index d1e75fabc..7f44590ed 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb @@ -22,7 +22,7 @@ RDEPENDS_${PN} += "libsystemd" RDEPENDS_${PN} += "phosphor-logging" SRC_URI += "git://github.com/openbmc/phosphor-watchdog" -SRCREV = "976764158af29113103a9a6acd8911f4f06c6b27" +SRCREV = "b93377104292de0f94087c0cbb79d4d6d8516b84" S = "${WORKDIR}/git" # Copies config file having arguments for host watchdog -- cgit v1.2.3 From d5f1bee814241fe1de5360167c19eeb9f47b69ae Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Mar 2019 20:32:24 +0000 Subject: phosphor-hwmon: srcrev bump 09d9c23699..27512cf82d Patrick Venture (1): Cleanup _gitignore (From meta-phosphor rev: 20fef82d78eb370c264ae86d169e559e1c2b54ee) Change-Id: I55b6d15e6c7b4d4fccf54da3f3cca16aa123405f Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index d72a4c1af..137fcb1a8 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -38,7 +38,7 @@ SRC_URI += "file://70-hwmon.rules" SRC_URI += "file://70-iio.rules" SRC_URI += "file://start_hwmon.sh" -SRCREV = "09d9c23699f625479c85724c34421c52be7b17e4" +SRCREV = "27512cf82dd7caf27a5886c050623499686d1fe8" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2fed76673029fe39fab7360b3a8185aac2008a6d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Mar 2019 18:41:48 +0000 Subject: phosphor-pid-control: srcrev bump c32e3fc5d9..94feffa5cd Patrick Venture (3): gitignore: add coverage pieces build: rework gtest checks build: enable code coverage (From meta-phosphor rev: dd56af96507d6760db3d5271c069a7dad01bfc09) Change-Id: Ifc5c62afd9b15f50e5ca2e53e66815c03add424b Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index a5e78645c..904f69c55 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -14,7 +14,7 @@ inherit obmc-phosphor-ipmiprovider-symlink S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "c32e3fc5d920967ef7fd58a7120096ba2224d41b" +SRCREV = "94feffa5cd850c18230eee79cc17edd0dd35741b" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if -- cgit v1.2.3 From a2363b772d80b3ca7a2eb6b874f8139645c57258 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Mar 2019 18:22:30 +0000 Subject: phosphor-user-manager: srcrev bump 5e8ccb979c..a929752bef Brad Bishop (1): MAINTAINERS: Remove myself, add Ratan and Richard Ratan Gupta (1): Corrected the error log message. (From meta-phosphor rev: 667591a83c942bb37b96b5dd72428ff57e135053) Change-Id: I8f95cabafaff7b86b6b471f12e777dcb78f54172 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb index 235981e7a..8a849238c 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -40,5 +40,5 @@ DBUS_SERVICE_phosphor-ldap = " \ xyz.openbmc_project.LDAP.PrivilegeMapper.service \ " SRC_URI += "git://github.com/openbmc/phosphor-user-manager" -SRCREV = "5e8ccb979c80044e0fa608f269f55b3613ecfd1c" +SRCREV = "a929752bef26e02ccd103a5669a402ba2b5d5eec" S = "${WORKDIR}/git" -- cgit v1.2.3 From 8057a40667e485c2469711df1c52450f333aecc6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 6 Mar 2019 15:52:29 +0000 Subject: phosphor-webui: srcrev bump eedf0b929e..511a2bbc55 Yang Cheng (1): Set SOL Screen dynamically (From meta-phosphor rev: 99a31c4ec8049cc0ba6d693932da277f30624565) Change-Id: I48ba00a08cda9062c360e598d718104ff18c2c7e Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 7e0c31d2c..5dbf8e4da 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 = "eedf0b929ea5e8e0c638ffe569f680b08dc6f6a5" +SRCREV = "511a2bbc5540fccb883b8d0005c2b387a23c9d05" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " -- cgit v1.2.3 From d22bc9bac60a8fb7dc452754595a544597be82de Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 7 Mar 2019 00:12:22 +0000 Subject: dbus-sensors: srcrev bump 73ca551df0..46342ec359 Jae Hyun Yoo (1): Adjust DIMM detection interval James Feist (3): Exit Air: Allow destruction ipmbsensor: Add delay to init cmd Filter ADC threshold crossings (From meta-phosphor rev: 30f9d6b6d782655cf4108c325c2fd1d3c36e19b9) Change-Id: Ic5d7534b3168616e2ef81e20459f44175759bcf0 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 3a6742757..305760a5f 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 = "73ca551df007a372e8a542d1ca5179bcfffc66ae" +SRCREV = "46342ec359c8e0ed543ebb352cfba8f26ce85afe" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 38e5955765d84b30467aa1fa3f7aef4e90522061 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 8 Mar 2019 01:32:09 +0000 Subject: phosphor-ipmi-ethstats: srcrev bump 539f03f546..a7a11f4631 Patrick Venture (3): set ENABLE_GOOGLE to boolean definition mark unused parameter as unused drop zero-length array if_name (From meta-phosphor rev: 7a12fcf653b6c56728707fedc1feae814a8d533f) Change-Id: I4d6a4517237840d88f5838774d3bfbf0ebe50d96 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb index ac19cf2e8..9b7604b04 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb @@ -14,7 +14,7 @@ DEPENDS += "phosphor-ipmi-host" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-ethstats" -SRCREV = "539f03f54621cad9edc7dee5a9b570c96f486dfe" +SRCREV = "a7a11f4631218fbdf00170342825570bc67f8f42" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From 6a263a49331787a3f7fd7a069f5887641973e899 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 8 Mar 2019 00:01:48 +0000 Subject: entity-manager: srcrev bump 550d1b5367..9945ddffc6 James Feist (1): fru-device: add extra debug print (From meta-phosphor rev: d858e9a2b070d4500ca2422592be3ed3a5386569) Change-Id: I8805307adc989fd4db7e219df1839340b923fa2c Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 9168ee13c..b86661808 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "550d1b53670e32c91ab4c6d717123a8672a92bd5" +SRCREV = "9945ddffc67a9e564a92a3c0bddf2a2d7dc70b97" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From 56def765faade30b42dc342393c086e6386bd44d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 7 Mar 2019 21:32:01 +0000 Subject: phosphor-ipmi-blobs: srcrev bump 97898c9056..fb808d1164 Patrick Venture (1): build: rework gtest checks (From meta-phosphor rev: cd1f8ba84f49c67e24844cc01c5327e9ac4200f1) Change-Id: I2e3fe5f0cdc23bde30fbbe909d8c8f15345e9044 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 939c9432d..fa01684c6 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs" -SRCREV = "97898c9056e48d2aa0ec1ec8251377c587b7caee" +SRCREV = "fb808d116407442d8cace6bcc484f3144c6c11ef" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From 45fbea04dbd390f9ca8be0ba4b08eb130ca9fcd5 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 7 Mar 2019 16:21:54 +0000 Subject: bmcweb: srcrev bump f1eebf06f7..39e77504ba Ed Tanous (1): bmcweb: /s/boost::string_view/std::string_view/g (From meta-phosphor rev: e634658a554364342348177bb69ffdd57d958179) Change-Id: I0287d1391d6bd7fc699f6214537bb8a3a1ef0dc7 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 16c50de3a..9f807bed7 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "f1eebf06f717d8561ff9bef2828c420ef051cb05" +SRCREV = "39e77504ba0d1e8de273cd54e1f000166bfa6d0d" S = "${WORKDIR}/git" -- cgit v1.2.3 From 2cefb0963ae04bb8c25af9e1d694946eed5f6578 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 7 Mar 2019 15:52:37 +0000 Subject: phosphor-hwmon: srcrev bump 27512cf82d..56c876f3a1 Patrick Venture (1): test: rework to use Pair-wise comparison (From meta-phosphor rev: 3d7d7a2826f2e42863cf78679da195794bd8cb59) Change-Id: Ib9516ac33d90b84d2c8e575ceb5d05b0efee6d11 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index 137fcb1a8..94b413210 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -38,7 +38,7 @@ SRC_URI += "file://70-hwmon.rules" SRC_URI += "file://70-iio.rules" SRC_URI += "file://start_hwmon.sh" -SRCREV = "27512cf82dd7caf27a5886c050623499686d1fe8" +SRCREV = "56c876f3a108f4f4fdbe13898ac3ba47b98b9a20" S = "${WORKDIR}/git" -- cgit v1.2.3 From ba2cdb78968d5af68008f532e007c3d75edb2b44 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 7 Mar 2019 15:52:07 +0000 Subject: phosphor-ipmi-flash: srcrev bump 98af2d1d8d..6bc04f9491 Patrick Venture (1): build: rework gtest checks (From meta-phosphor rev: 05d9faa35f3f74125812b29305a78e8ae3f611d0) Change-Id: Ifba195ba10b2919a8007786faac67ff3e24bcedf Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8484ddf5d..88b4d9500 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -16,7 +16,7 @@ DEPENDS += "sdbusplus" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "98af2d1d8dcac298fbe793683e70f1766e88856b" +SRCREV = "6bc04f9491d8ab6a68123fccfed99d30dd9e0d3c" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From d5edc3803ba1a300147844ab68658d2eaf584603 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 7 Mar 2019 15:51:46 +0000 Subject: phosphor-pid-control: srcrev bump 94feffa5cd..f42741197e Patrick Venture (1): build: add CODE_COVERAGE_CXXFLAGS everywhere (From meta-phosphor rev: 11e20b88ba117fa841410156905fe783ae27d044) Change-Id: Ief8ffabd105a480d0a38c47ce3d6c104be0e35ff Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 904f69c55..6bb1deb45 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -14,7 +14,7 @@ inherit obmc-phosphor-ipmiprovider-symlink S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "94feffa5cd850c18230eee79cc17edd0dd35741b" +SRCREV = "f42741197ec807e0436a5e519ccff18519c67248" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if -- cgit v1.2.3 From 4a41d32e3eaee566a7a6b8ab23a28a8670621c76 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 7 Mar 2019 16:57:39 +1030 Subject: linux-aspeed: Move to 4.19.27 This includes security and bug fixes from the 4.19.27 stable release. (From meta-aspeed rev: 4141fb8809bac796b9151edefd55b0ebc1c5c85d) Change-Id: Id716fed91ea62158f47263cd5563ae7894c9d2cf Signed-off-by: Joel Stanley Signed-off-by: Andrew Geissler --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index b9be23fc0..3486901af 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-4.19" -LINUX_VERSION ?= "4.19.26" +LINUX_VERSION ?= "4.19.27" -SRCREV="aca5a55b09ffa6a74d5a63fe6a908586a2ad1d80" +SRCREV="f813058c68770a1f2db222a63f80527593ad5beb" require linux-aspeed.inc -- cgit v1.2.3 From 6dbd158e122c62b12b645f78333ee70f63a83714 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 7 Mar 2019 16:58:36 +1030 Subject: linux-aspeed: Plametto DTS and MAX31725/6 driver Kun Yi (1): hwmon: (lm75) Add MAX31725/6 support Lei YU (1): ARM: dts: palmetto: Fix flash_memory region (From meta-aspeed rev: 0d30328f7a71de53f1d65e3dd45ed7dcf9aedea6) Change-Id: I73e46e36e4faa5ed32bb937728515544958a848f Signed-off-by: Joel Stanley Signed-off-by: Andrew Geissler --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 3486901af..1f0fad363 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-4.19" LINUX_VERSION ?= "4.19.27" -SRCREV="f813058c68770a1f2db222a63f80527593ad5beb" +SRCREV="7859d04be772a1d185de335a8e9d38ac03a89f3f" require linux-aspeed.inc -- cgit v1.2.3 From bafd0d0960ad8f190d1c41c539ac65d0d6bbe025 Mon Sep 17 00:00:00 2001 From: Cheng C Yang Date: Mon, 25 Feb 2019 09:28:49 +0800 Subject: Set SOL client to 100*32 resolution Change config.json to adjust SOL screen resolution to 100*32 for Intel Platform. (From meta-intel rev: fcd39a5b52f6afd6764f40d4b5b9c06da92e1e09) Change-Id: I61d6abd7e54ce97792b7609bc7be323408ccc593 Signed-off-by: Cheng C Yang Signed-off-by: Andrew Geissler --- .../meta-common/recipes-phosphor/webui/phosphor-webui/config.json | 6 ++++++ .../meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend | 8 ++++++++ 2 files changed, 14 insertions(+) create mode 100644 meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json create mode 100644 meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json new file mode 100644 index 000000000..628b4f8e8 --- /dev/null +++ b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json @@ -0,0 +1,6 @@ +{ + "customConsoleDisplaySize": { + "width": 100, + "height": 32 + } +} diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend new file mode 100644 index 000000000..ff1bfdb09 --- /dev/null +++ b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append = " file://config.json" + +do_compile_prepend() { + cp -r ${WORKDIR}/config.json ${S}/ +} + -- cgit v1.2.3 From 1dbc9850c14d4f30ed9caae5886c38e9bc2d077b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 9 Mar 2019 21:12:00 +0000 Subject: bmcweb: srcrev bump 39e77504ba..9f898f8f29 Lei YU (1): REST: Increase timeout for image upload Shawn McCarney (1): Redfish Chassis: Fix @odata.id, remove BuildDate (From meta-phosphor rev: 568fde533271fae5fcca0751e0e595c42c65dcad) Change-Id: I5cf6706712cc3a7e2e60affde4ad4eab915b1c8c Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 9f807bed7..cae280a9f 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "39e77504ba0d1e8de273cd54e1f000166bfa6d0d" +SRCREV = "9f898f8f29ba50d294ce249f4b2f41efcd14c791" S = "${WORKDIR}/git" -- cgit v1.2.3 From 3e10aaabf3cd947dc076953410f52b61d927914a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 8 Mar 2019 23:31:54 +0000 Subject: phosphor-pid-control: srcrev bump f42741197e..005d462140 Patrick Venture (1): use filesystem instead of experimental (From meta-phosphor rev: 7090766c766b373736761555c23306e19610d957) Change-Id: I551d0666f70af42e09d5d95a4e014e512c5974d0 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 6bb1deb45..8a76c504c 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -14,7 +14,7 @@ inherit obmc-phosphor-ipmiprovider-symlink S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "f42741197ec807e0436a5e519ccff18519c67248" +SRCREV = "005d46214073bb9ede18b4aa17eac8ff4ea72d7d" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if -- cgit v1.2.3 From e2141758aef8b493e0383ab7fee9cc3cbad38f90 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 8 Mar 2019 19:32:01 +0000 Subject: phosphor-ipmi-blobs: srcrev bump fb808d1164..fd4cdea449 Patrick Venture (2): build: enable code coverage build: enable valgrind (From meta-phosphor rev: e01d68fb2d36cd42fac766269c4ad63123df6e3e) Change-Id: I8c5b22c43f672af750cba71b231313ebe22e01e1 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fa01684c6..84fcae7d0 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs" -SRCREV = "fb808d116407442d8cace6bcc484f3144c6c11ef" +SRCREV = "fd4cdea449f01b910b654b78f2076cf76540619c" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From 1b98c2220533fce576bc61a3551323a7bf0f1d4d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 8 Mar 2019 17:22:29 +0000 Subject: dbus-sensors: srcrev bump 46342ec359..13f340b78e James Feist (1): Fix threshold conversion (From meta-phosphor rev: e2d83940b617e0fe9d4d73e5d7634b1ec506bb2d) Change-Id: I596fdf422eb2b3d546b0d3c11ba878cf27ec4f8c Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 305760a5f..2c654902c 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 = "46342ec359c8e0ed543ebb352cfba8f26ce85afe" +SRCREV = "13f340b78e27c6c734569432a0163523334aae8d" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From 291a25a7b2b06dc1a2ff70384d817c988b849be7 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 8 Mar 2019 17:21:59 +0000 Subject: phosphor-ipmi-ethstats: srcrev bump a7a11f4631..d087d81ae3 Patrick Venture (1): use filesystem instead of experimental (From meta-phosphor rev: 789d14647b0a9e66db19af76dcba5b09c9a59a3b) Change-Id: I81b986ea547438979314b23aee34c66c50fb4dd0 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb index 9b7604b04..7157c7e12 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_git.bb @@ -14,7 +14,7 @@ DEPENDS += "phosphor-ipmi-host" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-ethstats" -SRCREV = "a7a11f4631218fbdf00170342825570bc67f8f42" +SRCREV = "d087d81ae3cad0df1d641c87144909e46fcb20fb" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From c13b82eebd60cd38cc174994520076d8857b62fa Mon Sep 17 00:00:00 2001 From: Cheng C Yang Date: Fri, 8 Mar 2019 13:58:35 +0800 Subject: Enable Custom Key in Web SOL for Intel platform Add customKeyEnable and KeyType items in config.json to enable VT100+ Custom Key for Web SOL. Intel BIOS use VT100+ protocol for console redirection, with current xtermjs key extensions, some important keys such as Backspace, F1-F12 cannot work in Web SOL on Intel platform in BIOS setup page and UEFI shell. To support key extensions in VT100+, add some entries in config.json to enable VT100+ support in Intel platforms. (From meta-intel rev: 0e8cb4490bbae70dfbadd00a8b2eb5c3b90b7c2a) Change-Id: Icfe3de535acacbc03f187fb117a99e5bfd0dc657 Signed-off-by: Cheng C Yang Signed-off-by: Andrew Geissler --- .../meta-common/recipes-phosphor/webui/phosphor-webui/config.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json index 628b4f8e8..1543a6249 100644 --- a/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json +++ b/meta-intel/meta-common/recipes-phosphor/webui/phosphor-webui/config.json @@ -1,4 +1,6 @@ { + "customKeyEnable": true, + "keyType" : "VT100+", "customConsoleDisplaySize": { "width": 100, "height": 32 -- cgit v1.2.3 From 645ef2988be6765b043c15641ea47f49cb90f930 Mon Sep 17 00:00:00 2001 From: Amithash Prasad Date: Fri, 8 Mar 2019 14:24:26 -0800 Subject: Add support for reset, cycle and sled-cycle. Remove the requirement of the fru-id 1 from the command line. Add support to reset and cycle the server Add support to cycle the entire sled (Through the hotswap controller) Basic checks during power on/off to ensure valid initial steps. (From meta-facebook rev: af4ff94581bafa922e84b75b8eeff8b7e821328d) Change-Id: I8044e2afd52e58b095dd4ffad89e4397121a971a Signed-off-by: Amithash Prasad Signed-off-by: Andrew Geissler --- .../fb-powerctrl/files/host-poweroff.service | 2 +- .../fb-powerctrl/files/host-poweron.service | 2 +- .../recipes-fbtp/fb-powerctrl/files/power-util | 94 ++++++++++++++++------ .../recipes-fbtp/fb-powerctrl/files/setup_gpio.sh | 14 +++- 4 files changed, 85 insertions(+), 27 deletions(-) diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweroff.service b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweroff.service index 95c770837..d23ef909c 100644 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweroff.service +++ b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweroff.service @@ -5,5 +5,5 @@ After=host-gpio.service [Service] Type=oneshot -ExecStart=/usr/sbin/power-util mb 1 off +ExecStart=/usr/sbin/power-util mb off SyslogIdentifier=power-util diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweron.service b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweron.service index b070edac2..446df3850 100644 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweron.service +++ b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/host-poweron.service @@ -5,7 +5,7 @@ After=host-gpio.service [Service] Type=oneshot -ExecStart=/usr/sbin/power-util mb 1 on +ExecStart=/usr/sbin/power-util mb on SyslogIdentifier=power-util [Install] diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/power-util b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/power-util index 59f91ece7..a2261fb81 100755 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/power-util +++ b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/power-util @@ -1,48 +1,96 @@ #!/bin/bash # Usage of this utility function usage() { - echo "usage: power-util mb 1 [on|off]"; + echo "usage: power-util mb [on|off|status|cycle|reset]"; + echo " power-util sled-cycle" } GPIO_BASE=$(cat /sys/class/gpio/gpio*/base) PWR_GPIO=$(($GPIO_BASE + 32 + 3)) BMC_RDY_GPIO=$(($GPIO_BASE + 144 +1)) +PWR_GOOD=$(($GPIO_BASE + 8 + 6)) +PWR_RESET=$(($GPIO_BASE + 33)) -if [ $# -lt 3 ]; then +power_off() { + echo "Shutting down Server $2" + echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value + sleep 1 + echo 0 > /sys/class/gpio/gpio${PWR_GPIO}/value + sleep 6 + echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value +} + +power_on() { + echo "Powering on Server $2" + echo 0 > /sys/class/gpio/gpio${BMC_RDY_GPIO}/value + echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value + echo 0 > /sys/class/gpio/gpio${PWR_GPIO}/value + sleep 1 + echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value +} + +power_status() { + st=$(cat /sys/class/gpio/gpio${PWR_GOOD}/value) + if [ "$st" == "0" ]; then + echo "off" + else + echo "on" + fi +} + +power_reset() { + echo "Reset on server $2" + echo 0 > /sys/class/gpio/gpio${PWR_RESET}/value + sleep 0.1 + echo 1 > /sys/class/gpio/gpio${PWR_RESET}/value +} + +sled_cycle() { + i2cset -y 7 0x45 0xd9 c +} + +if [ $# -lt 2 ]; then echo "Total number of parameter=$#" echo "Insufficient parameter" usage; exit 0; fi -if [ $1 != "mb" ]; then - echo "Invalid parameter1=$1" - usage; - exit 0; +if [ $1 == "sled-cycle" ]; then + sled_cycle fi -if [ $2 -ne 1 ]; then - echo "Invalid parameter2=$2, Server $2 not supported" +if [ $1 != "mb" ]; then + echo "Invalid parameter1=$1" usage; exit 0; fi -if [ $3 = "on" ]; then - echo "Powering on Server $2" - echo 0 > /sys/class/gpio/gpio${BMC_RDY_GPIO}/value - echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value - echo 0 > /sys/class/gpio/gpio${PWR_GPIO}/value - sleep 1 - echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value -elif [ $3 = "off" ]; then - echo "Shutting down Server $2" - echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value - sleep 1 - echo 0 > /sys/class/gpio/gpio${PWR_GPIO}/value - sleep 6 - echo 1 > /sys/class/gpio/gpio${PWR_GPIO}/value +if [ $2 = "on" ]; then + if [ $(power_status) == "off" ]; then + power_on + fi +elif [ $2 = "off" ]; then + if [ $(power_status) == "on" ]; then + power_off + fi +elif [ $2 == "cycle" ]; then + if [ $(power_status) == "on" ]; then + power_off + else + echo "WARNING: Powering on server" + fi + power_on +elif [ $2 == "reset" ]; then + if [ $(power_status) == "on" ]; then + power_reset + else + echo "ERROR: Server not powered on" + fi +elif [ $2 == "status" ]; then + power_status else - echo "Invalid parameter3=$3" + echo "Invalid parameter2=$2" usage; fi diff --git a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/setup_gpio.sh b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/setup_gpio.sh index 4e13109cb..1b1b2e3f0 100755 --- a/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/setup_gpio.sh +++ b/meta-facebook/meta-tiogapass/recipes-fbtp/fb-powerctrl/files/setup_gpio.sh @@ -17,12 +17,22 @@ GPIO_BASE=$(cat /sys/class/gpio/gpio*/base) set_gpio_active_low $((${GPIO_BASE} + 144 +1)) high # FM_BMC_SSB_SMI_LPC_N, GPIO Q6, active low -set_gpio_active_low $((${GPIO_BASE} + 128 + 6)) high +#set_gpio_active_low $((${GPIO_BASE} + 128 + 6)) high # FP_PWR_BTN_PASS_R_N, GPIO E3, active low set_gpio_active_low $((${GPIO_BASE} + 32 + 3)) high # FP_PWR_GOOD, GPIO B6, active low -set_gpio_active_low $((${GPIO_BASE} + 8 + 6)) high +set_gpio_active_low $((${GPIO_BASE} + 8 + 6)) in + +# SYSRST_BTN_OUT_N, GPIO E1, active low +set_gpio_active_low $((${GPIO_BASE} + 32 + 1)) high + +# FP_PECI_MUX, active low +set_gpio_active_low $((${GPIO_BASE} + 212)) high + +# Set PECI Mux to high to select Peci interface +echo 1 > /sys/class/gpio/gpio$((${GPIO_BASE} + 212))/value + exit 0; -- cgit v1.2.3 From 5e4e49fccaf45bd7e594b7da534a889833d02e39 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 8 Mar 2019 19:21:35 +0000 Subject: sdbusplus: srcrev bump b5982abaa8..25ea94f6e4 Vernon Mauery (1): sd_event_wrapper must not close descriptor (From meta-phosphor rev: 5886d0f5cee0fc1864f6cd7cc7641feab3535e21) Change-Id: If6c7c7347aac1d5909f08615da519be7a7886660 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index 4dbf8d0d6..8136a753d 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -37,7 +37,7 @@ DEPENDS_append_class-native = " \ " SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "b5982abaa8c73698089a2d8d49f371f07198683e" +SRCREV = "25ea94f6e422a74261479bae6f849a4a9813121b" PACKAGECONFIG ??= "libsdbusplus transaction" PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd" -- cgit v1.2.3 From 160cd9cb6878dd36737a50c57e7146975d735c26 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 11 Mar 2019 08:12:31 +0000 Subject: phosphor-user-manager: srcrev bump a929752bef..95a2931473 Ratan Gupta (2): squash the following commits LDAP: Add the persistency for the "Enabled" property phosphor-dbus-interfaces: srcrev bump c3b1900e97..096a5af0a3 Qiang XU (1): Add intrusion sensor interface Ratan Gupta (1): Re-enable "Add few additional properties in the LDAP config" raviteja-b (1): Adding dbus method for GetUserInfo under User Manager (From meta-phosphor rev: e39cf941b88fe85eb72560f07ba23f26d7554e74) Change-Id: I65133791a575686cc1de848555c954fe39146a2f Signed-off-by: Andrew Geissler Signed-off-by: Richard Marian Thomaiyar Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 +- meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 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 8183bb220..c04c32dff 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 = "c3b1900e9754b410456e3b8d94a1026cd467f01c" +SRCREV = "096a5af0a38103e9bf121bef809c8903ee900b3c" DEPENDS_remove_class-native = "sdbus++-native" DEPENDS_remove_class-nativesdk = "sdbus++-native" diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb index 8a849238c..646add4a1 100644 --- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb @@ -40,5 +40,5 @@ DBUS_SERVICE_phosphor-ldap = " \ xyz.openbmc_project.LDAP.PrivilegeMapper.service \ " SRC_URI += "git://github.com/openbmc/phosphor-user-manager" -SRCREV = "a929752bef26e02ccd103a5669a402ba2b5d5eec" +SRCREV = "95a2931473dfa61a30e7a65606dab15ab24cd5b4" S = "${WORKDIR}/git" -- cgit v1.2.3 From 1bd1d19fad801d0b3668ab98761f678adfe48e00 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 11 Mar 2019 14:32:25 +0000 Subject: phosphor-hwmon: srcrev bump 56c876f3a1..9e997b4da9 Patrick Venture (2): test: rework gtest/gmock lookup use filesystem instead of experimental (From meta-phosphor rev: e22a66f1989646bb0e567149cc366c45a213a655) Change-Id: Idb36319bb383f7c090b96ee5f2c8dc382f88460f Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index 94b413210..ec2c9552a 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -38,7 +38,7 @@ SRC_URI += "file://70-hwmon.rules" SRC_URI += "file://70-iio.rules" SRC_URI += "file://start_hwmon.sh" -SRCREV = "56c876f3a108f4f4fdbe13898ac3ba47b98b9a20" +SRCREV = "9e997b4da98725401769ef82fe26e11c46a059d9" S = "${WORKDIR}/git" -- cgit v1.2.3 From 029b37deac70113644eee61784a6f78acb9111e2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 11 Mar 2019 17:21:56 +0000 Subject: bmcweb: srcrev bump 9f898f8f29..8afa1b9b96 Jennifer Lee (1): Redfish: Fix incorrect data of NetworkProtocol Marri Devender Rao (1): Redfish: Fix incorrect reference tag added as part of update_schemas.py script Qiang XU (1): redfish: chassis: add property of physical security Ratan Gupta (1): Redfish: Add the PATCH support for user locked property. Richard Marian Thomaiyar (2): Patch support for sensor overrride Fix typelist for fan in Thermal schema Santosh Puranik (1): Support for boot properties (From meta-phosphor rev: c86c6336d3f074dcf28962edc5a6e1a370935786) Change-Id: Idacf4ac351740a7672945d8f7fd97793a5a9f299 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index cae280a9f..3bb9aed4a 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "9f898f8f29ba50d294ce249f4b2f41efcd14c791" +SRCREV = "8afa1b9b96aeb2ebebc3d40a7ffd69fc3537bab1" S = "${WORKDIR}/git" -- cgit v1.2.3 From 1bbfcfa78b2ef9e396c38a1b6006eec8fabdf644 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 11 Mar 2019 16:41:52 +0000 Subject: phosphor-pid-control: srcrev bump 005d462140..6d31049a4e Patrick Venture (1): experiment: cppcheck cleanup (From meta-phosphor rev: e5ad9ec48ea6582555df1015ab7b1e475c13f920) Change-Id: Iea7ce7595a75ed88040f9a0efc4910adb543d365 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 8a76c504c..607f36cd2 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -14,7 +14,7 @@ inherit obmc-phosphor-ipmiprovider-symlink S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "005d46214073bb9ede18b4aa17eac8ff4ea72d7d" +SRCREV = "6d31049a4eb38f7b86874e9286c771ae0dd5f14d" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if -- cgit v1.2.3 From 9f7c1a457eaf5a9cd190912ae50f314f04796fb5 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Thu, 7 Mar 2019 10:47:37 -0800 Subject: meta-phosphor: add recipe for ipmi-blob-tool Add a recipe for ipmi-blob-tool. This repository cannot have BMC-specific dependencies, but BMC-specific code can depend on it. (From meta-phosphor rev: ea8434251c23a9601791cb5cacdef8fba74ef589) Change-Id: Icdcbc3f7b5041c538e98d1f9c3ec9cfa999a9d29 Signed-off-by: Patrick Venture Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb new file mode 100644 index 000000000..164283fd4 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -0,0 +1,15 @@ +HOMEPAGE = "http://github.com/openbmc/ipmi-blob-tool" +SUMMARY = "Library and Host-side tool for talking to OpenBMC IPMI BLOB handlers." +DESCRIPTION = "This package provides a library for the BMC and host for core blob mechanics and host-side binaries for talking to OpenBMC IPMI BLOB handlers." +PR = "r1" +PV = "0.1+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +inherit autotools pkgconfig + +DEPENDS += "autoconf-archive-native" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" +SRCREV = "1681f7ff9fe112a0c3c318d562f4b46489eea02c" -- cgit v1.2.3 From a9f19bd42b40a2cd3e0fc4f33740e1a74e36f5ed Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Thu, 7 Mar 2019 10:51:53 -0800 Subject: meta-phosphor: ipmi-flash depends on ipmi-blob-tool The BMC-side and host-side of phosphor-ipmi-flash will require materials provided by ipmi-blob-tool. (From meta-phosphor rev: f0bb2a90e46de96902629bcbdba21bf8f967c403) Change-Id: I864d7382a5a23d5bd1509184c9d31e2264137e78 Signed-off-by: Patrick Venture Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 1 + 1 file changed, 1 insertion(+) 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 88b4d9500..2f6fb59d2 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -13,6 +13,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "phosphor-ipmi-blobs" DEPENDS += "phosphor-logging" DEPENDS += "sdbusplus" +DEPENDS += "ipmi-blob-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -- cgit v1.2.3 From 6ae49a5a912d3c035cde199e178ea7f89a6229ad Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Thu, 7 Mar 2019 10:53:50 -0800 Subject: meta-phosphor: ipmi-blobs depends on ipmi-blob-tool The BMC-side of phosphor-ipmi-blobs will require materials provided by ipmi-blob-tool. (From meta-phosphor rev: a007bef18d3bf6e633fcaf0f763364f0d5013b67) Change-Id: Iaf942a58f900e950a9ad9c1ae3168d944abf8389 Signed-off-by: Patrick Venture Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb | 1 + 1 file changed, 1 insertion(+) 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 84fcae7d0..94658067c 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb @@ -12,6 +12,7 @@ inherit obmc-phosphor-ipmiprovider-symlink DEPENDS += "autoconf-archive-native" DEPENDS += "phosphor-ipmi-host" DEPENDS += "phosphor-logging" +DEPENDS += "ipmi-blob-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs" -- cgit v1.2.3 From 0647c29f97f806e7f20f6586cd32eb1a74f46e61 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Mon, 11 Mar 2019 08:45:12 -0700 Subject: meta-phosphor: pid-control: add cli11 dependency Add cli11 dependency for build. (From meta-phosphor rev: d0742562ef9e8853d9e22cebf460c57064c2e747) Change-Id: If3efd7a28c63e816fb61b490c2a18a81c55b0408 Signed-off-by: Patrick Venture Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 607f36cd2..5cbbe408d 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -28,6 +28,7 @@ DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" DEPENDS += "libevdev" DEPENDS += "nlohmann-json" +DEPENDS += "cli11" # We depend on this to be built first so we can build our providers. DEPENDS += "phosphor-ipmi-host" -- cgit v1.2.3 From c1b3aa3267acc50889652acf08518d8c5aebb97f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 12 Mar 2019 06:31:33 +0000 Subject: phosphor-networkd: srcrev bump 3f19a51e5f..04c3d714ba Patrick Venture (1): test: rtnetlink: use manager interface query (From meta-phosphor rev: 3ebadc3376f274f6a46d3374a81576e80cb4c015) Change-Id: I54646bb29eade6b358b3cedabe9de677b2445e2f Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/classes/phosphor-networkd-rev.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index 1273e6537..a54247596 100644 --- a/meta-phosphor/classes/phosphor-networkd-rev.bbclass +++ b/meta-phosphor/classes/phosphor-networkd-rev.bbclass @@ -1,2 +1,2 @@ SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "3f19a51e5fcf369645585818b282a1c381b6d92c" +SRCREV = "04c3d714ba0129f4746967f2d98985bae2b0a8fd" -- cgit v1.2.3 From ace574f3136a6b19f6a33c6fb462ac9649be64ee Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 11 Mar 2019 22:21:54 +0000 Subject: bmcweb: srcrev bump 8afa1b9b96..5c6221ac85 Gunnar Mills (1): Fix IndicatorLED "Blinking" value Richard Marian Thomaiyar (1): Fix: Power & Thermal patch method role update (From meta-phosphor rev: 96701c6039b2ca270d34416c682f81e948625f9a) Change-Id: If486ed02ccd0b7a99d3c86b5a276e3db6d3187e3 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 3bb9aed4a..77c93e628 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "8afa1b9b96aeb2ebebc3d40a7ffd69fc3537bab1" +SRCREV = "5c6221ac85ce72a612f7001246fb5a7ab521c7a5" S = "${WORKDIR}/git" -- cgit v1.2.3 From 70750e3076dada93f9e4279408aa24ee8fdf62a6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 11 Mar 2019 21:42:02 +0000 Subject: phosphor-ipmi-flash: srcrev bump 6bc04f9491..2bd7021d9a Patrick Venture (1): use filesystem instead of experimental (From meta-phosphor rev: ac4a569b462ed3ad02be3a69369f0a549b40f4a3) Change-Id: I7d02bc51bf743f5b0e3478802a297db8e8e910d1 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2f6fb59d2..7dd4cfcf2 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -17,7 +17,7 @@ DEPENDS += "ipmi-blob-tool" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "6bc04f9491d8ab6a68123fccfed99d30dd9e0d3c" +SRCREV = "2bd7021d9adbcc63fda3d904b24e47820b735bad" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From c13f46e1deabb6ba19e818ce5050ccfbebc6d070 Mon Sep 17 00:00:00 2001 From: Yuan Yao Date: Fri, 7 Dec 2018 18:09:48 +0800 Subject: meta-hxt: add soc update script Add a simple script to help update the soc(host) firmware by flashcp. Usage: Format: socupdate.sh FileName IP Example: socupdate.sh 0ACJAXXX.ROM 192.168.1.1 (From meta-hxt rev: 5679e42877a21303207011a2f8ec3e643b5e76b2) Change-Id: I44da894bdbe048c7a79ec30bedd006918e1ae2d2 Signed-off-by: Yuan Yao Signed-off-by: Andrew Geissler --- .../recipes-phosphor/socupdate/files/socupdate.sh | 129 +++++++++++++++++++++ .../recipes-phosphor/socupdate/socupdate.bb | 13 +++ 2 files changed, 142 insertions(+) create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/files/socupdate.sh create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/files/socupdate.sh b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/files/socupdate.sh new file mode 100644 index 000000000..640ad767b --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/files/socupdate.sh @@ -0,0 +1,129 @@ +#!/bin/sh -e +# SOC update tool, need two parameter(soc update file name and TFTP ip) + +if [ ! -n "$1" -o ! -n "$2" ] ;then + echo "Please enter SOC-ImageName and TFTP-IP." + echo "Format: socupdate.sh FileName IP" + echo "Example: socupdate.sh 0ACJAXXX.ROM 192.168.1.1" + exit +fi + +echo "SOC update start." + +echo "Check BMC status." +checkbmc='gpioutil -p Q4' +if $checkbmc = "1"; then + echo "BMC is ready." +else + echo "BMC isn't ready." + exit +fi + +echo "Check SOC image does it exist." +cd /tmp/ +FILEEXIST=0 +if [ -f "/tmp/$1" ]; then + GETFILE=`du -k $1 | awk '{print $1}'` + if [ "$GETFILE" -eq "65536" ]; then + FILEEXIST=1 + echo "SOC image is exist." + else + FILEEXIST=0 + fi +fi + +if [ $FILEEXIST -eq 0 ]; then + echo "Get SOC image from TFTP server." + echo "Please wait a few minutes." + tftp -g -r $1 $2 & + sleep 2 + LENGTH=0 + ERRCOUNT=0 + while true + do + echo -ne "\r[" + usleep 500000 + while [ $LENGTH -le 30 ] + do + usleep 500000 + echo -n ">" + LENGTH=$(($LENGTH+1)) + if [ -f "/tmp/$1" ]; then + GETFILE=`du -k $1 | awk '{print $1}'` + if [ $GETFILE -eq 65536 ]; then + echo -en "\r" + echo -en "--- Image download completed --- \n" + usleep 1000000 + break 2 + fi + else + ERRCOUNT=$(($ERRCOUNT+1)) + if [ $ERRCOUNT -le 10 ]; then + echo -en "\r" + echo -en "SOC-ImageName or TFTP-IP is ERROR. \n" + usleep 500000 + exit + fi + fi + done + echo -n "]" + LENGTH=0 + usleep 500000 + echo -en "\r " + done +fi +sleep 3 + +echo "Switch the host SPI bus to BMC." +cmd='gpioutil -p C7 -v 1' +if $cmd 1>/dev/null 2>&1; then + echo "Switch completed." +else + echo "Switch failed." +fi +echo "Load the ASpeed SMC driver" +echo 1e630000.flash-controller > /sys/bus/platform/drivers/aspeed-smc/bind +sleep 2 +chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}') +echo "---Current Chassisstate $chassisstate---" +if [ "$chassisstate" == 'On' ]; +then + echo "---Chassis on turning it off---" + obmcutil chassisoff + sleep 10 +fi + +echo "Flashcp to update SOC." +echo "Please wait a few minutes." +flashcp -v /tmp/$1 /dev/mtd6 +sleep 3 + +echo "Switch the host SPI bus to HOST." +cmd1='gpioutil -p C7 -v 0' +if $cmd1 1>/dev/null 2>&1; then + echo "Switch completed." +else + echo "Switch failed." +fi +echo "unLoad the ASpeed SMC driver" +echo 1e630000.flash-controller > /sys/bus/platform/drivers/aspeed-smc/unbind +echo -ne "SOC update steps is complete.\n" +if [ "$chassisstate" == 'On' ]; +then + echo "5 sec later will be power-on." + echo "If wantn't power-on, please CTRL + C leave script." + WAITSEC=5 + while [ $WAITSEC -ge 0 ] + do + echo -n "Countdown seconds:$WAITSEC" + sleep 1 + echo -en "\r" + WAITSEC=$(($WAITSEC-1)) + if [ $WAITSEC -eq 0 ]; then + echo -en "\r" + echo -en "--- Power-on --- \n" + obmcutil chassison + break 1 + fi + done +fi diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb new file mode 100644 index 000000000..e2ae60afb --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/socupdate/socupdate.bb @@ -0,0 +1,13 @@ +SUMMARY = "HXT SOC update" +DESCRIPTION = "A sample script to help update the host(soc) firmware" +HOMEPAGE = "" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${HXTBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +SRC_URI += "file://socupdate.sh" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/socupdate.sh ${D}${bindir}/socupdate.sh +} -- cgit v1.2.3 From 88e7a15a69c32ee7d040216c585291670f3b98b4 Mon Sep 17 00:00:00 2001 From: Yuan Yao Date: Fri, 7 Dec 2018 18:10:04 +0800 Subject: meta-hxt: add sol support (From meta-hxt rev: 983f81795dcfb10acd7a9a138206476a0a3a1bb0) Change-Id: I745e731c32cfaf3c8e367a56b596dc2e6140a01f Signed-off-by: Yuan Yao Signed-off-by: Andrew Geissler --- .../recipes-phosphor/console/obmc-console/obmc-console.conf | 2 ++ .../recipes-phosphor/console/obmc-console_%.bbappend | 2 ++ .../console/stardragon4800-rep2-console-client.bb | 10 ++++++++++ .../stardragon4800-rep2-console-client.sh | 5 +++++ .../stardragon4800-rep2-console-client@.service | 9 +++++++++ 5 files changed, 28 insertions(+) create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console/obmc-console.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console_%.bbappend create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client.sh create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client@.service diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console/obmc-console.conf new file mode 100644 index 000000000..85f35c190 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -0,0 +1,2 @@ +local-tty = ttyS2 +local-tty-baud = 115200 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console_%.bbappend b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console_%.bbappend new file mode 100644 index 000000000..91909f129 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/obmc-console_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend_stardragon4800-rep2 := "${THISDIR}/${PN}:" +OBMC_CONSOLE_HOST_TTY = "ttyS2" diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb new file mode 100644 index 000000000..879f7a520 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client.bb @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend_stardragon4800-rep2 := "${THISDIR}/${PN}:" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${HXTBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +SRC_URI += "file://stardragon4800-rep2-console-client.sh" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/stardragon4800-rep2-console-client.sh ${D}${bindir}/stardragon4800-rep2-console-client.sh +} diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client.sh b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client.sh new file mode 100644 index 000000000..a95c1a656 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client.sh @@ -0,0 +1,5 @@ +#!/bin/sh -e +#Control UART mux for obmc-console-client +echo 0 > /sys/class/gpio/gpio325/value +obmc-console-client +echo 1 > /sys/class/gpio/gpio325/value diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client@.service b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client@.service new file mode 100644 index 000000000..dce0eec0d --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/console/stardragon4800-rep2-console-client/stardragon4800-rep2-console-client@.service @@ -0,0 +1,9 @@ +[Unit] +Description=Control UART mux for obmc-console-client + +[Service] +ExecStart=/usr/bin/env stardragon4800-rep2-console-client.sh +SyslogIdentifier=stardragon4800-rep2-console-client.sh + +[Install] +WantedBy={SYSTEMD_DEFAULT_TARGET} -- cgit v1.2.3 From 4ba01a1378ed66f2460f31d50c515d4a3070455a Mon Sep 17 00:00:00 2001 From: Yuan Yao Date: Fri, 7 Dec 2018 18:11:09 +0800 Subject: meta-hxt: add some sensors support for rep2 HXT stardragon4800 is an ARMv8-compatible 48-core processor chip. The REP2 is a reference design board for stardragon4800. BMC will handle the sensors,devices by I2C,SPI, include: IR38163, PXM1310, NVT210, TMP421, ADM1278, PCA9641 and so on. (From meta-hxt rev: 7f93ff421703876e060efd1f25d6dec5c899ed05) Change-Id: Ida87db042c52d7b3dc365525eec0dfebc9d19041 Signed-off-by: Yuan Yao Signed-off-by: Andrew Geissler --- .../apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf | 7 +++ .../apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf | 5 ++ .../apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf | 5 ++ .../apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf | 5 ++ .../apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf | 5 ++ .../apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf | 5 ++ .../apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf | 5 ++ .../apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf | 7 +++ .../apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf | 7 +++ .../apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf | 3 + .../apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf | 3 + .../apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf | 3 + .../apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf | 27 ++++++++ .../apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf | 27 ++++++++ .../i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf | 27 ++++++++ .../i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf | 17 +++++ .../pca9641@70/i2c-arb/max31790@20.conf | 47 ++++++++++++++ .../pca9641@70/i2c-arb/max31790@23.conf | 47 ++++++++++++++ .../i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf | 7 +++ .../ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf | 3 + .../ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf | 7 +++ .../ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf | 3 + .../ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf | 3 + .../ahb/flash-controller@1e631000/spi2@0.conf | 73 ++++++++++++++++++++++ .../phosphor-hwmon/obmc/hwmon/iio-hwmon.conf | 30 +++++++++ .../sensors/phosphor-hwmon_%.bbappend | 34 ++++++++++ 26 files changed, 412 insertions(+) create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf create mode 100644 meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf new file mode 100644 index 000000000..e968f08e7 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@12.conf @@ -0,0 +1,7 @@ +LABEL_temp1=SYS_SOC_TEMP_L +CRITLO_temp1=0 +CRITHI_temp1=100000 + +LABEL_temp2=SYS_SOC_TEMP_R +CRITLO_temp2=0 +CRITHI_temp2=100000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf new file mode 100644 index 000000000..a1ba06196 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@42.conf @@ -0,0 +1,5 @@ +LABEL_in1=VREG_5P0 +WARNLO_in1=4758 +WARNHI_in1=5258 +CRITLO_in1=4507 +CRITHI_in1=5509 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf new file mode 100644 index 000000000..8edf80c69 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@44.conf @@ -0,0 +1,5 @@ +LABEL_in1=VREG_3P3 +WARNLO_in1=3130 +WARNHI_in1=3474 +CRITLO_in1=2974 +CRITHI_in1=3631 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf new file mode 100644 index 000000000..b083035d3 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@46.conf @@ -0,0 +1,5 @@ +LABEL_in1=VREG_3P3_AUX +WARNLO_in1=3130 +WARNHI_in1=3474 +CRITLO_in1=2974 +CRITHI_in1=3631 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf new file mode 100644 index 000000000..fc0896b0f --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/ir38163@48.conf @@ -0,0 +1,5 @@ +LABEL_in1=VREG_5P0_USB +WARNLO_in1=4758 +WARNHI_in1=5258 +CRITLO_in1=4507 +CRITHI_in1=5509 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf new file mode 100644 index 000000000..91a38eec8 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@02.conf @@ -0,0 +1,5 @@ +LABEL_in1=PVDDQ_510 +WARNLO_in1=1144 +WARNHI_in1=1264 +CRITLO_in1=1080 +CRITHI_in1=1320 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf new file mode 100644 index 000000000..d86a58890 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@180/pxm1310@04.conf @@ -0,0 +1,5 @@ +LABEL_in1=PVDDQ_423 +WARNLO_in1=1144 +WARNHI_in1=1264 +CRITLO_in1=1080 +CRITHI_in1=1320 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf new file mode 100644 index 000000000..e968f08e7 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c.conf @@ -0,0 +1,7 @@ +LABEL_temp1=SYS_SOC_TEMP_L +CRITLO_temp1=0 +CRITHI_temp1=100000 + +LABEL_temp2=SYS_SOC_TEMP_R +CRITLO_temp2=0 +CRITHI_temp2=100000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf new file mode 100644 index 000000000..6a0bab548 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d.conf @@ -0,0 +1,7 @@ +LABEL_temp1=SYS_INLET_0_L +CRITLO_temp1=0 +CRITHI_temp1=50000 + +LABEL_temp2=SYS_INLET_0_R +CRITLO_temp2=0 +CRITHI_temp2=50000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf new file mode 100644 index 000000000..b85648222 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f.conf @@ -0,0 +1,3 @@ +LABEL_temp1=SYS_INLET_1 +CRITLO_temp1=0 +CRITHI_temp1=50000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf new file mode 100644 index 000000000..2ed024e34 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d.conf @@ -0,0 +1,3 @@ +LABEL_temp1=SYS_INLET_2 +CRITLO_temp1=0 +CRITHI_temp1=50000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf new file mode 100644 index 000000000..ee3b5d5e5 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f.conf @@ -0,0 +1,3 @@ +LABEL_temp1=SYS_INLET_3 +CRITLO_temp1=0 +CRITHI_temp1=50000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf new file mode 100644 index 000000000..2805cadb2 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@10.conf @@ -0,0 +1,27 @@ +LABEL_in1=HSC_AUX_VIN +WARNLO_in1=11431 +WARNHI_in1=12567 +CRITLO_in1=10792 +CRITHI_in1=13206 + +LABEL_in2=HSC_AUX_VOUT +WARNLO_in2=11431 +WARNHI_in2=12567 +CRITLO_in2=10792 +CRITHI_in2=13206 + +LABEL_curr1=HSC_AUX_IOUT +WARNLO_curr1=0 +WARNHI_curr1=50058 +CRITLO_curr1=0 +CRITHI_curr1=60021 + +LABEL_power1=HSC_AUX_PIN +WARNLO_power1=0 +WARNHI_power1=601520 +CRITLO_power1=0 +CRITHI_power1=721240 + +LABEL_temp1=HSC_AUX_TEMP +CRITLO_temp1=0 +CRITHI_temp1=105000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf new file mode 100644 index 000000000..3c4ebbae6 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@300/adm1278@11.conf @@ -0,0 +1,27 @@ +LABEL_in1=HSC_HDD_VIN +WARNLO_in1=11431 +WARNHI_in1=12567 +CRITLO_in1=10792 +CRITHI_in1=13206 + +LABEL_in2=HSC_HDD_VOUT +WARNLO_in2=11431 +WARNHI_in2=12567 +CRITLO_in2=10792 +CRITHI_in2=13206 + +LABEL_curr1=HSC_HDD_IOUT +WARNLO_curr1=0 +WARNHI_curr1=11993 +CRITLO_curr1=0 +CRITHI_curr1=15008 + +LABEL_power1=HSC_HDD_PIN +WARNLO_power1=0 +WARNHI_power1=143200 +CRITLO_power1=0 +CRITHI_power1=179200 + +LABEL_temp1=HSC_HDD_TEMP +CRITLO_temp1=0 +CRITHI_temp1=60000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf new file mode 100644 index 000000000..01b32101d --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12.conf @@ -0,0 +1,27 @@ +LABEL_in1=HSC_FAN_VIN +WARNLO_in1=11431 +WARNHI_in1=12567 +CRITLO_in1=10792 +CRITHI_in1=13206 + +LABEL_in2=HSC_FAN_VOUT +WARNLO_in2=11431 +WARNHI_in2=12567 +CRITLO_in2=10792 +CRITHI_in2=13206 + +LABEL_curr1=HSC_FAN_IOUT +WARNLO_curr1=0 +WARNHI_curr1=24948 +CRITLO_curr1=0 +CRITHI_curr1=29988 + +LABEL_power1=HSC_FAN_PIN +WARNLO_power1=0 +WARNHI_power1=298980 +CRITLO_power1=0 +CRITHI_power1=359380 + +LABEL_temp1=HSC_FAN_TEMP +CRITLO_temp1=0 +CRITHI_temp1=105000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf new file mode 100644 index 000000000..5a6fe7ec3 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58.conf @@ -0,0 +1,17 @@ +LABEL_fan1=PSU_FAN +CRITLO_fan1=535 +CRITHI_fan1=13054 + +LABEL_temp3=PSU_TEMP_AMB +CRITLO_temp3=0 +CRITHI_temp3=50000 + +LABEL_temp1=PSU_TEMP_HS +CRITLO_temp1=0 +CRITHI_temp1=100000 + +LABEL_in1=PSU_VIN +WARNLO_in1=96000 +WARNHI_in1=0 +CRITLO_in1=0 +CRITHI_in1=253000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf new file mode 100644 index 000000000..1e21d96d6 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20.conf @@ -0,0 +1,47 @@ +LABEL_fan1=SYS_FAN_1_F +CRITLO_fan1=535 +CRITHI_fan1=26964 +GAIN_fan1=0.85 +OFFSET_fan1=0 + +LABEL_fan2=SYS_FAN_1_R +CRITLO_fan2=535 +CRITHI_fan2=26964 +GAIN_fan2=0.8 +OFFSET_fan2=0 + +LABEL_fan8=SYS_FAN_2_F +CRITLO_fan8=535 +CRITHI_fan8=26964 +GAIN_fan8=0.85 +OFFSET_fan8=0 + +LABEL_fan3=SYS_FAN_2_R +CRITLO_fan3=535 +CRITHI_fan3=26964 +GAIN_fan3=0.8 +OFFSET_fan3=0 + +LABEL_fan4=SYS_FAN_3_F +CRITLO_fan4=535 +CRITHI_fan4=26964 +GAIN_fan4=0.85 +OFFSET_fan4=0 + +LABEL_fan5=SYS_FAN_3_R +CRITLO_fan5=535 +CRITHI_fan5=26964 +GAIN_fan5=0.8 +OFFSET_fan5=0 + +LABEL_fan11=SYS_FAN_4_F +CRITLO_fan11=535 +CRITHI_fan11=26964 +GAIN_fan11=0.85 +OFFSET_fan11=0 + +LABEL_fan6=SYS_FAN_4_R +CRITLO_fan6=535 +CRITHI_fan6=26964 +GAIN_fan6=0.8 +OFFSET_fan6=0 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf new file mode 100644 index 000000000..20dad4b44 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23.conf @@ -0,0 +1,47 @@ +LABEL_fan1=SYS_FAN_5_F +CRITLO_fan1=535 +CRITHI_fan1=26964 +GAIN_fan1=0.85 +OFFSET_fan1=0 + +LABEL_fan2=SYS_FAN_5_R +CRITLO_fan2=535 +CRITHI_fan2=26964 +GAIN_fan2=0.8 +OFFSET_fan2=0 + +LABEL_fan8=SYS_FAN_6_F +CRITLO_fan8=535 +CRITHI_fan8=26964 +GAIN_fan8=0.85 +OFFSET_fan8=0 + +LABEL_fan3=SYS_FAN_6_R +CRITLO_fan3=535 +CRITHI_fan3=26964 +GAIN_fan3=0.8 +OFFSET_fan3=0 + +LABEL_fan4=SYS_FAN_7_F +CRITLO_fan4=535 +CRITHI_fan4=26964 +GAIN_fan4=0.85 +OFFSET_fan4=0 + +LABEL_fan5=SYS_FAN_7_R +CRITLO_fan5=535 +CRITHI_fan5=26964 +GAIN_fan5=0.8 +OFFSET_fan5=0 + +LABEL_fan11=SYS_FAN_8_F +CRITLO_fan11=535 +CRITHI_fan11=26964 +GAIN_fan11=0.85 +OFFSET_fan11=0 + +LABEL_fan6=SYS_FAN_8_R +CRITLO_fan6=535 +CRITHI_fan6=26964 +GAIN_fan6=0.8 +OFFSET_fan6=0 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf new file mode 100644 index 000000000..1c85be91a --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d.conf @@ -0,0 +1,7 @@ +LABEL_temp1=FAN_BD_TEMP_L +CRITLO_temp1=0 +CRITHI_temp1=60000 + +LABEL_temp2=FAN_BD_TEMP_R +CRITLO_temp2=0 +CRITHI_temp2=60000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf new file mode 100644 index 000000000..a7e74da32 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1c.conf @@ -0,0 +1,3 @@ +LABEL_temp1=SYS_OUTLET_3 +CRITLO_temp1=0 +CRITHI_temp1=100000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf new file mode 100644 index 000000000..0bb21b236 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@1e.conf @@ -0,0 +1,7 @@ +LABEL_temp1=SYS_OUTLET_0_L +CRITLO_temp1=0 +CRITHI_temp1=100000 + +LABEL_temp2=SYS_OUTLET_0_R +CRITLO_temp2=0 +CRITHI_temp2=100000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf new file mode 100644 index 000000000..f794c0e7b --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@2a.conf @@ -0,0 +1,3 @@ +LABEL_temp1=SYS_OUTLET_1 +CRITLO_temp1=0 +CRITHI_temp1=100000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf new file mode 100644 index 000000000..3834fc2dd --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@80/tmp421@4e.conf @@ -0,0 +1,3 @@ +LABEL_temp1=SYS_OUTLET_2 +CRITLO_temp1=0 +CRITHI_temp1=100000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf new file mode 100644 index 000000000..1311e52bb --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/flash-controller@1e631000/spi2@0.conf @@ -0,0 +1,73 @@ +LABEL_temp1=SOC_TEMP +CRITLO_temp1=0 +CRITHI_temp1=94000 + +LABEL_temp2=PMF2432_TEMP +CRITLO_temp2=0 +CRITHI_temp2=103000 + +LABEL_temp3=PMF2433_TEMP +CRITLO_temp3=0 +CRITHI_temp3=103000 + +LABEL_temp4=CVR_APC_TEMP +CRITLO_temp4=0 +CRITHI_temp4=103000 + +LABEL_temp5=CVR_CBF_TEMP +CRITLO_temp5=0 +CRITHI_temp5=103000 + +LABEL_temp6=DIMM_C0D0_TEMP +CRITLO_temp6=0 +CRITHI_temp6=83000 + +LABEL_temp7=DIMM_C0D1_TEMP +CRITLO_temp7=0 +CRITHI_temp7=83000 + +LABEL_temp8=DIMM_C1D0_TEMP +CRITLO_temp8=0 +CRITHI_temp8=83000 + +LABEL_temp9=DIMM_C1D1_TEMP +CRITLO_temp9=0 +CRITHI_temp9=83000 + +LABEL_temp10=DIMM_C2D0_TEMP +CRITLO_temp10=0 +CRITHI_temp10=83000 + +LABEL_temp11=DIMM_C2D1_TEMP +CRITLO_temp11=0 +CRITHI_temp11=83000 + +LABEL_temp12=DIMM_C3D0_TEMP +CRITLO_temp12=0 +CRITHI_temp12=83000 + +LABEL_temp13=DIMM_C3D1_TEMP +CRITLO_temp13=0 +CRITHI_temp13=83000 + +LABEL_temp14=DIMM_C4D0_TEMP +CRITLO_temp14=0 +CRITHI_temp14=83000 + +LABEL_temp15=DIMM_C4D1_TEMP +CRITLO_temp15=0 +CRITHI_temp15=83000 + +LABEL_temp16=DIMM_C5D0_TEMP +CRITLO_temp16=0 +CRITHI_temp16=83000 + +LABEL_temp17=DIMM_C5D1_TEMP +CRITLO_temp17=0 +CRITHI_temp17=83000 + +LABEL_power1=SOC_PWR +WARNLO_power1=0 +WARNHI_power1=120000 +CRITLO_power1=0 +CRITHI_power1=130000 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf new file mode 100644 index 000000000..86d33962d --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon.conf @@ -0,0 +1,30 @@ +LABEL_in1=SYS_3V3 +GAIN_in1=2.40 +WARNLO_in1=3132 +WARNHI_in1=3463 +CRITLO_in1=2975 +CRITHI_in1=3637 +LABEL_in2=SYS_5V0 +GAIN_in2=3.86 +WARNLO_in2=4744 +WARNHI_in2=5253 +CRITLO_in2=4502 +CRITHI_in2=5494 +LABEL_in3=SYS_12V0 +GAIN_in3=8.82 +WARNLO_in3=11408 +WARNHI_in3=12586 +CRITLO_in3=10850 +CRITHI_in3=13206 +LABEL_in6=SYS_3V3_AUX +GAIN_in6=2.40 +WARNLO_in6=3132 +WARNHI_in6=3463 +CRITLO_in6=2975 +CRITHI_in6=3637 +LABEL_in8=SYS_3V0_Battery +GAIN_in8=1.66 +WARNLO_in8=2849 +WARNHI_in8=3460 +CRITLO_in8=2701 +CRITHI_in8=3629 diff --git a/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend new file mode 100644 index 000000000..5d89e8267 --- /dev/null +++ b/meta-hxt/meta-stardragon4800-rep2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -0,0 +1,34 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +NAMES = " apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1d \ + apb/i2c@1e78a000/i2c-bus@1c0/tmp421@1f \ + apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4d \ + apb/i2c@1e78a000/i2c-bus@1c0/tmp421@4f \ + apb/i2c@1e78a000/i2c-bus@1c0/nvt210@4c \ + apb/i2c@1e78a000/i2c-bus@180/ir38163@42 \ + apb/i2c@1e78a000/i2c-bus@180/ir38163@44 \ + apb/i2c@1e78a000/i2c-bus@180/ir38163@46 \ + apb/i2c@1e78a000/i2c-bus@180/ir38163@48 \ + apb/i2c@1e78a000/i2c-bus@180/pxm1310@02 \ + apb/i2c@1e78a000/i2c-bus@180/pxm1310@04 \ + apb/i2c@1e78a000/i2c-bus@80/tmp421@1c \ + apb/i2c@1e78a000/i2c-bus@80/tmp421@1e \ + apb/i2c@1e78a000/i2c-bus@80/tmp421@2a \ + apb/i2c@1e78a000/i2c-bus@80/tmp421@4e \ + apb/i2c@1e78a000/i2c-bus@300/adm1278@10 \ + apb/i2c@1e78a000/i2c-bus@300/adm1278@11 \ + apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/adm1278@12 \ + apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@20 \ + apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/max31790@23 \ + apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/tmp421@1d \ + apb/i2c@1e78a000/i2c-bus@340/pca9641@70/i2c-arb/ds1100@58 \ + flash-controller@1e631000/spi2@0 \ +" + +ITEMSFMT = "ahb/{0}.conf" + +ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" +ITEMS += "iio-hwmon.conf" + +ENVS = "obmc/hwmon/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" -- cgit v1.2.3 From e7428cbc37f9dc0f3f8e73be489fe3b96ee863ca Mon Sep 17 00:00:00 2001 From: FranHsu Date: Fri, 22 Feb 2019 20:13:49 +0800 Subject: meta-gsj: Add USB-NIC systemd configuration for GSJ board. (From meta-quanta rev: 41ff54605a8df6e456e2035b410114545bc94284) Tested: Build Quanta GSJ board image and load on the EVB. Ensure that BMC boots to console, and the USB network interface is working. Fix typo. Change-Id: If93ae6fe2b0181d96630c802adc7e5e216b1de42 Signed-off-by: FranHsu Signed-off-by: Andrew Geissler --- .../usb-network/files/00-bmc-usb0.network | 7 ++++++ .../usb-network/files/usb_network.service | 9 +++++++ .../usb-network/files/usb_network.sh | 27 ++++++++++++++++++++ .../recipes-phosphor/usb-network/usb-network.bb | 29 ++++++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/00-bmc-usb0.network create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.service create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.sh create mode 100644 meta-quanta/meta-gsj/recipes-phosphor/usb-network/usb-network.bb diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/00-bmc-usb0.network b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/00-bmc-usb0.network new file mode 100644 index 000000000..94839637b --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/00-bmc-usb0.network @@ -0,0 +1,7 @@ +[Match] +Name=usb0 +[Address] +Address=169.254.95.118/16 +[Network] +LinkLocalAddressing=yes +IPv6AcceptRA=no diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.service b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.service new file mode 100644 index 000000000..913f5fbee --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.service @@ -0,0 +1,9 @@ +[Unit] +Description=enable usb network + +[Service] +Type=oneshot +ExecStart=/bin/bash -c '/usr/sbin/usb_network.sh' + +[Install] +WantedBy=multi-user.target diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.sh b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.sh new file mode 100644 index 000000000..45fa888be --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/files/usb_network.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +cd /sys/kernel/config/usb_gadget + +if [ ! -f "g1" ]; then + mkdir g1 + cd g1 + + echo 0x1d6b > idVendor # Linux foundation + echo 0x0104 > idProduct # Multifunction composite gadget + mkdir -p strings/0x409 + echo "Linux" > strings/0x409/manufacturer + echo "Ethernet/RNDIS gadget" > strings/0x409/product + + mkdir -p configs/c.1 + echo 100 > configs/c.1/MaxPower + mkdir -p configs/c.1/strings/0x409 + echo "RNDIS" > configs/c.1/strings/0x409/configuration + + mkdir -p functions/rndis.usb0 + + ln -s functions/rndis.usb0 configs/c.1 + + echo f0839000.udc > UDC + +fi +exit 0 diff --git a/meta-quanta/meta-gsj/recipes-phosphor/usb-network/usb-network.bb b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/usb-network.bb new file mode 100644 index 000000000..591ca5afd --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/usb-network/usb-network.bb @@ -0,0 +1,29 @@ +FILESEXTRAPATHS_append := "${THISDIR}/files:" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${QUANTABASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + +DEPENDS += "systemd" +RDEPENDS_${PN} += "libsystemd" +RDEPENDS_${PN} += "bash" + +SRC_URI += "file://usb_network.sh \ + file://usb_network.service \ + file://00-bmc-usb0.network" + +do_install() { + install -d ${D}/${sbindir} + install -m 0755 ${WORKDIR}/usb_network.sh ${D}/${sbindir} + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/usb_network.service ${D}${systemd_unitdir}/system + + install -d ${D}${sysconfdir_native}/systemd/network/ + install -m 0644 ${WORKDIR}/00-bmc-usb0.network ${D}${sysconfdir_native}/systemd/network +} + +NATIVE_SYSTEMD_SUPPORT = "1" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "usb_network.service" +FILES_${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network" + +inherit allarch systemd \ No newline at end of file -- cgit v1.2.3 From 733887b0a358d7bf4072ce17a5c4f85c6e2a44cf Mon Sep 17 00:00:00 2001 From: Kun Yi Date: Fri, 8 Mar 2019 11:43:27 -0800 Subject: meta-phosphor: add phosphor-ipmi-blobs-binarystore package Add the phosphor-ipmi-blobs-binarystore package which handles binary data read/write/serialize using IPMI blobs semantics. (From meta-phosphor rev: 66e51a579995973846583c48fa5cb8e28bb15cb8) Tested: verified library was compiled and installed when added to obmc-phosphor-image. Signed-off-by: Kun Yi Change-Id: I43905673bf9c77c21feb6f94cb2fdc13f2fa850c Signed-off-by: Andrew Geissler --- .../ipmi/phosphor-ipmi-blobs-binarystore_git.bb | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb new file mode 100644 index 000000000..8d45667cd --- /dev/null +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_git.bb @@ -0,0 +1,26 @@ +HOMEPAGE = "http://github.com/openbmc/phosphor-ipmi-blobs-binarystore" +SUMMARY = "BMC Generic Binary Blob Store via OEM IPMI Blob Transport" +DESCRIPTION = "This package provides a read/write/serialize abstraction for storing binary data through IPMI blobs" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +inherit autotools pkgconfig +inherit obmc-phosphor-ipmiprovider-symlink + +DEPENDS += "autoconf-archive-native" +DEPENDS += "phosphor-ipmi-blobs" +DEPENDS += "phosphor-logging" +DEPENDS += "protobuf-native" +DEPENDS += "protobuf" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/openbmc/phosphor-ipmi-blobs-binarystore" +SRCREV = "8ca234e6986763ffaddcf56b49fecdfe96a60182" + +FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES_${PN}_append = " ${libdir}/blob-ipmid/lib*${SOLIBS}" +FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" + +BLOBIPMI_PROVIDER_LIBRARY += "libbinarystore.so" -- cgit v1.2.3 From 318eb5d7ee2b098cff27129fcdece3e0121958d2 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 13 Mar 2019 02:21:27 +0000 Subject: phosphor-networkd: srcrev bump 04c3d714ba..f1aa51cedf William A. Kennington III (3): configure: Don't allow configurable systemd directories configure: Cleanup dbus variables configure: Remove systemd dbus paths (From meta-phosphor rev: d024050887b882480908cb69e784a103353fb9dc) Change-Id: I3f93351ab8ac53765f4d08d4781da566d2533fe9 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/classes/phosphor-networkd-rev.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index a54247596..eca260de9 100644 --- a/meta-phosphor/classes/phosphor-networkd-rev.bbclass +++ b/meta-phosphor/classes/phosphor-networkd-rev.bbclass @@ -1,2 +1,2 @@ SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "04c3d714ba0129f4746967f2d98985bae2b0a8fd" +SRCREV = "f1aa51cedf4618d084ef9edd613d5f886fc8b73c" -- cgit v1.2.3 From 86825c6ac5fd583d1c0109cab08e47c02c606efc Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 12 Mar 2019 23:31:54 +0000 Subject: bmcweb: srcrev bump 5c6221ac85..9474b37880 Ratan Gupta (5): Redfish: Send the success message in PATCH request Redfish(AccountService): Send the correct error message for the read only property Redfish(Ethernet): Don't init the vlanID and vlanEnable Redfish(Ethernet): Fix to not convert the json index into string Redfish(Network): Allow empty list item for ipv4 address. Richard Marian Thomaiyar (1): Support for overriding multiple sensor (From meta-phosphor rev: b56bf6b037dd1707f01a51a39d71846150645aef) Change-Id: I4e6a4aec3d3aaf13d5e8f8a22e25e4baa5454559 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 77c93e628..9d11fa384 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "5c6221ac85ce72a612f7001246fb5a7ab521c7a5" +SRCREV = "9474b3788017bddd70e493e2b9b7674be30abc87" S = "${WORKDIR}/git" -- cgit v1.2.3 From d558c0976d8320106a1d14affcc05baf3dfeec32 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 13 Mar 2019 00:01:57 +0000 Subject: phosphor-pid-control: srcrev bump 6d31049a4e..b5cc37cebe Patrick Venture (1): swap out getopts for cli11 (From meta-phosphor rev: 6e897aafdcb63b52b96e793c078cda08e615c6e6) Change-Id: I2c70efe6c7be2a680efce76e58bdd274a015a321 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 5cbbe408d..2df6e4050 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -14,7 +14,7 @@ inherit obmc-phosphor-ipmiprovider-symlink S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "6d31049a4eb38f7b86874e9286c771ae0dd5f14d" +SRCREV = "b5cc37cebec74f0bd2a8d378d5f911fc4fa3439e" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if -- cgit v1.2.3 From 30d3f3dc9e428ef5c4db17bf3ceaea16851345e6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 12 Mar 2019 19:12:04 +0000 Subject: phosphor-ipmi-blobs: srcrev bump fd4cdea449..de8a16e2e8 Patrick Venture (3): use filesystem instead of experimental build: add dependency on ipmiblob use ipmiblob library from ipmi-blob-tool (From meta-phosphor rev: 5efa796aea6f68325252ec65f600a474227ea5d3) Change-Id: Ic8c9739f6ebebe47d75af45c42f2915227db8088 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-blobs_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 94658067c..a82e9f611 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 = "fd4cdea449f01b910b654b78f2076cf76540619c" +SRCREV = "de8a16e2e85f49e142461b7e6fe901d3f8740fdf" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From fd1770ddc0f8d5dc732289345f75bcd2748df1a4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Tue, 12 Mar 2019 00:00:41 +0000 Subject: google-ipmi-sys: srcrev bump a289fa2e2f..0788699a94 Patrick Venture (1): use filesystem instead of experimental (From meta-google rev: eeb70ed1eff576e8b4d2e8bda2e9fafb4a92613a) Change-Id: I42d81d00920e42721687fad4a80efb742df0004a Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb index 9d3ef1876..fd90ab09d 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb @@ -18,7 +18,7 @@ DEPENDS += "nlohmann-json" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/google-ipmi-sys" -SRCREV = "a289fa2e2f7a0e9ef5b896e26f4f91d39df30b9e" +SRCREV = "0788699a94c7a36f4d736357a5733763380bb726" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From 925bbd05851909b3ec5af58572c0b3aad4b85f84 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 9 Mar 2019 04:30:33 +0000 Subject: google-ipmi-i2c: srcrev bump d7f368aae0..605687d8a0 Patrick Venture (2): README: drop TOC add host-side kernel driver (From meta-google rev: c155fdf2d5a3403e53e1bc4b2a9d7c0e479b3d94) Change-Id: I5559f7cba7f31ae468cc71b6a831be47f40b898d Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb index 4cfcd9bd5..053a77c95 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb @@ -14,7 +14,7 @@ DEPENDS += "phosphor-ipmi-host" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/google-ipmi-i2c" -SRCREV = "d7f368aae016cb2987ee0499b79174cb0ef79f6a" +SRCREV = "605687d8a0df0d8f304c7fc7f1f654d95c956a08" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From 602b38aeb523c5ddbfa672be19ef14ed132885e5 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Tue, 12 Mar 2019 17:32:50 -0700 Subject: meta-google: rework README to be non-markdown Rework the README to not use markdown. (From meta-google rev: e95ffa4345393be4ea00f05060f51f2a6af3833b) Change-Id: Ie4b25a0af5817358ab48d184cc358bce262521a3 Signed-off-by: Patrick Venture Signed-off-by: Andrew Geissler --- meta-google/README | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ meta-google/README.md | 60 --------------------------------------------------- 2 files changed, 60 insertions(+), 60 deletions(-) create mode 100644 meta-google/README delete mode 100644 meta-google/README.md diff --git a/meta-google/README b/meta-google/README new file mode 100644 index 000000000..9965f427a --- /dev/null +++ b/meta-google/README @@ -0,0 +1,60 @@ +This README file contains information on the contents of the meta-google layer. + +Please see the corresponding sections below for details. + + +Dependencies +============ + +This layer depends on: + + URI: https://github.com/openbmc/meta-phosphor + branch: master + +Patches +======= + +Please submit any patches against the meta-google layer to the OpenBMC gerrit https://gerrit.openbmc-project.xyz/ + +Layer maintainer: Patrick Venture + +When sending patches, following [OpenBMC guidelines](https://github.com/openbmc/docs/blob/master/CONTRIBUTING.md). + +Table of Contents +================= + + I. Adding the filesystems layer to your build + II. Purpose +III. Customizations + + +I. Adding the meta-google layer to your build +================================================= + +In order to use this layer, you need to make the build system aware of +it. + +Assuming the meta-google layer exists at the top-level of your +yocto build tree, you can add it to the build system by adding the +location of the meta-google layer to bblayers.conf, along with any +other layers needed. e.g.: + + BBLAYERS ?= " \ + /path/to/yocto/meta-phosphor \ + /path/to/yocto/meta-google \ + " + + +II. Purpose +============ + +Including this layer adds the following packages to your obmc-phosphor-image: + +* google-ipmi-sys: OEM IPMI Handler for providing specific information to the host. +* phosphor-ipmi-blobs: OEM IPMI Blobs Handler for providing the framework for specific blob handlers. +* phosphor-ipmi-ethstats: OEM IPMI Handler for reporting ethernet device statistics from the BMCs ethernet devices. +* phosphor-ipmi-flash: OEM IPMI Handler for controlling in-band firmware updates. + +III. Customizations + +Presently, this layer also enables the Google Iana for registering phosphor-ipmi-ethstats in addition to the OpenBMC one. diff --git a/meta-google/README.md b/meta-google/README.md deleted file mode 100644 index 7399b0305..000000000 --- a/meta-google/README.md +++ /dev/null @@ -1,60 +0,0 @@ -This README file contains information on the contents of the meta-google layer. - -Please see the corresponding sections below for details. - - -Dependencies -============ - -This layer depends on: - - URI: https://github.com/openbmc/meta-phosphor - branch: master - -Patches -======= - -Please submit any patches against the meta-google layer to the OpenBMC gerrit https://gerrit.openbmc-project.xyz/ - -Layer maintainer: Patrick Venture - -When sending patches, following [OpenBMC guidelines](https://github.com/openbmc/docs/blob/master/CONTRIBUTING.md). - -Table of Contents -================= - - I. Adding the filesystems layer to your build - II. Purpose -III. Customizations - - -I. Adding the meta-google layer to your build -================================================= - -In order to use this layer, you need to make the build system aware of -it. - -Assuming the meta-google layer exists at the top-level of your -yocto build tree, you can add it to the build system by adding the -location of the meta-google layer to bblayers.conf, along with any -other layers needed. e.g.: - - BBLAYERS ?= " \ - /path/to/yocto/meta-phosphor \ - /path/to/yocto/meta-google \ - " - - -II. Purpose -============ - -Including this layer adds the following packages to your `obmc-phosphor-image`: - -* [google-ipmi-sys](https://github.com/openbmc/google-ipmi-sys): OEM IPMI Handler for providing specific information to the host. -* [phosphor-ipmi-blobs](https://github.com/openbmc/phosphor-ipmi-blobs): OEM IPMI Blobs Handler for providing the framework for specific blob handlers. -* [phosphor-ipmi-ethstats](https://github.com/openbmc/phosphor-ipmi-ethstats): OEM IPMI Handler for reporting ethernet device statistics from the BMCs ethernet devices. -* [phosphor-ipmi-flash](https://github.com/openbmc/phosphor-ipmi-flash): OEM IPMI Handler for controlling in-band firmware updates. - -III. Customizations - -Presently, this layer also enables the Google Iana for registering `phosphor-ipmi-ethstats` in addition to the OpenBMC one. -- cgit v1.2.3 From ae29d00f227e55192a69f66c87633e1b53fc6e68 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Tue, 12 Mar 2019 17:36:58 -0700 Subject: meta-google: cleanup README Further cleanup of the README, including a phrasing tweak. (From meta-google rev: 98170ba7a8ab9be3c3dfd631c93c80d06516638c) Change-Id: I5a0bb45e69742e7fad403102577cd54ade2d0599 Signed-off-by: Patrick Venture Signed-off-by: Andrew Geissler --- meta-google/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-google/README b/meta-google/README index 9965f427a..ef22a55af 100644 --- a/meta-google/README +++ b/meta-google/README @@ -18,7 +18,7 @@ Please submit any patches against the meta-google layer to the OpenBMC gerrit ht Layer maintainer: Patrick Venture -When sending patches, following [OpenBMC guidelines](https://github.com/openbmc/docs/blob/master/CONTRIBUTING.md). +When sending patches, follow the OpenBMC guidelines. Table of Contents ================= -- cgit v1.2.3 From f6fdf32275ba8eb910ca34c7147cd5b9eb2de52c Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 12 Mar 2019 13:37:01 -0400 Subject: meta-phosphor: Add a hint for ipmi whitelists Add additional providers with whitelists to distro or machine configuration and not in recipe context (bbappend) otherwise ipmid will not know about whitelists. (From meta-phosphor rev: 997610111f30b51742478258aa9b5513f10901e9) Change-Id: I652935f62485371f5abb517832cbf2284db8e08b Signed-off-by: Brad Bishop Signed-off-by: Andrew Geissler --- .../packagegroups/packagegroup-obmc-ipmid-providers.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb index 265abacdc..5892c23db 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-ipmid-providers.bb @@ -8,3 +8,7 @@ PACKAGES = "${PN}-libs" SUMMARY_${PN}-libs = "Extra providers for ipmid." RDEPENDS_${PN}-libs = "${VIRTUAL-RUNTIME_phosphor-ipmi-providers}" + +# Warning. Add additional providers with whitelists to distro or machine +# configuration and not in recipe context (bbappend) otherwise ipmid will not +# know about your whitelist. -- cgit v1.2.3 From 12e66533bbb1143007e349337515c1b1cbf1c5f9 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 13 Mar 2019 20:41:41 +0000 Subject: entity-manager: srcrev bump 9945ddffc6..1027d1e7fd Cheng C Yang (1): Add new PSU to entity-manager Zhu, Yunge (1): Add CPU[1-4][DIMM[1-12]]/FAN[1-8] Fault Led Gpios (From meta-phosphor rev: 5fecb6f5fa21039a867700c70d290ad065310027) Change-Id: I9bd880b1473d15f7ee2bd4eb1b188e83a937ba6d Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index b86661808..5130462a0 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "9945ddffc67a9e564a92a3c0bddf2a2d7dc70b97" +SRCREV = "1027d1e7fdac664e664547003e1031ed0fabd179" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From 49ce2039b57ad341245c8c66104bc7ca5844d6b7 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 13 Mar 2019 18:32:26 +0000 Subject: dbus-sensors: srcrev bump 13f340b78e..18af423d4f James Feist (1): Trim insignificant figures from exit air temp (From meta-phosphor rev: 882a2cd63b29fa2d6d0dc567647958a679a9fab3) Change-Id: I726d7b718dcafa7dcbd13771d2f574aecb4032d4 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 2c654902c..926565c05 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 = "13f340b78e27c6c734569432a0163523334aae8d" +SRCREV = "18af423d4fdac3bb5c0f6d3741c8ce7e070743f3" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From cde037a777bd35d309acccde9c19c1ff2783d578 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 14 Mar 2019 22:12:00 +0000 Subject: bmcweb: srcrev bump 9474b37880..603a664025 Gunnar Mills (1): Add BMCWEB_ENABLE_REDFISH_ONE_CHASSIS build option (From meta-phosphor rev: 3310350a291cfc1f4ea45e09a61c531a0de064a0) Change-Id: Idc8c94dc06cfba105029c0fa9f055a8249d1b291 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 9d11fa384..d2b568239 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "9474b3788017bddd70e493e2b9b7674be30abc87" +SRCREV = "603a664025801fd02079298374781f49ce816e5b" S = "${WORKDIR}/git" -- cgit v1.2.3 From 83df53c6b0603e4922c6ad136b08eb41ff2fbf5d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 14 Mar 2019 18:11:38 +0000 Subject: gpioplus: srcrev bump b208502884..444d6214d5 William A. Kennington III (1): autotools: Fix for autoconf-archive 2019.01.19 (From meta-phosphor rev: 65d6bac518f11b8a51f16287ca8445b128cbe34d) Change-Id: Ia6f6af861ee9c7a67d198bbd6f60bf101846945e Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb index ff214b777..62ca318c3 100644 --- a/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb +++ b/meta-phosphor/recipes-extended/gpioplus/gpioplus_git.bb @@ -18,6 +18,6 @@ EXTRA_OECONF_append += " \ " SRC_URI += "git://github.com/openbmc/gpioplus" -SRCREV = "b20850288428d2f33d86038555421b365aceefa9" +SRCREV = "444d6214d532a8b5862ad3a41893ca7079b1e9ff" S = "${WORKDIR}/git" -- cgit v1.2.3 From 6b30bc0439fb3b818f11cce36639fbccf2d41575 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 15 Mar 2019 16:32:48 +1030 Subject: linux-aspeed: Move to 4.19.29 This includes security and bug fixes from the 4.19.28 and 4.19.29 stable releases. (From meta-aspeed rev: cf1135c947f613b514dcb8707e1620cdc17f21e1) Change-Id: I14d6537c4fce4daffd1e2e571ded383ed8c14cee Signed-off-by: Joel Stanley Signed-off-by: Andrew Geissler --- meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 1f0fad363..524bcea46 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-4.19" -LINUX_VERSION ?= "4.19.27" +LINUX_VERSION ?= "4.19.29" -SRCREV="7859d04be772a1d185de335a8e9d38ac03a89f3f" +SRCREV="9bd1e03005e74ecfe16f58143714f25793ae1c5d" require linux-aspeed.inc -- cgit v1.2.3 From 77d9728b49d75f00c0eeea7bc5bca50ad2c07fbf Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 14 Mar 2019 21:10:33 +0000 Subject: google-ipmi-sys: srcrev bump 0788699a94..6667a646bf Patrick Venture (4): build: add build of empty tests eth: move structure to header test: add basic tests for eth command build: add code coverage William A. Kennington III (1): Makefile: split out common libary code for testing (From meta-google rev: c791de74684935b02749dd029c43f8c8a6704d6a) Change-Id: I989846b585d9a829ae1110e706f579a4799cc23c Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb index fd90ab09d..3c0ef6a53 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb @@ -18,7 +18,7 @@ DEPENDS += "nlohmann-json" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/google-ipmi-sys" -SRCREV = "0788699a94c7a36f4d736357a5733763380bb726" +SRCREV = "6667a646bff33fdd22e69363e2313e2e61e10e53" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -- cgit v1.2.3 From 9e65e3ddae23d6f2be03ff07098d9f9634b011b1 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 16 Mar 2019 15:42:10 +0000 Subject: ipmi-blob-tool: srcrev bump 1681f7ff9f..a835642007 Patrick Venture (2): ipmi_errors: object cleanup blob_handler: fprintf tweak (From meta-phosphor rev: bd486b3028866d8e962ffa42aba7c395970ffdb3) Change-Id: Ic3dcb3ce54beadbd517aeee02283cdbc12d68c77 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb index 164283fd4..aba85bc71 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmi-blob-tool_git.bb @@ -12,4 +12,4 @@ DEPENDS += "autoconf-archive-native" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/ipmi-blob-tool" -SRCREV = "1681f7ff9fe112a0c3c318d562f4b46489eea02c" +SRCREV = "a8356420078bb7e7580fe6c42818e20203c7cbfc" -- cgit v1.2.3 From 795fc630f70cc3d2e168020a21304d71394089b5 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 15 Mar 2019 20:51:40 +0000 Subject: sdbusplus: srcrev bump 25ea94f6e4..b5a8446979 William A. Kennington III (1): bus: Add chrono types for timeouts (From meta-phosphor rev: 8e796a400c632cba99caf5e586ddcc330d34c6fa) Change-Id: Ia721e75ff7cd5075ccc57aaea0de31ec9adc1b0a Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index 8136a753d..057052c18 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -37,7 +37,7 @@ DEPENDS_append_class-native = " \ " SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "25ea94f6e422a74261479bae6f849a4a9813121b" +SRCREV = "b5a844697969dfcc3ca664bfd152b73dd0ffa7c0" PACKAGECONFIG ??= "libsdbusplus transaction" PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd" -- cgit v1.2.3 From 6671b66a1bc3a449dc969527d9f6ec298b12c951 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 15 Mar 2019 20:41:41 +0000 Subject: sdeventplus: srcrev bump 08ebb3993a..651e87ad36 William A. Kennington III (2): meson: Add alternative build system clang-tidy: Basic configuration (From meta-phosphor rev: 27ea2d76a6c144b0290872dfaf5248c771db2114) Change-Id: Id48cc18fd489ee5ff0307950f89d5aa35c4c9628 Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb index 3ae74aa2b..9f5147db6 100644 --- a/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb +++ b/meta-phosphor/recipes-extended/sdeventplus/sdeventplus_git.bb @@ -19,6 +19,6 @@ EXTRA_OECONF_append += " \ " SRC_URI += "git://github.com/openbmc/sdeventplus" -SRCREV = "08ebb3993a2b5a82d0a5ead29a649c95632f7c64" +SRCREV = "651e87ad362e55ed4e34e6565fd0674390941a58" S = "${WORKDIR}/git" -- cgit v1.2.3 From 7d4f04a866a0419830cc8f7462b816049613804f Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 15 Mar 2019 19:02:38 +0000 Subject: dbus-sensors: srcrev bump 18af423d4f..3a1807e08a James Feist (1): Destroy redundancy sensor before re-creation. (From meta-phosphor rev: 273e3a21e42d7cfd831868489232f2b5e714706e) Change-Id: I922c55750f9d2aedc054e08fdb0ec1f21cd7a2ba Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 926565c05..d8e86ccd2 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 = "18af423d4fdac3bb5c0f6d3741c8ce7e070743f3" +SRCREV = "3a1807e08a024ec712d7bc02ad62629ff76570c8" PV = "0.1+git${SRCPV}" -- cgit v1.2.3 From a9d9e970071285a9c9fd574774356d4489cce1db Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 15 Mar 2019 18:11:42 +0000 Subject: entity-manager: srcrev bump 1027d1e7fd..93f67b2de0 Cheng C Yang (1): Change PSU json to support PSU Sensor (From meta-phosphor rev: be489058134f19f10f4ba32ab0f4c786d66055bc) Change-Id: Ibec617cc85823a7ed9a61297de8cb719ddb5716e Signed-off-by: Andrew Geissler Signed-off-by: Andrew Geissler --- meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 5130462a0..13a2c5fe6 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "1027d1e7fdac664e664547003e1031ed0fabd179" +SRCREV = "93f67b2de03c0edba350e3bc2d1153995d3b75ec" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3 From 225376f0a37ee9b6f20626e5f377d8833ea1727f Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Mon, 18 Mar 2019 13:46:22 -0700 Subject: Update to internal Signed-off-by: Ed Tanous --- meta-openbmc-mods/conf/layer.conf | 2 +- meta-openbmc-mods/conf/machine/include/intel.inc | 2 + .../classes/obmc-phosphor-image-common.bbclass | 1 + .../recipes-core/at-scale-debug/at-scale-debug.bb | 2 +- .../bmcweb/0001-Refine-KVM-websock-proxy.patch | 119 - .../recipes-core/bmcweb/bmcweb_%.bbappend | 2 - .../recipes-core/cpu-log-util/cpu-log-util_git.bb | 2 +- .../recipes-core/fw-update/files/usb-ctrl | 136 + .../recipes-core/fw-update/intel-fw-update.bb | 4 + .../recipes-core/ipmi/intel-ipmi-oem_%.bbappend | 2 +- .../recipes-core/ipmi/ipmi-providers.bb | 2 +- .../recipes-core/peci-pcie/peci-pcie_git.bb | 2 +- .../obmc-ikvm/obmc-ikvm/.clang-format | 98 - .../0001-Fix-video-restarting-sync-issue.patch | 57 + ...start-video-when-mode-detection-is-failed.patch | 82 + .../recipes-graphics/obmc-ikvm/obmc-ikvm/LICENSE | 201 - .../obmc-ikvm/obmc-ikvm/MAINTAINERS | 45 - .../obmc-ikvm/obmc-ikvm/Makefile.am | 31 - .../recipes-graphics/obmc-ikvm/obmc-ikvm/README.md | 18 - .../obmc-ikvm/obmc-ikvm/bootstrap.sh | 18 - .../obmc-ikvm/obmc-ikvm/configure.ac | 29 - .../obmc-ikvm/obmc-ikvm/create_usbhid.sh | 135 - .../obmc-ikvm/obmc-ikvm/ikvm_args.cpp | 57 - .../obmc-ikvm/obmc-ikvm/ikvm_args.hpp | 123 - .../obmc-ikvm/obmc-ikvm/ikvm_input.cpp | 380 -- .../obmc-ikvm/obmc-ikvm/ikvm_input.hpp | 111 - .../obmc-ikvm/obmc-ikvm/ikvm_manager.cpp | 100 - .../obmc-ikvm/obmc-ikvm/ikvm_manager.hpp | 75 - .../obmc-ikvm/obmc-ikvm/ikvm_server.cpp | 218 - .../obmc-ikvm/obmc-ikvm/ikvm_server.hpp | 167 - .../obmc-ikvm/obmc-ikvm/ikvm_video.cpp | 478 --- .../obmc-ikvm/obmc-ikvm/ikvm_video.hpp | 150 - .../obmc-ikvm/obmc-ikvm/obmc-ikvm.cpp | 12 - .../obmc-ikvm/obmc-ikvm/scancodes.hpp | 82 - .../recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb | 3 + .../recipes-intel/chassis/intel-chassis-control.bb | 2 +- .../packagegroups/packagegroup-intel-apps.bb | 1 + .../recipes-intel/smbios/smbios-mdrv1.bb | 2 +- .../recipes-intel/smbios/smbios-mdrv2.bb | 2 +- ...-drivers-to-sync-with-linux-upstreaming-v.patch | 4310 +++++++++++++++++++- .../0026-Add-support-for-new-PECI-commands.patch | 459 ++- ...e-passthrough-based-gpio-character-device.patch | 287 ++ ...eout-ms-and-retries-device-tree-propertie.patch | 105 + .../recipes-kernel/linux/linux-aspeed_%.bbappend | 4 +- .../configuration/entity-manager_%.bbappend | 2 +- ...ng-the-Session-interface-for-Host-and-LAN.patch | 126 + ...20-Create-dbus-interface-for-SOL-commands.patch | 76 + .../dbus/phosphor-dbus-interfaces_%.bbappend | 2 + .../fans/phosphor-pid-control_%.bbappend | 2 +- ...mage_verify-Add-support-for-OpenSSL-1.1.0.patch | 130 - .../flash/phosphor-software-manager_%.bbappend | 2 +- .../recipes-phosphor/gpiodaemon/gpiodaemon.bb | 2 +- .../ipmi/phosphor-ipmi-channel-inventory%.bbappend | 4 - .../phosphor-ipmi-channel-inventory%/channel.yaml | 8 - ...x-User-commands-require-channel-layer-lib.patch | 37 + ...nt-set-front-panel-button-enables-command.patch | 185 + .../ipmi/phosphor-ipmi-host_%.bbappend | 2 + .../ipmi/phosphor-ipmi-node-manager-proxy_git.bb | 19 - .../ipmi/phosphor-node-manager-proxy_git.bb | 4 +- .../leds/intel-led-manager-config/led.yaml | 8 + .../sensors/dbus-sensors_%.bbappend | 6 +- .../srvcfg-manager/srvcfg-manager_git.bb | 2 +- .../0002-Capture-host-restart-cause.patch | 68 +- ...boot-for-the-Reboot-host-state-transition.patch | 71 + .../state/phosphor-state-manager_%.bbappend | 1 + .../0001-Implement-post-code-manager.patch | 499 +++ .../state/post-code-manager_git.bb | 34 + .../recipes-phosphor/system/callback-manager.bb | 4 +- .../system/obmc-mgr-system%.bbappend | 2 - ...suport-for-multiple-user-manager-services.patch | 63 +- .../0007-Fix-some-page-keeps-loading-on-IE11.patch | 68 + .../webui/phosphor-webui/config.json | 8 + .../webui/phosphor-webui_%.bbappend | 9 +- .../0001-Create-intel-purley-dts.patch | 31 +- .../recipes-kernel/linux/linux-aspeed/wolfpass.cfg | 9 + .../entity-manager/TNP-baseboard.json | 1945 +++++++++ .../configuration/entity-manager_%.bbappend | 3 +- .../fru/default-fru/S2600TNP.fru.bin | Bin 0 -> 512 bytes .../recipes-phosphor/fru/default-fru/checkFru.sh | 11 +- 79 files changed, 8336 insertions(+), 3225 deletions(-) delete mode 100644 meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb/0001-Refine-KVM-websock-proxy.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-core/fw-update/files/usb-ctrl delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/.clang-format create mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0001-Fix-video-restarting-sync-issue.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0002-Restart-video-when-mode-detection-is-failed.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/LICENSE delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/MAINTAINERS delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/Makefile.am delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/README.md delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/bootstrap.sh delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/configure.ac delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/create_usbhid.sh delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/ikvm_args.cpp delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/ikvm_args.hpp delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/ikvm_input.cpp delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/ikvm_input.hpp delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/ikvm_manager.cpp delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/ikvm_manager.hpp delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/ikvm_server.cpp delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/ikvm_server.hpp delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/ikvm_video.cpp delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/ikvm_video.hpp delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/obmc-ikvm.cpp delete mode 100644 meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/scancodes.hpp create mode 100644 meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0041-Enable-passthrough-based-gpio-character-device.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed/0042-Add-bus-timeout-ms-and-retries-device-tree-propertie.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0019-Creating-the-Session-interface-for-Host-and-LAN.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0020-Create-dbus-interface-for-SOL-commands.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/flash/phosphor-software-manager/0001-image_verify-Add-support-for-OpenSSL-1.1.0.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory%.bbappend delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory%/channel.yaml create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0054-Fix-User-commands-require-channel-layer-lib.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0055-Implement-set-front-panel-button-enables-command.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-node-manager-proxy_git.bb create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/state/phosphor-state-manager/0003-Use-warm-reboot-for-the-Reboot-host-state-transition.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/state/post-code-manager/0001-Implement-post-code-manager.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/state/post-code-manager_git.bb delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/system/obmc-mgr-system%.bbappend create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui/0007-Fix-some-page-keeps-loading-on-IE11.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/webui/phosphor-webui/config.json create mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json create mode 100644 meta-openbmc-mods/meta-wolfpass/recipes-phosphor/fru/default-fru/S2600TNP.fru.bin diff --git a/meta-openbmc-mods/conf/layer.conf b/meta-openbmc-mods/conf/layer.conf index 8fcab4a0a..9cc62fc6a 100644 --- a/meta-openbmc-mods/conf/layer.conf +++ b/meta-openbmc-mods/conf/layer.conf @@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "intel" BBFILE_PATTERN_intel = "^${LAYERDIR}/" BBFILE_PRIORITY_intel = "5" -LAYERSERIES_COMPAT_intel = "sumo" +LAYERSERIES_COMPAT_intel = "thud" IMAGE_FEATURES[validitems] += "tools-sdk tools-debug" diff --git a/meta-openbmc-mods/conf/machine/include/intel.inc b/meta-openbmc-mods/conf/machine/include/intel.inc index 7fe8bf50f..20ca34a66 100644 --- a/meta-openbmc-mods/conf/machine/include/intel.inc +++ b/meta-openbmc-mods/conf/machine/include/intel.inc @@ -10,6 +10,8 @@ OBMC_MACHINE_FEATURES += "\ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" +VIRTUAL-RUNTIME_obmc-led-monitor = "" + PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-intel-apps" diff --git a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass index 7deca9c05..fad660450 100644 --- a/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass +++ b/meta-openbmc-mods/meta-common/classes/obmc-phosphor-image-common.bbclass @@ -29,6 +29,7 @@ IMAGE_INSTALL_append = " \ frb2-watchdog \ srvcfg-manager \ callback-manager \ + post-code-manager \ " # this package was flagged as a security risk diff --git a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb index 8d4a67ec5..de30d52b7 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/at-scale-debug/at-scale-debug.bb @@ -13,7 +13,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir" SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" -SRCREV = "de77d02aefa3c9df62365e7f07224c5cf9b0eb96" +SRCREV = "c4c223bdbe5b58a7acad12dc9700365330f2df1c" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} += "com.intel.AtScaleDebug.service" diff --git a/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb/0001-Refine-KVM-websock-proxy.patch b/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb/0001-Refine-KVM-websock-proxy.patch deleted file mode 100644 index acbfebdee..000000000 --- a/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb/0001-Refine-KVM-websock-proxy.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 430bfc33ee396e4aced0514b66703e5c58a7503d Mon Sep 17 00:00:00 2001 -From: Jae Hyun Yoo -Date: Tue, 26 Feb 2019 15:46:07 -0800 -Subject: [PATCH] Refine KVM websock proxy - -This commit simplifies input buffer delivering logic by removing -a doWrite() call from readDone(). Input events can be delivered -through websocket's onmessage handler only and it's enough. - -Also, it fixes a suspicious weak point of commit/consume pair on -outputBuffer. - -Signed-off-by: Jae Hyun Yoo ---- - include/kvm_websocket.hpp | 57 +++++++++++++++++++++-------------------------- - 1 file changed, 26 insertions(+), 31 deletions(-) - -diff --git a/include/kvm_websocket.hpp b/include/kvm_websocket.hpp -index aa2eaecc3205..447171b9981a 100644 ---- a/include/kvm_websocket.hpp -+++ b/include/kvm_websocket.hpp -@@ -20,53 +20,48 @@ static boost::beast::flat_static_buffer<1024U> inputBuffer; - - static crow::websocket::Connection* session = nullptr; - --static bool doingWrite = false; -+inline void doWrite(); - --inline void doWrite() -+inline void WriteDone(const boost::system::error_code& ec, -+ std::size_t bytesWritten) - { -- if (doingWrite) -+ BMCWEB_LOG_DEBUG << "Wrote " << bytesWritten << "bytes"; -+ inputBuffer.consume(bytesWritten); -+ -+ if (session == nullptr) -+ { -+ return; -+ } -+ if (ec == boost::asio::error::eof) -+ { -+ session->close("KVM socket port closed"); -+ return; -+ } -+ if (ec) - { -- BMCWEB_LOG_DEBUG << "Already writing. Bailing out"; -+ session->close("Error in reading to host port"); -+ BMCWEB_LOG_ERROR << "Error in KVM socket write " << ec; - return; - } -+ -+ doWrite(); -+} -+ -+inline void doWrite() -+{ - if (inputBuffer.size() == 0) - { - BMCWEB_LOG_DEBUG << "inputBuffer empty. Bailing out"; - return; - } - -- doingWrite = true; -- hostSocket->async_write_some( -- inputBuffer.data(), -- [](boost::beast::error_code ec, std::size_t bytes_written) { -- BMCWEB_LOG_DEBUG << "Wrote " << bytes_written << "bytes"; -- doingWrite = false; -- inputBuffer.consume(bytes_written); -- -- if (session == nullptr) -- { -- return; -- } -- if (ec == boost::asio::error::eof) -- { -- session->close("KVM socket port closed"); -- return; -- } -- if (ec) -- { -- session->close("Error in reading to host port"); -- BMCWEB_LOG_ERROR << "Error in KVM socket write " << ec; -- return; -- } -- doWrite(); -- }); -+ hostSocket->async_write_some(inputBuffer.data(), WriteDone); - } - - inline void doRead(); - - inline void readDone(const boost::system::error_code& ec, std::size_t bytesRead) - { -- outputBuffer.commit(bytesRead); - BMCWEB_LOG_DEBUG << "read done. Read " << bytesRead << " bytes"; - if (ec) - { -@@ -82,6 +77,7 @@ inline void readDone(const boost::system::error_code& ec, std::size_t bytesRead) - return; - } - -+ outputBuffer.commit(bytesRead); - boost::beast::string_view payload( - static_cast(outputBuffer.data().data()), bytesRead); - BMCWEB_LOG_DEBUG << "Sending payload size " << payload.size(); -@@ -112,7 +108,6 @@ inline void connectHandler(const boost::system::error_code& ec) - return; - } - -- doWrite(); - doRead(); - } - --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb_%.bbappend index 8d5a43c51..7f07e48ea 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/bmcweb/bmcweb_%.bbappend @@ -6,8 +6,6 @@ GROUPADD_PARAM_${PN} = "web; redfish " FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI += "file://0001-Refine-KVM-websock-proxy.patch" - # Enable CPU Log and Raw PECI support EXTRA_OECMAKE += "-DBMCWEB_ENABLE_REDFISH_CPU_LOG=ON" EXTRA_OECMAKE += "-DBMCWEB_ENABLE_REDFISH_RAW_PECI=ON" diff --git a/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb b/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb index 10793689b..8419fb483 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/cpu-log-util/cpu-log-util_git.bb @@ -11,7 +11,7 @@ LICENSE = "CLOSED" LIC_FILES_CHKSUM = "" SRC_URI = "git://git@github.com/Intel-BMC/at-scale-debug;protocol=ssh" -SRCREV = "de77d02aefa3c9df62365e7f07224c5cf9b0eb96" +SRCREV = "c4c223bdbe5b58a7acad12dc9700365330f2df1c" S = "${WORKDIR}/git/cpu-log-util" PACKAGES += "libpeci" diff --git a/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/usb-ctrl b/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/usb-ctrl new file mode 100644 index 000000000..ae9f54263 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-core/fw-update/files/usb-ctrl @@ -0,0 +1,136 @@ +#!/bin/sh + +setup_image() +{ + set -x + local storage="$1" + local sz_mb="$2" + # create the backing store + dd if=/dev/zero of=$storage bs=1M seek=$sz_mb count=0 2>/dev/null + # this shows up as 23FC-F676 in /dev/disk/by-uuid + local diskid=0x23FCF676 + mkdosfs -n 'OPENBMC-FW' -i $diskid -I $storage >/dev/null 2>&1 +} + +mount_image() +{ + set -x + local storage="$1" + local stormnt="$2" + mkdir -p $stormnt || exit 1 + mount -o loop -t vfat $storage $stormnt +} + +cleanup_image() +{ + set -x + local storage="$1" + local stormnt="$2" + umount -f "$stormnt" + rm -f "$storage" + rmdir "$stormnt" +} + +GADGET_BASE=/sys/kernel/config/usb_gadget + +which_dev() +{ + local in_use=$(cat $GADGET_BASE/*/UDC) + cd /sys/class/udc + for D in *; do + case "$in_use" in + *"$D"*) ;; + *) echo "$D"; return 0;; + esac + done + return 1 +} + +usb_ms_insert() +{ + local name="$1" + local storage="$2" + + if [ -d $GADGET_BASE/$name ]; then + echo "device $name already exists" >&2 + return 1 + fi + mkdir $GADGET_BASE/$name + cd $GADGET_BASE/$name + + echo 0x1d6b > idVendor # Linux Foundation + echo 0x0105 > idProduct # FunctionFS Gadget + mkdir strings/0x409 + local machineid=$(cat /etc/machine-id) + local data="OpenBMC USB mass storage gadget device serial number" + local serial=$( echo -n "${machineid}${data}${machineid}" | \ + sha256sum | cut -b 0-12 ) + echo $serial > strings/0x409/serialnumber + echo OpenBMC > strings/0x409/manufacturer + echo "OpenBMC Mass Storage" > strings/0x409/product + + mkdir configs/c.1 + mkdir functions/mass_storage.$name + echo $storage > functions/mass_storage.$name/lun.0/file + echo 0 > functions/mass_storage.$name/lun.0/removable + mkdir configs/c.1/strings/0x409 + + echo "Conf 1" > configs/c.1/strings/0x409/configuration + echo 120 > configs/c.1/MaxPower + ln -s functions/mass_storage.$name configs/c.1 + local dev=$(which_dev) + echo $dev > UDC +} + +usb_ms_eject() +{ + local name="$1" + + echo '' > $GADGET_BASE/$name/UDC + + rm -f $GADGET_BASE/$name/configs/c.1/mass_storage.$name + rmdir $GADGET_BASE/$name/configs/c.1/strings/0x409 + rmdir $GADGET_BASE/$name/configs/c.1 + rmdir $GADGET_BASE/$name/functions/mass_storage.$name + rmdir $GADGET_BASE/$name/strings/0x409 + rmdir $GADGET_BASE/$name +} + +usage() +{ + echo "Usage: $0 ..." + echo " $0 setup " + echo " $0 insert " + echo " $0 eject " + echo " $0 mount " + echo " $0 cleanup " + exit 1 +} + +echo "$#: $0 $@" +case "$1" in + insert) + shift + usb_ms_insert "$@" + ;; + eject) + shift + usb_ms_eject "$@" + ;; + setup) + shift + setup_image "$@" + ;; + mount) + shift + mount_image "$@" + ;; + cleanup) + shift + cleanup_image "$@" + ;; + *) + usage + ;; +esac +exit $? diff --git a/meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb b/meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb index ea39e62be..ac8e58c03 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/fw-update/intel-fw-update.bb @@ -6,13 +6,17 @@ PR = "r1" RDEPENDS_intel-fw-update += "mtd-utils" # wget tftp scp RDEPENDS_intel-fw-update += "busybox dropbear" +# mkfs.vfat, parted +RDEPENDS_intel-fw-update += "dosfstools parted" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" SRC_URI += "file://fwupd.sh" +SRC_URI += "file://usb-ctrl" do_install() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/fwupd.sh ${D}${bindir} + install -m 0755 ${WORKDIR}/usb-ctrl ${D}${bindir} } diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend index a7c19f708..5526d9c6b 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/intel-ipmi-oem_%.bbappend @@ -1,2 +1,2 @@ SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git" -SRCREV = "fcce83df799d9580f48b7f793989c9c96bc882e0" +SRCREV = "7086a88cfe94db15233bae450b3a03d3566bca68" diff --git a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb index 9e620a19c..c23da6df2 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/ipmi/ipmi-providers.bb @@ -2,7 +2,7 @@ SUMMARY = "Intel IPMI Providers" DESCRIPTION = "IPMI Provider Libraries" SRC_URI = "git://git@github.com/Intel-BMC/intel-ipmi-providers;protocol=ssh" -SRCREV = "3573b25576d14b3334f93bd988c6e2003fab8f90" +SRCREV = "bbb45687fc2993980ac95117d8503ee6c2358965" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb index 91eed5a82..2e89c27c1 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-core/peci-pcie/peci-pcie_git.bb @@ -10,7 +10,7 @@ SRC_URI = "git://git@github.com/Intel-BMC/provingground;protocol=ssh" DEPENDS = "boost sdbusplus cpu-log-util" PV = "0.1+git${SRCPV}" -SRCREV = "3cc86d6c536b4c5ee7afb5447837b83ce8b3d149" +SRCREV = "c927781ad3ca1408cd7fb0b7cc2538ea10ded76b" S = "${WORKDIR}/git/peci_pcie" diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/.clang-format b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/.clang-format deleted file mode 100644 index 8c5278e6f..000000000 --- a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/.clang-format +++ /dev/null @@ -1,98 +0,0 @@ ---- -Language: Cpp -# BasedOnStyle: LLVM -AccessModifierOffset: -2 -AlignAfterOpenBracket: Align -AlignConsecutiveAssignments: false -AlignConsecutiveDeclarations: false -AlignEscapedNewlinesLeft: false -AlignOperands: true -AlignTrailingComments: true -AllowAllParametersOfDeclarationOnNextLine: true -AllowShortBlocksOnASingleLine: false -AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: None -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: true -BinPackArguments: true -BinPackParameters: true -BraceWrapping: - AfterClass: true - AfterControlStatement: true - AfterEnum: true - AfterFunction: true - AfterNamespace: true - AfterObjCDeclaration: true - AfterStruct: true - AfterUnion: true - BeforeCatch: true - BeforeElse: true - IndentBraces: false -BreakBeforeBinaryOperators: None -BreakBeforeBraces: Custom -BreakBeforeTernaryOperators: true -BreakConstructorInitializers: AfterColon -ColumnLimit: 80 -CommentPragmas: '^ IWYU pragma:' -ConstructorInitializerAllOnOneLineOrOnePerLine: false -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 4 -Cpp11BracedListStyle: true -DerivePointerAlignment: false -DisableFormat: false -ExperimentalAutoDetectBinPacking: false -FixNamespaceComments: true -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] -IncludeBlocks: Regroup -IncludeCategories: - - Regex: '^[<"](gtest|gmock)' - Priority: 5 - - Regex: '^"config.h"' - Priority: -1 - - Regex: '^".*\.hpp"' - Priority: 1 - - Regex: '^<.*\.h>' - Priority: 2 - - Regex: '^<.*' - Priority: 3 - - Regex: '.*' - Priority: 4 -IndentCaseLabels: true -IndentWidth: 4 -IndentWrappedFunctionNames: true -KeepEmptyLinesAtTheStartOfBlocks: true -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -ObjCBlockIndentWidth: 2 -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true -PenaltyBreakBeforeFirstCallParameter: 19 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakString: 1000 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 60 -PointerAlignment: Left -ReflowComments: true -SortIncludes: true -SortUsingDeclarations: true -SpaceAfterCStyleCast: false -SpaceBeforeAssignmentOperators: true -SpaceBeforeParens: ControlStatements -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 1 -SpacesInAngles: false -SpacesInContainerLiterals: true -SpacesInCStyleCastParentheses: false -SpacesInParentheses: false -SpacesInSquareBrackets: false -Standard: Cpp11 -TabWidth: 4 -UseTab: Never -... diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0001-Fix-video-restarting-sync-issue.patch b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0001-Fix-video-restarting-sync-issue.patch new file mode 100644 index 000000000..0c9267796 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0001-Fix-video-restarting-sync-issue.patch @@ -0,0 +1,57 @@ +From 561e73cf200fa25a2c2f1ede4e4c899e192a95a4 Mon Sep 17 00:00:00 2001 +From: Jae Hyun Yoo +Date: Wed, 6 Mar 2019 15:39:58 -0800 +Subject: [PATCH] Fix video restarting sync issue + +There is a video start/stop sync issue inbetween ikvm server and +ikvm manager because newClient and clientGone callback called +by a different thread from libvncserver. To fix this issue, this +commit moves the video.start() call from server to manager to +unify video control thread. + +Tested: + Open KVM web page and reload the web page by pressing F5. + KVM page should be reloaded correctly. + +Change-Id: Ic0d14ea712510318e9e8f45615a95e82aeaaddf1 +Signed-off-by: Jae Hyun Yoo +--- + ikvm_manager.cpp | 1 + + ikvm_server.cpp | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ikvm_manager.cpp b/ikvm_manager.cpp +index 5e014d057410..d56110dd977f 100644 +--- a/ikvm_manager.cpp ++++ b/ikvm_manager.cpp +@@ -21,6 +21,7 @@ void Manager::run() + { + if (server.wantsFrame()) + { ++ video.start(); + video.getFrame(); + server.sendFrame(); + } +diff --git a/ikvm_server.cpp b/ikvm_server.cpp +index 37a927b9d418..35310da292be 100644 +--- a/ikvm_server.cpp ++++ b/ikvm_server.cpp +@@ -154,6 +154,7 @@ void Server::clientGone(rfbClientPtr cl) + Server* server = (Server*)cl->screen->screenData; + + delete (ClientData*)cl->clientData; ++ cl->clientData = nullptr; + + if (server->numClients-- == 1) + { +@@ -173,7 +174,6 @@ enum rfbNewClientAction Server::newClient(rfbClientPtr cl) + { + server->pendingResize = false; + server->frameCounter = 0; +- server->video.start(); + } + + return RFB_CLIENT_ACCEPT; +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0002-Restart-video-when-mode-detection-is-failed.patch b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0002-Restart-video-when-mode-detection-is-failed.patch new file mode 100644 index 000000000..9219b7dd0 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/0002-Restart-video-when-mode-detection-is-failed.patch @@ -0,0 +1,82 @@ +From 474addee4ed8da523bdc1cfe609099f9ebfb6f07 Mon Sep 17 00:00:00 2001 +From: Jae Hyun Yoo +Date: Fri, 15 Mar 2019 15:21:51 -0700 +Subject: [PATCH] Restart video when mode detection is failed + +KVM sometimes stops when video mode is changed. This commit adds +video restarting logic for the case. + +Tested: + 1. Open BMCWeb -> Server control -> KVM + 2. Checked KVM screen update while restarting the host. It + updates all frames even when video mode changes happen. + +Change-Id: If986394110986e49a6eaac1ae2859208fa7681f5 +Signed-off-by: Jae Hyun Yoo +--- + ikvm_video.cpp | 23 +++++++++++++---------- + ikvm_video.hpp | 6 ++++++ + 2 files changed, 19 insertions(+), 10 deletions(-) + +diff --git a/ikvm_video.cpp b/ikvm_video.cpp +index ed5ed92ef131..a34cdf2c083f 100644 +--- a/ikvm_video.cpp ++++ b/ikvm_video.cpp +@@ -155,6 +155,7 @@ bool Video::needsResize() + { + log("Failed to query timings", + entry("ERROR=%s", strerror(errno))); ++ restart(); + return false; + } + +@@ -265,17 +266,19 @@ void Video::resize() + xyz::openbmc_project::Common::Device::ReadFailure:: + CALLOUT_DEVICE_PATH(path.c_str())); + } +- +- rc = ioctl(fd, VIDIOC_S_DV_TIMINGS, &timings); +- if (rc < 0) ++ else + { +- log("Failed to set timings", +- entry("ERROR=%s", strerror(errno))); +- elog( +- xyz::openbmc_project::Common::Device::ReadFailure:: +- CALLOUT_ERRNO(errno), +- xyz::openbmc_project::Common::Device::ReadFailure:: +- CALLOUT_DEVICE_PATH(path.c_str())); ++ rc = ioctl(fd, VIDIOC_S_DV_TIMINGS, &timings); ++ if (rc < 0) ++ { ++ log("Failed to set timings", ++ entry("ERROR=%s", strerror(errno))); ++ elog( ++ xyz::openbmc_project::Common::Device::ReadFailure:: ++ CALLOUT_ERRNO(errno), ++ xyz::openbmc_project::Common::Device::ReadFailure:: ++ CALLOUT_DEVICE_PATH(path.c_str())); ++ } + } + + buffers.clear(); +diff --git a/ikvm_video.hpp b/ikvm_video.hpp +index 0e5f3afb27b4..faaa57d36f1a 100644 +--- a/ikvm_video.hpp ++++ b/ikvm_video.hpp +@@ -50,6 +50,12 @@ class Video + void start(); + /* @brief Stops streaming from the video device */ + void stop(); ++ /* @brief Restarts streaming from the video device */ ++ void restart() ++ { ++ stop(); ++ start(); ++ } + + /* + * @brief Gets the desired video frame rate in frames per second +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/LICENSE b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/LICENSE deleted file mode 100644 index 8dada3eda..000000000 --- a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/MAINTAINERS b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/MAINTAINERS deleted file mode 100644 index a5ab97e02..000000000 --- a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/MAINTAINERS +++ /dev/null @@ -1,45 +0,0 @@ -How to use this list: - Find the most specific section entry (described below) that matches where - your change lives and add the reviewers (R) and maintainers (M) as - reviewers. You can use the same method to track down who knows a particular - code base best. - - Your change/query may span multiple entries; that is okay. - - If you do not find an entry that describes your request at all, someone - forgot to update this list; please at least file an issue or send an email - to a maintainer, but preferably you should just update this document. - -Description of section entries: - - Section entries are structured according to the following scheme: - - X: NAME - X: ... - . - . - . - - Where REPO_NAME is the name of the repository within the OpenBMC GitHub - organization; FILE_PATH is a file path within the repository, possibly with - wildcards; X is a tag of one of the following types: - - M: Denotes maintainer; has fields NAME ; - if omitted from an entry, assume one of the maintainers from the - MAINTAINERS entry. - R: Denotes reviewer; has fields NAME ; - these people are to be added as reviewers for a change matching the repo - path. - F: Denotes forked from an external repository; has fields URL. - - Line comments are to be denoted "# SOME COMMENT" (typical shell style - comment); it is important to follow the correct syntax and semantics as we - may want to use automated tools with this file in the future. - - A change cannot be added to an OpenBMC repository without a MAINTAINER's - approval; thus, a MAINTAINER should always be listed as a reviewer. - -START OF MAINTAINERS LIST -------------------------- - -M: Eddie James diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/Makefile.am b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/Makefile.am deleted file mode 100644 index 1022b2e59..000000000 --- a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -bin_PROGRAMS = obmc-ikvm -dist_bin_SCRIPTS = create_usbhid.sh - -noinst_HEADERS = \ - ikvm_args.hpp \ - ikvm_input.hpp \ - ikvm_manager.hpp \ - ikvm_server.hpp \ - ikvm_video.hpp - -obmc_ikvm_SOURCES = \ - ikvm_args.cpp \ - ikvm_input.cpp \ - ikvm_manager.cpp \ - ikvm_server.cpp \ - ikvm_video.cpp \ - obmc-ikvm.cpp - -obmc_ikvm_CXXFLAGS = \ - $(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \ - $(PHOSPHOR_LOGGING_CFLAGS) \ - $(PTHREAD_CFLAGS) \ - $(SDBUSPLUS_CFLAGS) \ - $(LIBVNCSERVER_CFLAGS) - -obmc_ikvm_LDFLAGS = \ - $(PHOSPHOR_DBUS_INTERFACES_LIBS) \ - $(PHOSPHOR_LOGGING_LIBS) \ - $(PTHREAD_LIBS) \ - $(SDBUSPLUS_LIBS) \ - $(LIBVNCSERVER_LIBS) diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/README.md b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/README.md deleted file mode 100644 index 70d6e1373..000000000 --- a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# OpenBMC IpKVM Server - -The obmc-ikvm application is a VNC server that provides access to the host -graphics output. The application interfaces with the video device on the BMC -that captures the host graphics, and then serves that video data on the RFB -(remote framebuffer, also known as VNC) protocol. The application also -interfaces with the BMC USB gadget device to pass HID events from the BMC to -the host, allowing the user to interact with the host system. - -## Usage - -Once the host is running and an appropriate HID gadget device is instantiated -on the BMC, the application can be started with the following command: -``` obmc-ikvm -v