diff options
Diffstat (limited to 'meta-openpower')
35 files changed, 183 insertions, 196 deletions
diff --git a/meta-openpower/README.md b/meta-openpower/README.md index 5558eb1ee..df764b8c2 100644 --- a/meta-openpower/README.md +++ b/meta-openpower/README.md @@ -1,6 +1,48 @@ -OpenPOWER -================ +OpenEmbedded/Yocto/OpenBMC BSP layer for OpenPOWER reference platforms +====================================================================== -meta-openpower is the OpenPOWER layer and should be included in all OpenPOWER -systems' bblayers.conf. More information on OpenPOWER can be found +This layer provides support for the BMC firmware on OpenPOWER reference +platforms, and/or a base upon which to create a BMC firmware implementation on +any POWER system. + +``` +This layer depends on: + +URI: git://git.openembedded.org/openembedded-core +layers: meta +branch: master +revision: HEAD + +URI: https://github.com/openbmc/meta-phosphor +branch: master +revision: HEAD + +URI: https://github.com/openbmc/meta-aspeed +branch: master +revision: HEAD +``` + +More information on OpenPOWER can be found [here](https://openpowerfoundation.org/). + +Contributing +------------ + +meta-openpower patches are reviewed using the Gerrit instance at +https://gerrit.openbmc-project.xyz. + +Please submit patches to Gerrit. More information on using Gerrit can be found +[here](https://github.com/openbmc/docs/blob/master/CONTRIBUTING.md#submitting-changes-via-gerrit-server). +https://github.com/openbmc/meta-openpower is a hosting mirror only and GitHub +pull requests are not monitored and will not be accepted. + +Patch checklist. Please ensure patches adhere to the following guidelines: + + - meta-openpower uses the [OE style + guidelines](https://www.openembedded.org/wiki/Styleguide). + - follow [the seven rules of a great git commit + message](https://chris.beams.io/posts/git-commit/#seven-rules) + +For questions or help please come join us on the [mailing +list](https://lists.ozlabs.org/listinfo/openbmc) or in +[IRC](irc://freenode.net/openbmc). diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf index 6bc20a421..0b3f1a8b6 100644 --- a/meta-openpower/conf/layer.conf +++ b/meta-openpower/conf/layer.conf @@ -8,7 +8,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "openpower-layer" BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/" LAYERVERSION_openpower-layer = "1" -LAYERSERIES_COMPAT_openpower-layer = "thud warrior" - -# Provide a variable that points the base of the openpower layer. -OPENPOWERBASE = '${@os.path.normpath("${LAYERDIR}/")}' +LAYERDEPENDS_openpower-layer = "core phosphor-layer aspeed-layer" +LAYERSERIES_COMPAT_openpower-layer = "warrior zeus" diff --git a/meta-openpower/recipes-bsp/pdbg/pdbg_2.2.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_2.3.bb index cd2b8fe44..faca30fde 100644 --- a/meta-openpower/recipes-bsp/pdbg/pdbg_2.2.bb +++ b/meta-openpower/recipes-bsp/pdbg/pdbg_2.3.bb @@ -3,10 +3,10 @@ DESCRIPTION = "pdbg allows JTAG-like debugging of the host POWER processors" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" -PV = "2.2+git${SRCPV}" +PV = "2.3+git${SRCPV}" SRC_URI += "git://github.com/open-power/pdbg.git" -SRCREV = "dbbb35af951e36cb1ff134bdf74a5346d316e782" +SRCREV = "8a10a05c89db666bf98734139334166da7c370a4" DEPENDS += "dtc-native" diff --git a/meta-openpower/recipes-phosphor/configuration/openpower-yaml-config.bb b/meta-openpower/recipes-phosphor/configuration/openpower-yaml-config.bb index 52ac769ab..39141bab8 100644 --- a/meta-openpower/recipes-phosphor/configuration/openpower-yaml-config.bb +++ b/meta-openpower/recipes-phosphor/configuration/openpower-yaml-config.bb @@ -1,7 +1,7 @@ SUMMARY = "Shared OpenPOWER configuration" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit allarch diff --git a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb index 6f0771aa6..e0b296fb9 100644 --- a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb +++ b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb @@ -3,7 +3,7 @@ DESCRIPTION="Add the /org/open_power path namespace and \ org.open_power interface prefix to the mapper \ watch list." LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit phosphor-mapper inherit native diff --git a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces_git.bb b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces_git.bb index 23381bee9..f376ab011 100644 --- a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces_git.bb +++ b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces_git.bb @@ -16,7 +16,7 @@ DEPENDS += "sdbus++-native" DEPENDS += "phosphor-dbus-interfaces" SRC_URI += "git://github.com/openbmc/openpower-dbus-interfaces" -SRCREV = "84a750aeee62b90a5817f4eea39562d2f277cd63" +SRCREV = "c5191609d0a738fdc2c2887bf06b8f69824d515b" DEPENDS_remove_class-native = "sdbus++-native" DEPENDS_remove_class-nativesdk = "sdbus++-native" diff --git a/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/guard b/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/guard new file mode 100644 index 000000000..cdd461fec --- /dev/null +++ b/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector/plugins.d/guard @@ -0,0 +1,18 @@ +#!/bin/bash +# +# config: 2 40 +# @brief: Collect GUARD record information. +# + +. $DREPORT_INCLUDE/functions + +desc="GUARD Records" +file_name="/var/lib/phosphor-software-manager/pnor/prsv/GUARD" + +# Check file is present and not empty. +if [ ! -s "$file_name" ]; then + log_info "No $desc" + exit 0 +fi + +add_copy_file "$file_name" "$desc" diff --git a/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend new file mode 100644 index 000000000..a4cb739e8 --- /dev/null +++ b/meta-openpower/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend @@ -0,0 +1,18 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://plugins.d/guard" + +install_openpower_plugins() { + install -m 0755 ${WORKDIR}/plugins.d/guard ${D}${dreport_plugin_dir} +} + +#Link in the plugins so dreport run them at the appropriate time +python link_openpower_plugins() { + workdir = d.getVar('WORKDIR', True) + script = os.path.join(workdir, 'plugins.d', 'guard') + install_dreport_user_script(script, d) +} + +DEBUG_COLLECTOR_INSTALL_POSTFUNCS ?= "" +DEBUG_COLLECTOR_INSTALL_POSTFUNCS_df-openpower ?= "install_openpower_plugins link_openpower_plugins" + +do_install[postfuncs] += "${DEBUG_COLLECTOR_INSTALL_POSTFUNCS}" diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 982a1678d..a59bcac19 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -39,7 +39,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "4d3d91262bcaf1afc2eee54145052106644410be" +SRCREV = "b41a57d52c6e5f6673b784a7a94a8dec0787770b" DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service" diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb index 7af9731f5..e056d6d28 100644 --- a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb +++ b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb @@ -2,7 +2,7 @@ SUMMARY = "FSI Services" DESCRIPTION = "Install FSI related services" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd diff --git a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb index 452cdeb87..ebb3a2f77 100644 --- a/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb +++ b/meta-openpower/recipes-phosphor/host/checkstop-monitor.bb @@ -1,7 +1,7 @@ SUMMARY = "OpenPOWER Host checkstop monitor application" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd inherit allarch diff --git a/meta-openpower/recipes-phosphor/host/hostboot-settings.bb b/meta-openpower/recipes-phosphor/host/hostboot-settings.bb deleted file mode 100644 index 0a713e766..000000000 --- a/meta-openpower/recipes-phosphor/host/hostboot-settings.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "OpenPower Hostboot Boot settings tool" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit obmc-phosphor-systemd -inherit allarch - -SRC_URI = "file://hb_settings" -SYSTEMD_SERVICE_${PN} += "hostboot-settings.service" - -do_fetch[noexec] = "1" -do_patch[noexec] = "1" -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/hb_settings ${D}${bindir} -} diff --git a/meta-openpower/recipes-phosphor/host/hostboot-settings/hb_settings b/meta-openpower/recipes-phosphor/host/hostboot-settings/hb_settings deleted file mode 100644 index d75d4b74d..000000000 --- a/meta-openpower/recipes-phosphor/host/hostboot-settings/hb_settings +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/sh -# Copyright 2018 IBM Corp -# SPDX-License-Identifier: Apache-2.0 -# Authored May 2018, Joel Stanley <joel@jms.id.au> -# -# This script sets the SIO scratch registers 0x2D in order to configure -# hostboot. It supports boot flags v1 as defined in hostboot source: -# src/usr/initservice/bootconfig/bootconfig_ast2400.C -# src/usr/console/ast2400.C -# -# BOOT_FLAGS_VERSION_REG = 0x28, -# Serial config reg: 0x2d -# Serial config mask: 0xc0 -# -# NONE = 0x00, // No output selected -# SELECT_SUART = 0x40, // SIO Uart -# SELECT_VUART = 0x80, // SOL virtual uart -# RESERVED = 0xc0, // Reserved - - -SYSFS_SIO=/sys/devices/platform/ahb/ahb:apb/1e789000.lpc/1e789080.lpc-host/1e789080.lpc-host:regs -SYSFS_SIO28=$SYSFS_SIO/sio_28 -SYSFS_SIO2D=$SYSFS_SIO/sio_2d - -FLAGS_VERSION1=$((0x42)) - -usage() -{ - echo "usage: hb_settings [[-u|--uart vuart|suart|none] | [-s|--show] | [-h]]" -} - -show_regs() -{ - SIO28=$(cat $SYSFS_SIO28) - SIO2D=$(cat $SYSFS_SIO2D) - - case $SIO28 in - $FLAGS_VERSION1) - echo "Boot flags version 1" - ;; - * ) - echo "Unknown boot flags version" - ;; - esac - - case $(($SIO2D >> 6)) in - 0) - echo "Hostboot serial output disabled" - ;; - 1) - echo "Hostboot serial output on SUART" - ;; - 2) - echo "Hostboot serial output on VUART" - ;; - 3) - echo "Reserved value" - ;; - * ) - echo "Invalid uart value" - ;; - esac -} - -set_regs() -{ - case $uart in - suart) - echo "Hostboot serial output on SUART" - VAL=0x40 - ;; - vuart) - echo "Hostboot serial output on VUART" - VAL=0x80 - ;; - none) - echo "Hostboot serial output disabled" - VAL=0x00 - ;; - * ) - echo "Invalid uart value" - usage - exit 1 - esac - - echo $FLAGS_VERSION1 > $SYSFS_SIO28 - echo $VAL > $SYSFS_SIO2D -} - -while [ "$1" != "" ]; do - case $1 in - -u | --uart) shift - uart=$1 - set_regs - exit - ;; - -s | --show ) show_regs - exit - ;; - -h | --help ) usage - exit - ;; - * ) usage - exit 1 - esac - shift -done - -usage -exit 0 diff --git a/meta-openpower/recipes-phosphor/host/hostboot-settings/hostboot-settings.service b/meta-openpower/recipes-phosphor/host/hostboot-settings/hostboot-settings.service deleted file mode 100644 index 9ce81d79b..000000000 --- a/meta-openpower/recipes-phosphor/host/hostboot-settings/hostboot-settings.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Hostboot Boot Settings - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStart=/usr/bin/hb_settings --uart vuart - -[Install] -WantedBy=multi-user.target diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 05d6d90df..33ac60c6c 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit autotools obmc-phosphor-utils pkgconfig pythonnative inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "16ab00cb9383b17b8dd033a1cb300e2a013d55b1" +SRCREV = "60db8b147dad15890ffed21230537cd8d4898efc" DEPENDS += " \ autoconf-archive-native \ @@ -23,13 +23,6 @@ DEPENDS += " \ # For libpdbg, provided by the pdbg package DEPENDS += "pdbg" -# For now, explicitly depend on the pdbg package for the pdbg binary at runtime -# (as documentation). This will be removed shortly when we only depend on -# libpdbg; the pdbg package will automatically injected into RDEPENDS by -# bitbake as it is in DEPENDS and openpower-proc-nmi has a runtime link -# dependency on libpdbg. -RDEPENDS_${PN} += "pdbg" - TEMPLATE = "pcie-poweroff@.service" INSTANCE_FORMAT = "pcie-poweroff@{}.service" INSTANCES = "${@compose_list(d, 'INSTANCE_FORMAT', 'OBMC_CHASSIS_INSTANCES')}" @@ -38,5 +31,4 @@ SYSTEMD_SERVICE_${PN} = "${TEMPLATE} ${INSTANCES}" SYSTEMD_SERVICE_${PN} += " \ xyz.openbmc_project.Control.Host.NMI.service \ - nmi.service \ " diff --git a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb index e395841ba..769a1348d 100644 --- a/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb +++ b/meta-openpower/recipes-phosphor/host/p9-cfam-override.bb @@ -2,7 +2,7 @@ SUMMARY = "POWER9 CFAM override" DESCRIPTION = "Applies user CFAM register overrides from file" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd diff --git a/meta-openpower/recipes-phosphor/host/p9-host-start.bb b/meta-openpower/recipes-phosphor/host/p9-host-start.bb index b9110010e..374359838 100644 --- a/meta-openpower/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openpower/recipes-phosphor/host/p9-host-start.bb @@ -2,7 +2,7 @@ SUMMARY = "POWER9 start host" DESCRIPTION = "Service to start POWER9 IPL through SBE" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd diff --git a/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb b/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb index 43efeab24..29167b0e1 100644 --- a/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb +++ b/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb @@ -2,7 +2,7 @@ SUMMARY = "POWER9 VCS workaround" DESCRIPTION = "Apply fixes over FSI to POWER9 CPUs prior to host power on" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd diff --git a/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb index b60a9e38f..bd0a8eea4 100644 --- a/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/hostboot-inventory-config-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Hostboot hostfw inventory map for phosphor-ipmi-fru" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-fru diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb index b9fd60552..6e2c1fc5d 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-sensor-inventory-mrw-native.bb @@ -1,7 +1,7 @@ SUMMARY = "OEM sensor config for phosphor-host-ipmid" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-host diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb index 4ca070784..1c8758793 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-whitelist-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Whitelisted OpenBMC IPMI OEM commands" DESCRIPTION = "Whitelisted OpenBMC IPMI OEM commands for OpenPOWER based systems" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit phosphor-ipmi-host-whitelist diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc index f13d3046a..b0daf33c5 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-host-ipmi-oem" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/openpower-host-ipmi-oem" -SRCREV = "81c34dfea4f6535cfe9519fa9fc2be798456132a" +SRCREV = "64354b6604e6a1d6b60463cae15c33b137768e1b" diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh index 42a85b873..62284d16b 100644 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh +++ b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname/first-boot-set-hostname.sh @@ -12,9 +12,10 @@ sync_hostname() { MAPPER_IFACE='xyz.openbmc_project.ObjectMapper' MAPPER_PATH='/xyz/openbmc_project/object_mapper' INVENTORY_PATH='/xyz/openbmc_project/inventory' + BMC_ITEM_IFACE='xyz.openbmc_project.Inventory.Item.Bmc' INV_ASSET_IFACE='xyz.openbmc_project.Inventory.Decorator.Asset' - + BMC_SN='' BMC_ITEM_PATH=$(busctl --no-pager --verbose call \ ${MAPPER_IFACE} \ ${MAPPER_PATH} \ @@ -30,21 +31,54 @@ sync_hostname() { BMC_ITEM_SERVICE=$(mapper get-service \ ${BMC_ITEM_PATH} 2>/dev/null || true) - if [[ -z "${BMC_ITEM_SERVICE}" ]]; then + if [[ -n "${BMC_ITEM_SERVICE}" ]]; then + BMC_SN=$(busctl get-property ${BMC_ITEM_SERVICE} \ + ${BMC_ITEM_PATH} \ + ${INV_ASSET_IFACE} SerialNumber) + # 's "002B0DH1000"' + BMC_SN=${BMC_SN#*\"} + BMC_SN=${BMC_SN%\"*} + else show_error "No BMC item found in the Inventory. Is VPD EEPROM empty?" - return fi - BMC_SN=$(busctl get-property ${BMC_ITEM_SERVICE} \ - ${BMC_ITEM_PATH} \ - ${INV_ASSET_IFACE} SerialNumber) - # 's "002B0DH1000"' - BMC_SN=${BMC_SN#*\"} - BMC_SN=${BMC_SN%\"*} + if [[ -z "${BMC_SN}" ]] ; then + show_error "BMC Serial Number empty! Setting Hostname as 'hostname + mac address' " + + NETWORK_ITEM_IFACE='xyz.openbmc_project.Inventory.Item.NetworkInterface' + NETWORK_ITEM_PATH=$(busctl --no-pager --verbose call \ + ${MAPPER_IFACE} \ + ${MAPPER_PATH} \ + ${MAPPER_IFACE} \ + GetSubTree sias \ + ${INVENTORY_PATH} 0 1 ${NETWORK_ITEM_IFACE} \ + 2>/dev/null | grep ${INVENTORY_PATH} || true) + + NETWORK_ITEM_PATH=${NETWORK_ITEM_PATH#*\"} + NETWORK_ITEM_PATH=${NETWORK_ITEM_PATH%\"*} + + NETWORK_ITEM_OBJ=$(mapper get-service ${NETWORK_ITEM_PATH} 2>/dev/null || true) + + if [[ -z "${NETWORK_ITEM_OBJ}" ]]; then + show_error 'No Ethernet interface found in the Inventory. Unique hostname not set!' + exit 1 + fi + + MAC_ADDR=$(busctl get-property ${NETWORK_ITEM_OBJ} \ + ${NETWORK_ITEM_PATH} \ + ${NETWORK_ITEM_IFACE} MACAddress) + + # 's "54:52:01:02:03:04"' + MAC_ADDR=${MAC_ADDR#*\"} + MAC_ADDR=${MAC_ADDR%\"*} + + hostnamectl set-hostname $(hostname)-${MAC_ADDR} + else + hostnamectl set-hostname $(hostname)-${BMC_SN} + fi - hostnamectl set-hostname {MACHINE}-${BMC_SN} } -[ "$(hostname)" = "{MACHINE}" ] && sync_hostname +sync_hostname -systemctl disable first-boot-set-hostname.service +systemctl --no-reload disable first-boot-set-hostname.service diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname_1.0.bb b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname_1.0.bb index 7f71e7c01..f3f7d34cf 100644 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-hostname_1.0.bb +++ b/meta-openpower/recipes-phosphor/network/first-boot-set-hostname_1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Init BMC Hostname" DESCRIPTION = "Setup BMC Unique hostname" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit allarch systemd diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh b/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh index 9668ed5f1..da1b305d4 100755 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh +++ b/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh @@ -15,13 +15,34 @@ sync_mac() { INVENTORY_PATH='/xyz/openbmc_project/inventory' NETWORK_ITEM_IFACE='xyz.openbmc_project.Inventory.Item.NetworkInterface' - NETWORK_ITEM_PATH=$(busctl --no-pager --verbose call \ + # Get the NETWORK ITEM count + NETWORK_ITEM_PATH_COUNT=$(busctl --no-pager --verbose call \ + ${MAPPER_IFACE} \ + ${MAPPER_PATH} \ + ${MAPPER_IFACE} \ + GetSubTree sias \ + ${INVENTORY_PATH} 0 1 ${NETWORK_ITEM_IFACE} \ + 2>/dev/null | grep ${INVENTORY_PATH} | wc -l || true) + + if [ $NETWORK_ITEM_PATH_COUNT -gt 1 ]; then + # If there are more than 2 NETOWRK ITEM and path must contain $1 + # for finding the right NETWORK ITEM + NETWORK_ITEM_PATH=$(busctl --no-pager --verbose call \ + ${MAPPER_IFACE} \ + ${MAPPER_PATH} \ + ${MAPPER_IFACE} \ + GetSubTree sias \ + ${INVENTORY_PATH} 0 1 ${NETWORK_ITEM_IFACE} \ + 2>/dev/null | grep ${INVENTORY_PATH} | grep $1 || true) + else + NETWORK_ITEM_PATH=$(busctl --no-pager --verbose call \ ${MAPPER_IFACE} \ ${MAPPER_PATH} \ ${MAPPER_IFACE} \ GetSubTree sias \ ${INVENTORY_PATH} 0 1 ${NETWORK_ITEM_IFACE} \ 2>/dev/null | grep ${INVENTORY_PATH} || true) + fi # ' STRING "/xyz/openbmc_project/inventory/system/chassis/ethernet";' NETWORK_ITEM_PATH=${NETWORK_ITEM_PATH#*\"} @@ -58,4 +79,4 @@ fi sync_mac $1 -systemctl disable first-boot-set-mac@${1}.service +systemctl --no-reload disable first-boot-set-mac@${1}.service diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-mac_1.0.bb b/meta-openpower/recipes-phosphor/network/first-boot-set-mac_1.0.bb index 1a1ee97dc..f67ddd464 100644 --- a/meta-openpower/recipes-phosphor/network/first-boot-set-mac_1.0.bb +++ b/meta-openpower/recipes-phosphor/network/first-boot-set-mac_1.0.bb @@ -2,7 +2,7 @@ SUMMARY = "Init BMC MAC address" DESCRIPTION = "Setup BMC MAC address read from VPD" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit allarch systemd diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb index 1b228adb3..796088546 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb @@ -1,7 +1,7 @@ SUMMARY = "OpenPower OCC Control with MRW generated sensor IDs" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-occ-control diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index 51045253a..2832c940a 100644 --- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -47,6 +47,5 @@ RDEPENDS_${PN}-flash = " \ SUMMARY_${PN}-system = "OpenPOWER System" RDEPENDS_${PN}-system = " \ - hostboot-settings \ pdbg \ " diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb index e04ebd908..3c9c8eae2 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-example-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Inventory config for openpower-vpd-parser" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb index 12e9f277e..be0779fef 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-inventory-mrw-native.bb @@ -1,7 +1,7 @@ SUMMARY = "Inventory config for openpower-vpd-parser" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb index c398cc8f8..67107a6e8 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-example-native.bb @@ -1,7 +1,7 @@ SUMMARY = "FRU properties config for openpower-vpd-parser" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb index 0e32a4268..42b1f37e4 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-properties-mrw-native.bb @@ -1,7 +1,7 @@ SUMMARY = "FRU properties config for openpower-vpd-parser" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb index e0717e36d..5b0188614 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout-native.bb @@ -1,7 +1,7 @@ SUMMARY = "VPD layout for openpower-fru-vpd" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OPENPOWERBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit native inherit openpower-fru-vpd diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml index b7db18f0c..b13ff8d67 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd-layout/layout.yaml @@ -11,3 +11,8 @@ ETHERNET: VINI,B1: MACAddress OPFR,B1: MACAddress xyz.openbmc_project.Inventory.Item.Ethernet: +ETHERNET1: + xyz.openbmc_project.Inventory.Item.NetworkInterface: + VINI,B1: MACAddress + OPFR,B1: MACAddress + xyz.openbmc_project.Inventory.Item.Ethernet: diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index b3b125ba3..80fb65fbc 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "ee79ca842542c240d9f87166d2aecde32d6b6f80" +SRCREV = "18197ae979ea3fea5f5f34216987f497e02ce96e" |