diff options
1081 files changed, 64781 insertions, 10853 deletions
@@ -1,2 +1,5 @@ owners: - bradleyb@fuzziesquirrel.com +- edtanous@google.com +- geissonator@yahoo.com +- patrick@stwcx.xyz diff --git a/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 4948cb4cb..ac98c7ce7 100644 --- a/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-amd/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,3 +1 @@ -# Enable threshold monitoring -EXTRA_OECMAKE += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" -EXTRA_OECMAKE += "-DREDFISH_LOG_MONITOR_PULSE_EVENTS=ON" +PACKAGECONFIG_append = " log-threshold log-pulse" diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb index e7c3cc160..5c4b6a012 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb @@ -7,79 +7,29 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca inherit systemd inherit obmc-phosphor-systemd -# For now, monitoring shutdown_ack and reboot_ack are the only usecases -OBMC_HOST_MONITOR_INSTANCES = "shutdown_ack reboot_ack" -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/shutdown_ack obmc/gpio/reboot_ack" - S = "${WORKDIR}" -SRC_URI = "file://ampere-host-shutdown.service \ - file://ampere-host-reset.service \ - file://ampere_power_util.sh \ - file://ampere-chassis-poweroff.service \ - file://ampere-chassis-poweron.service \ - file://ampere-host-reset-ack.service \ - file://ampere-host-force-reset.service \ - file://ampere-host-power-cycle.service \ +SRC_URI = " \ + file://ampere-host-force-reset@.service \ + file://ampere-host-on-host-check@.service \ " -DEPENDS = "systemd virtual/obmc-gpio-monitor" -RDEPENDS_${PN} = "bash virtual/obmc-gpio-monitor" - SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = " \ - ampere-host-shutdown.service \ - ampere-host-reset.service \ - ampere-chassis-poweroff.service \ - ampere-chassis-poweron.service \ - ampere-host-reset-ack.service \ - ampere-host-force-reset.service \ - ampere-host-power-cycle.service \ + ampere-host-force-reset@.service \ " -# host power control -# overwrite the host shutdown to graceful shutdown -HOST_SHUTDOWN_TMPL = "ampere-host-shutdown.service" -HOST_SHUTDOWN_TGTFMT = "obmc-host-shutdown@{0}.target" -HOST_SHUTDOWN_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SHUTDOWN_TGTFMT}.requires/${HOST_SHUTDOWN_TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}" - -# Force the power cycle target to run the ampere power cycle -HOST_REBOOT_SVC = "ampere-host-power-cycle.service" -HOST_REBOOT_SVC_TGTFMT = "obmc-host-reboot@{0}.target" -HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_SVC_TGTFMT}.requires/${HOST_REBOOT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" -# overwrite the host reset to graceful reset -HOST_WARM_REBOOT_SOFT_SVC = "ampere-host-reset.service" -HOST_WARM_REBOOT_TGTFMT = "obmc-host-warm-reboot@{0}.target" -HOST_WARM_REBOOT_SOFT_SVC_FMT = "../${HOST_WARM_REBOOT_SOFT_SVC}:${HOST_WARM_REBOOT_TGTFMT}.requires/${HOST_WARM_REBOOT_SOFT_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" - -# overwrite force reboot -HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset.service" +# append force reboot +HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset@.service" +HOST_WARM_REBOOT_FORCE_INSTMPL = "ampere-host-force-reset@{0}.service" HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" -HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_TGT}" +HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_INSTMPL}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" - -# chassis power control -CHASSIS_POWERON_SVC = "ampere-chassis-poweron.service" -CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" -CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -CHASSIS_POWEROFF_SVC = "ampere-chassis-poweroff.service" -CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" -CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_SVC}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -TMPL = "phosphor-gpio-monitor@.service" -INSTFMT = "phosphor-gpio-monitor@{0}.service" -TGT = "multi-user.target" -FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}" - -do_install() { - install -d ${D}/usr/sbin - install -m 0755 ${WORKDIR}/ampere_power_util.sh ${D}/${sbindir}/ampere_power_util.sh -} - +SYSTEMD_SERVICE_${PN} += "${HOST_WARM_REBOOT_FORCE_TGT}" + +HOST_ON_RESET_HOSTTMPL = "ampere-host-on-host-check@.service" +HOST_ON_RESET_HOSTINSTMPL = "ampere-host-on-host-check@{0}.service" +HOST_ON_RESET_HOSTTGTFMT = "obmc-host-startmin@{0}.target" +HOST_ON_RESET_HOSTFMT = "../${HOST_ON_RESET_HOSTTMPL}:${HOST_ON_RESET_HOSTTGTFMT}.requires/${HOST_ON_RESET_HOSTINSTMPL}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_ON_RESET_HOSTFMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_SERVICE_${PN} += "${HOST_ON_RESET_HOSTTMPL}" diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-force-reset@.service b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-force-reset@.service new file mode 100644 index 000000000..6e03c8b81 --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-force-reset@.service @@ -0,0 +1,14 @@ +[Unit] +Description=Ampere Computing LLC force reset host%i +Wants=phosphor-reboot-host@%i.service +Conflicts=obmc-chassis-poweroff@%i.target +OnFailure=obmc-chassis-powerreset@%i.target + +[Service] +RemainAfterExit=no +Type=oneshot +ExecStart=/bin/sh -c "sleep 3 && /usr/bin/env ampere_power_util.sh mb force_reset" +SyslogIdentifier=ampere_power_util.sh + +[Install] +WantedBy=obmc-host-force-warm-reboot@%i.target
\ No newline at end of file diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-on-host-check@.service b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-on-host-check@.service new file mode 100644 index 000000000..36e5a642c --- /dev/null +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-on-host-check@.service @@ -0,0 +1,13 @@ +[Unit] +Description=Check Host%i status before obmc-host-startmin +Wants=obmc-host-started@%i.target +After=obmc-host-started@%i.target +Conflicts=obmc-host-stop@%i.target +Conflicts=phosphor-reset-host-check@%i.service +OnFailure=obmc-host-quiesce@%i.target +OnFailureJobMode=flush +ConditionPathExists=!/run/openbmc/host@%i-on + +[Service] +Type=oneshot +ExecStart=/usr/sbin/ampere_host_check.sh 1 0 diff --git a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch b/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch new file mode 100644 index 000000000..174a1cd6d --- /dev/null +++ b/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils/0001-flashcp-support-offset-option.patch @@ -0,0 +1,143 @@ +From e29268bb252b4eec5830816912817a2650b04ee9 Mon Sep 17 00:00:00 2001 +From: Tung Nguyen <tung.nguyen@amperecomputing.com> +Date: Tue, 20 Jul 2021 15:32:32 +0700 +Subject: [PATCH] flashcp support offset option + +The flashcp command from mtd-utils just support to flash from offset 0. +Add offset option to specify the start offset so that firmware can be +flashed correctly + +Signed-off-by: Tung Nguyen <tung.nguyen@amperecomputing.com> + +%% original patch: 0001-support-flash-offset.patch +--- + misc-utils/flashcp.c | 50 +++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 47 insertions(+), 3 deletions(-) + +diff --git a/misc-utils/flashcp.c b/misc-utils/flashcp.c +index d7b0a59..d1ef79c 100644 +--- a/misc-utils/flashcp.c ++++ b/misc-utils/flashcp.c +@@ -90,7 +90,7 @@ static NORETURN void showusage(bool error) + "\n" + "Flash Copy - Written by Abraham van der Merwe <abraham@2d3d.co.za>\n" + "\n" +- "usage: %1$s [ -v | --verbose | -A | --erase-all ] <filename> <device>\n" ++ "usage: %1$s [ -v | --verbose | -A | --erase-all ] <filename> <device> <offset>\n" + " %1$s -h | --help\n" + " %1$s -V | --version\n" + "\n" +@@ -100,6 +100,7 @@ static NORETURN void showusage(bool error) + " -V | --version Show version information and exit\n" + " <filename> File which you want to copy to flash\n" + " <device> Flash device to write to (e.g. /dev/mtd0, /dev/mtd1, etc.)\n" ++ " <offset> The start offset. Optional, default: 0\n" + "\n", + PROGRAM_NAME); + +@@ -154,6 +155,16 @@ static void safe_rewind (int fd,const char *filename) + } + } + ++static int safe_rewind_offset(int fd, const char *filename, off_t offset) ++{ ++ if (lseek(fd, offset, SEEK_SET) < 0) { ++ log_printf(LOG_ERROR, "While seeking to start of %s: %m\n", filename); ++ return EXIT_FAILURE; ++ } ++ ++ return EXIT_SUCCESS; ++} ++ + /******************************************************************************/ + + static int dev_fd = -1,fil_fd = -1; +@@ -167,6 +178,8 @@ static void cleanup (void) + int main (int argc,char *argv[]) + { + const char *filename = NULL,*device = NULL; ++ off_t offset; ++ + int i,flags = FLAG_NONE; + ssize_t result; + size_t size,written; +@@ -218,6 +231,20 @@ int main (int argc,char *argv[]) + showusage(true); + } + } ++ ++ if (optind + 3 == argc) { ++ flags |= FLAG_FILENAME; ++ filename = argv[optind]; ++ DEBUG("Got filename: %s\n", filename); ++ ++ flags |= FLAG_DEVICE; ++ device = argv[optind + 1]; ++ DEBUG("Got device: %s\n", device); ++ ++ offset = strtoul(argv[optind + 2], NULL, 16); ++ DEBUG("Got offset: 0x%x\n", offset); ++ } ++ + if (optind+2 == argc) { + flags |= FLAG_FILENAME; + filename = argv[optind]; +@@ -226,6 +253,8 @@ int main (int argc,char *argv[]) + flags |= FLAG_DEVICE; + device = argv[optind+1]; + DEBUG("Got device: %s\n",device); ++ ++ offset = 0; + } + + if (flags & FLAG_HELP || device == NULL) +@@ -257,6 +286,12 @@ int main (int argc,char *argv[]) + exit (EXIT_FAILURE); + } + ++ /* does offset is out of the mtd */ ++ if (offset > mtd.size) { ++ log_printf(LOG_ERROR, "%s offset won't fit into %s!\n", offset, device); ++ exit(EXIT_FAILURE); ++ } ++ + /***************************************************** + * erase enough blocks so that we can write the file * + *****************************************************/ +@@ -271,6 +306,8 @@ int main (int argc,char *argv[]) + } + else + { ++ /* Erase from the offset */ ++ erase.start = offset; + erase.length = (filestat.st_size + mtd.erasesize - 1) / mtd.erasesize; + erase.length *= mtd.erasesize; + } +@@ -317,6 +354,12 @@ int main (int argc,char *argv[]) + size = filestat.st_size; + i = BUFSIZE; + written = 0; ++ ++ /* if offset is greater than 0 */ ++ if (offset) ++ if (safe_rewind_offset(dev_fd, device, offset) != EXIT_SUCCESS) ++ return EXIT_FAILURE; ++ + while (size) + { + if (size < BUFSIZE) i = size; +@@ -361,8 +404,9 @@ int main (int argc,char *argv[]) + * verify that flash == file data * + **********************************/ + +- safe_rewind (fil_fd,filename); +- safe_rewind (dev_fd,device); ++ safe_rewind(fil_fd, filename); ++ safe_rewind_offset(dev_fd, device, offset); ++ + size = filestat.st_size; + i = BUFSIZE; + written = 0; +-- +2.17.1 + diff --git a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend b/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend new file mode 100644 index 000000000..08aa3ce69 --- /dev/null +++ b/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://0001-flashcp-support-offset-option.patch " diff --git a/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 000000000..b2883fcaf --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG_append = " nic-ethtool" diff --git a/meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 4be8ddbd5..2f74fd2c3 100644 --- a/meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,2 +1 @@ -# Enable threshold monitoring -EXTRA_OECMAKE += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" +PACKAGECONFIG_append = " log-threshold" diff --git a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager/ampere-reset-host-check@.service b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager/ampere-reset-host-check@.service new file mode 100644 index 000000000..83f6581be --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager/ampere-reset-host-check@.service @@ -0,0 +1,18 @@ +[Unit] +Description=Check Host%i status on BMC reset +Wants=phosphor-ipmi-host.service +After=phosphor-ipmi-host.service +Wants=obmc-host-reset-running@%i.target +Before=obmc-host-reset-running@%i.target +Wants=op-reset-chassis-on@%i.service +After=op-reset-chassis-on@%i.service +Conflicts=obmc-host-stop@%i.target +ConditionPathExists=/run/openbmc/chassis@%i-on + +[Service] +RemainAfterExit=yes +Type=oneshot +ExecStart=/usr/sbin/ampere_host_check.sh 1 0 + +[Install] +WantedBy=obmc-host-reset@%i.target
\ No newline at end of file diff --git a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend index d54407ba3..bdb89ce63 100644 --- a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -4,21 +4,10 @@ DEPS_CFG = "resetreason.conf" DEPS_TGT = "phosphor-discover-system-state@.service" SYSTEMD_OVERRIDE_${PN}-discover_append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" -# We don't want the obmc-host-shutdown (softoff) to require -# obmc-chassis-poweroff. obmc-chassis-poweroff will be activated once -# the Shutdown ACK pin is toggled (monitored by phosphor-gpio-monitor) -HOST_STOP_FMT = "" -HOST_REBOOT_FMT = "" +SRC_URI += " \ + file://ampere-reset-host-check@.service \ + " -pkg_postinst_${PN}-obmc-targets_append() { - rm "$D$systemd_system_unitdir/obmc-host-shutdown@0.target.requires/obmc-chassis-poweroff@0.target" - - rm "$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" - rm "$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/obmc-host-force-warm-reboot@0.target" - - rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/phosphor-reboot-host@0.service" - rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/obmc-host-shutdown@0.target" - - rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/obmc-host-stop@0.target" - rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/phosphor-reboot-host@0.service" -} +do_install_append() { + install -m 0644 ${WORKDIR}/ampere-reset-host-check@.service ${D}${systemd_unitdir}/system/phosphor-reset-host-check@.service +}
\ No newline at end of file diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 171a023f4..43a1059dd 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -25,9 +25,12 @@ OBMC_MACHINE_FEATURES += "\ VOLATILE_LOG_DIR = "no" OBMC_IMAGE_EXTRA_INSTALL_append = "\ + mtjade-utils \ ampere-usbnet \ ampere-flash-utils \ ampere-mac-update \ + mtjade-gpio-config \ + mtd-utils \ " PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" diff --git a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh index 876671c1b..7a9ace30e 100755 --- a/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh +++ b/meta-ampere/meta-jade/recipes-ampere/flash/ampere-flash-utils/ampere_flash_bios.sh @@ -15,6 +15,8 @@ # limitations under the License. do_flash () { + OFFSET=$1 + # Check the PNOR partition available HOST_MTD=$(cat /proc/mtd | grep "pnor" | sed -n 's/^\(.*\):.*/\1/p') if [ -z "$HOST_MTD" ]; @@ -30,18 +32,10 @@ do_flash () { echo "Fail to probe Host SPI-NOR device" exit 1 fi - - echo "--- Flashing firmware to @/dev/$HOST_MTD" - flash_eraseall /dev/$HOST_MTD - flashcp -v $IMAGE /dev/$HOST_MTD - - echo "--- Unbind the ASpeed SMC driver" - echo 1e630000.spi > /sys/bus/platform/drivers/aspeed-smc/unbind - else - echo "--- Flashing firmware to @/dev/$HOST_MTD" - flash_eraseall /dev/$HOST_MTD - flashcp -v $IMAGE /dev/$HOST_MTD fi + + echo "--- Flashing firmware to @/dev/$HOST_MTD offset=$OFFSET" + flashcp -v $IMAGE /dev/$HOST_MTD $OFFSET } @@ -84,7 +78,7 @@ if [[ $? -ne 0 ]]; then fi # Flash the firmware -do_flash +do_flash 0x400000 # Switch the host SPI bus to HOST." echo "--- Switch the host SPI bus to HOST." @@ -99,5 +93,5 @@ if [ "$chassisstate" == 'On' ]; then sleep 5 echo "Turn on the Host" - obmcutil chassison + obmcutil poweron fi diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb new file mode 100644 index 000000000..69fedd67a --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config.bb @@ -0,0 +1,44 @@ +SUMMARY = "Ampere Computing LLC Utilities" +DESCRIPTION = "Ampere Utilities for Mt.Jade systems" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd +inherit obmc-phosphor-systemd + +S = "${WORKDIR}" + +SRC_URI = " \ + file://ampere_gpio_utils.sh \ + " + +DEPENDS = "systemd" +RDEPENDS_${PN} = "bash" + +SYSTEMD_PACKAGES = "${PN}" + +SYSTEMD_SERVICE_${PN} = " \ + ampere-gpio-poweroff@.service \ + ampere-gpio-poweron@.service \ + " + +# chassis power on +CHASSIS_POWERON_SVC = "ampere-gpio-poweron@.service" +CHASSIS_POWERON_INSTMPL = "ampere-gpio-poweron@{0}.service" +CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" +CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_INSTMPL}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" + +# chassis power off +CHASSIS_POWEROFF_SVC = "ampere-gpio-poweroff@.service" +CHASSIS_POWEROFF_INSTMPL = "ampere-gpio-poweroff@{0}.service" +CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" +CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_INSTMPL}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" + +do_install() { + install -d ${D}/usr/sbin + install -m 0755 ${WORKDIR}/ampere_gpio_utils.sh ${D}/${sbindir}/ +} + diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service new file mode 100644 index 000000000..78862eb32 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweroff@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Ampere set GPIOs before power off +Requires=op-wait-power-off@%i.service +Before=op-wait-power-off@%i.service +Conflicts=obmc-chassis-poweron@%i.target + +[Service] +Type=oneshot +ExecStart=/usr/bin/env ampere_gpio_utils.sh power off +SyslogIdentifier=ampere_gpio_utils
\ No newline at end of file diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service new file mode 100644 index 000000000..09aa58826 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere-gpio-poweron@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Ampere set GPIOs before power on +Requires=op-wait-power-on@%i.service +Before=op-wait-power-on@%i.service +Conflicts=obmc-chassis-poweroff@%i.target + +[Service] +Type=oneshot +ExecStart=/usr/bin/env ampere_gpio_utils.sh power on +SyslogIdentifier=ampere_gpio_utils diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere_gpio_utils.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere_gpio_utils.sh new file mode 100644 index 000000000..8e4f455bf --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-gpio-config/ampere_gpio_utils.sh @@ -0,0 +1,43 @@ +#!/bin/bash +source /usr/sbin/gpio-defs.sh +source /usr/sbin/gpio-lib.sh + +function usage() { + echo "usage: ampere_gpio_utils.sh [power] [on|off]"; +} + +set_gpio_power_off() { + echo "Setting GPIO before Power off" + gpio_configure_output $OCP_AUX_PWREN 1 + gpio_configure_output $OCP_MAIN_PWREN 0 + gpio_configure_output $SPI0_PROGRAM_SEL 0 +} + +set_gpio_power_on() { + echo "Setting GPIO before Power on" + gpio_configure_output $OCP_AUX_PWREN 1 + gpio_configure_output $OCP_MAIN_PWREN 1 + gpio_configure_output $SPI0_PROGRAM_SEL 1 + gpio_configure_output $SPI0_BACKUP_SEL 0 +} + +if [ $# -lt 2 ]; then + echo "Total number of parameter=$#" + echo "Insufficient parameter" + usage; + exit 0; +fi + +if [ $1 == "power" ]; then + if [ $2 == "on" ]; then + set_gpio_power_on + elif [ $2 == "off" ]; then + set_gpio_power_off + fi + exit 0; +else + echo "Invalid parameter1=$1" + usage; + exit 0; +fi +exit 0; diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils.bb b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils.bb new file mode 100644 index 000000000..159ccdd64 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils.bb @@ -0,0 +1,22 @@ +SUMMARY = "Ampere Platform Environment Definitions" +DESCRIPTION = "Ampere Platform Environment Definitions" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +SRC_URI = " \ + file://gpio-defs.sh \ + file://gpio-lib.sh \ + file://ampere_power_util.sh \ + file://ampere_host_check.sh \ + " + +RDEPENDS_${PN} = "bash" + +do_install() { + install -d ${D}/usr/sbin + install -m 0755 ${WORKDIR}/gpio-lib.sh ${D}/${sbindir}/ + install -m 0755 ${WORKDIR}/gpio-defs.sh ${D}/${sbindir}/ + install -m 0755 ${WORKDIR}/ampere_power_util.sh ${D}/${sbindir}/ + install -m 0755 ${WORKDIR}/ampere_host_check.sh ${D}/${sbindir}/ +}
\ No newline at end of file diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_host_check.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_host_check.sh new file mode 100644 index 000000000..9eeeeca5a --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_host_check.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +source /usr/sbin/gpio-defs.sh +source /usr/sbin/gpio-lib.sh + +host_status() { + st=$(busctl get-property xyz.openbmc_project.State.Host /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host CurrentHostState | cut -d"." -f6) + if [ "$st" == "Running\"" ]; then + echo "on" + else + echo "off" + fi +} + +createFile=$1 +setState=$2 + +if [ $(host_status) == "on" ]; then + exit 0 +fi + +# Time out to check S0_FW_BOOT_OK is 60 seconds +cnt=60 +val=0 +while [ $cnt -gt 0 ]; +do + val=$(gpio_get_val $S0_CPU_FW_BOOT_OK) + cnt=$((cnt - 1)) + echo "$cnt S0_CPU_FW_BOOT_OK = $val" + if [ $val == 1 ]; then + # Sleep 5 second before the host is ready + sleep 5 + if [ $createFile == 1 ]; then + if [ ! -d "/run/openbmc" ]; then + mkdir -p /run/openbmc + fi + echo "Creating /run/openbmc/host@0-on" + touch /run/openbmc/host@0-on + fi + exit 0 + fi + sleep 1 +done + +exit 1 diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_power_util.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_power_util.sh new file mode 100644 index 000000000..2c8ba3d91 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/ampere_power_util.sh @@ -0,0 +1,131 @@ +#!/bin/bash +#ampere_platform_config.sh is platform configuration file +source /usr/sbin/gpio-defs.sh + +# Usage of this utility +function usage() { + echo "usage: power-util mb [status|shutdown_ack|force_reset|soft_off]"; +} + +power_status() { + st=$(busctl get-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis CurrentPowerState | cut -d"." -f6) + if [ "$st" == "On\"" ]; then + echo "on" + else + echo "off" + fi +} + +shutdown_ack() { + if [ -f "/run/openbmc/host@0-softpoweroff" ]; then + echo "Receive shutdown ACK triggered after softportoff the host." + touch /run/openbmc/host@0-softpoweroff-shutdown-ack + else + echo "Receive shutdown ACK triggered" + sleep 3 + systemctl start obmc-chassis-poweroff@0.target + fi +} + +soft_off() { + # Trigger shutdown_req + touch /run/openbmc/host@0-softpoweroff + gpioset -l $GPIO_CHIP0_IDX $S0_SHD_REQ_L=1 + sleep 1s + gpioset -l $GPIO_CHIP0_IDX $S0_SHD_REQ_L=0 + + # Wait for shutdown_ack from the host in 30 seconds + cnt=30 + while [ $cnt -gt 0 ]; + do + # Wait for SHUTDOWN_ACK and create the host@0-softpoweroff-shutdown-ack + if [ -f "/run/openbmc/host@0-softpoweroff-shutdown-ack" ]; then + break + fi + sleep 1 + cnt=$((cnt - 1)) + done + # Softpoweroff is successed + sleep 2 + rm -rf /run/openbmc/host@0-softpoweroff + if [ -f "/run/openbmc/host@0-softpoweroff-shutdown-ack" ]; then + rm -rf /run/openbmc/host@0-softpoweroff-shutdown-ack + fi + echo 0 +} + +force_reset() { + if [ -f "/run/openbmc/host@0-softpoweroff" ]; then + # In graceful host reset, after trigger os shutdown, + # the phosphor-state-manager will call force-warm-reset + # in this case the force_reset should wait for shutdown_ack from host + cnt=30 + while [ $cnt -gt 0 ]; + do + if [ -f "/run/openbmc/host@0-softpoweroff-shutdown-ack" ]; then + break + fi + echo "Waiting for shutdown-ack count down $cnt" + sleep 1 + cnt=$((cnt - 1)) + done + # The host OS is failed to shutdown + if [ $cnt == 0 ]; then + echo "Shutdown-ack time out after 30s." + exit 0 + fi + fi + echo "Triggering sysreset pin" + gpioset -l $GPIO_CHIP0_IDX $S0_SYSRESET_L=1 + sleep 1 + gpioset -l $GPIO_CHIP0_IDX $S0_SYSRESET_L=0 +} + +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; +fi + +# check if power guard enabled +dir="/run/systemd/system/" +file="reboot-guard.conf" +units=("reboot" "poweroff" "halt") +for unit in "${units[@]}"; do + if [ -f ${dir}${unit}.target.d/${file} ]; then + echo "PowerGuard enabled, cannot do power control, exit!!!" + exit -1 + fi +done + +if [ ! -d "/run/openbmc/" ]; then + mkdir -p "/run/openbmc/" +fi + +if [ $2 == "shutdown_ack" ]; then + shutdown_ack +elif [ $2 == "status" ]; then + power_status +elif [ $2 == "force_reset" ]; then + force_reset +elif [ $2 == "soft_off" ]; then + ret=$(soft_off) + if [ $ret == 0 ]; then + echo "The host is already softoff" + else + echo "Failed to softoff the host" + fi + exit $ret; +else + echo "Invalid parameter2=$2" + usage; +fi + +exit 0; diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-defs.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-defs.sh new file mode 100644 index 000000000..7c887d409 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-defs.sh @@ -0,0 +1,40 @@ +# Index of GPIO device in gpioget/gpioset +GPIO_CHIP0_IDX=0 +GPIO_CHIP1_IDX=1 + +# Base of GPIO chip in /sys/class/gpio +GPIO_CHIP0_BASE=792 +GPIO_CHIP1_BASE=780 + +### Power control configuration +# Power control gpios +S0_SHD_REQ_L=49 +S0_SHD_ACK_L=50 +S0_REBOOT_ACK_L=75 +S0_SYSRESET_L=91 + + +### Table 1: GPIO Assignments +S0_CPU_FW_BOOT_OK=48 +CPU_BMC_OVERTEMP_L=51 +CPU_BMC_HIGHTEMP_L=72 +CPU_FAULT_ALERT=73 +S1_CPU_FW_BOOT_OK=202 + +### Table 2: Alert and Additional Miscellaneous Signals +S0_SCP_AUTH_FAILURE=74 +S1_SCP_AUTH_FAILURE=205 +BMC_OK=228 +SLAVE_PRESENT_L=230 + +### Common GPIOs +SYS_PSON_L=42 +BMC_READY=229 + +### OCP power selection +OCP_AUX_PWREN=139 +OCP_MAIN_PWREN=140 + +### SPI0 Mode selection +SPI0_PROGRAM_SEL=226 +SPI0_BACKUP_SEL=227 diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-lib.sh b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-lib.sh new file mode 100644 index 000000000..8d1aa61d7 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-ampere/platform/mtjade-utils/gpio-lib.sh @@ -0,0 +1,31 @@ +#!/bin/bash +source /usr/sbin/gpio-defs.sh + +function gpio_number() { + GPIO_BASE=$(cat /sys/class/gpio/gpiochip$GPIO_CHIP0_BASE/base) + echo $((${GPIO_BASE} + $1)) +} + +# Configure GPIO as output and set its value +function gpio_configure_output() { + gpioId=$(gpio_number $1) + echo $gpioId > /sys/class/gpio/export + echo out > /sys/class/gpio/gpio${gpioId}/direction + echo $2 > /sys/class/gpio/gpio${gpioId}/value + echo $gpioId > /sys/class/gpio/unexport +} + +function gpio_get_val() { + gpioId=$(gpio_number $1) + echo $gpioId > /sys/class/gpio/export + echo $(cat /sys/class/gpio/gpio$gpioId/value) + echo $gpioId > /sys/class/gpio/unexport +} + +# Configure GPIO as input +function gpio_configure_input() { + gpioId=$(gpio_number $1) + echo $gpioId > /sys/class/gpio/export + echo "in" > /sys/class/gpio/gpio${gpioId}/direction + echo $gpioId > /sys/class/gpio/unexport +} diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb new file mode 100644 index 000000000..4358b1242 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling.bb @@ -0,0 +1,23 @@ +SUMMARY = "Ampere Computing LLC Host Gpio Handling" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit obmc-phosphor-systemd + +DEPENDS += "virtual/obmc-gpio-monitor" +RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" + +OBMC_HOST_ACK_MONITOR_INSTANCES = "reboot_ack shutdown_ack" + +SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/reboot_ack \ + obmc/gpio/shutdown_ack \ + " + +TMPL = "phosphor-gpio-monitor@.service" +INSTFMT = "phosphor-gpio-monitor@{0}.service" +TGT = "multi-user.target" +FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" + +SYSTEMD_SERVICE_${PN} += "ampere-host-shutdown-ack@.service" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_ACK_MONITOR_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling/ampere-host-shutdown-ack@.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling/ampere-host-shutdown-ack@.service new file mode 100644 index 000000000..6588191aa --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling/ampere-host-shutdown-ack@.service @@ -0,0 +1,8 @@ +[Unit] +Description=Ampere Computing LLC host shutdown ACK +Conflicts=obmc-chassis-poweron@0.target + +[Service] +Type=oneshot +ExecStart=/usr/bin/env ampere_power_util.sh mb shutdown_ack +SyslogIdentifier=ampere_host_shutdown_ack diff --git a/meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/reboot_ack b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling/obmc/gpio/reboot_ack index 0436d32da..a8ad98ee7 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/reboot_ack +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling/obmc/gpio/reboot_ack @@ -1,4 +1,4 @@ DEVPATH=/dev/input/event0 KEY=75 POLARITY=1 -TARGET=ampere-host-reset-ack.service +TARGET=obmc-host-force-warm-reboot@0.target diff --git a/meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/shutdown_ack b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling/obmc/gpio/shutdown_ack index a0e857fac..18cc87246 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/files/obmc/gpio/shutdown_ack +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/host-gpio-handling/obmc/gpio/shutdown_ack @@ -1,4 +1,4 @@ DEVPATH=/dev/input/event0 KEY=50 POLARITY=1 -TARGET=ampere-chassis-poweroff.service +TARGET=ampere-host-shutdown-ack@0.service diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml index e900ad789..3fa190852 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml +++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml @@ -12,5 +12,5 @@ events: /system/chassis: xyz.openbmc_project.Inventory.Item.Chassis: Type: - value: "RackMount" + value: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" type: string diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host/ampere-phosphor-softpoweroff b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host/ampere-phosphor-softpoweroff new file mode 100644 index 000000000..214aeed7a --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host/ampere-phosphor-softpoweroff @@ -0,0 +1,5 @@ +#!/bin/bash +# Usage of this utility +echo "Trigger soft off the host." +/usr/sbin/ampere_power_util.sh mb soft_off +exit $?; diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host/ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host/ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service new file mode 100644 index 000000000..01b31b1b3 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host/ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service @@ -0,0 +1,13 @@ +[Unit] +Description=Ampere Soft power off of the host +Wants=obmc-host-stop-pre@0.target +Before=obmc-host-stop-pre@0.target +Conflicts=obmc-host-start@0.target +ConditionPathExists=!/run/openbmc/host@0-request +ConditionPathExists=!/lib/systemd/system/pldmSoftPowerOff.service + +[Service] +Restart=no +ExecStart=/usr/bin/env phosphor-softpoweroff +SyslogIdentifier=phosphor-softpoweroff +Type=oneshot diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index c0bcbdd3a..b8ea8d8d5 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -3,13 +3,23 @@ FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:" DEPENDS_append_mtjade = " mtjade-yaml-config" RRECOMMENDS_${PN} += "ipmitool" +RDEPENDS_${PN} += "bash" + +SRC_URI += " \ + file://ampere-phosphor-softpoweroff \ + file://ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service \ + " EXTRA_OECONF_mtjade = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-sensors-${MACHINE}.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \ " +AMPERE_SOFTPOWEROFF_TMPL = "ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" + do_install_append_mtjade(){ install -d ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host + install -m 0755 ${WORKDIR}/ampere-phosphor-softpoweroff ${D}/${bindir}/phosphor-softpoweroff + install -m 0644 ${WORKDIR}/${AMPERE_SOFTPOWEROFF_TMPL} ${D}${systemd_unitdir}/system/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service } diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend new file mode 100644 index 000000000..33802713d --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -0,0 +1,7 @@ +DEFAULT_RMCPP_IFACE = "eth1" + +ALT_RMCPP_IFACE = "eth0" +SYSTEMD_SERVICE_${PN} += " \ + ${PN}@${ALT_RMCPP_IFACE}.service \ + ${PN}@${ALT_RMCPP_IFACE}.socket \ + " diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index f41e5bcd7..ca86a4a21 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,2 +1,6 @@ -RDEPENDS_${PN}-extras_append_mtjade = " webui-vue phosphor-image-signing" +RDEPENDS_${PN}-extras_append_mtjade = " webui-vue phosphor-image-signing phosphor-virtual-sensor" RDEPENDS_${PN}-inventory_append_mtjade = " fault-monitor id-button psu-hotswap-reset" + +RDEPENDS_${PN}-inventory_append_mtjade = " \ + host-gpio-handling \ + " diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json new file mode 100644 index 000000000..d0dc76782 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json @@ -0,0 +1,36 @@ +[ + { + "Desc": + { + "Name": "total_power", + "SensorType": "power" + }, + "Threshold" : + { + }, + "Params": + { + "DbusParam": + [ + { + "ParamName": "PSU0_POUTPUT", + "Desc": + { + "Name": "PSU0_POUTPUT", + "SensorType": "power" + } + }, + { + "ParamName": "PSU1_POUTPUT", + "Desc": + { + "Name": "PSU1_POUTPUT", + "SensorType": "power" + } + } + ] + }, + "Expression": "PSU0_POUTPUT + PSU1_POUTPUT" + } +] + diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 000000000..3c68ff533 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append_mtjade += " \ + file://virtual_sensor_config.json \ + " + +do_install_append_mtjade() { + install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/ +} + diff --git a/meta-ampere/meta-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend new file mode 100644 index 000000000..0d17c372a --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:" + +# +# Ampere Mt. Jade power control involves different action during +# the course of action which does not involve rebooting the Host. +# Thus disable the use of Host Power-On watchdog. +# +WATCHDOG_FMT = "" +ENABLE_WATCHDOG_FMT = "" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig index 6ef0c4cc4..08ac6eb04 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig @@ -59,6 +59,7 @@ CONFIG_SYN_COOKIES=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y +# CONFIG_IPV6_SIT is not set CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_ADVANCED is not set diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig index 43230b075..e7867a34e 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -63,6 +63,7 @@ CONFIG_SYN_COOKIES=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y +# CONFIG_IPV6_SIT is not set CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_ADVANCED is not set diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index c2363b280..fa3507d5d 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -65,6 +65,7 @@ CONFIG_SYN_COOKIES=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y +# CONFIG_IPV6_SIT is not set CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_ADVANCED is not set diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 063970a6f..208031f1c 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-5.10" -LINUX_VERSION ?= "5.10.46" +LINUX_VERSION ?= "5.10.53" -SRCREV="dd1e9367157f900616f0eae3cef897c23d4e7452" +SRCREV="1519240139a91e3dbc97d8f79de29a22a3328257" require linux-aspeed.inc diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-sensors.yaml b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-sensors.yaml index af7aea46b..3e68a7aa1 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-sensors.yaml +++ b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config/g220a-ipmi-sensors.yaml @@ -20,9 +20,9 @@ sensorType: 1 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -4: +2: bExp: 0 - entityID: 50 + entityID: 3 entityInstance: 1 interfaces: xyz.openbmc_project.Sensor.Value: @@ -32,6 +32,50 @@ type: double multiplierM: 1 mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/CPU0_VR_0_Temperature + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +3: + bExp: 0 + entityID: 3 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/CPU1_VR_0_Temperature + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +4: + bExp: 0 + entityID: 3 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read path: /xyz/openbmc_project/sensors/temperature/DTS_CPU1 offsetB: 0 rExp: 0 @@ -44,8 +88,8 @@ unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC 5: bExp: 0 - entityID: 50 - entityInstance: 1 + entityID: 3 + entityInstance: 4 interfaces: xyz.openbmc_project.Sensor.Value: Value: @@ -64,9 +108,317 @@ sensorType: 1 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC -38: +6: bExp: 0 - entityID: 50 + entityID: 3 + entityInstance: 5 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/PCH_VR_Temperature + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +13: + bExp: 0 + entityID: 32 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/CPU0_DIMM_VR_1_Temperature + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +14: + bExp: 0 + entityID: 32 + entityInstance: 4 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/CPU1_DIMM_VR_1_Temperature + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +15: + bExp: 0 + entityID: 19 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/PSU0_Temperature + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +16: + bExp: 0 + entityID: 19 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/PSU1_Temperature + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +17: + bExp: 0 + entityID: 19 + entityInstance: 3 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/MB_InIet1_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +18: + bExp: 0 + entityID: 19 + entityInstance: 4 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/MB_InIet2_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +19: + bExp: 0 + entityID: 23 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/OCP_BP_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +21: + bExp: 0 + entityID: 23 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/NVMe_Front_BP0_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +22: + bExp: 0 + entityID: 23 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/NVMe_Front_BP1_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +23: + bExp: 0 + entityID: 23 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/NVMe_Rear_BP_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +24: + bExp: 0 + entityID: 23 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/Riser_Rear_BP_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +25: + bExp: 0 + entityID: 23 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/MB_Outlet1_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +26: + bExp: 0 + entityID: 23 + entityInstance: 2 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/temperature/MB_Outlet2_Temp + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +27: + bExp: 0 + entityID: 10 entityInstance: 1 interfaces: xyz.openbmc_project.Sensor.Value: @@ -86,9 +438,9 @@ sensorType: 2 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.Volts -39: +28: bExp: 0 - entityID: 50 + entityID: 10 entityInstance: 1 interfaces: xyz.openbmc_project.Sensor.Value: @@ -108,9 +460,9 @@ sensorType: 2 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.Volts -40: +29: bExp: 0 - entityID: 50 + entityID: 10 entityInstance: 1 interfaces: xyz.openbmc_project.Sensor.Value: @@ -130,7 +482,95 @@ sensorType: 2 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.Volts -67: +36: + bExp: 0 + entityID: 50 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/current/PSU0_Input_Current + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 3 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes +37: + bExp: 0 + entityID: 50 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/current/PSU1_Input_Current + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 3 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes +38: + bExp: 0 + entityID: 50 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/current/PSU0_Output_Current + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 3 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes +39: + bExp: 0 + entityID: 50 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/current/PSU1_Output_Current + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 3 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes +40: bExp: 0 entityID: 50 entityInstance: 1 @@ -152,7 +592,7 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -68: +41: bExp: 0 entityID: 50 entityInstance: 1 @@ -174,7 +614,7 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -69: +42: bExp: 0 entityID: 50 entityInstance: 1 @@ -196,7 +636,7 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -70: +43: bExp: 0 entityID: 50 entityInstance: 1 @@ -218,7 +658,7 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -71: +44: bExp: 0 entityID: 50 entityInstance: 1 @@ -240,7 +680,7 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -72: +45: bExp: 0 entityID: 50 entityInstance: 1 @@ -262,7 +702,7 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -73: +46: bExp: 0 entityID: 50 entityInstance: 1 @@ -284,7 +724,7 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -74: +47: bExp: 0 entityID: 50 entityInstance: 1 @@ -306,7 +746,7 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -75: +48: bExp: 0 entityID: 50 entityInstance: 1 @@ -315,7 +755,7 @@ Value: Offsets: 255: - type: double + type: double multiplierM: 96 mutability: Mutability::Read path: /xyz/openbmc_project/sensors/fan_tach/Fan5_0 @@ -328,7 +768,7 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -76: +49: bExp: 0 entityID: 50 entityInstance: 1 @@ -350,7 +790,7 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -77: +50: bExp: 0 entityID: 50 entityInstance: 1 @@ -359,7 +799,7 @@ Value: Offsets: 255: - type: double + type: double multiplierM: 96 mutability: Mutability::Read path: /xyz/openbmc_project/sensors/fan_tach/Fan6_0 @@ -372,7 +812,7 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS -78: +51: bExp: 0 entityID: 50 entityInstance: 1 @@ -381,7 +821,7 @@ Value: Offsets: 255: - type: double + type: double multiplierM: 96 mutability: Mutability::Read path: /xyz/openbmc_project/sensors/fan_tach/Fan6_1 @@ -394,3 +834,47 @@ sensorType: 4 serviceInterface: org.freedesktop.DBus.Properties unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS +165: + bExp: 0 + entityID: 50 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 96 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/power/CPU_Power + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts +166: + bExp: 0 + entityID: 50 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 96 + mutability: Mutability::Read + path: /xyz/openbmc_project/sensors/power/Memory_Power + offsetB: 0 + rExp: 0 + readingType: readingData + scale: 0 + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 11 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync/me-time-sync.service b/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync/me-time-sync.service index e0ee717c5..703bc3533 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync/me-time-sync.service +++ b/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync/me-time-sync.service @@ -3,9 +3,16 @@ Description=Sync time from ME Wants=ipmb.service After=ipmb.service +#ipmb may not ready for communication when +#me-time-sync start, add some retry [Service] -Type=oneshot +Type=simple +Restart=always +StartLimitInterval=90 +StartLimitBurst=5 ExecStart=/usr/bin/me-time-sync.sh +RemainAfterExit=yes + [Install] WantedBy=multi-user.target diff --git a/meta-bytedance/recipes-core/systemd/systemd-conf/coredump.conf b/meta-bytedance/recipes-core/systemd/systemd-conf/coredump.conf new file mode 100644 index 000000000..8c3d11274 --- /dev/null +++ b/meta-bytedance/recipes-core/systemd/systemd-conf/coredump.conf @@ -0,0 +1,8 @@ +[Coredump] +#Storage=external +#Compress=yes +#ProcessSizeMax=2G +#ExternalSizeMax=2G +#JournalSizeMax=767M +MaxUse=2M +#KeepFree= diff --git a/meta-bytedance/recipes-core/systemd/systemd-conf_%.bbappend b/meta-bytedance/recipes-core/systemd/systemd-conf_%.bbappend new file mode 100644 index 000000000..7677eee30 --- /dev/null +++ b/meta-bytedance/recipes-core/systemd/systemd-conf_%.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append = " \ + file://coredump.conf \ +" + +do_install_append() { + install -m 0644 \ + ${WORKDIR}/coredump.conf \ + -D -t ${D}${sysconfdir}/systemd +} + +FILES_${PN}_append = " \ + ${sysconfdir}/systemd/coredump.conf \ +" diff --git a/meta-bytedance/recipes-core/systemd/systemd_%.bbappend b/meta-bytedance/recipes-core/systemd/systemd_%.bbappend new file mode 100644 index 000000000..2bdee496b --- /dev/null +++ b/meta-bytedance/recipes-core/systemd/systemd_%.bbappend @@ -0,0 +1,3 @@ +do_install_append () { + rm ${D}${sysconfdir}/systemd/coredump.conf +} diff --git a/meta-bytedance/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-bytedance/recipes-phosphor/interfaces/bmcweb_%.bbappend index aa47f7c56..f079618b2 100644 --- a/meta-bytedance/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-bytedance/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1 +1,4 @@ -EXTRA_OEMESON_append = " -Drest=enabled" +EXTRA_OEMESON_append = " \ + -Drest=enabled \ + -Dhttp-body-limit=65 \ + " diff --git a/meta-facebook/meta-bletchley/conf/local.conf.sample b/meta-facebook/meta-bletchley/conf/local.conf.sample index bb86f3418..0c5e4cd5f 100644 --- a/meta-facebook/meta-bletchley/conf/local.conf.sample +++ b/meta-facebook/meta-bletchley/conf/local.conf.sample @@ -126,12 +126,9 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - 'image-mklibs' to reduce shared library files size for an image # - 'image-prelink' in order to prelink the filesystem image # - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-mklibs image-prelink" +USER_CLASSES ?= "buildstats image-prelink" # # Runtime testing of images diff --git a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch new file mode 100644 index 000000000..46f892908 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk/0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch @@ -0,0 +1,31 @@ +From 12e9371e44b922e0383dba3a231a21b82ca03368 Mon Sep 17 00:00:00 2001 +From: Howard <howard.chiu@quantatw.com> +Date: Wed, 4 Aug 2021 14:08:14 +0800 +Subject: [PATCH] u-boot: ast2600: 57600 baudrate for bletchley + +Specific patch for bletchley only +--- + configs/ast2600_openbmc_spl_defconfig | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configs/ast2600_openbmc_spl_defconfig b/configs/ast2600_openbmc_spl_defconfig +index c1ed4f54d5..2257673e16 100644 +--- a/configs/ast2600_openbmc_spl_defconfig ++++ b/configs/ast2600_openbmc_spl_defconfig +@@ -35,7 +35,7 @@ CONFIG_ARMV7_PSCI_NR_CPUS=2 + CONFIG_NR_DRAM_BANKS=1 + CONFIG_FIT=y + CONFIG_USE_BOOTARGS=y +-CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw" ++CONFIG_BOOTARGS="console=ttyS4,57600n8 root=/dev/ram rw" + CONFIG_USE_BOOTCOMMAND=y + CONFIG_BOOTCOMMAND="bootm 20100000" + CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y +@@ -133,3 +133,4 @@ CONFIG_USE_TINY_PRINTF=y + CONFIG_TPM=y + CONFIG_SPL_TPM=y + # CONFIG_EFI_LOADER is not set ++CONFIG_BAUDRATE=57600 +-- +2.25.1 + diff --git a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend new file mode 100644 index 000000000..2789df998 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch \ + " diff --git a/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend new file mode 100644 index 000000000..b7bdbd200 --- /dev/null +++ b/meta-facebook/meta-bletchley/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-aspeed-sdk:" + +SRC_URI += " \ + file://0001-u-boot-ast2600-57600-baudrate-for-bletchley.patch \ + " diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json index eea3b4e20..3f1e7dd8e 100644 --- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json @@ -1,6 +1,6 @@ { "0" : { - "name" : "IPMB", + "name" : "Ipmb", "is_valid" : true, "active_sessions" : 0, "max_transfer_size" : 256, diff --git a/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 4948cb4cb..ac98c7ce7 100644 --- a/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-facebook/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,3 +1 @@ -# Enable threshold monitoring -EXTRA_OECMAKE += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" -EXTRA_OECMAKE += "-DREDFISH_LOG_MONITOR_PULSE_EVENTS=ON" +PACKAGECONFIG_append = " log-threshold log-pulse" diff --git a/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb new file mode 100644 index 000000000..affbcf727 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl.bb @@ -0,0 +1,81 @@ +SUMMARY = "Ampere Computing LLC Host Control Implementation" +DESCRIPTION = "A host control implementation suitable for Ampere Computing LLC's systems" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd +inherit obmc-phosphor-systemd + +S = "${WORKDIR}" + +SRC_URI = "file://ampere-host-shutdown.service \ + file://ampere-host-reset.service \ + file://ampere_power_util.sh \ + file://ampere-chassis-poweroff.service \ + file://ampere-chassis-poweron.service \ + file://ampere-host-reset-ack.service \ + file://ampere-host-force-reset.service \ + file://ampere-host-power-cycle.service \ + " + +DEPENDS = "systemd" +RDEPENDS_${PN} = "bash" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = " \ + ampere-host-shutdown.service \ + ampere-host-reset.service \ + ampere-chassis-poweroff.service \ + ampere-chassis-poweron.service \ + ampere-host-reset-ack.service \ + ampere-host-force-reset.service \ + ampere-host-power-cycle.service \ + " +# host power control +# overwrite the host shutdown to graceful shutdown +HOST_SHUTDOWN_TMPL = "ampere-host-shutdown.service" +HOST_SHUTDOWN_TGTFMT = "obmc-host-shutdown@{0}.target" +HOST_SHUTDOWN_FMT = "../${HOST_SHUTDOWN_TMPL}:${HOST_SHUTDOWN_TGTFMT}.requires/${HOST_SHUTDOWN_TMPL}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_SHUTDOWN_FMT', 'OBMC_HOST_INSTANCES')}" + +# Force the power cycle target to run the ampere power cycle +HOST_REBOOT_SVC = "ampere-host-power-cycle.service" +HOST_REBOOT_SVC_TGTFMT = "obmc-host-reboot@{0}.target" +HOST_REBOOT_SVC_FMT = "../${HOST_REBOOT_SVC}:${HOST_REBOOT_SVC_TGTFMT}.requires/${HOST_REBOOT_SVC}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_REBOOT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" + +# overwrite the host reset to graceful reset +HOST_WARM_REBOOT_SOFT_SVC = "ampere-host-reset.service" +HOST_WARM_REBOOT_TGTFMT = "obmc-host-warm-reboot@{0}.target" +HOST_WARM_REBOOT_SOFT_SVC_FMT = "../${HOST_WARM_REBOOT_SOFT_SVC}:${HOST_WARM_REBOOT_TGTFMT}.requires/${HOST_WARM_REBOOT_SOFT_SVC}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_SOFT_SVC_FMT', 'OBMC_HOST_INSTANCES')}" + +# overwrite force reboot +HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset.service" +HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" +HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_TGT}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" + +# chassis power control +CHASSIS_POWERON_SVC = "ampere-chassis-poweron.service" +CHASSIS_POWERON_TGTFMT = "obmc-chassis-poweron@{0}.target" +CHASSIS_POWERON_FMT = "../${CHASSIS_POWERON_SVC}:${CHASSIS_POWERON_TGTFMT}.requires/${CHASSIS_POWERON_SVC}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWERON_FMT', 'OBMC_CHASSIS_INSTANCES')}" + +CHASSIS_POWEROFF_SVC = "ampere-chassis-poweroff.service" +CHASSIS_POWEROFF_TGTFMT = "obmc-chassis-poweroff@{0}.target" +CHASSIS_POWEROFF_FMT = "../${CHASSIS_POWEROFF_SVC}:${CHASSIS_POWEROFF_TGTFMT}.requires/${CHASSIS_POWEROFF_SVC}" +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'CHASSIS_POWEROFF_FMT', 'OBMC_CHASSIS_INSTANCES')}" + +TMPL = "phosphor-gpio-monitor@.service" +INSTFMT = "phosphor-gpio-monitor@{0}.service" +TGT = "multi-user.target" +FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_MONITOR_INSTANCES')}" + +do_install() { + install -d ${D}/usr/sbin + install -m 0755 ${WORKDIR}/ampere_power_util.sh ${D}/${sbindir}/ampere_power_util.sh +} + diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweroff.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweroff.service index b0a1af785..c3a4dce37 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweroff.service +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweroff.service @@ -9,3 +9,4 @@ RemainAfterExit=no Type=oneshot ExecStart=/usr/bin/env ampere_power_util.sh mb off SyslogIdentifier=ampere_power_util.sh + diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweron.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweron.service index 76ceb8856..1ab492202 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-chassis-poweron.service +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-chassis-poweron.service @@ -7,3 +7,4 @@ RemainAfterExit=yes Type=oneshot ExecStart=/usr/bin/env ampere_power_util.sh mb on SyslogIdentifier=ampere_power_util.sh + diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-force-reset.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-force-reset.service index 8a40baf7b..8a40baf7b 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-force-reset.service +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-force-reset.service diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-power-cycle.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service index 2fb03effb..0b32aa158 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-power-cycle.service +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-power-cycle.service @@ -6,5 +6,6 @@ OnFailure=obmc-chassis-powerreset@0.target [Service] RemainAfterExit=no Type=oneshot -ExecStart=/usr/bin/env ampere_power_util.sh mb cycle +ExecStart=/usr/bin/env ampere_power_util.sh mb force_reset SyslogIdentifier=ampere_power_util.sh + diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset-ack.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset-ack.service index 504186ec6..a5338797a 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset-ack.service +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset-ack.service @@ -8,3 +8,4 @@ RemainAfterExit=no Type=oneshot ExecStart=/usr/bin/env ampere_power_util.sh mb force_reset SyslogIdentifier=ampere_power_util.sh + diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service index ac7618ad0..2deb24d4f 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-reset.service +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-reset.service @@ -7,3 +7,4 @@ RemainAfterExit=no Type=oneshot ExecStart=/usr/bin/env ampere_power_util.sh mb graceful_reset SyslogIdentifier=ampere_power_util.sh + diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-shutdown.service b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-shutdown.service index be4d45260..b7a458ede 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl/ampere-host-shutdown.service +++ b/meta-fii/meta-kudo/recipes-kudo/host/ampere-hostctrl/ampere-host-shutdown.service @@ -8,3 +8,4 @@ RemainAfterExit=no Type=oneshot ExecStart=/usr/bin/env ampere_power_util.sh mb graceful_shutdown SyslogIdentifier=ampere_power_util.sh + diff --git a/meta-ampere/meta-common/recipes-ac01/host/files/ampere_power_util.sh b/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh index 8bab9a370..420abfb8c 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/files/ampere_power_util.sh +++ b/meta-fii/meta-kudo/recipes-kudo/host/files/ampere_power_util.sh @@ -11,6 +11,9 @@ power_off() { power_on() { echo "Powering on Server $2" + gpioset 6 11=1 + sleep 1 + gpioset 6 11=0 busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.On } @@ -31,21 +34,25 @@ power_reset() { graceful_shutdown() { if [ -f "/run/openbmc/host@0-request" ]; then echo "shutdown host immediately" + gpioset 6 11=1 + sleep 6 + gpioset 6 11=0 power_off else echo "Triggering graceful shutdown" - gpioset -l 0 49=1 - sleep 1 - gpioset -l 0 49=0 + gpioset -l 2 6=0 + sleep 3 + gpioset -l 2 6=1 sleep 30s + power_off fi } force_reset() { echo "Triggering sysreset pin" - gpioset -l 0 91=1 + gpioset -l 2 1=0 sleep 1 - gpioset -l 0 91=0 + gpioset -l 2 1=1 } if [ $# -lt 2 ]; then @@ -77,7 +84,7 @@ elif [ $2 = "off" ]; then fi elif [ $2 == "cycle" ]; then if [ $(power_status) == "on" ]; then - echo "Powering off server" + echo "Power cycling server" power_off sleep 20s power_on @@ -107,3 +114,4 @@ else fi exit 0; + diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh index e0697b906..90ec84aba 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw-ver.sh @@ -8,12 +8,12 @@ function fw_rev() { case $1 in cpldb) rsp=($(i2cget -y -f -a 13 0x76 0x00 i 5)) - ver=$(printf '%d.%d.%d.%d' ${rsp[6]} ${rsp[5]} ${rsp[4]} ${rsp[3]}) + ver=$(printf '%d.%d.%d.%d' ${rsp[5]} ${rsp[4]} ${rsp[3]} ${rsp[2]}) ;; cpldm) I2C_BUS_DEV=$(readlink "/sys/bus/i2c/devices/4-0077/channel-2" | cut -c 8-) rsp=($(i2cget -y -f -a $I2C_BUS_DEV 0x76 0x00 i 5)) - ver=$(printf '%d.%d.%d.%d' ${rsp[6]} ${rsp[5]} ${rsp[4]} ${rsp[3]}) + ver=$(printf '%d.%d.%d.%d' ${rsp[5]} ${rsp[4]} ${rsp[3]} ${rsp[2]}) ;; *) ;; diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh index d103747b2..a63c3e61c 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-fw-utility/kudo-fw/kudo-fw.sh @@ -28,6 +28,10 @@ function fwbios() { fi echo "Flashing BIOS @/dev/$BIOS_MTD" flashcp -v $1 /dev/$BIOS_MTD + if [ $? -ne 0 ]; then + echo "Flashing the bios failed " >&2 + exit 1 + fi wait # switch the SPI mux from BMC to Host @@ -36,23 +40,38 @@ function fwbios() { fi i2cset -y -f -a 13 0x76 0x10 0x00 + # Disable LPI mode NV_SI_CPU_LPI_FREQ_DISABLE. + # Moved to before SCP as fwscp function returns 0 on success + nvparm -s 0x1 -o 0x114090 + # TODO: Disabled toggling of SMPro heartbeat (require CPLD v 1.12.0.0+) + # nvparm -s 0x1 -o 0x5F0638 + if [ $? -ne 0 ]; then + echo "Setting default nvparms failed " >&2 + exit 1 + fi + if [[ $(find ${1} -type f -size +17156k 2>/dev/null) ]]; then echo "Extracting the SCP from the image" dd if=$1 bs=1024 skip=17156 count=256 of=/run/initramfs/myscp.img fwscp /run/initramfs/myscp.img fi - # Disable LPI mode NV_SI_CPU_LPI_FREQ_DISABLE. - nvparm -s 0x1 -o 0x114090 + rm -f $1 + exit 0 } function fwbmccpld() { # BMC_JTAG_MUX_1 #218 0:BMC 1:MB set_gpio_ctrl 218 out 0 loadsvf -d /dev/jtag0 -s $1 -m 0 + if [ $? -ne 0 ]; then + echo "BMC CPLD update failed" >&2 + exit 1 + fi wait set_gpio_ctrl 218 out 1 rm -f $1 + exit 0 } function fwmbcpld() { @@ -61,8 +80,13 @@ function fwmbcpld() { set_gpio_ctrl 218 out 1 set_gpio_ctrl 164 out 1 loadsvf -d /dev/jtag0 -s $1 -m 0 + if [ $? -ne 0 ]; then + echo "Mobo CPLD update failed" >&2 + exit 1 + fi wait rm -f $1 + exit 0 } function fwscp() { @@ -72,10 +96,15 @@ function fwscp() { set_gpio_ctrl 85 out 0 I2C_BUS_DEV=$(ls -l $devpath/"13-0077/" | grep channel-0 | awk '{ print $11}' | cut -c 8-) ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1 + if [ $? -ne 0 ]; then + echo "SCP eeprom update failed" >&2 + exit 1 + fi wait set_gpio_ctrl 85 out 1 set_gpio_ctrl 168 out 1 rm -f $1 + exit 0 } function fwscpback() { @@ -85,12 +114,58 @@ function fwscpback() { set_gpio_ctrl 85 out 0 I2C_BUS_DEV=$(ls -l $devpath/"13-0077/" | grep channel-0 | awk '{ print $11}' | cut -c 8-) ampere_eeprom_prog -b $I2C_BUS_DEV -s 0x50 -p -f $1 + if [ $? -ne 0 ]; then + echo "SCP BACKUP eeprom update failed" >&2 + exit 1 + fi wait set_gpio_ctrl 85 out 1 set_gpio_ctrl 168 out 1 rm -f $1 + exit 0 +} + +function fwmb_pwr_seq(){ + #$1 0x40 seq config file + #$2 0x41 seq config file + if [[ ! -e $1 ]]; then + echo "$1 file does not exist" + exit 1 + fi + if [[ ! -e $2 ]]; then + echo "$2 file does not exist" + exit 1 + fi + echo 32-0040 > /sys/bus/i2c/drivers/adm1266/unbind + echo 32-0041 > /sys/bus/i2c/drivers/adm1266/unbind + adm1266_fw_fx $1 $2 + if [ $? -ne 0 ]; then + echo "The power seq flash failed" >&2 + exit 1 + fi + echo 32-0040 > /sys/bus/i2c/drivers/adm1266/bind + echo 32-0041 > /sys/bus/i2c/drivers/adm1266/bind + rm -f $1 + rm -f $2 + exit 0 } +if [[ ! $(which flashcp) ]]; then + echo "flashcp utility not installed" + exit 1 +fi +if [[ ! $(which ampere_eeprom_prog) ]]; then + echo "ampere_eeprom_prog utility not installed" + exit 1 +fi +if [[ ! $(which loadsvf) ]]; then + echo "loadsvf utility not installed" + exit 1 +fi +if [[ ! -e /dev/jtag0 ]]; then + echo "Jtag device driver not functional" + exit 1 +fi case $1 in bios) @@ -108,6 +183,9 @@ case $1 in scpback) fwscpback $2 ;; + mbseq) + fwmb_pwr_seq $2 $3 + ;; *) ;; esac diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh index b589379fb..5145009a6 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-boot/init_once.sh @@ -1,7 +1,10 @@ #!/bin/bash source /usr/sbin/kudo-lib.sh - +# sleep so that FRU and all ipmitool Devices are ready before HOST OS +# gpio 143 for HPM_STBY_RST_N do to DC-SCM spec +set_gpio_ctrl 143 out 1 +sleep 5 # for the MUX to get ready # set all mux route to CPU before power on host # BMC_CPU_RTC_I2C_SEL #120 set_gpio_ctrl 120 out 1 @@ -21,7 +24,27 @@ set_gpio_ctrl 7 out 1 i2cset -y -f -a 13 0x76 0x10 0x00 # Power control -# MON_BMC_ALIVE, GPIO 10 +# MON_BMC_ALIVE, GPIO 10(EVT), GPIO137(DVT) set_gpio_ctrl 10 out 1 +set_gpio_ctrl 137 out 1 # S0_BMC_OK, GPIO 69 set_gpio_ctrl 69 out 1 + +# Disable CPU 1 CLK when cpu not detected +boardver=$(printf '%d' `cat /sys/bus/i2c/drivers/fiicpld/34-0076/CMD00 | awk '{print $6}'`) +# echo init_once cpu $CPU1_STATUS > /dev/ttyS0 +# echo init_once board $boardver > /dev/ttyS0 +CPU1_STATUS_N=$(get_gpio_ctrl 136) +if [[ $CPU1_STATUS_N == 1 ]]; then + #Execute this only on DVT systems + if [[ $boardver == 0 ]]; then + echo EVT system $boardver + else + echo DVT system $boardver + i2cset -y -a -f 37 0x68 0x05 0x03 + fi + #These i2c deviecs are already installed on EVT systems + i2cset -y -a -f 16 0x6a 0 1 0xdf i + i2cset -y -a -f 16 0x6a 11 1 0x01 i + i2cset -y -a -f 17 0x67 1 2 0x3f 0x0c i +fi diff --git a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd/kudo.sh b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd/kudo.sh index 0c12fca13..03adb8ef6 100644 --- a/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd/kudo.sh +++ b/meta-fii/meta-kudo/recipes-kudo/kudo-sys-utility/kudo-cmd/kudo.sh @@ -13,7 +13,6 @@ function usage_rst() { } function usage_led() { - echo " kudo led 'att'/'boot' [parameter]" echo " on --> change to CPU console" echo " off --> change to CPU 0 SCP console" @@ -22,11 +21,13 @@ function usage_led() { function usage_uart() { echo " kudo uart [parameter]" - echo " host --> change to CPU console" - echo " scp1 --> change to CPU 0 SCP console" - echo " scp2 --> change to CPU 1 SCP console" - echo " hosthr --> change CPU console to header" - echo " scphr --> change SCP console to header" + echo " host --> show CPU console" + echo " scp --> show SCP0 console" + echo " swhost --> change to CPU console to ttyS1" + echo " swscp1 --> change to CPU 0 SCP console to ttyS3" + echo " swscp2 --> change to CPU 1 SCP console" + echo " swhosthr --> change CPU console to header" + echo " swscphr --> change SCP console to header" echo " display --> " } @@ -70,10 +71,10 @@ function reset() { set_gpio_ctrl 203 out 0 ;; display) - echo "Virtual reset #94" $(get set_gpio_ctrl 94) - echo "S0 System reset #65" $(get set_gpio_ctrl 65) - echo "Power Button #203" $(get set_gpio_ctrl 203) - echo "BMC_CPU SHD Req #70" $(get set_gpio_ctrl 70) + echo "Virtual reset #94" $(get_gpio_ctrl 94) + echo "S0 System reset #65" $(get_gpio_ctrl 65) + echo "Power Button #203" $(get_gpio_ctrl 203) + echo "BMC_CPU SHD Req #70" $(get_gpio_ctrl 70) ;; *) usage_rst @@ -114,22 +115,38 @@ function fw_rev() { function uartmux() { case $1 in host) + if [ `tty` == "/dev/ttyS0" ]; then + echo "Couldn't redirect to the host console within BMC local console" + else + echo "Entering Console use 'shift ~~..' to quit" + obmc-console-client -c /etc/obmc-console/server.ttyS1.conf + fi + ;; + scp) + if [ `tty` == "/dev/ttyS0" ]; then + echo "Couldn't redirect to the scp console within BMC local console" + else + echo "Entering Console use 'shift ~~..' to quit" + obmc-console-client -c /etc/obmc-console/server.ttyS3.conf + fi + ;; + swhost) set_gpio_ctrl 167 out 1 ;; - scp1) + swscp1) set_gpio_ctrl 161 out 1 set_gpio_ctrl 177 out 1 set_gpio_ctrl 198 out 0 ;; - scp2) + swscp2) set_gpio_ctrl 161 out 1 set_gpio_ctrl 177 out 1 set_gpio_ctrl 198 out 1 ;; - hosthr) + swhosthr) set_gpio_ctrl 167 out 0 ;; - scphr) + swscphr) set_gpio_ctrl 161 out 0 set_gpio_ctrl 177 out 0 ;; diff --git a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb index 07d038024..cc32052c5 100644 --- a/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb +++ b/meta-fii/meta-kudo/recipes-kudo/packagegroups/packagegroup-kudo-apps.bb @@ -5,6 +5,7 @@ inherit packagegroup PROVIDES = "${PACKAGES}" PACKAGES = " \ + ${PN}-kudo-chassis \ ${PN}-kudo-system \ ${PN}-kudo-fw \ ${PN}-fan-mgmt \ @@ -17,6 +18,14 @@ RPROVIDES_${PN}-kudo-system += "virtual-obmc-system-mgmt" RPROVIDES_${PN}-kudo-fw += "virtual-obmc-flash-mgmt" RPROVIDES_${PN}-fan-mgmt += "virtual-obmc-fan-mgmt" +SUMMARY_${PN}-kudo-chassis = "kudo chassis" +RDEPENDS_${PN}-kudo-chassis = " \ + phosphor-hostlogger \ + obmc-op-control-power \ + obmc-phosphor-buttons-signals \ + obmc-phosphor-buttons-handler \ + " + SUMMARY_${PN}-kudo-system = "kudo System" RDEPENDS_${PN}-kudo-system = " \ ipmitool \ @@ -32,6 +41,7 @@ RDEPENDS_${PN}-kudo-system = " \ gbmc-mac-config \ kudo-boot \ kudo-cmd \ + phosphor-state-manager \ " SUMMARY_${PN}-kudo-fw = "kudo Firmware" diff --git a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 664ca5901..3fffde0d4 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,2 +1 @@ -# Enable threshold monitoring -EXTRA_OECMAKE_append_kudo = " -DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" +PACKAGECONFIG_append_kudo = " log-threshold" diff --git a/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager/chassis_capabilities.override.yml b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager/chassis_capabilities.override.yml new file mode 100644 index 000000000..461fec845 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager/chassis_capabilities.override.yml @@ -0,0 +1,23 @@ +/xyz/openbmc_project/control/chassis0/chassiscapabilities: + - Interface: xyz.openbmc_project.Control.ChassisCapabilities + Properties: + CapabilitiesFlags: + Default: 32 + ChassisIntrusionEnabled: + Default: 'true' + ChassisFrontPanelLockoutEnabled: + Default: 'true' + ChassisNMIEnabled: + Default: 'true' + ChassisPowerInterlockEnabled: + Default: 'true' + FRUDeviceAddress: + Default: 32 + SDRDeviceAddress: + Default: 32 + SELDeviceAddress: + Default: 32 + SMDeviceAddress: + Default: 32 + BridgeDeviceAddress: + Default: 32 diff --git a/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend new file mode 100644 index 000000000..79d7ac0b0 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_append_kudo := ":${THISDIR}/${PN}" +SRC_URI_append_kudo = " file://chassis_capabilities.override.yml" diff --git a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json new file mode 100644 index 000000000..2dccd42e8 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json @@ -0,0 +1,27 @@ +{ + "gpio_configs": { + + "power_config": { + "power_good_in": "PGOOD", + "power_up_outs": [ + ], + "reset_outs": [ + {"name": "BMC_S0_SYSRESET_N", "polarity": false} + ] + } + }, + + "gpio_definitions": [ + { + "name": "PGOOD", + "num": 200, + "direction": "in" + }, + { + "name": "BMC_S0_SYSRESET_N", + "num": 65, + "direction": "out" + } + ] +} + diff --git a/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend new file mode 100644 index 000000000..533a69a91 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_append_kudo := ":${THISDIR}/${PN}" +SRC_URI_append_kudo = " file://gpio_defs.json" + diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service new file mode 100644 index 000000000..73aabb6ed --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-cycle.service @@ -0,0 +1,8 @@ +[Unit] +Description=Watchdog power state power hotswap + +[Service] +Type=oneshot +RemainAfterExit=no +ExecStart=/usr/bin/env kudo.sh rst hotswap +SyslogIdentifier=phosphor-watchdog diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service new file mode 100644 index 000000000..9586368b5 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-poweroff.service @@ -0,0 +1,8 @@ +[Unit] +Description=Watchdog power state power cycle shutdown + +[Service] +Type=oneshot +RemainAfterExit=no +ExecStart=/usr/bin/env kudo.sh rst shutdown +SyslogIdentifier=phosphor-watchdog diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service new file mode 100644 index 000000000..fb6614e49 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog-host-reset.service @@ -0,0 +1,8 @@ +[Unit] +Description=Watchdog power state reset system + +[Service] +Type=oneshot +RemainAfterExit=no +ExecStart=/usr/bin/env kudo.sh rst system +SyslogIdentifier=phosphor-watchdog diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service new file mode 100644 index 000000000..675293456 --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog.service @@ -0,0 +1,18 @@ +[Unit] +Description=Phosphor Watchdog + +[Service] +ExecStart=/usr/bin/env phosphor-watchdog --continue --service=xyz.openbmc_project.Watchdog \ + --path=/xyz/openbmc_project/watchdog/host0 \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.HardReset=phosphor-watchdog-host-reset.service \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerOff=phosphor-watchdog-host-poweroff.service \ + --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerCycle=phosphor-watchdog-host-cycle.service \ + +# This should use state manager instead of the service files currently defined + +SyslogIdentifier=phosphor-watchdog +BusName=xyz.openbmc_project.Watchdog +Type=dbus + +[Install] +WantedBy=basic.target diff --git a/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend new file mode 100644 index 000000000..e795905ab --- /dev/null +++ b/meta-fii/meta-kudo/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/${PN}:" + +# Remove the override to keep service running after DC cycle +SYSTEMD_OVERRIDE_${PN}_remove_kudo = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_SERVICE_${PN}_kudo = " phosphor-watchdog.service \ + phosphor-watchdog-host-poweroff.service \ + phosphor-watchdog-host-cycle.service\ + phosphor-watchdog-host-reset.service\ + " diff --git a/meta-google/conf/distro/gbmc.conf b/meta-google/conf/distro/gbmc.conf index 354c93991..0aca6318c 100644 --- a/meta-google/conf/distro/gbmc.conf +++ b/meta-google/conf/distro/gbmc.conf @@ -16,3 +16,5 @@ DISTRO_FEATURES_append = " ipmi-fru" WATCHDOG_PKG ?= "watchdog" SANITY_TESTED_DISTROS_append = " Debian-rodete \n debian-rodete \n " + +PREFERRED_PROVIDER_virtual/bmc-update ?= "inplace-gbmc-update" diff --git a/meta-google/recipes-core/busybox/files/gbmc.cfg b/meta-google/recipes-core/busybox/files/gbmc.cfg index e097a921a..158f771b3 100644 --- a/meta-google/recipes-core/busybox/files/gbmc.cfg +++ b/meta-google/recipes-core/busybox/files/gbmc.cfg @@ -16,3 +16,6 @@ CONFIG_FEATURE_UDHCPC6_RFC3646=y CONFIG_FEATURE_UDHCPC6_RFC4704=y CONFIG_FEATURE_UDHCPC6_RFC4833=y CONFIG_FEATURE_UDHCPC6_RFC5970=y + +# Misc +CONFIG_BC=y diff --git a/meta-google/recipes-extended/libconfig/conf2struct-native_git.bb b/meta-google/recipes-extended/libconfig/conf2struct-native_git.bb index 1a77f4de1..ab5c3d829 100644 --- a/meta-google/recipes-extended/libconfig/conf2struct-native_git.bb +++ b/meta-google/recipes-extended/libconfig/conf2struct-native_git.bb @@ -1,9 +1,9 @@ LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=1b886630cdc9a17c26250934beda407d" +LIC_FILES_CHKSUM = "file://COPYING;md5=667d4ad55f5fbf4c3e853e8acd0f74de" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/yrutschle/conf2struct" -SRCREV = "e8468017b27211b1c452f8df0afe6f19e97035a4" +SRCREV = "6bc9eed1eb50175e5fda791f27d85e72f5a6ac78" S = "${WORKDIR}/git" SRC_URI += " \ diff --git a/meta-google/recipes-extended/networking/sslh_git.bb b/meta-google/recipes-extended/networking/sslh_git.bb index b683571c1..ba26e2999 100644 --- a/meta-google/recipes-extended/networking/sslh_git.bb +++ b/meta-google/recipes-extended/networking/sslh_git.bb @@ -1,10 +1,10 @@ -PR = "r1" +PR = "r2" PV = "0.1+git${SRCPV}" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/yrutschle/sslh" -SRCREV = "517e4ad5b4d57dae396790882bd4629947be1632" +SRCREV = "63f9c4a582f79f4d0e484efe0ccaeed77a79f7df" S = "${WORKDIR}/git" inherit perlnative @@ -14,7 +14,7 @@ DEPENDS += "libbsd" DEPENDS += "libcap" DEPENDS += "libconfig" DEPENDS += "systemd" -DEPENDS += "pcre" +DEPENDS += "pcre2" EXTRA_OEMAKE += "DESTDIR=${D}" EXTRA_OEMAKE += "PREFIX=${prefix}" @@ -22,10 +22,16 @@ EXTRA_OEMAKE += "USELIBCAP=1" EXTRA_OEMAKE += "USELIBBSD=1" EXTRA_OEMAKE += "USESYSTEMD=1" +do_configure() { + oe_runmake distclean +} + do_compile() { - oe_runmake + # Workaround for the broken dependencies in the Makefile + oe_runmake sslh-conf.h + oe_runmake } do_install() { - oe_runmake install + oe_runmake install } diff --git a/meta-google/recipes-google/google-misc/google-misc.inc b/meta-google/recipes-google/google-misc/google-misc.inc index 20b4e0536..36ad141de 100644 --- a/meta-google/recipes-google/google-misc/google-misc.inc +++ b/meta-google/recipes-google/google-misc/google-misc.inc @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://../../LICENSE;md5=34400b68072d710fecd0a2940a0d1658" SRC_URI += "git://github.com/openbmc/google-misc" -SRCREV = "548f3ad151678fc3ee87b7bef25b6601611af978" +SRCREV = "d237c6cc59e731c2a8a3a1bdcd91ad39bd67e182" S = "${WORKDIR}/git/subprojects/${GOOGLE_MISC_PROJ}" inherit meson 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 6acf234cf..801de4361 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb @@ -19,7 +19,7 @@ DEPENDS += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/google-ipmi-sys" -SRCREV = "bc62b193aec2991397a7f671cd3a74492a961d5c" +SRCREV = "b69209b498bf9b1c009c528e40280d13e68f8dbd" FILES_${PN} += "${libdir}/ipmid-providers" diff --git a/meta-google/recipes-google/kcs/gbmc-kcs-config.bb b/meta-google/recipes-google/kcs/gbmc-kcs-config.bb deleted file mode 100644 index ca7110660..000000000 --- a/meta-google/recipes-google/kcs/gbmc-kcs-config.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "Configures KCS for a gBMC system" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit systemd - -S = "${WORKDIR}" - -PROVIDES += "virtual-obmc-host-ipmi-hw" -RPROVIDES_${PN} += "virtual-obmc-host-ipmi-hw" - -FILES_${PN} += "${systemd_system_unitdir}" -RDEPENDS_${PN} += "google-kcsbridge" - -GBMC_KCS_DEV ?= "" - -def systemd_escape_char(c): - return '\\x{:x}'.format(ord(c)) - -def systemd_escape(unit): - import string - ret = '' - if len(unit) > 0 and unit[0] == '.': - ret += systemd_escape_char(unit[0]) - unit = unit[1:] - for c in unit: - if c == '/': - ret += '-' - elif c not in {*string.ascii_letters, *string.digits, ':', '_', '.'}: - ret += systemd_escape_char(c) - else: - ret += c - return ret - -do_install_append() { - if [ -z '${GBMC_KCS_DEV}' ]; then - echo "Missing GBMC_KCS_DEV" >&2 - exit 1 - fi - - wantdir=${D}${systemd_system_unitdir}/multi-user.target.wants - install -d -m0755 $wantdir - inst="${@systemd_escape(GBMC_KCS_DEV)}" - ln -sv ../kcsbridge@.service $wantdir/kcsbridge@$inst.service -} diff --git a/meta-google/recipes-google/kcs/google-kcsbridge_git.bb b/meta-google/recipes-google/kcs/google-kcsbridge_git.bb deleted file mode 100644 index 4b3138eee..000000000 --- a/meta-google/recipes-google/kcs/google-kcsbridge_git.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "Google NCSI daemon" -DESCRIPTION = "Google NCSI daemon." -GOOGLE_MISC_PROJ = "kcsbridge" - -require ../google-misc/google-misc.inc - -inherit systemd - -DEPENDS += " \ - fmt \ - sdbusplus \ - sdeventplus \ - stdplus \ -" - -SYSTEMD_SERVICE_${PN} += "kcsbridge@.service" diff --git a/meta-google/recipes-google/networking/google-usb-network/00-bmc-usb0.network.m4 b/meta-google/recipes-google/networking/google-usb-network/00-bmc-usb0.network.m4 new file mode 100644 index 000000000..699ee8538 --- /dev/null +++ b/meta-google/recipes-google/networking/google-usb-network/00-bmc-usb0.network.m4 @@ -0,0 +1,7 @@ +[Match] +Name=usb0 +[Address] +Address=M_BMC_IP_ADDR +[Network] +LinkLocalAddressing=ipv6 +IPv6AcceptRA=no diff --git a/meta-google/recipes-google/networking/google-usb-network/usb_network.service.m4 b/meta-google/recipes-google/networking/google-usb-network/usb_network.service.m4 new file mode 100644 index 000000000..581c29b66 --- /dev/null +++ b/meta-google/recipes-google/networking/google-usb-network/usb_network.service.m4 @@ -0,0 +1,28 @@ +divert(-1) +define(`HOST_MAC_ARG', `ifelse($1, `invalid', `', + ifelse($1, `', `', + ` --host-mac "$1"'))') + +define(`DEV_MAC_ARG', `ifelse($1, `invalid', `', + ifelse($1, `', `', + ` --dev-mac "$1"'))') + +divert(0)dnl +dnl +[Unit] +Description=USB ECM Gadget +After=phosphor-ipmi-host.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=M_SCRIPT_INSTALL_DIR/usb_network.sh \ + --product-id "M_BMC_USB_ECM_PRODUCT_ID" \ + --product-name "M_BMC_USB_ECM_PRODUCT_NAME" \ + HOST_MAC_ARG(M_BMC_USB_ECM_HOST_MAC) \ + DEV_MAC_ARG(M_BMC_USB_ECM_DEV_MAC) \ + --bind-device "M_BMC_USB_ECM_BIND_DEV" +ExecStop=M_SCRIPT_INSTALL_DIR/usb_network.sh stop + +[Install] +WantedBy=multi-user.target diff --git a/meta-google/recipes-google/networking/google-usb-network/usb_network.sh b/meta-google/recipes-google/networking/google-usb-network/usb_network.sh new file mode 100755 index 000000000..08f9ad23b --- /dev/null +++ b/meta-google/recipes-google/networking/google-usb-network/usb_network.sh @@ -0,0 +1,165 @@ +#!/bin/bash +# Copyright 2021 Google LLC +# +# 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. + + +# List of options the script accepts. Trailing column means that the option +# requires an argument. +ARGUMENT_LIST=( + "help" + "product-id:" + "product-name:" + "host-mac:" + "bind-device:" + "dev-mac:" + "gadget-dir-name:" + "iface-name:" +) + +print_usage() { + cat <<HELP +$0 [OPTIONS] [stop|start] + Create USB Gadget Configuration + --product-id USB Product Id for the gadget. + --product-name Product name string (en) for the gadget. + --host-mac MAC address of the host part of the connection. Optional. + --dev-mac MAC address of the device (gadget) part of the connection. Optional. + --bind-device Name of the device to bind, as listed in /sys/class/udc/ + --gadget-dir-name Optional base name for gadget directory. Default: "g1" + --iface-name Optional name of the network interface. Default: "usb0" + --help Print this help and exit. +HELP +} + +gadget_start() { + local gadget_dir="${CONFIGFS_HOME}/usb_gadget/${GADGET_DIR_NAME}" + mkdir -p "${gadget_dir}" + echo ${ID_VENDOR} > "${gadget_dir}/idVendor" + echo ${ID_PRODUCT} > "${gadget_dir}/idProduct" + + local str_en_dir="${gadget_dir}/strings/0x409" + mkdir -p "${str_en_dir}" + echo ${STR_EN_VENDOR} > "${str_en_dir}/manufacturer" + echo ${STR_EN_PRODUCT} > "${str_en_dir}/product" + + local config_dir="${gadget_dir}/configs/c.1" + mkdir -p "${config_dir}" + echo 100 > "${config_dir}/MaxPower" + mkdir -p "${config_dir}/strings/0x409" + echo "ECM" > "${config_dir}/strings/0x409/configuration" + + local func_dir="${gadget_dir}/functions/ecm.${IFACE_NAME}" + mkdir -p "${func_dir}" + + if [[ -n $HOST_MAC_ADDR ]]; then + echo ${HOST_MAC_ADDR} > ${func_dir}/host_addr + fi + + if [[ -n $DEV_MAC_ADDR ]]; then + echo ${DEV_MAC_ADDR} > ${func_dir}/dev_addr + fi + + ln -s "${func_dir}" "${config_dir}" + + echo "${BIND_DEVICE}" > ${gadget_dir}/UDC +} + +gadget_stop() { + local gadget_dir="${CONFIGFS_HOME}/usb_gadget/${GADGET_DIR_NAME}" + rm -f ${gadget_dir}/configs/c.1/ecm.${IFACE_NAME} + rm -rf ${gadget_dir}/configs/c.1/strings/0x409 + rm -rf ${gadget_dir}/configs/c.1 + rm -rf ${gadget_dir}/strings/0x409 + rm -rf ${gadget_dir}/functions/ecm.${IFACE_NAME} + rm -rf ${gadget_dir} +} + +opts=$(getopt \ + --longoptions "$(printf "%s," "${ARGUMENT_LIST[@]}")" \ + --name "$(basename "$0")" \ + --options "" \ + -- "$@" +) + +eval set --$opts + +CONFIGFS_HOME=${CONFIGFS_HOME:-/sys/kernel/config} +ID_VENDOR="0x18d1" # Google +ID_PRODUCT="" +STR_EN_VENDOR="Google" +STR_EN_PRODUCT="" +DEV_MAC_ADDR="" +HOST_MAC_ADDR="" +BIND_DEVICE="" +ACTION="start" +GADGET_DIR_NAME="g1" +IFACE_NAME="usb0" +while [[ $# -gt 0 ]]; do + case "$1" in + --product-id) + ID_PRODUCT=$2 + shift 2 + ;; + --product-name) + STR_EN_PRODUCT=$2 + shift 2 + ;; + --host-mac) + HOST_MAC_ADDR=$2 + shift 2 + ;; + --dev-mac) + DEV_MAC_ADDR=$2 + shift 2 + ;; + --bind-device) + BIND_DEVICE=$2 + shift 2 + ;; + --gadget-dir-name) + GADGET_DIR_NAME=$2 + shift 2 + ;; + --iface-name) + IFACE_NAME=$2 + shift 2 + ;; + --help) + print_usage + exit 0 + ;; + start) + ACTION="start" + shift 1 + break + ;; + stop) + ACTION="stop" + shift 1 + break + ;; + --) + shift 1 + ;; + *) + break + ;; + esac +done + +if [[ $ACTION == "stop" ]]; then + gadget_stop +else + gadget_start +fi diff --git a/meta-google/recipes-google/networking/google-usb-network/usb_network_test.sh b/meta-google/recipes-google/networking/google-usb-network/usb_network_test.sh new file mode 100755 index 000000000..e5894338b --- /dev/null +++ b/meta-google/recipes-google/networking/google-usb-network/usb_network_test.sh @@ -0,0 +1,295 @@ +#!/bin/bash +# Copyright 2021 Google LLC +# +# 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. + + +TEMPDIRS="" +TEMPFILES="" +# Script under test +SUT=$PWD/usb_network.sh + +TEST_STATUS="OK" + +test_setup() { + echo -n "Testing $1 ..." + FAKE_CONFIGFS=$(mktemp -d) + TEMPDIRS="${TEMPDIRS} ${FAKE_CONFIGFS}" + FAKE_GADGETFS=$FAKE_CONFIGFS/usb_gadget + mkdir -p "$FAKE_GADGETFS" +} + +test_teardown() { + echo ${TEST_STATUS} + if test -n "$TEMPDIRS"; then + rm -rf ${TEMPDIRS} + fi + if test -n "$TEMPFILES"; then + rm -f $TEMPFILES + fi +} + +test_fail() { + echo -n " $@ " >&2 + TEST_STATUS="FAIL" + + test_teardown + exit 1 +} + +check_file_content() { + local filename="$1" + local expected_content="$2" + + if ! test -f "${filename}"; then + test_fail "File ${filename} does not exist!" + fi + + local actual_content=$(cat ${filename}) + if [[ $expected_content != $actual_content ]]; then + test_fail "Expected ${expected_content}, got ${actual_content}" + fi +} + +test_gadget_creation_with_defaults() { + local extra_args=() + local gadget_dir="$1" + if [[ $gadget_dir == "" ]]; then + gadget_dir="g1"; + else + extra_args=(${extra_args} --gadget-dir-name "${gadget_dir}") + fi + local product_name="Souvenier BMC" + local product_id="0xcafe" + local host_mac="ab:cd:ef:10:11:12" + local dev_mac="12:11:10:ef:cd:ab" + local bind_device="f80002000.udc" + CONFIGFS_HOME=${FAKE_CONFIGFS} ${SUT} --product-id "${product_id}" \ + --product-name "${product_name}" \ + --host-mac "${host_mac}" \ + --dev-mac "${dev_mac}" \ + --bind-device "${bind_device}" \ + ${extra_args[@]} + + if test $? -ne 0; then + test_fail "${SUT} failed" + fi + + if ! test -d "${FAKE_GADGETFS}/${gadget_dir}"; then + test_fail "Gadget was not created!" + fi + + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/idVendor "0x18d1" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/idProduct "${product_id}" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/strings/0x409/manufacturer "Google" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/strings/0x409/product "${product_name}" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/configs/c.1/MaxPower "100" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/configs/c.1/strings/0x409/configuration "ECM" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/functions/ecm.usb0/dev_addr "${dev_mac}" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/functions/ecm.usb0/host_addr "${host_mac}" + + if ! test -d ${FAKE_GADGETFS}/${gadget_dir}/functions/ecm.usb0; then + test_fail "Function directory was not created" + fi + + local func_link="${FAKE_GADGETFS}/${gadget_dir}/configs/c.1/ecm.usb0" + if ! test -L "${func_link}"; then + test_fail "Symlink to the function was not created in the config" + fi + + local link_dest=$(realpath ${func_link}) + if [[ $link_dest != ${FAKE_GADGETFS}/${gadget_dir}/functions/ecm.usb0 ]]; then + test_fail "Symlink points to the wrong file/dir" + fi + + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/UDC "${bind_device}" +} + +test_gadget_creation_with_override() { + mkdir -p ${FAKE_GADGETFS}/g1/{strings,configs,functions} + touch ${FAKE_GADGETFS}/g1/{idVendor,idProduct} + + test_gadget_creation_with_defaults +} + +test_gadget_stopping() { + local extra_args=() + local gadget_dir="$1" + local iface_name="$2" + if [[ $gadget_dir == "" ]]; then + gadget_dir="g1"; + else + extra_args=(${extra_args} --gadget-dir-name "${gadget_dir}") + fi + + if [[ $iface_name == "" ]]; then + iface_name="usb0"; + else + extra_args=(${extra_args} --iface-name "${iface_name}") + fi + + CONFIGFS_HOME=${FAKE_CONFIGFS} ${SUT} ${extra_args[@]} stop + + if test -d "${FAKE_GADGETFS}/${gadget_dir}"; then + test_fail "Gadget was not removed!" + fi +} + +test_gadget_creation_no_macs() { + local gadget_dir="g1"; + local product_name="Souvenier BMC" + local product_id="0xcafe" + local bind_device="f80002000.udc" + CONFIGFS_HOME=${FAKE_CONFIGFS} ${SUT} --product-id "${product_id}" \ + --product-name "${product_name}" \ + --bind-device "${bind_device}" + + if test $? -ne 0; then + test_fail "${SUT} failed" + fi + + if ! test -d "${FAKE_GADGETFS}/${gadget_dir}"; then + test_fail "Gadget was not created!" + fi + + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/idVendor "0x18d1" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/idProduct "${product_id}" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/strings/0x409/manufacturer "Google" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/strings/0x409/product "${product_name}" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/configs/c.1/MaxPower "100" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/configs/c.1/strings/0x409/configuration "ECM" + + if test -e ${FAKE_GADGETFS}/${gadget_dir}/functions/ecm.usb0/dev_addr; then + test_fail "dev_addr should not be set" + fi + + if test -e ${FAKE_GADGETFS}/${gadget_dir}/functions/ecm.usb0/host_addr; then + test_fail "host_addr should not be set" + fi + + local func_link="${FAKE_GADGETFS}/${gadget_dir}/configs/c.1/ecm.usb0" + if ! test -L "${func_link}"; then + test_fail "Symlink to the function was not created in the config" + fi + + local link_dest=$(realpath ${func_link}) + if [[ $link_dest != ${FAKE_GADGETFS}/${gadget_dir}/functions/ecm.usb0 ]]; then + test_fail "Symlink points to the wrong file/dir" + fi + + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/UDC "${bind_device}" +} + +test_gadget_creation_alt_iface() { + local gadget_dir="g1"; + local product_name="Souvenier BMC" + local product_id="0xcafe" + local bind_device="f80002000.udc" + local iface_name="iface0" + CONFIGFS_HOME=${FAKE_CONFIGFS} ${SUT} --product-id "${product_id}" \ + --product-name "${product_name}" \ + --bind-device "${bind_device}" \ + --iface-name "${iface_name}" + + if test $? -ne 0; then + test_fail "${SUT} failed" + fi + + if ! test -d "${FAKE_GADGETFS}/${gadget_dir}"; then + test_fail "Gadget was not created!" + fi + + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/idVendor "0x18d1" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/idProduct "${product_id}" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/strings/0x409/manufacturer "Google" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/strings/0x409/product "${product_name}" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/configs/c.1/MaxPower "100" + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/configs/c.1/strings/0x409/configuration "ECM" + + if ! test -d ${FAKE_GADGETFS}/${gadget_dir}/functions/ecm.${iface_name}; then + test_fail "Function directory was not created" + fi + + if test -e ${FAKE_GADGETFS}/${gadget_dir}/functions/ecm.${iface_name}/dev_addr; then + test_fail "dev_addr should not be set" + fi + + if test -e ${FAKE_GADGETFS}/${gadget_dir}/functions/ecm.${iface_name}/host_addr; then + test_fail "host_addr should not be set" + fi + + local func_link="${FAKE_GADGETFS}/${gadget_dir}/configs/c.1/ecm.${iface_name}" + if ! test -L "${func_link}"; then + test_fail "Symlink to the function was not created in the config" + fi + + local link_dest=$(realpath ${func_link}) + if [[ $link_dest != ${FAKE_GADGETFS}/${gadget_dir}/functions/ecm.${iface_name} ]]; then + test_fail "Symlink points to the wrong file/dir" + fi + + check_file_content ${FAKE_GADGETFS}/${gadget_dir}/UDC "${bind_device}" +} + + +# ------------------------------------------------------------------- +test_setup "Device Creation" + +test_gadget_creation_with_defaults + +test_teardown +# ------------------------------------------------------------------- + +# ------------------------------------------------------------------- +test_setup "Device Creation With Override" + +test_gadget_creation_with_override + +test_teardown +# ------------------------------------------------------------------- + +# ------------------------------------------------------------------- +test_setup "Test Device Stop" + +test_gadget_creation_with_defaults +test_gadget_stopping + +test_teardown +# ------------------------------------------------------------------- + +# ------------------------------------------------------------------- +test_setup "Device Creation/Stopping, Alternative Name" + +test_gadget_creation_with_defaults "gAlt" +test_gadget_stopping "gAlt" + +test_teardown +# ------------------------------------------------------------------- + +# ------------------------------------------------------------------- +test_setup "Device Creation without MAC Addrs" + +test_gadget_creation_no_macs + +test_teardown +# ------------------------------------------------------------------- + +# ------------------------------------------------------------------- +test_setup "Device Creation/Stopping, Alternative Interface" + +test_gadget_creation_alt_iface + +test_teardown +# ------------------------------------------------------------------- + +echo "SUCCESS!" diff --git a/meta-google/recipes-google/networking/google-usb-network_git.bb b/meta-google/recipes-google/networking/google-usb-network_git.bb new file mode 100644 index 000000000..ec51eaa5b --- /dev/null +++ b/meta-google/recipes-google/networking/google-usb-network_git.bb @@ -0,0 +1,64 @@ +SUMMARY = "Google USB ECM Gadget Configuration Script" +DESCRIPTION = "Google USB ECM Gadget Configuration Script" +PR = "r1" +PV = "0.2" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +FILESEXTRAPATHS_prepend = "${THISDIR}/${PN}:" + +inherit systemd + +DEPENDS += "m4-native" +DEPENDS += "systemd" +RDEPENDS_${PN} += "bash" + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "usb_network.service" + +BMC_IP_ADDR ??= "169.254.95.118/16" +BMC_USB_ECM_PRODUCT_ID ??= "" +BMC_USB_ECM_PRODUCT_NAME ??= "${MACHINE} BMC" +BMC_USB_ECM_HOST_MAC ??= "invalid" +BMC_USB_ECM_DEV_MAC ??= "invalid" +BMC_USB_ECM_BIND_DEV ??= "" +BMC_USB_CONFIG_PRIORITY ??= "" +BMC_USB_CONFIG_FILENAME ??= "${BMC_USB_CONFIG_PRIORITY}-bmc-usb0.network" + +SRC_URI += "file://00-bmc-usb0.network.m4" +SRC_URI += "file://usb_network.service.m4" +SRC_URI += "file://usb_network.sh" + +FILES_${PN} = "${bindir}/usb_network.sh" +FILES_${PN}_append = " ${systemd_unitdir}/network/${BMC_USB_CONFIG_FILENAME}" + +do_compile() { + test "X${BMC_IP_ADDR}" != "X" || bberror "Please define BMC_IP_ADDR" + m4 -DM_BMC_IP_ADDR=${BMC_IP_ADDR} ${WORKDIR}/00-bmc-usb0.network.m4 > ${S}/00-bmc-usb0.network + + test "X${BMC_USB_ECM_PRODUCT_ID}" != "X" || bberror "Please define BMC_USB_ECM_PRODUCT_ID" + test "X${BMC_USB_ECM_PRODUCT_NAME}" != "X" || bberror "Please define BMC_USB_ECM_PRODUCT_NAME" + test "X${BMC_USB_ECM_BIND_DEV}" != "X" || bberror "Please define BMC_USB_ECM_BIND_DEV" + + m4 \ + -DM_BMC_USB_ECM_PRODUCT_ID="${BMC_USB_ECM_PRODUCT_ID}" \ + -DM_BMC_USB_ECM_PRODUCT_NAME="${BMC_USB_ECM_PRODUCT_NAME}" \ + -DM_BMC_USB_ECM_HOST_MAC="${BMC_USB_ECM_HOST_MAC}" \ + -DM_BMC_USB_ECM_DEV_MAC="${BMC_USB_ECM_DEV_MAC}" \ + -DM_BMC_USB_ECM_BIND_DEV="${BMC_USB_ECM_BIND_DEV}" \ + -DM_SCRIPT_INSTALL_DIR="${bindir}" \ + ${WORKDIR}/usb_network.service.m4 > ${S}/usb_network.service +} + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${WORKDIR}/usb_network.sh ${D}/${bindir} + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${S}/usb_network.service ${D}${systemd_system_unitdir} + + install -d ${D}${systemd_unitdir}/network + install -m 0644 ${S}/00-bmc-usb0.network \ + ${D}${systemd_unitdir}/network/${BMC_USB_CONFIG_FILENAME} +} diff --git a/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb b/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb new file mode 100644 index 000000000..7eba3b0fc --- /dev/null +++ b/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb @@ -0,0 +1,23 @@ +SUMMARY = "Dummy image uploader for sending debug binaries" +DESCRIPTION = "Dummy image uploader for sending debug binaries" +PR = "r1" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd + +SRC_URI += "file://config-dummy.json" +SRC_URI += "file://dummy-verify.service" + +FILES_${PN} += "${datadir}/phosphor-ipmi-flash" + +SYSTEMD_SERVICE_${PN} += "dummy-verify.service" + +do_install() { + install -d ${D}${datadir}/phosphor-ipmi-flash + install -m 0644 ${WORKDIR}/config-dummy.json ${D}${datadir}/phosphor-ipmi-flash + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/dummy-verify.service ${D}${systemd_system_unitdir} +} diff --git a/meta-google/recipes-phosphor/flash/dummy-gbmc-update/config-dummy.json b/meta-google/recipes-phosphor/flash/dummy-gbmc-update/config-dummy.json new file mode 100644 index 000000000..e68e9105b --- /dev/null +++ b/meta-google/recipes-phosphor/flash/dummy-gbmc-update/config-dummy.json @@ -0,0 +1,19 @@ +[{ + "blob": "/flash/dummy", + "handler": { + "type": "file", + "path": "/run/initramfs/bmc-image" + }, + "actions": { + "preparation": { + "type": "skip" + }, + "verification": { + "type": "systemd", + "unit": "dummy-verify.service" + }, + "update": { + "type": "skip" + } + } +}] diff --git a/meta-google/recipes-phosphor/flash/dummy-gbmc-update/dummy-verify.service b/meta-google/recipes-phosphor/flash/dummy-gbmc-update/dummy-verify.service new file mode 100644 index 000000000..ec320d551 --- /dev/null +++ b/meta-google/recipes-phosphor/flash/dummy-gbmc-update/dummy-verify.service @@ -0,0 +1,6 @@ +[Unit] +Description=Dummy flash file verification + +[Service] +Type=oneshot +ExecStart=/bin/mv /run/initramfs/bmc-image /run/initramfs/dummy diff --git a/meta-google/recipes-phosphor/flash/google-key.bb b/meta-google/recipes-phosphor/flash/google-key.bb new file mode 100644 index 000000000..220211526 --- /dev/null +++ b/meta-google/recipes-phosphor/flash/google-key.bb @@ -0,0 +1,26 @@ +SUMMARY = "Google Key installation Script" +DESCRIPTION = "Google Key installation Script" +PR = "r1" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +RDEPENDS_${PN} += "bash" +RDEPENDS_${PN} += "gnupg" + +SRC_URI += " \ + file://platforms_gbmc_bringup.gpg \ + file://platforms_gbmc_secure.gpg \ + file://verify-bmc-image.sh \ +" + +do_install() { + # Install keys into image. + install -d -m 0755 ${D}${datadir}/google-key + install -m 0644 ${WORKDIR}/platforms_gbmc_secure.gpg ${D}${datadir}/google-key/prod.key + install -m 0644 ${WORKDIR}/platforms_gbmc_bringup.gpg ${D}${datadir}/google-key/dev.key + + # Install the verification helper + install -d -m 0755 ${D}${bindir} + install -m 0755 ${WORKDIR}/verify-bmc-image.sh ${D}${bindir} +} diff --git a/meta-google/recipes-phosphor/flash/google-key/platforms_gbmc_bringup.gpg b/meta-google/recipes-phosphor/flash/google-key/platforms_gbmc_bringup.gpg Binary files differnew file mode 100644 index 000000000..f347e224b --- /dev/null +++ b/meta-google/recipes-phosphor/flash/google-key/platforms_gbmc_bringup.gpg diff --git a/meta-google/recipes-phosphor/flash/google-key/platforms_gbmc_secure.gpg b/meta-google/recipes-phosphor/flash/google-key/platforms_gbmc_secure.gpg Binary files differnew file mode 100644 index 000000000..9281f7790 --- /dev/null +++ b/meta-google/recipes-phosphor/flash/google-key/platforms_gbmc_secure.gpg diff --git a/meta-google/recipes-phosphor/flash/google-key/verify-bmc-image.sh b/meta-google/recipes-phosphor/flash/google-key/verify-bmc-image.sh new file mode 100755 index 000000000..cac229a94 --- /dev/null +++ b/meta-google/recipes-phosphor/flash/google-key/verify-bmc-image.sh @@ -0,0 +1,63 @@ +#!/bin/bash +# Copyright 2021 Google LLC +# +# 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. + +help_out() { + echo "$ARG0 [--allow-dev] <image file> <sig file>" >&2 + exit 2 +} + +opts="$(getopt -o 'd' -l 'allow-dev' -- "$@")" || exit +dev= +eval set -- "$opts" +while true; do + case "$1" in + --allow-dev|-d) + dev=1 + shift + ;; + --) + shift + break + ;; + *) + echo "Bad option: $1" >&2 + help_out + ;; + esac +done +image_file="${1?Missing image file}" || help_out +sig_file="${2?Missing sig file}" || help_out + +# gnupg needs a home directory even though we don't want to persist any +# information. We always make a new temporary directory for this +GNUPGHOME= +cleanup() { + test -n "$GNUPGHOME" && rm -rf "$GNUPGHOME" +} +trap cleanup ERR EXIT INT +export GNUPGHOME="$(mktemp -d)" || exit + +gpg() { + command gpg --batch --allow-non-selfsigned-uid --no-tty "$@" +} +import_key() { + gpg --import "/usr/share/google-key/$1.key" +} + +import_key prod +if [ -n "$dev" ]; then + import_key dev +fi +gpg --verify --ignore-time-conflict "$sig_file" "$image_file" diff --git a/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb b/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb new file mode 100644 index 000000000..c71a579e1 --- /dev/null +++ b/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb @@ -0,0 +1,44 @@ +SUMMARY = "Google BMC Inplace Update Script" +DESCRIPTION = "Google BMC Inplace Update Script" +PR = "r1" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit obmc-phosphor-systemd + +PROVIDES += "virtual/bmc-update" +RPROVIDES_${PN} += "virtual/bmc-update" + +RDEPENDS_${PN} += "google-key" +RDEPENDS_${PN} += "bash" + +SRC_URI += " \ + file://config-bmc.json \ + file://inplace-gbmc-verify.service \ + file://inplace-gbmc-verify.sh \ + file://inplace-gbmc-version.service \ + file://inplace-gbmc-version.sh \ +" + +SYSTEMD_SERVICE_${PN} += "inplace-gbmc-verify.service" +SYSTEMD_SERVICE_${PN} += "inplace-gbmc-version.service" + +FILES_${PN} += "${datadir}/phosphor-ipmi-flash" + +do_install() { + sed -i 's,@ALLOW_DEV@,,' ${WORKDIR}/inplace-gbmc-verify.sh + + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/*.sh ${D}${bindir} + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/*.service ${D}${systemd_system_unitdir} + + install -d ${D}${datadir}/phosphor-ipmi-flash + install -m 0644 ${WORKDIR}/config-bmc.json ${D}${datadir}/phosphor-ipmi-flash +} + +do_install_prepend_dev() { + sed -i 's,@ALLOW_DEV@,--allow-dev,' ${WORKDIR}/inplace-gbmc-verify.sh +} diff --git a/meta-google/recipes-phosphor/flash/inplace-gbmc-update/config-bmc.json b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/config-bmc.json new file mode 100644 index 000000000..8bd11f2e1 --- /dev/null +++ b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/config-bmc.json @@ -0,0 +1,33 @@ +[{ + "blob": "/flash/image", + "version": { + "handler": { + "type": "file", + "path": "/run/inplace-gbmc-version" + }, + "actions":{ + "open": { + "type": "systemd", + "unit": "inplace-gbmc-version.service" + } + } + }, + "handler": { + "type": "file", + "path": "/run/initramfs/bmc-image" + }, + "actions": { + "preparation": { + "type": "skip" + }, + "verification": { + "type": "systemd", + "unit": "inplace-gbmc-verify.service" + }, + "update": { + "type": "systemd", + "unit": "reboot.target", + "mode": "replace-irreversibly" + } + } +}] diff --git a/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-verify.service b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-verify.service new file mode 100644 index 000000000..4552780af --- /dev/null +++ b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-verify.service @@ -0,0 +1,6 @@ +[Unit] +Description=Verify the Flash Image File + +[Service] +Type=oneshot +ExecStart=/usr/bin/inplace-gbmc-verify.sh diff --git a/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-verify.sh b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-verify.sh new file mode 100644 index 000000000..d5307d3d1 --- /dev/null +++ b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-verify.sh @@ -0,0 +1,57 @@ +#!/bin/bash +# Copyright 2021 Google LLC +# +# 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. + + +# This script will check the signature for the BMC image against +# the baked in keyring available. If any aspect of this fails, +# the scripts returns non-zero and this can be reported to the +# host. +# +# 1. Verify the image +# 2. Rename the image + +KEYRING=/etc/googlekeys/gbmc/gbmc.gpg +SIGNATURE_FILE=/tmp/bmc.sig +STATUS_FILE=/tmp/bmc.verify + +# Store in /run/initramfs because the behaviour of mv changes +# depending on whether the file is moving within a tree or not. +IMAGE_FILE=/run/initramfs/bmc-image +VERIFIED_FILE=/run/initramfs/image-bmc + +# Make sure we run ERR traps when a function returns an error +set -e + +# Write out the result of the script to a status file upon exiting +# normally or due to an error +exit_handler() { + local status="$?" + if (( status == 0 )); then + echo "success" >"${STATUS_FILE}" + else + echo "failed" >"${STATUS_FILE}" + fi + trap - EXIT ERR + exit "$status" +} +trap exit_handler EXIT ERR + +echo "running" > ${STATUS_FILE} + +# Verify the image. +verify-bmc-image.sh @ALLOW_DEV@ "$IMAGE_FILE" "$SIGNATURE_FILE" || exit + +# Rename the staged file for initramfs updates. +mv ${IMAGE_FILE} ${VERIFIED_FILE}#!/bin/bash diff --git a/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-version.service b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-version.service new file mode 100644 index 000000000..3f6b67179 --- /dev/null +++ b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-version.service @@ -0,0 +1,9 @@ +[Unit] +Description=Version string for inplace BMC + +[Service] +Type=oneshot +StandardOutput=file:/run/inplace-gbmc-version +StandardError=journal +ExecStartPre=/bin/rm -f /run/inplace-gbmc-version +ExecStart=/usr/bin/inplace-gbmc-version.sh diff --git a/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-version.sh b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-version.sh new file mode 100644 index 000000000..0c5c4e787 --- /dev/null +++ b/meta-google/recipes-phosphor/flash/inplace-gbmc-update/inplace-gbmc-version.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Copyright 2021 Google LLC +# +# 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. + +grep '^VERSION_ID=' /etc/os-release | sed 's,.*-\([^-]*\),\1,g' | tr -d '\n'#!/bin/bash diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend index 0c74fc8bb..942dfc14c 100644 --- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -4,6 +4,7 @@ OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-blobs" OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-ethstats" OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-flash" +# Google BMC (gBMC) specific installs OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " iproute2 iproute2-ss" OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-systemd-config" OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-iperf3" @@ -13,5 +14,12 @@ OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = \ '${@"" if not d.getVar("GBMC_NCSI_IF_NAME") else " gbmc-ncsi-config"}' OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = \ '${@"" if not d.getVar("GBMC_MAC_EEPROM_OF_NAME") else " gbmc-mac-config"}' -OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = \ - '${@"" if not d.getVar("GBMC_KCS_DEV") else " gbmc-kcs-config"}' + +# Include these useful utilities for all gbmc platforms +OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " ipmitool" +OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " iotools" +OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " lrzsz" + +# Add gBMC update recipes +OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " dummy-gbmc-update" +OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " virtual/bmc-update" diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend new file mode 100644 index 000000000..03e99b2d0 --- /dev/null +++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -0,0 +1,22 @@ +FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/${PN}:" + +SRC_URI_append_gbmc = " file://gbmc_bridge.json" + +DEPENDS_append_gbmc = " jq-native" + +GBMCBR_IPMI_CHANNEL ?= "11" + +# Replace a channel in config.json to add gbmcbr reporting +do_install_append_gbmc() { + chjson=${D}${datadir}/ipmi-providers/channel_config.json + overlapping="$(jq '."${GBMCBR_IPMI_CHANNEL}" | .is_valid and .name != "gbmcbr"' $chjson)" + if [ "$overlapping" != "false" ]; then + echo "gBMC channel config overlaps on ${GBMCBR_IPMI_CHANNEL}" >&2 + cat $chjson + exit 1 + fi + jq --slurpfile brcfg ${WORKDIR}/gbmc_bridge.json \ + '. + {"${GBMCBR_IPMI_CHANNEL}": $brcfg[0]}' $chjson >${WORKDIR}/tmp + mv ${WORKDIR}/tmp $chjson +} + diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config/gbmc_bridge.json b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config/gbmc_bridge.json new file mode 100644 index 000000000..f87728388 --- /dev/null +++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config/gbmc_bridge.json @@ -0,0 +1,11 @@ +{ + "name" : "gbmcbr", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "lan-802.3", + "protocol_type" : "ipmb-1.0", + "session_supported" : "multi-session", + "is_ipmi" : true + } +} diff --git a/meta-google/recipes-phosphor/settings/phosphor-settings-manager/timemanager-default-HOST-MANUAL.override.yml b/meta-google/recipes-phosphor/settings/phosphor-settings-manager/timemanager-default-HOST-MANUAL.override.yml index 77c0dff08..d7d46ec03 100644 --- a/meta-google/recipes-phosphor/settings/phosphor-settings-manager/timemanager-default-HOST-MANUAL.override.yml +++ b/meta-google/recipes-phosphor/settings/phosphor-settings-manager/timemanager-default-HOST-MANUAL.override.yml @@ -1,3 +1,17 @@ +# Copyright 2021 Google LLC +# +# 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. + --- /xyz/openbmc_project/time/sync_method: - Interface: xyz.openbmc_project.Time.Synchronization diff --git a/meta-ibm/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf index 2d696ecd8..7860e3eba 100644 --- a/meta-ibm/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf @@ -39,3 +39,6 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ WKS_HOSTFW_SIZE = "4G" IMAGE_FEATURES_remove = "obmc-ikvm" + +DEBUG_TRIGGERS = "kcs2" +PACKAGECONFIG_append_pn-debug-trigger = " triggers" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml index 8fbc38162..0671e155e 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml +++ b/meta-ibm/meta-palmetto/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml @@ -12,5 +12,5 @@ events: /system/chassis: xyz.openbmc_project.Inventory.Item.Chassis: Type: - value: "RackMount" + value: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" type: string diff --git a/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml index 0f72008c7..08f35805c 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml +++ b/meta-ibm/meta-romulus/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml @@ -12,5 +12,5 @@ events: /system/chassis: xyz.openbmc_project.Inventory.Item.Chassis: Type: - value: "RackMount" + value: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" type: string diff --git a/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg b/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg index 481a62180..5cda19abb 100644 --- a/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg +++ b/meta-ibm/recipes-kernel/linux/linux-aspeed/p10bmc.cfg @@ -5,6 +5,7 @@ CONFIG_SENSORS_MAX31785=y CONFIG_SENSORS_UCD9000=y CONFIG_RTC_DRV_RV8803=y CONFIG_IIO=y +CONFIG_SI7020=y CONFIG_BMP280=y CONFIG_PSTORE=y CONFIG_PSTORE_CONSOLE=y diff --git a/meta-ibm/recipes-kernel/linux/linux-aspeed/witherspoon.cfg b/meta-ibm/recipes-kernel/linux/linux-aspeed/witherspoon.cfg index dc41d5834..0b6a2e8bb 100644 --- a/meta-ibm/recipes-kernel/linux/linux-aspeed/witherspoon.cfg +++ b/meta-ibm/recipes-kernel/linux/linux-aspeed/witherspoon.cfg @@ -5,3 +5,7 @@ CONFIG_SENSORS_UCD9000=y CONFIG_RTC_DRV_RV8803=y CONFIG_IIO=y CONFIG_BMP280=y +CONFIG_IPMI_KCS_BMC=y +CONFIG_IPMI_KCS_BMC_CDEV_RAW=y +CONFIG_ASPEED_KCS_IPMI_BMC=y +CONFIG_MAGIC_SYSRQ=y diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 7de421656..0d8b3b872 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -47,6 +47,7 @@ SYSTEMD_OVERRIDE_phosphor-fan-monitor_p10bmc += "fan-watchdog-conflicts.conf:pho # Witherspoon fan control service linking # Link fan control init service +SYSTEMD_SERVICE_${PN}-control_witherspoon += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}" SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to be started at standby FMT_CONTROL_STDBY_witherspoon = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}" diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-0.conf deleted file mode 100644 index d2c96e643..000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-0.conf +++ /dev/null @@ -1,7 +0,0 @@ -INVENTORY=/system/chassis/motherboard/powersupply0 -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=144 -DRIVER_BIND_DELAY_MS=1500 -NAME=powersupply0 -DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0068 -EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-1.conf deleted file mode 100644 index 655ce07f5..000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-1.conf +++ /dev/null @@ -1,7 +0,0 @@ -INVENTORY=/system/chassis/motherboard/powersupply1 -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=145 -DRIVER_BIND_DELAY_MS=1500 -NAME=powersupply1 -DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-0069 -EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-2.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-2.conf deleted file mode 100644 index 0723892d6..000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-2.conf +++ /dev/null @@ -1,7 +0,0 @@ -INVENTORY=/system/chassis/motherboard/powersupply2 -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=146 -DRIVER_BIND_DELAY_MS=1500 -NAME=powersupply2 -DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-006a -EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-3.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-3.conf deleted file mode 100644 index 3dadeefbe..000000000 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/p10bmc/obmc/gpio/phosphor-power-supply-3.conf +++ /dev/null @@ -1,7 +0,0 @@ -INVENTORY=/system/chassis/motherboard/powersupply3 -DEVPATH=/dev/input/by-path/platform-gpio-keys-event -KEY=147 -DRIVER_BIND_DELAY_MS=1500 -NAME=powersupply3 -DRIVERS=/sys/bus/i2c/drivers/ibm-cffps,3-006b -EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 9884173d5..995dca3ae 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -7,10 +7,8 @@ FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.wants/${INSTFMT_POW SYSTEMD_LINK_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" SYSTEMD_LINK_${PN}-presence_append_mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_LINK_${PN}-presence_append_p10bmc = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_p10bmc = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml index a2ff9d177..f85adc3db 100644 --- a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml +++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml @@ -12,5 +12,5 @@ events: /system/chassis: xyz.openbmc_project.Inventory.Item.Chassis: Type: - value: "RackMount" + value: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" type: string diff --git a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml index a363bda8d..e8be22f8a 100644 --- a/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml +++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml @@ -47,5 +47,5 @@ events: /system/chassis: xyz.openbmc_project.Inventory.Item.Chassis: Type: - value: "RackMount" + value: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" type: string diff --git a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json index e1c085a3c..7405ce1fc 100644 --- a/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/p10bmc/ibm,everest_associations.json @@ -191,6 +191,67 @@ "/xyz/openbmc_project/sensors/fan_tach/fan3_0", "/xyz/openbmc_project/sensors/fan_tach/fan3_1" ] + }, + { + "types": + { + "rType": "inventory", + "fType": "assembly" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm3", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm4", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm5", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm6", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm7", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm8", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm9", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm10", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm11", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm12", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm13", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm14", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/vrm15", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/bmc/tod_battery", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/tpm", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/panel0" + ] + }, + { + "types": + { + "rType": "chassis", + "fType": "inventory" + }, + "paths": + [ + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot3", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot4", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot5", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot6", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot7", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot8", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot9", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/pcieslot10", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme0", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme1", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme2", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme3", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme4", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme5", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme6", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme7", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme8", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/dasd_backplane/nvme9" + ] } ] }, @@ -351,6 +412,818 @@ ] }, { + "path": "system/chassis/motherboard/pcieslot0", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c01_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c01_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcieslot1", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c02_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c02_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcieslot2", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c03_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c03_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcieslot3", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c04_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c04_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcieslot4", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c05_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c05_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcieslot5", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c06_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c06_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcieslot6", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c07_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c07_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcieslot7", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c08_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c08_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcieslot8", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c09_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c09_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcieslot9", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c10_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c10_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcieslot10", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c11_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/pcieslot_c11_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card0/cxp_top", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c01_top_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c01_cxp_top_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card0/cxp_bot", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c01_cxp_bot_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c01_cxp_bot_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card1/cxp_top", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c02_cxp_top_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c02_cxp_top_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card1/cxp_bot", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c02_cxp_bot_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c02_cxp_bot_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card2/cxp_top", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c03_cxp_top_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c03_cxp_top_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card2/cxp_bot", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c03_cxp_bot_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c03_cxp_bot_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card3/cxp_top", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c04_cxp_top_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c04_cxp_top_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card3/cxp_bot", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c04_cxp_bot_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c04_cxp_bot_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card4/cxp_top", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c05_cxp_top_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c05_cxp_top_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card4/cxp_bot", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c05_cxp_bot_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c05_cxp_bot_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card6/cxp_top", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c07_cxp_top_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c07_cxp_top_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card6/cxp_bot", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c07_cxp_bot_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c07_cxp_bot_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card7/cxp_top", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c08_cxp_top_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c08_cxp_top_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card7/cxp_bot", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c08_cxp_bot_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c08_cxp_bot_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card9/cxp_top", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c10_cxp_top_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c10_cxp_top_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card9/cxp_bot", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c10_cxp_bot_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c10_cxp_bot_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card10/cxp_top", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c11_cxp_top_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c11_cxp_top_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/pcie_cable_card10/cxp_bot", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c11_cxp_bot_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/cablecard_c11_cxp_bot_identify" + ] + } + ] + }, + { "path": "system/chassis/motherboard", "endpoints": [ @@ -1163,6 +2036,2246 @@ ] }, { + "path": "system/chassis/motherboard/dasd_backplane/nvme0", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme0_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme0_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dasd_backplane/nvme1", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme1_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme1_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dasd_backplane/nvme2", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme2_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme2_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dasd_backplane/nvme3", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme3_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme3_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dasd_backplane/nvme4", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme4_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme4_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dasd_backplane/nvme5", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme5_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme5_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dasd_backplane/nvme6", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme6_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme6_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dasd_backplane/nvme7", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme7_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme7_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dasd_backplane/nvme8", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme8_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme8_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dasd_backplane/nvme9", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme9_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/nvme9_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm0", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm0_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm0_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm1", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm1_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm1_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm2", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm2_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm2_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm3", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm3_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm3_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm4", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm4_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm4_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm5", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm5_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm5_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm6", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm6_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm6_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm7", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm7_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm7_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm8", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm8_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm8_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm9", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm9_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm9_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm10", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm10_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm10_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm11", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm11_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm11_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm12", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm12_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm12_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm13", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm13_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm13_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm14", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm14_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm14_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm15", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm15_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm15_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm16", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm16_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm16_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm17", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm17_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm17_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm18", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm18_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm18_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm19", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm19_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm19_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm20", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm20_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm20_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm21", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm21_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm21_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm22", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm22_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm22_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm23", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm23_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm23_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm24", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm24_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm24_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm25", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm25_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm25_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm26", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm26_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm26_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm27", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm27_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm27_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm28", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm28_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm28_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm29", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm29_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm29_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm30", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm30_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm30_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm31", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm31_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm31_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm32", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm32_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm32_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm33", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm33_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm33_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm34", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm34_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm34_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm35", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm35_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm35_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm36", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm36_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm36_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm37", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm37_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm37_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm38", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm38_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm38_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm39", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm39_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm39_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm40", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm40_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm40_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm41", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm41_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm41_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm42", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm42_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm42_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm43", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm43_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm43_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm44", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm44_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm44_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm45", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm45_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm45_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm46", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm46_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm46_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm47", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm47_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm47_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm48", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm48_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm48_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm49", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm49_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm49_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm50", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm50_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm50_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm51", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm51_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm51_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm52", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm52_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm52_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm53", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm53_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm53_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm54", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm54_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm54_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm55", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm55_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddim55_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm56", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm56_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm56_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm57", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm57_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm57_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm58", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm58_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm58_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm59", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm59_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm59_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm60", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm60_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm60_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm61", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm61_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm61_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm62", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm62_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm62_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/dimm63", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm63_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/ddimm63_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/capi_conn0", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector0_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector0_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/capi_conn1", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector1_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector1_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/capi_conn2", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector2_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector2_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/capi_conn3", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector3_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector3_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/capi_conn4", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector4_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector4_identify" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/capi_conn5", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector5_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/opencapi_connector5_identify" + ] + } + ] + }, + { "path": "system/chassis/motherboard/dasd_backplane", "endpoints": [ @@ -1189,6 +4302,34 @@ ] } ] + }, + { + "path": "system/chassis/motherboard/dasd_backplane/panel0", + "endpoints": + [ + { + "types": + { + "rType": "fault_inventory_object", + "fType": "fault_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/op_panel_base_fault" + ] + }, + { + "types": + { + "rType": "identify_inventory_object", + "fType": "identify_led_group" + }, + "paths": + [ + "/xyz/openbmc_project/led/groups/op_panel_base_identify" + ] + } + ] } - ] -} + ] +} diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,everest_dev_callouts.json b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,everest_dev_callouts.json new file mode 100644 index 000000000..b554fd415 --- /dev/null +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging/p10bmc/ibm,everest_dev_callouts.json @@ -0,0 +1,39001 @@ +{ + "FSI":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10-0", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "0-1":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10-1", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "0-2":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10-0", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "0-3":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10-1", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "0-4":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10-0", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "0-5":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10-1", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "0-6":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10-0", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "0-7":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10-1", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "FSI-I2C":{ + "0":{ + "0":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C88", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-56/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "96":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9551-TPM", + "HexAddress":"0x60", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "1":{ + "100":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9551_I2C_CP00", + "HexAddress":"0x64", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "26":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C01-pcieslot-x8/pcie-cable-card-0/cablecard-CXP-TOP", + "HexAddress":"0x1a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "34":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C01-pcieslot-x8/pcie-cable-card-0/cablecard-CXP-BOT", + "HexAddress":"0x22", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C89", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-57/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "10":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C91", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-59/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "11":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C92", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-60/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "12":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C95", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-63/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "13":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C93", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-61/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "8":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C90", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-58/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "9":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C94", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-62/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + } + }, + "0-1":{ + "12":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C84", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-52/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "13":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C83", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-51/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "14":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C80", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-48/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "15":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C81", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-49/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "2":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C87", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-55/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "3":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C86", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-54/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "8":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C85", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-53/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "9":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C82", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-50/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + } + }, + "0-2":{ + "0":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "98":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9553_CP10_T1-0", + "HexAddress":"0x62", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "1":{ + "100":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9552_I2C_CP10", + "HexAddress":"0x64", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C11-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-TOP", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "26":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C09-pcieslot-x8/pcie-cable-card-0/cablecard-CXP-TOP", + "HexAddress":"0x1a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "27":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C10-pcieslot-x8/pcie-cable-card-0/cablecard-CXP-TOP", + "HexAddress":"0x1b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C11-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-BOT", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "34":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C09-pcieslot-x8/pcie-cable-card-0/cablecard-CXP-BOT", + "HexAddress":"0x22", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "35":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C10-pcieslot-x8/pcie-cable-card-0/cablecard-CXP-BOT", + "HexAddress":"0x23", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C23", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-1/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "98":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9553_CP10_T0-1", + "HexAddress":"0x62", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "10":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C25", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-3/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "11":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C26", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-4/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "12":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C29", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-7/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "13":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C27", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-5/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "8":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C24", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-2/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "9":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C28", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-6/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + } + }, + "0-3":{ + "1":{ + "100":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9552_I2C_CP11", + "HexAddress":"0x64", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C08-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-TOP", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "27":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C07-pcieslot-x8/pcie-cable-card-0/cablecard-CXP-TOP", + "HexAddress":"0x1b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C08-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-BOT", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "35":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C07-pcieslot-x8/pcie-cable-card-0/cablecard-CXP-BOT", + "HexAddress":"0x23", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "98":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9553_CP11_T2-3", + "HexAddress":"0x62", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "12":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C34", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-12/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "13":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C33", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-11/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "14":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C30", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-8/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "15":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C31", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-9/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "2":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C37", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-15/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "3":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C36", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-14/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "8":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C35", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-13/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "9":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C32", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-10/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + } + }, + "0-4":{ + "0":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9553_CP20_T3-4", + "HexAddress":"0x0", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C38", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-16/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "1":{ + "100":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9552_I2C_CP20", + "HexAddress":"0x64", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C04-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-TOP", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "26":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C05-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-TOP", + "HexAddress":"0x1a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C04-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-BOT", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "34":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C05-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-BOT", + "HexAddress":"0x22", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C39", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-17/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "10":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C41", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-19/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "11":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C43", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-21/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "12":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C45", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-23/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "13":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C42", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-20/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "8":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C40", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-18/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "9":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C44", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-22/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + } + }, + "0-5":{ + "0":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9553_CP21_T5-6", + "HexAddress":"0x0", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "1":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9553_CP21_T4-7", + "HexAddress":"0x0", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "100":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9551_I2C_CP21", + "HexAddress":"0x64", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C02-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-TOP", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C03-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-TOP", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C02-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-BOT", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "33":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C03-pcieslot-x16/pcie-cable-card-0/cablecard-CXP-BOT", + "HexAddress":"0x21", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "12":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C50", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C50", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C50", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C50", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C50", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C50", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C50", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C50", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-28/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "13":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C48", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C48", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C48", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C48", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C48", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C48", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C48", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C48", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C48", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C48", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-26/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "14":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C46", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-24/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "15":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C49", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-27/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "2":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C52", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-30/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "3":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C53", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-31/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "8":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C51", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-29/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "9":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C22", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-0/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C47", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-25/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + } + }, + "0-6":{ + "0":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C73", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-41/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "1":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C72", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-40/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "10":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C75", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-43/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "11":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C77", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-45/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "12":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C79", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-47/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "13":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C76", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-44/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "14":{ + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "15":{ + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "8":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C74", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-42/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "9":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C78", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-46/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + } + }, + "0-7":{ + "12":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C68", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-36/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "13":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C66", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-34/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "14":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C64", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-32/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "15":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C67", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-35/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "2":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C70", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-38/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "3":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C71", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-39/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "8":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C69", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-37/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "9":{ + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/pmic0", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "16":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/adc0", + "HexAddress":"0x10", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/adc1", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/ocmb", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/ocmb", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/ocmb", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/PCA9554A", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/PCA9554B", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "71":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/pmic2", + "HexAddress":"0x47", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/spdA", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/spdB", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "88":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/rcd0", + "HexAddress":"0x58", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "89":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/rcd1", + "HexAddress":"0x59", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "90":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/pmic1", + "HexAddress":"0x5a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "91":{ + "Callouts":[ + { + "LocationCode":"P0-C65", + "Name":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/ddimm-conn-33/dimm-0/pmic3", + "HexAddress":"0x5b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + } + } + }, + "FSI-SPI":{ + "0":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/p0-sbe-p", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "1":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/p0-sbe-b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "2":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/p0-mvpd", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "3":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/p0-meas", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "4":{ + "Callouts":[ + { + "LocationCode":"P0-C96", + "Name":"/sys-0/node-0/bellavista-0/TPM-conn-0/Tourmalet-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/TPM-conn-0/Tourmalet-0/NPCT750AAC-0", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "6":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/everest-apss-0", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "0-1":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/p1-sbe-p", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "1":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/p1-sbe-b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "2":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/p1-mvpd", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "3":{ + "Callouts":[ + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/p1-meas", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "0-2":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/p0-sbe-p", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "1":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/p0-sbe-b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "2":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/p0-mvpd", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "3":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/p0-meas", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "0-3":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/p1-sbe-p", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "1":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/p1-sbe-b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "2":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/p1-mvpd", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "3":{ + "Callouts":[ + { + "LocationCode":"P0-C14", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-1/godel-0/p1-meas", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "0-4":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/p0-sbe-p", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "1":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/p0-sbe-b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "2":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/p0-mvpd", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "3":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/p0-meas", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "0-5":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/p1-sbe-p", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "1":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/p1-sbe-b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "2":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/p1-mvpd", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "3":{ + "Callouts":[ + { + "LocationCode":"P0-C19", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-2/godel-0/p1-meas", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "0-6":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/p0-sbe-p", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "1":{ + "Callouts":[ + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/p0-sbe-b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "2":{ + "Callouts":[ + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/p0-mvpd", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "3":{ + "Callouts":[ + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/p0-meas", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "0-7":{ + "0":{ + "Callouts":[ + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/p1-sbe-p", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "1":{ + "Callouts":[ + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/p1-sbe-b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "2":{ + "Callouts":[ + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/p1-mvpd", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "3":{ + "Callouts":[ + { + "LocationCode":"P0-C56", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C61", + "MRU":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0/power10", + "Name":"/sys-0/node-0/bellavista-0/proc_socket-0/godel-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/proc_socket-3/godel-0/p1-mvpd", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + } + }, + "I2C":{ + "0":{ + "106":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/SI5332_BMC_01-1", + "HexAddress":"0x6a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "108":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/9ZXL0451E_I2C1-3", + "HexAddress":"0x6c", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/TPM-conn-0/Tourmalet-0/tourmalet_vpd-0", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "97":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Bellavista_PCA9552_Resets-3", + "HexAddress":"0x61", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "98":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Bellavista_PCA9552_CardPresent-4", + "HexAddress":"0x62", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "99":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Bellavista_PCA9552_VRMcardPresent-10", + "HexAddress":"0x63", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "1":{ + "106":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/SI5332_BMC_02-0", + "HexAddress":"0x6a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "108":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/9ZXL0451E_I2C2-0", + "HexAddress":"0x6c", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "109":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/9ZXL0451E_I2C2-1", + "HexAddress":"0x6d", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "111":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/9ZXL0451E_I2C2-2", + "HexAddress":"0x6f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "10":{ + "100":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vpcieB-5", + "HexAddress":"0x64", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "101":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vpcieB-6", + "HexAddress":"0x65", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "102":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vavdd-7", + "HexAddress":"0x66", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vavdd-8", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "112":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vcs-1", + "HexAddress":"0x70", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "113":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vcs-2", + "HexAddress":"0x71", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "114":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vdn-3", + "HexAddress":"0x72", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "115":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vdn-4", + "HexAddress":"0x73", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "116":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-5", + "HexAddress":"0x74", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "117":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-6", + "HexAddress":"0x75", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "118":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-7", + "HexAddress":"0x76", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "119":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-8", + "HexAddress":"0x77", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "23":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Bellavista_ADS7138_Imon_C9-C11", + "HexAddress":"0x17", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C15", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0/IR35219_vdd-0", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C13", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0/IR35219_vdd-0", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "26":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/IR35219-vcs-vdn-0", + "HexAddress":"0x1a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "27":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/IR35219-vio-0", + "HexAddress":"0x1b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "28":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35219-vcs-vpcieA-1", + "HexAddress":"0x1c", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "29":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35219-vpcieB-avdd-2", + "HexAddress":"0x1d", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C13", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0/PCA9555-0", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "33":{ + "Callouts":[ + { + "LocationCode":"P0-C15", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0/PCA9555-0", + "HexAddress":"0x21", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "34":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/PCA9555-1", + "HexAddress":"0x22", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "35":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/PCA9555-2", + "HexAddress":"0x23", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "48":{ + "Callouts":[ + { + "LocationCode":"P0-C15", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0/IR35220_vdd-1", + "HexAddress":"0x30", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "49":{ + "Callouts":[ + { + "LocationCode":"P0-C15", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0/IR35220_vdd-2", + "HexAddress":"0x31", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "50":{ + "Callouts":[ + { + "LocationCode":"P0-C15", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0/IR35220_vdd-3", + "HexAddress":"0x32", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "51":{ + "Callouts":[ + { + "LocationCode":"P0-C15", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0/IR35220_vdd-4", + "HexAddress":"0x33", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "52":{ + "Callouts":[ + { + "LocationCode":"P0-C15", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0/IR35220_vdd-5", + "HexAddress":"0x34", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "53":{ + "Callouts":[ + { + "LocationCode":"P0-C15", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0/IR35220_vdd-6", + "HexAddress":"0x35", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "54":{ + "Callouts":[ + { + "LocationCode":"P0-C15", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0/IR35220_vdd-7", + "HexAddress":"0x36", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "55":{ + "Callouts":[ + { + "LocationCode":"P0-C15", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0/IR35220_vdd-8", + "HexAddress":"0x37", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C13", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0/IR35220_vdd-1", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "57":{ + "Callouts":[ + { + "LocationCode":"P0-C13", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0/IR35220_vdd-2", + "HexAddress":"0x39", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "58":{ + "Callouts":[ + { + "LocationCode":"P0-C13", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0/IR35220_vdd-3", + "HexAddress":"0x3a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "59":{ + "Callouts":[ + { + "LocationCode":"P0-C13", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0/IR35220_vdd-4", + "HexAddress":"0x3b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "60":{ + "Callouts":[ + { + "LocationCode":"P0-C13", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0/IR35220_vdd-5", + "HexAddress":"0x3c", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "61":{ + "Callouts":[ + { + "LocationCode":"P0-C13", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0/IR35220_vdd-6", + "HexAddress":"0x3d", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "62":{ + "Callouts":[ + { + "LocationCode":"P0-C13", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0/IR35220_vdd-7", + "HexAddress":"0x3e", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C13", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0/IR35220_vdd-8", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C13", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C13-conn/norgay-vrm-vdd-0/norgay-vpd-0", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C15", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C15-conn/norgay-vrm-vdd-0/norgay-vpd-0", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "82":{ + "Callouts":[ + { + "LocationCode":"P0-C12", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C12-conn/gunten-vrm-vcs-vdn-vio-0/gunten-vpd-0", + "HexAddress":"0x52", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "83":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/marmet-vpd-0", + "HexAddress":"0x53", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "96":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vcs-1", + "HexAddress":"0x60", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "97":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vcs-2", + "HexAddress":"0x61", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "98":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vpcieA-3", + "HexAddress":"0x62", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "99":{ + "Callouts":[ + { + "LocationCode":"P0-C16", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C16-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vpcieA-4", + "HexAddress":"0x63", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "11":{ + "100":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/IR35220-3v3cs-6", + "HexAddress":"0x64", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "101":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/IR35220-3v3cs-7", + "HexAddress":"0x65", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "102":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/IR35220-3v3cs-8", + "HexAddress":"0x66", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "112":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vcs-1", + "HexAddress":"0x70", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "113":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vcs-2", + "HexAddress":"0x71", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "114":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vdn-3", + "HexAddress":"0x72", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "115":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vdn-4", + "HexAddress":"0x73", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "116":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-5", + "HexAddress":"0x74", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "117":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-6", + "HexAddress":"0x75", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "118":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-7", + "HexAddress":"0x76", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "119":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-8", + "HexAddress":"0x77", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C60", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0/IR35219_vdd-0", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C62", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0/IR35219_vdd-0", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "26":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/IR35219-vcs-vdn-0", + "HexAddress":"0x1a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "27":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/IR35219-vio-0", + "HexAddress":"0x1b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "28":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/IR35219-vcs-3v3-0", + "HexAddress":"0x1c", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "29":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/TDA38740-1V1CS1-0", + "HexAddress":"0x1d", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "30":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/TDA38740-1V1CS2-1", + "HexAddress":"0x1e", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C62", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0/PCA9555-0", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "33":{ + "Callouts":[ + { + "LocationCode":"P0-C60", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0/PCA9555-0", + "HexAddress":"0x21", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "34":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/PCA9555-1", + "HexAddress":"0x22", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "35":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/PCA9555-3", + "HexAddress":"0x23", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "48":{ + "Callouts":[ + { + "LocationCode":"P0-C60", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0/IR35220_vdd-1", + "HexAddress":"0x30", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "49":{ + "Callouts":[ + { + "LocationCode":"P0-C60", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0/IR35220_vdd-2", + "HexAddress":"0x31", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "50":{ + "Callouts":[ + { + "LocationCode":"P0-C60", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0/IR35220_vdd-3", + "HexAddress":"0x32", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "51":{ + "Callouts":[ + { + "LocationCode":"P0-C60", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0/IR35220_vdd-4", + "HexAddress":"0x33", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "52":{ + "Callouts":[ + { + "LocationCode":"P0-C60", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0/IR35220_vdd-5", + "HexAddress":"0x34", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "53":{ + "Callouts":[ + { + "LocationCode":"P0-C60", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0/IR35220_vdd-6", + "HexAddress":"0x35", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "54":{ + "Callouts":[ + { + "LocationCode":"P0-C60", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0/IR35220_vdd-7", + "HexAddress":"0x36", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "55":{ + "Callouts":[ + { + "LocationCode":"P0-C60", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0/IR35220_vdd-8", + "HexAddress":"0x37", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C62", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0/IR35220_vdd-1", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "57":{ + "Callouts":[ + { + "LocationCode":"P0-C62", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0/IR35220_vdd-2", + "HexAddress":"0x39", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "58":{ + "Callouts":[ + { + "LocationCode":"P0-C62", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0/IR35220_vdd-3", + "HexAddress":"0x3a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "59":{ + "Callouts":[ + { + "LocationCode":"P0-C62", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0/IR35220_vdd-4", + "HexAddress":"0x3b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "60":{ + "Callouts":[ + { + "LocationCode":"P0-C62", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0/IR35220_vdd-5", + "HexAddress":"0x3c", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "61":{ + "Callouts":[ + { + "LocationCode":"P0-C62", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0/IR35220_vdd-6", + "HexAddress":"0x3d", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "62":{ + "Callouts":[ + { + "LocationCode":"P0-C62", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0/IR35220_vdd-7", + "HexAddress":"0x3e", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C62", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0/IR35220_vdd-8", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C62", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C62-conn/norgay-vrm-vdd-0/norgay-vpd-0", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C60", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C60-conn/norgay-vrm-vdd-0/norgay-vpd-0", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "82":{ + "Callouts":[ + { + "LocationCode":"P0-C63", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C63-conn/gunten-vrm-vcs-vdn-vio-0/gunten-vpd-0", + "HexAddress":"0x52", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "83":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/reist-vpd-0", + "HexAddress":"0x53", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "96":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/IR35220-vcs-1", + "HexAddress":"0x60", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "97":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/IR35220-vcs-2", + "HexAddress":"0x61", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "98":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/IR35220-1v1cs-3", + "HexAddress":"0x62", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "99":{ + "Callouts":[ + { + "LocationCode":"P0-C59", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux1-C59-conn/reist-aux-0/IR35220-1v1cs-4", + "HexAddress":"0x63", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "12":{ + "46":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/Tola-tpm-1", + "HexAddress":"0x2e", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-secureboot-eeprom-3", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "13":{ + "100":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/IR35220-3v3cs-6", + "HexAddress":"0x64", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "101":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/IR35220-3v3cs-7", + "HexAddress":"0x65", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "102":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/IR35220-3v3cs-8", + "HexAddress":"0x66", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "112":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vcs-1", + "HexAddress":"0x70", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "113":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vcs-2", + "HexAddress":"0x71", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "114":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vdn-3", + "HexAddress":"0x72", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "115":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vdn-4", + "HexAddress":"0x73", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "116":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-5", + "HexAddress":"0x74", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "117":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-6", + "HexAddress":"0x75", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "118":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-7", + "HexAddress":"0x76", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "119":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-8", + "HexAddress":"0x77", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "21":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Bellavista_ADS7138_Imon_C1-C4", + "HexAddress":"0x15", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C20", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0/IR35219_vdd-0", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C18", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0/IR35219_vdd-0", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "26":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/IR35219-vcs-vdn-0", + "HexAddress":"0x1a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "27":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/IR35219-vio-0", + "HexAddress":"0x1b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "28":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/IR35219-vcs-3v3-0", + "HexAddress":"0x1c", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "29":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/TDA38740-1V1CS1-0", + "HexAddress":"0x1d", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "30":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/TDA38740-1V1CS2-1", + "HexAddress":"0x1e", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C18", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0/PCA9555-0", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "33":{ + "Callouts":[ + { + "LocationCode":"P0-C20", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0/PCA9555-0", + "HexAddress":"0x21", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "34":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/PCA9555-1", + "HexAddress":"0x22", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "35":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/PCA9555-3", + "HexAddress":"0x23", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "48":{ + "Callouts":[ + { + "LocationCode":"P0-C20", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0/IR35220_vdd-1", + "HexAddress":"0x30", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "49":{ + "Callouts":[ + { + "LocationCode":"P0-C20", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0/IR35220_vdd-2", + "HexAddress":"0x31", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "50":{ + "Callouts":[ + { + "LocationCode":"P0-C20", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0/IR35220_vdd-3", + "HexAddress":"0x32", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "51":{ + "Callouts":[ + { + "LocationCode":"P0-C20", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0/IR35220_vdd-4", + "HexAddress":"0x33", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "52":{ + "Callouts":[ + { + "LocationCode":"P0-C20", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0/IR35220_vdd-5", + "HexAddress":"0x34", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "53":{ + "Callouts":[ + { + "LocationCode":"P0-C20", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0/IR35220_vdd-6", + "HexAddress":"0x35", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "54":{ + "Callouts":[ + { + "LocationCode":"P0-C20", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0/IR35220_vdd-7", + "HexAddress":"0x36", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "55":{ + "Callouts":[ + { + "LocationCode":"P0-C20", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0/IR35220_vdd-8", + "HexAddress":"0x37", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C18", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0/IR35220_vdd-1", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "57":{ + "Callouts":[ + { + "LocationCode":"P0-C18", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0/IR35220_vdd-2", + "HexAddress":"0x39", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "58":{ + "Callouts":[ + { + "LocationCode":"P0-C18", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0/IR35220_vdd-3", + "HexAddress":"0x3a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "59":{ + "Callouts":[ + { + "LocationCode":"P0-C18", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0/IR35220_vdd-4", + "HexAddress":"0x3b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "60":{ + "Callouts":[ + { + "LocationCode":"P0-C18", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0/IR35220_vdd-5", + "HexAddress":"0x3c", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "61":{ + "Callouts":[ + { + "LocationCode":"P0-C18", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0/IR35220_vdd-6", + "HexAddress":"0x3d", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "62":{ + "Callouts":[ + { + "LocationCode":"P0-C18", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0/IR35220_vdd-7", + "HexAddress":"0x3e", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C18", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0/IR35220_vdd-8", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C18", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C18-conn/norgay-vrm-vdd-0/norgay-vpd-0", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C20", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C20-conn/norgay-vrm-vdd-0/norgay-vpd-0", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "82":{ + "Callouts":[ + { + "LocationCode":"P0-C21", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C21-conn/gunten-vrm-vcs-vdn-vio-0/gunten-vpd-0", + "HexAddress":"0x52", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "83":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/reist-vpd-0", + "HexAddress":"0x53", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "96":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/IR35220-vcs-1", + "HexAddress":"0x60", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "97":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/IR35220-vcs-2", + "HexAddress":"0x61", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "98":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/IR35220-1v1cs-3", + "HexAddress":"0x62", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "99":{ + "Callouts":[ + { + "LocationCode":"P0-C17", + "Name":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-aux2-C17-conn/reist-aux-0/IR35220-1v1cs-4", + "HexAddress":"0x63", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "14":{ + "112":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0-P1", + "Name":"/sys-0/node-0/bellavista-0/Dasd-BP-conn-0/BaseCamp-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Dasd-BP-conn-0/BaseCamp-0/PCA9646-i2c15-0", + "HexAddress":"0x70", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "113":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0-P1", + "Name":"/sys-0/node-0/bellavista-0/Dasd-BP-conn-0/BaseCamp-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Dasd-BP-conn-0/BaseCamp-0/PCA9646-i2c15-1", + "HexAddress":"0x71", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "15":{ + "112":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0-P1", + "Name":"/sys-0/node-0/bellavista-0/Dasd-BP-conn-0/BaseCamp-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Dasd-BP-conn-0/BaseCamp-0/PCA9646-i2c16-2", + "HexAddress":"0x70", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "113":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0-P1", + "Name":"/sys-0/node-0/bellavista-0/Dasd-BP-conn-0/BaseCamp-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Dasd-BP-conn-0/BaseCamp-0/PCA9646-i2c16-3", + "HexAddress":"0x71", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "114":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0-P1", + "Name":"/sys-0/node-0/bellavista-0/Dasd-BP-conn-0/BaseCamp-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Dasd-BP-conn-0/BaseCamp-0/PCA9646-i2c16-4", + "HexAddress":"0x72", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "3":{ + "104":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"E0", + "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-0/power-supply-0", + "Priority":"H" + }, + { + "LocationCode":"P0-P2", + "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-0/power-supply-0/power-supply-blackbox-0", + "HexAddress":"0x68", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "105":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"E1", + "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-1/power-supply-0", + "Priority":"H" + }, + { + "LocationCode":"P0-P2", + "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-1/power-supply-0/power-supply-blackbox-0", + "HexAddress":"0x69", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "106":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"E2", + "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-2/power-supply-0", + "Priority":"H" + }, + { + "LocationCode":"P0-P2", + "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-2/power-supply-0/power-supply-blackbox-0", + "HexAddress":"0x6a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "107":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"E3", + "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-3/power-supply-0", + "Priority":"H" + }, + { + "LocationCode":"P0-P2", + "Name":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Power-riser-conn-0/Fansipan-0/power-supply-conn-3/power-supply-0/power-supply-blackbox-0", + "HexAddress":"0x6b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "22":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/Bellavista_ADS7138_Imon_C5-C8", + "HexAddress":"0x16", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/everest-apss-0", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "66":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/PIC18F2XK20-0", + "HexAddress":"0x42", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "4":{ + "101":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9552_CableCard1_5", + "HexAddress":"0x65", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "72":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C01-pcieslot-x8/pcie-cable-card-0/cablecard-TMP275A", + "HexAddress":"0x48", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "73":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C02-pcieslot-x16/pcie-cable-card-0/cablecard-TMP275A", + "HexAddress":"0x49", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "74":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C03-pcieslot-x16/pcie-cable-card-0/cablecard-TMP275A", + "HexAddress":"0x4a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C02-pcieslot-x16/pcie-cable-card-0/pcie-cable-card-vpd-0", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C03-pcieslot-x16/pcie-cable-card-0/pcie-cable-card-vpd-0", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "82":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C01-pcieslot-x8/pcie-cable-card-0/pcie-cable-card-vpd-0", + "HexAddress":"0x52", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "96":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C01-pcieslot-x8/pcie-cable-card-0/cablecard-PCA9551", + "HexAddress":"0x60", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "97":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C02-pcieslot-x16/pcie-cable-card-0/cablecard-PCA9551", + "HexAddress":"0x61", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "98":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C03-pcieslot-x16/pcie-cable-card-0/cablecard-PCA9551", + "HexAddress":"0x62", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "5":{ + "102":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9552_CableCard6_11", + "HexAddress":"0x66", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "72":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C04-pcieslot-x16/pcie-cable-card-0/cablecard-TMP275A", + "HexAddress":"0x48", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "73":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C05-pcieslot-x16/pcie-cable-card-0/cablecard-TMP275A", + "HexAddress":"0x49", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "74":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C06-pcieslot-x8/pcie-cable-card-0/cablecard-TMP275A", + "HexAddress":"0x4a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "75":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C07-pcieslot-x8/pcie-cable-card-0/cablecard-TMP275A", + "HexAddress":"0x4b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C04-pcieslot-x16/pcie-cable-card-0/pcie-cable-card-vpd-0", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C05-pcieslot-x16/pcie-cable-card-0/pcie-cable-card-vpd-0", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "82":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C06-pcieslot-x8/pcie-cable-card-0/pcie-cable-card-vpd-0", + "HexAddress":"0x52", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "83":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C07-pcieslot-x8/pcie-cable-card-0/pcie-cable-card-vpd-0", + "HexAddress":"0x53", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "96":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C04-pcieslot-x16/pcie-cable-card-0/cablecard-PCA9551", + "HexAddress":"0x60", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "97":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C05-pcieslot-x16/pcie-cable-card-0/cablecard-PCA9551", + "HexAddress":"0x61", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "98":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C06-pcieslot-x8/pcie-cable-card-0/cablecard-PCA9551", + "HexAddress":"0x62", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "99":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C07-pcieslot-x8/pcie-cable-card-0/cablecard-PCA9551", + "HexAddress":"0x63", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "6":{ + "101":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/PCA9552_PE_Slot_LEDs", + "HexAddress":"0x65", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "72":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C08-pcieslot-x16/pcie-cable-card-0/cablecard-TMP275A", + "HexAddress":"0x48", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "73":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C11-pcieslot-x16/pcie-cable-card-0/cablecard-TMP275A", + "HexAddress":"0x49", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "74":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C09-pcieslot-x8/pcie-cable-card-0/cablecard-TMP275A", + "HexAddress":"0x4a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "75":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C10-pcieslot-x8/pcie-cable-card-0/cablecard-TMP275A", + "HexAddress":"0x4b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C08-pcieslot-x16/pcie-cable-card-0/pcie-cable-card-vpd-0", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C11-pcieslot-x16/pcie-cable-card-0/pcie-cable-card-vpd-0", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "82":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C09-pcieslot-x8/pcie-cable-card-0/pcie-cable-card-vpd-0", + "HexAddress":"0x52", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "83":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C10-pcieslot-x8/pcie-cable-card-0/pcie-cable-card-vpd-0", + "HexAddress":"0x53", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "96":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C08-pcieslot-x16/pcie-cable-card-0/cablecard-PCA9551", + "HexAddress":"0x60", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "97":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C11-pcieslot-x16/pcie-cable-card-0/cablecard-PCA9551", + "HexAddress":"0x61", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "98":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C09-pcieslot-x8/pcie-cable-card-0/cablecard-PCA9551", + "HexAddress":"0x62", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "99":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/C10-pcieslot-x8/pcie-cable-card-0/cablecard-PCA9551", + "HexAddress":"0x63", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "7":{ + "48":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/16F882_led-0", + "HexAddress":"0x30", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "49":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/16F882_led-1", + "HexAddress":"0x31", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "50":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/16F882_led-2", + "HexAddress":"0x32", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "51":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/16F882_led-3", + "HexAddress":"0x33", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "52":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/16F882_led-4", + "HexAddress":"0x34", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "53":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/16F882_led-5", + "HexAddress":"0x35", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "8":{ + "112":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/PCA9646-5", + "HexAddress":"0x70", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "17":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/UCD90320-0", + "HexAddress":"0x11", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "50":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/Tola-rtc-0", + "HexAddress":"0x32", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "72":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/TMP275-1", + "HexAddress":"0x48", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "73":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/TMP275-2", + "HexAddress":"0x49", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + }, + { + "LocationCode":"P0", + "Name":"/sys-0/node-0/bellavista-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/bellavista_vpd-0", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"H" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/Tola-vpd-0", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + }, + "9":{ + "100":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vpcieB-5", + "HexAddress":"0x64", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "101":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vpcieB-6", + "HexAddress":"0x65", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "102":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vavdd-7", + "HexAddress":"0x66", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "103":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vavdd-8", + "HexAddress":"0x67", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "112":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vcs-1", + "HexAddress":"0x70", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "113":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vcs-2", + "HexAddress":"0x71", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "114":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vdn-3", + "HexAddress":"0x72", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "115":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vdn-4", + "HexAddress":"0x73", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "116":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-5", + "HexAddress":"0x74", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "117":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-6", + "HexAddress":"0x75", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "118":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-7", + "HexAddress":"0x76", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "119":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/IR35220-vio-8", + "HexAddress":"0x77", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "24":{ + "Callouts":[ + { + "LocationCode":"P0-C55", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0/IR35219_vdd-0", + "HexAddress":"0x18", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "25":{ + "Callouts":[ + { + "LocationCode":"P0-C57", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0/IR35219_vdd-0", + "HexAddress":"0x19", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "26":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/IR35219-vcs-vdn-0", + "HexAddress":"0x1a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "27":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/IR35219-vio-0", + "HexAddress":"0x1b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "28":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35219-vcs-vpcieA-1", + "HexAddress":"0x1c", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "29":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35219-vpcieB-avdd-2", + "HexAddress":"0x1d", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "32":{ + "Callouts":[ + { + "LocationCode":"P0-C57", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0/PCA9555-0", + "HexAddress":"0x20", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "33":{ + "Callouts":[ + { + "LocationCode":"P0-C55", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0/PCA9555-0", + "HexAddress":"0x21", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "34":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/PCA9555-1", + "HexAddress":"0x22", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "35":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/PCA9555-2", + "HexAddress":"0x23", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "48":{ + "Callouts":[ + { + "LocationCode":"P0-C55", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0/IR35220_vdd-1", + "HexAddress":"0x30", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "49":{ + "Callouts":[ + { + "LocationCode":"P0-C55", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0/IR35220_vdd-2", + "HexAddress":"0x31", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "50":{ + "Callouts":[ + { + "LocationCode":"P0-C55", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0/IR35220_vdd-3", + "HexAddress":"0x32", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "51":{ + "Callouts":[ + { + "LocationCode":"P0-C55", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0/IR35220_vdd-4", + "HexAddress":"0x33", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "52":{ + "Callouts":[ + { + "LocationCode":"P0-C55", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0/IR35220_vdd-5", + "HexAddress":"0x34", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "53":{ + "Callouts":[ + { + "LocationCode":"P0-C55", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0/IR35220_vdd-6", + "HexAddress":"0x35", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "54":{ + "Callouts":[ + { + "LocationCode":"P0-C55", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0/IR35220_vdd-7", + "HexAddress":"0x36", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "55":{ + "Callouts":[ + { + "LocationCode":"P0-C55", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0/IR35220_vdd-8", + "HexAddress":"0x37", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "56":{ + "Callouts":[ + { + "LocationCode":"P0-C57", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0/IR35220_vdd-1", + "HexAddress":"0x38", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "57":{ + "Callouts":[ + { + "LocationCode":"P0-C57", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0/IR35220_vdd-2", + "HexAddress":"0x39", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "58":{ + "Callouts":[ + { + "LocationCode":"P0-C57", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0/IR35220_vdd-3", + "HexAddress":"0x3a", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "59":{ + "Callouts":[ + { + "LocationCode":"P0-C57", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0/IR35220_vdd-4", + "HexAddress":"0x3b", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "60":{ + "Callouts":[ + { + "LocationCode":"P0-C57", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0/IR35220_vdd-5", + "HexAddress":"0x3c", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "61":{ + "Callouts":[ + { + "LocationCode":"P0-C57", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0/IR35220_vdd-6", + "HexAddress":"0x3d", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "62":{ + "Callouts":[ + { + "LocationCode":"P0-C57", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0/IR35220_vdd-7", + "HexAddress":"0x3e", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "63":{ + "Callouts":[ + { + "LocationCode":"P0-C57", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0/IR35220_vdd-8", + "HexAddress":"0x3f", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "80":{ + "Callouts":[ + { + "LocationCode":"P0-C57", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C57-conn/norgay-vrm-vdd-0/norgay-vpd-0", + "HexAddress":"0x50", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "81":{ + "Callouts":[ + { + "LocationCode":"P0-C55", + "Name":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vdd-C55-conn/norgay-vrm-vdd-0/norgay-vpd-0", + "HexAddress":"0x51", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "82":{ + "Callouts":[ + { + "LocationCode":"P0-C54", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vdn-vio-C54-conn/gunten-vrm-vcs-vdn-vio-0/gunten-vpd-0", + "HexAddress":"0x52", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "83":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/marmet-vpd-0", + "HexAddress":"0x53", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "96":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vcs-1", + "HexAddress":"0x60", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "97":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vcs-2", + "HexAddress":"0x61", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "98":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vpcieA-3", + "HexAddress":"0x62", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + }, + "99":{ + "Callouts":[ + { + "LocationCode":"P0-C58", + "Name":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0", + "Priority":"H" + }, + { + "LocationCode":"P0-C0", + "MRU":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/BMC-0", + "Name":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0", + "Priority":"L" + } + ], + "Dest":"/sys-0/node-0/bellavista-0/VRM-vcs-vpcie-avdd-C58-conn/marmet-vrm-vcs-vpcie-avdd-0/IR35220-vpcieA-4", + "HexAddress":"0x63", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + } + }, + "SPI":{ + "0":{ + "Callouts":[], + "Dest":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/Tola-tpm-1", + "Source":"/sys-0/node-0/bellavista-0/eBMC-card-conn-0/Tola-0/bmc-0" + } + } +} diff --git a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index ac43352c2..01714829f 100644 --- a/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -5,8 +5,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" SRC_URI_append_p10bmc = " file://ibm,rainier-2u_dev_callouts.json" SRC_URI_append_p10bmc = " file://ibm,rainier-4u_dev_callouts.json" +SRC_URI_append_p10bmc = " file://ibm,everest_dev_callouts.json" FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json" FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-logging/pels/ibm,rainier-4u_dev_callouts.json" +FILES_${PN}_append_p10bmc = " ${datadir}/phosphor-logging/pels/ibm,everest_dev_callouts.json" #Enable phal feature, if available. PACKAGECONFIG_append = " ${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" @@ -16,5 +18,6 @@ do_install_append_p10bmc() { install -d ${D}/${datadir}/phosphor-logging/pels install -m 0644 ${WORKDIR}/ibm,rainier-2u_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,rainier-2u_dev_callouts.json install -m 0644 ${WORKDIR}/ibm,rainier-4u_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,rainier-4u_dev_callouts.json + install -m 0644 ${WORKDIR}/ibm,everest_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,everest_dev_callouts.json ln -s ./ibm,rainier-4u_dev_callouts.json ${D}/${datadir}/phosphor-logging/pels/ibm,rainier-1s4u_dev_callouts.json } diff --git a/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend b/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend index 0c8f41a02..46020aad7 100644 --- a/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend +++ b/meta-ibm/recipes-phosphor/mctp/mctp_%.bbappend @@ -4,3 +4,4 @@ SRC_URI_append_p10bmc = " file://mctp" SRC_URI_append_witherspoon-tacoma = " file://mctp" PACKAGECONFIG_append_p10bmc = " astlpc-raw-kcs" +PACKAGECONFIG_append_witherspoon-tacoma = " astlpc-raw-kcs" diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 7cd4cd2ac..63c8b03b8 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -31,7 +31,7 @@ RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVE RDEPENDS_${PN}-extras_append_p10bmc = " ${POWER_SERVICE_PACKAGES_P10} webui-vue dbus-sensors phosphor-virtual-sensor kexec-tools makedumpfile kdump vmcore-dmesg" RDEPENDS_${PN}-extras_append_p10bmc = " pldm openpower-hw-diags srvcfg-manager biosconfig-manager phosphor-post-code-manager phosphor-host-postd debug-trigger mctp" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem ${POWER_SERVICE_PACKAGES_AC_SERVER}" -RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg" +RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm srvcfg-manager webui-vue biosconfig-manager phosphor-post-code-manager phosphor-host-postd kexec-tools makedumpfile kdump vmcore-dmesg debug-trigger" RDEPENDS_${PN}-extras_remove_p10bmc = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-host-state-mgmt_remove_p10bmc = "checkstop-monitor" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy.bb new file mode 100644 index 000000000..5940009a3 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy.bb @@ -0,0 +1,17 @@ +SUMMARY = "Event policy configuration for meta-fp5280g2 machines" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch +inherit phosphor-dbus-monitor + +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +SRC_URI += "file://config.yaml" + +do_install() { + install -D ${WORKDIR}/config.yaml ${D}${config_dir}/config.yaml +} + +FILES_${PN} += "${config_dir}/config.yaml" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy/config.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy/config.yaml new file mode 100644 index 000000000..5c62d45a3 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy/config.yaml @@ -0,0 +1,133 @@ +- name: occpath group + class: group + group: path + members: + - meta: PATH + path: /org/open_power/control/occ0 + +- name: occproctemp property + class: group + group: property + type: boolean + members: + - interface: org.open_power.OCC.Status + meta: PROPERTY + property: ThrottleProcTemp + +- name: occprocpower property + class: group + group: property + type: boolean + members: + - interface: org.open_power.OCC.Status + meta: PROPERTY + property: ThrottleProcPower + +- name: occmemtemp property + class: group + group: property + type: boolean + members: + - interface: org.open_power.OCC.Status + meta: PROPERTY + property: ThrottleMemTemp + +- name: watch occproctemp + class: watch + watch: property + paths: occpath group + properties: occproctemp property + callback: check occproctemp + +- name: watch occprocpower + class: watch + watch: property + paths: occpath group + properties: occprocpower property + callback: check occprocpower + +- name: watch occmemtemp + class: watch + watch: property + paths: occpath group + properties: occmemtemp property + callback: check occmemtemp + +- name: check occproctemp + class: condition + condition: count + paths: occpath group + properties: occproctemp property + defer: 1000us + callback: create occproctemp event + countop: '==' + countbound: 1 + op: '==' + bound: true + +- name: check occprocpower + class: condition + condition: count + paths: occpath group + properties: occprocpower property + defer: 1000us + callback: create occprocpower event + countop: '==' + countbound: 1 + op: '==' + bound: true + +- name: check occmemtemp + class: condition + condition: count + paths: occpath group + properties: occmemtemp property + defer: 1000us + callback: create occmemtemp event + countop: '==' + countbound: 1 + op: '==' + bound: true + +- name: create occproctemp event + class: callback + callback: event + paths: occpath group + properties: occproctemp property + eventName: occ + eventMessage: "Processor throttled due to an over temperature condition." + +- name: create occprocpower event + class: callback + callback: event + paths: occpath group + properties: occprocpower property + eventName: occ + eventMessage: "Processor throttled due to reaching the power cap limit." + +- name: create occmemtemp event + class: callback + callback: event + paths: occpath group + properties: occmemtemp property + eventName: occ + eventMessage: "Memory throttled due to an over temperature condition." + +- name: errorlog path group + class: group + group: path + members: + - meta: PATH + path: /xyz/openbmc_project/logging + +- name: pathwatch errorlog + class: pathwatch + pathwatch: path + paths: errorlog path group + pathcallback: create errorlog trap + +- name: create errorlog trap + class: pathcallback + pathcallback: eventpath + paths: errorlog path group + eventType: ErrorTrap diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend new file mode 100644 index 000000000..570cb6b82 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend @@ -0,0 +1 @@ +PHOSPHOR_DBUS_MONITOR_CONFIGS_append_fp5280g2 = " events-policy" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis/chassis.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis/chassis.yaml index b5c548ece..4d1ad4b33 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis/chassis.yaml +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis/chassis.yaml @@ -9,5 +9,5 @@ events: /system/chassis: xyz.openbmc_project.Inventory.Item.Chassis: Type: - value: "RackMount" + value: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" type: string diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index e4206678f..325086aca 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1,8 +1,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" PACKAGECONFIG_append = " associations" -SRC_URI_append = " file://associations.json" +SRC_URI += " file://associations.json" -DEPENDS_append_fp5280g2 = " phosphor-inventory-manager-chassis" +DEPENDS += " phosphor-inventory-manager-chassis" do_install_append() { install -d ${D}${base_datadir} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp b/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp new file mode 100644 index 000000000..2d5f2465e --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp @@ -0,0 +1,2 @@ +DEMUX_BINDING_OPTS=astlpc + diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend new file mode 100644 index 000000000..b27014bb1 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://mctp" + +do_install_append() { + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/mctp ${D}${sysconfdir}/default/mctp +} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager/sol-default.override.yml b/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager/sol-default.override.yml new file mode 100644 index 000000000..28bf86687 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager/sol-default.override.yml @@ -0,0 +1,17 @@ +/xyz/openbmc_project/ipmi/sol/eth1: + - Interface: xyz.openbmc_project.Ipmi.SOL + Properties: + AccumulateIntervalMS: + Default: 100 + Enable: + Default: 'true' + Privilege: + Default: 4 + Progress: + Default: 0 + RetryCount: + Default: 7 + RetryIntervalMS: + Default: 100 + Threshold: + Default: 1 diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend new file mode 100644 index 000000000..70532c57c --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " file://sol-default.override.yml" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 4fdd19c49..ef0e8193a 100755 --- a/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "323818779d541d53a70b8894f21e14b082ca59d0" +SRCREV = "e7725610df6ecb4943b0feca920ccc0dd0fad93c" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb index a5e1a6f90..effd89b40 100644 --- a/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb +++ b/meta-intel-openbmc/meta-common/recipes-intel/pfr/pfr-manager_git.bb @@ -8,7 +8,7 @@ inherit cmake systemd SRC_URI = "git://github.com/openbmc/pfr-manager" PV = "0.1+git${SRCPV}" -SRCREV = "29b4779eb8dd444f2e70806e35ae2c398222a74d" +SRCREV = "bcc7ce1f418c1a16a7868fee62499fa677242254" S = "${WORKDIR}/git" diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 3e769e174..c7e2194ca 100644 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-intel-openbmc/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,2 +1 @@ -# Enable threshold monitoring -EXTRA_OECMAKE_intel += "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON" +PACKAGECONFIG_append_intel = " log-threshold" diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-KCS-driver-support-in-uBoot.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-KCS-driver-support-in-uBoot.patch index 9020ff265..515b383e5 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-KCS-driver-support-in-uBoot.patch +++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0022-KCS-driver-support-in-uBoot.patch @@ -13,16 +13,17 @@ only when Force Firmware Update Jumper is ON. Tested By: Stopped booting in uBoot and sent IPMI commands -via KCS interfaces using cmdtool.efi. +via KCS interfaces. - Get Device ID: - Req: cmdtool.efi 20 18 1 - Res: 00 23 00 12 03 02 BF 57 01 00 7B 00 00 00 00 00 + Req: ipmitool raw 6 1 + Res: 23 00 12 03 02 BF 57 01 00 7B 00 00 00 00 00 - Get Self Test Results - Req: cmdtool.efi 20 18 4 - Res: 00 56 00 + Req: ipmitool raw 6 4 + Res: 56 00 - All other commands - Req: cmdtool.efi 20 18 2 - Res: C1 (Invalid). + Req: ipmitool raw 6 2 + Res: Unable to send RAW command (channel=0x0 netfn=0x6 lun=0x0 +cmd=0x2 rsp=0xc1): Invalid command Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> Signed-off-by: James Feist <james.feist@linux.intel.com> diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0024-IPMI-command-handler-implementation-in-uboot.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0024-IPMI-command-handler-implementation-in-uboot.patch index 0697c2808..ce160e137 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0024-IPMI-command-handler-implementation-in-uboot.patch +++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0024-IPMI-command-handler-implementation-in-uboot.patch @@ -12,11 +12,11 @@ Tested By: Ran the above IPMI command Via KCS channel and got proper response. - Get Device ID - Req: cmdtool.efi 20 18 1 - Res: 0x00 0x23 0x00 0x82 0x03 0x02 0x00 0x57 0x01 0x00 0x7b 0x00 0x00 0x00 0x00 0x00 + Req: ipmitool raw 6 1 + Res: 23 00 82 03 02 00 57 01 00 7b 00 00 00 00 00 - Get Self Test Results - Req: cmdtool.efi 20 18 4 - Res: 00 56 00 + Req: ipmitool raw 6 4 + Res: 56 00 Change-Id: I18b205bc45c34f7c4ef16adc29fa5bd494624ceb Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0029-FFUJ-FW-IPMI-commands-and-flash-support-in-u-boot.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0029-FFUJ-FW-IPMI-commands-and-flash-support-in-u-boot.patch index 5dbf1304c..238630af6 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0029-FFUJ-FW-IPMI-commands-and-flash-support-in-u-boot.patch +++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0029-FFUJ-FW-IPMI-commands-and-flash-support-in-u-boot.patch @@ -22,10 +22,10 @@ OEM Commands: 1) Get Buffer Size(0x66) Tested: - - Used cmdtool.efi to test the individual commands - implementation and negative cases. - - Used debug fwpiaupd.efi tool for validating Firmware - image transfer via KCS and flashing. + - Tested the individual commands implementation and negative + cases. + - Used debug tool for validating Firmware image transfer via + KCS and flashing. Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0030-Support-Get-Set-Security-mode-command.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0030-Support-Get-Set-Security-mode-command.patch index ce62c3fb1..d471d2c99 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0030-Support-Get-Set-Security-mode-command.patch +++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0030-Support-Get-Set-Security-mode-command.patch @@ -11,9 +11,9 @@ value, which is not allowed in normal mode from Host interface Tested: 1. Verified get security mode returns proper value read from -U-Boot environment variable. cmdtool.efi 20 C0 B3 +U-Boot environment variable. ipmitool raw 0x30 0xB3 2. Verified set security mode updates U-Boot environment variable -and it is reflected in linux too cmdtool.efi 20 C0 B4 4 +and it is reflected in linux too. ipmitool raw 0x30 0xB4 4 3. Verified negative test cases with improper values and it throws correct errors diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0036-Re-Enable-KCS.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0036-Re-Enable-KCS.patch index 08b05e60b..90eb41627 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0036-Re-Enable-KCS.patch +++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0036-Re-Enable-KCS.patch @@ -7,7 +7,7 @@ Phosphor-isolation isolates too much and seems to make KCS not work. This removes the lines from that patch that seem to be of question. -Tested: AC/Cycled, cmdtool.efi 20 18 1 works +Tested: AC/Cycled, ipmitool raw 6 1 works Signed-off-by: James Feist <james.feist@linux.intel.com> diff --git a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0011-KCS-driver-support-in-uBoot.patch b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0011-KCS-driver-support-in-uBoot.patch index 6a37f7b72..df10a9a0c 100644 --- a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0011-KCS-driver-support-in-uBoot.patch +++ b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0011-KCS-driver-support-in-uBoot.patch @@ -13,16 +13,17 @@ only when Force Firmware Update Jumper is ON. Tested: Stopped booting in uBoot and sent IPMI commands -via KCS interfaces using cmdtool.efi. +via KCS interfaces. - Get Device ID: - Req: cmdtool.efi 20 18 1 - Res: 00 23 00 12 03 02 BF 57 01 00 7B 00 00 00 00 00 + Req: ipmitool raw 6 1 + Res: 23 00 12 03 02 BF 57 01 00 7B 00 00 00 00 00 - Get Self Test Results - Req: cmdtool.efi 20 18 4 - Res: 00 56 00 + Req: ipmitool raw 6 4 + Res: 56 00 - All other commands - Req: cmdtool.efi 20 18 2 - Res: C1 (Invalid). + Req: ipmitool raw 6 2 + Res: Unable to send RAW command (channel=0x0 netfn=0x6 lun=0x0 +cmd=0x2 rsp=0xc1): Invalid command Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> Signed-off-by: James Feist <james.feist@linux.intel.com> diff --git a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0012-IPMI-command-handler-implementation-in-uboot.patch b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0012-IPMI-command-handler-implementation-in-uboot.patch index a4a574424..67123645d 100644 --- a/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0012-IPMI-command-handler-implementation-in-uboot.patch +++ b/meta-openbmc-mods/meta-ast2600/recipes-bsp/u-boot/files/0012-IPMI-command-handler-implementation-in-uboot.patch @@ -12,11 +12,11 @@ Tested By: Ran the above IPMI command Via KCS channel and got proper response. - Get Device ID - Req: cmdtool.efi 20 18 1 - Res: 0x00 0x23 0x00 0x82 0x03 0x02 0x00 0x57 0x01 0x00 0x7b 0x00 0x00 0x00 0x00 0x00 + Req: ipmitool raw 6 1 + Res: 00 23 00 82 03 02 00 57 01 00 7b 00 00 00 00 00 - Get Self Test Results - Req: cmdtool.efi 20 18 4 - Res: 00 56 00 + Req: ipmitool raw 6 4 + Res: 56 00 Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> diff --git a/meta-openbmc-mods/meta-ast2600/recipes-graphics/obmc-ikvm/obmc-ikvm/0001-Enable-per-frame-CRC-calculation-option-to-save-netw.patch b/meta-openbmc-mods/meta-ast2600/recipes-graphics/obmc-ikvm/obmc-ikvm/0001-Enable-per-frame-CRC-calculation-option-to-save-netw.patch new file mode 100644 index 000000000..459d0dddc --- /dev/null +++ b/meta-openbmc-mods/meta-ast2600/recipes-graphics/obmc-ikvm/obmc-ikvm/0001-Enable-per-frame-CRC-calculation-option-to-save-netw.patch @@ -0,0 +1,30 @@ +From fa81ec28629d59b8bad623ff8d3285162671d45a Mon Sep 17 00:00:00 2001 +From: Jae Hyun Yoo <jae.hyun.yoo@intel.com> +Date: Wed, 21 Jul 2021 13:03:22 -0700 +Subject: [PATCH] Enable per-frame CRC calculation option to save network + bandwidth + +This commit enables per-frame CRC calculation option to save network +bandwidth by dropping off frames that don't have changes. + +Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@intel.com> +--- + start-ipkvm.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/start-ipkvm.service b/start-ipkvm.service +index 60234b231da3..10e424845599 100644 +--- a/start-ipkvm.service ++++ b/start-ipkvm.service +@@ -5,7 +5,7 @@ ConditionPathIsMountPoint=/sys/kernel/config + [Service] + Restart=always + ExecStartPre=/usr/bin/create_usbhid.sh disconnect +-ExecStart=/usr/bin/obmc-ikvm -v /dev/video0 -k /dev/hidg0 -p /dev/hidg1 ++ExecStart=/usr/bin/obmc-ikvm -c -v /dev/video0 -k /dev/hidg0 -p /dev/hidg1 + + [Install] + WantedBy=multi-user.target +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-ast2600/recipes-graphics/obmc-ikvm/obmc-ikvm_%.bbappend b/meta-openbmc-mods/meta-ast2600/recipes-graphics/obmc-ikvm/obmc-ikvm_%.bbappend new file mode 100644 index 000000000..23c9060d2 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2600/recipes-graphics/obmc-ikvm/obmc-ikvm_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" + +SRC_URI += " \ + file://0001-Enable-per-frame-CRC-calculation-option-to-save-netw.patch \ + " diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-openbmc-mods/meta-common/recipes-connectivity/avahi/avahi_%.bbappend index 72d991c7e..e1caeaafa 100644 --- a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-connectivity/avahi/avahi_%.bbappend @@ -1 +1,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + " diff --git a/meta-openbmc-mods/meta-common/recipes-core/glibc/glibc/0038-CVE-2021-35942-handle-overflow-in-positional-parameter-number.patch b/meta-openbmc-mods/meta-common/recipes-core/glibc/glibc/0038-CVE-2021-35942-handle-overflow-in-positional-parameter-number.patch new file mode 100644 index 000000000..4ad5da6da --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-core/glibc/glibc/0038-CVE-2021-35942-handle-overflow-in-positional-parameter-number.patch @@ -0,0 +1,40 @@ +From 5adda61f62b77384718b4c0d8336ade8f2b4b35c Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@linux-m68k.org> +Date: Fri, 25 Jun 2021 15:02:47 +0200 +Subject: [PATCH] wordexp: handle overflow in positional parameter number (bug + 28011) + +Use strtoul instead of atoi so that overflow can be detected. +--- + posix/wordexp-test.c | 1 + + posix/wordexp.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c +index f93a546d7e..9df02dbbb3 100644 +--- a/posix/wordexp-test.c ++++ b/posix/wordexp-test.c +@@ -183,6 +183,7 @@ struct test_case_struct + { 0, NULL, "$var", 0, 0, { NULL, }, IFS }, + { 0, NULL, "\"\\n\"", 0, 1, { "\\n", }, IFS }, + { 0, NULL, "", 0, 0, { NULL, }, IFS }, ++ { 0, NULL, "${1234567890123456789012}", 0, 0, { NULL, }, IFS }, + + /* Flags not already covered (testit() has special handling for these) */ + { 0, NULL, "one two", WRDE_DOOFFS, 2, { "one", "two", }, IFS }, +diff --git a/posix/wordexp.c b/posix/wordexp.c +index bcbe96e48d..1f3b09f721 100644 +--- a/posix/wordexp.c ++++ b/posix/wordexp.c +@@ -1399,7 +1399,7 @@ envsubst: + /* Is it a numeric parameter? */ + else if (isdigit (env[0])) + { +- int n = atoi (env); ++ unsigned long n = strtoul (env, NULL, 10); + + if (n >= __libc_argc) + /* Substitute NULL. */ +-- +2.27.0 + diff --git a/meta-openbmc-mods/meta-common/recipes-core/glibc/glibc_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/glibc/glibc_%.bbappend index 77cd9ce46..a40461c62 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/glibc/glibc_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/glibc/glibc_%.bbappend @@ -5,4 +5,5 @@ SRC_URI += " \ file://0036-sunrpc-use-snprintf-to-guard-against-buffer-overflow.patch \ file://0036-Use-__pthread_attr_copy-in-mq_notify-bug-27896.patch \ file://0037-Fix-use-of-__pthread_attr_copy-in-mq_notify-bug-27896.patch \ + file://0038-CVE-2021-35942-handle-overflow-in-positional-parameter-number.patch \ " 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 e26e7ada4..2e5c11158 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 @@ -2,7 +2,7 @@ EXTRA_OECMAKE += "${@bb.utils.contains('IMAGE_FSTYPES', 'intel-pfr', '-DINTEL_PF EXTRA_OECMAKE += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-DBMC_VALIDATION_UNSECURE_FEATURE=ON', '', d)}" EXTRA_OECMAKE += "-DUSING_ENTITY_MANAGER_DECORATORS=OFF" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem.git" -SRCREV = "323818779d541d53a70b8894f21e14b082ca59d0" +SRCREV = "a87dbd4ee3ff53e7e53052c1663f85b390a0ab31" FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/0003-CVE-2021-33910-basic-unit-name-do-not-use-strdupa-on-a-path.patch b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/0003-CVE-2021-33910-basic-unit-name-do-not-use-strdupa-on-a-path.patch new file mode 100644 index 000000000..a240d63d4 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd/0003-CVE-2021-33910-basic-unit-name-do-not-use-strdupa-on-a-path.patch @@ -0,0 +1,64 @@ +From 4a1c5f34bd3e1daed4490e9d97918e504d19733b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> +Date: Wed, 23 Jun 2021 11:46:41 +0200 +Subject: [PATCH] basic/unit-name: do not use strdupa() on a path + +The path may have unbounded length, for example through a fuse mount. + +CVE-2021-33910: attacked controlled alloca() leads to crash in systemd and +ultimately a kernel panic. Systemd parses the content of /proc/self/mountinfo +and each mountpoint is passed to mount_setup_unit(), which calls +unit_name_path_escape() underneath. A local attacker who is able to mount a +filesystem with a very long path can crash systemd and the whole system. + +https://bugzilla.redhat.com/show_bug.cgi?id=1970887 + +The resulting string length is bounded by UNIT_NAME_MAX, which is 256. But we +can't easily check the length after simplification before doing the +simplification, which in turns uses a copy of the string we can write to. +So we can't reject paths that are too long before doing the duplication. +Hence the most obvious solution is to switch back to strdup(), as before +7410616cd9dbbec97cf98d75324da5cda2b2f7a2. + +(cherry picked from commit 441e0115646d54f080e5c3bb0ba477c892861ab9) +(cherry picked from commit 764b74113e36ac5219a4b82a05f311b5a92136ce) +--- + src/basic/unit-name.c | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c +index 85dcba6cb7..46b24f2d9e 100644 +--- a/src/basic/unit-name.c ++++ b/src/basic/unit-name.c +@@ -378,12 +378,13 @@ int unit_name_unescape(const char *f, char **ret) { + } + + int unit_name_path_escape(const char *f, char **ret) { +- char *p, *s; ++ _cleanup_free_ char *p = NULL; ++ char *s; + + assert(f); + assert(ret); + +- p = strdupa(f); ++ p = strdup(f); + if (!p) + return -ENOMEM; + +@@ -395,13 +396,9 @@ int unit_name_path_escape(const char *f, char **ret) { + if (!path_is_normalized(p)) + return -EINVAL; + +- /* Truncate trailing slashes */ ++ /* Truncate trailing slashes and skip leading slashes */ + delete_trailing_chars(p, "/"); +- +- /* Truncate leading slashes */ +- p = skip_leading_chars(p, "/"); +- +- s = unit_name_escape(p); ++ s = unit_name_escape(skip_leading_chars(p, "/")); + } + if (!s) + return -ENOMEM; diff --git a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend index ca73c1770..3fe5ff5ac 100644 --- a/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-core/systemd/systemd_%.bbappend @@ -7,6 +7,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-Modfiy-system.conf-DefaultTimeoutStopSec.patch \ file://systemd-time-wait-sync.service \ file://0002-Add-event-log-for-system-time-synchronization.patch \ + file://0003-CVE-2021-33910-basic-unit-name-do-not-use-strdupa-on-a-path.patch \ " USERADD_PACKAGES_remove = "${PN}-journal-gateway ${PN}-journal-upload ${PN}-journal-remote" diff --git a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0002-Skip-decoding-some-dbus-identifiers.patch b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0002-Skip-decoding-some-dbus-identifiers.patch new file mode 100644 index 000000000..3f65cd16f --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus/0002-Skip-decoding-some-dbus-identifiers.patch @@ -0,0 +1,66 @@ +From 2765f7fe7e01f3bbf30b008d0aea5c4260c2bbb9 Mon Sep 17 00:00:00 2001 +From: Nidhin MS <nidhin.ms@intel.com> +Date: Tue, 22 Jun 2021 19:49:28 +0530 +Subject: [PATCH] Skip decoding some dbus identifiers + +Dbus identifiers starting with _ and having length less than 3 and also +those having incorrect encoding can be skipped from decoding in +filename() method. Services like user manager accepts usernames +starting with _ and does not restrict accepted usernames. +Ignore those dbus identifiers while decoding. + +Tested: +Small identifiers decoded correctly + +Change-Id: I11aea22060a789dcf756142ee02637dfe7d77c14 +Signed-off-by: Nidhin MS <nidhin.ms@intel.com> +--- + src/message/native_types.cpp | 7 +++++-- + test/message/types.cpp | 8 ++++---- + 2 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/src/message/native_types.cpp b/src/message/native_types.cpp +index f0a7747..118d829 100644 +--- a/src/message/native_types.cpp ++++ b/src/message/native_types.cpp +@@ -79,13 +79,16 @@ std::string string_path_wrapper::filename() const + } + if (i + 2 >= filename.size()) + { +- return ""; ++ out.append(1, filename[i]); ++ continue; + } ++ + auto ch = unhex[filename[i + 1]]; + auto cl = unhex[filename[i + 2]]; + if (ch == -1 || cl == -1) + { +- return ""; ++ out.append(1, filename[i]); ++ continue; + } + out.append(1, (ch << 4) | cl); + i += 2; +diff --git a/test/message/types.cpp b/test/message/types.cpp +index d666008..2c639f5 100644 +--- a/test/message/types.cpp ++++ b/test/message/types.cpp +@@ -53,10 +53,10 @@ TEST(MessageTypes, ObjectPathFilename) + EXPECT_EQ(sdbusplus::message::object_path("/_2d").filename(), "-"); + EXPECT_EQ(sdbusplus::message::object_path("/_20").filename(), " "); + EXPECT_EQ(sdbusplus::message::object_path("/_2F").filename(), "/"); +- EXPECT_EQ(sdbusplus::message::object_path("/_").filename(), ""); +- EXPECT_EQ(sdbusplus::message::object_path("/_2").filename(), ""); +- EXPECT_EQ(sdbusplus::message::object_path("/_2y").filename(), ""); +- EXPECT_EQ(sdbusplus::message::object_path("/_y2").filename(), ""); ++ EXPECT_EQ(sdbusplus::message::object_path("/_").filename(), "_"); ++ EXPECT_EQ(sdbusplus::message::object_path("/_2").filename(), "_2"); ++ EXPECT_EQ(sdbusplus::message::object_path("/_2y").filename(), "_2y"); ++ EXPECT_EQ(sdbusplus::message::object_path("/_y2").filename(), "_y2"); + EXPECT_EQ(sdbusplus::message::object_path("/bios_active").filename(), + "bios_active"); + } +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend index 6d16fe190..cea571f08 100644 --- a/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-extended/sdbusplus/sdbusplus_%.bbappend @@ -2,4 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-Revert-server-Check-return-code-for-sd_bus_add_objec.patch \ + file://0002-Skip-decoding-some-dbus-identifiers.patch \ " diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend b/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend index 16d362620..4ee58544e 100644 --- a/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-graphics/libvncserver/libvncserver_%.bbappend @@ -2,4 +2,4 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" # Use the latest to support obmc-ikvm properly SRC_URI = "git://github.com/LibVNC/libvncserver" -SRCREV = "a452ef3efa2ff0efb9d223fc5d477a0b4db6f0bf" +SRCREV = "8f6b47ddb8f224510ec50d50012b17721bea6f2d" diff --git a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm_%.bbappend b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm_%.bbappend index 04499f1b7..7277faaad 100644 --- a/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-graphics/obmc-ikvm/obmc-ikvm_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" #SRC_URI = "git://github.com/openbmc/obmc-ikvm" -SRCREV = "7a420e4c928ce4f0720a82a74e05d23ef3c362fb" +SRCREV = "2d2f3dab4253a3d6edf6bef98c5f880f51d2394b" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb b/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb index d8436709b..93de696d2 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/hsbp/hsbp-manager_git.bb @@ -2,7 +2,7 @@ SUMMARY = "HSBP Manager" DESCRIPTION = "HSBP Manager monitors HSBPs through SMBUS" SRC_URI = "git://github.com/openbmc/s2600wf-misc.git" -SRCREV = "52639bebada24990c3514786d65598dc5557477a" +SRCREV = "1a9dde9b193a34392ab11a14d9cd0310f9abb930" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend index cbf56344d..020c8d53f 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-intel/intel-pfr/pfr-manager_%.bbappend @@ -1,5 +1,5 @@ # Enable downstream autobump SRC_URI = "git://github.com/openbmc/pfr-manager" -SRCREV = "29b4779eb8dd444f2e70806e35ae2c398222a74d" +SRCREV = "bcc7ce1f418c1a16a7868fee62499fa677242254" DEPENDS += " libgpiod \ " diff --git a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb index fefbfa403..b96ded9a4 100644 --- a/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb +++ b/meta-openbmc-mods/meta-common/recipes-intel/smbios/smbios-mdrv2.bb @@ -2,7 +2,7 @@ SUMMARY = "SMBIOS MDR version 2 service for Intel based platform" DESCRIPTION = "SMBIOS MDR version 2 service for Intel based platfrom" SRC_URI = "git://github.com/openbmc/smbios-mdr.git" -SRCREV = "5b285892fe22bc5ed9ddf5a5f1322b58a55cfca8" +SRCREV = "a427dd1de9e765861a52ce0f73021a282cc6ce4c" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend index d1f5daef0..8c35e6c07 100644 --- a/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,12 +1,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -LINUX_VERSION = "5.10.46" +LINUX_VERSION = "5.10.53" -KBRANCH = "dev-5.10.46-intel" +KBRANCH = "dev-5.10-intel" KSRC = "git://github.com/Intel-BMC/linux;protocol=ssh;branch=${KBRANCH}" # Include this as a comment only for downstream auto-bump # SRC_URI = "git://github.com/Intel-BMC/linux;protocol=ssh;branch=dev-5.10-intel" -SRCREV="9ec121d97a292628e01462df8f13b017add3b034" +SRCREV="978d545ce0c53bd45c80a224b56141bcc3389828" do_compile_prepend(){ # device tree compiler flags diff --git a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch index 282b5669a..2cfa380ef 100644 --- a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch +++ b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0003-Adding-channel-specific-privilege-to-network.patch @@ -1,4 +1,4 @@ -From 24bac5f6660ec5e5ea15c0f062dc4a08fbc0e876 Mon Sep 17 00:00:00 2001 +From 29c6b0a294e2c32c9617d243d71d202e926262d0 Mon Sep 17 00:00:00 2001 From: AppaRao Puli <apparao.puli@linux.intel.com> Date: Thu, 2 Apr 2020 17:06:07 +0530 Subject: [PATCH] Adding channel specific privilege to network @@ -19,17 +19,17 @@ Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> Signed-off-by: Yong Li <yong.b.li@linux.intel.com> Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com> --- - src/ethernet_interface.cpp | 124 +++++++++++++++++++++++++++++++++++++++++ - src/ethernet_interface.hpp | 37 +++++++++++- - src/network_manager.cpp | 102 +++++++++++++++++++++++++++++++++ + src/ethernet_interface.cpp | 124 +++++++++++++++++++++++++++++++++++++ + src/ethernet_interface.hpp | 36 ++++++++++- + src/network_manager.cpp | 102 ++++++++++++++++++++++++++++++ src/network_manager.hpp | 9 +++ - 4 files changed, 271 insertions(+), 1 deletion(-) + 4 files changed, 270 insertions(+), 1 deletion(-) diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp -index 607e658..e2b2da9 100644 +index 5ce4349..4c52fc8 100644 --- a/src/ethernet_interface.cpp +++ b/src/ethernet_interface.cpp -@@ -45,6 +45,10 @@ constexpr auto PROPERTY_INTERFACE = "org.freedesktop.DBus.Properties"; +@@ -49,6 +49,10 @@ constexpr auto PROPERTY_INTERFACE = "org.freedesktop.DBus.Properties"; constexpr auto RESOLVED_SERVICE_PATH = "/org/freedesktop/resolve1/link/"; constexpr auto METHOD_GET = "Get"; @@ -40,7 +40,7 @@ index 607e658..e2b2da9 100644 struct EthernetIntfSocket { EthernetIntfSocket(int domain, int type, int protocol) -@@ -128,6 +132,7 @@ EthernetInterface::EthernetInterface(sdbusplus::bus::bus& bus, +@@ -133,6 +137,7 @@ EthernetInterface::EthernetInterface(sdbusplus::bus::bus& bus, EthernetInterfaceIntf::autoNeg(std::get<2>(ifInfo)); EthernetInterfaceIntf::speed(std::get<0>(ifInfo)); #endif @@ -48,7 +48,7 @@ index 607e658..e2b2da9 100644 // Emit deferred signal. if (emitSignal) -@@ -1175,5 +1180,124 @@ std::string EthernetInterface::defaultGateway6(std::string gateway) +@@ -1248,5 +1253,124 @@ std::string EthernetInterface::defaultGateway6(std::string gateway) manager.writeToConfigurationFile(); return gw; } @@ -174,7 +174,7 @@ index 607e658..e2b2da9 100644 } // namespace network } // namespace phosphor diff --git a/src/ethernet_interface.hpp b/src/ethernet_interface.hpp -index 8e28b51..ebba151 100644 +index 12d307f..d764b2b 100644 --- a/src/ethernet_interface.hpp +++ b/src/ethernet_interface.hpp @@ -2,11 +2,14 @@ @@ -190,9 +190,9 @@ index 8e28b51..ebba151 100644 #include <sdbusplus/bus.hpp> +#include <sdbusplus/bus/match.hpp> #include <sdbusplus/server/object.hpp> + #include <sdbusplus/timer.hpp> #include <string> - #include <xyz/openbmc_project/Collection/DeleteAll/server.hpp> -@@ -33,7 +36,8 @@ using Ifaces = sdbusplus::server::object::object< +@@ -35,7 +38,8 @@ using Ifaces = sdbusplus::server::object::object< sdbusplus::xyz::openbmc_project::Network::server::MACAddress, sdbusplus::xyz::openbmc_project::Network::IP::server::Create, sdbusplus::xyz::openbmc_project::Network::Neighbor::server::CreateStatic, @@ -202,7 +202,7 @@ index 8e28b51..ebba151 100644 using IP = sdbusplus::xyz::openbmc_project::Network::server::IP; -@@ -41,11 +45,14 @@ using EthernetInterfaceIntf = +@@ -43,11 +47,14 @@ using EthernetInterfaceIntf = sdbusplus::xyz::openbmc_project::Network::server::EthernetInterface; using MacAddressIntf = sdbusplus::xyz::openbmc_project::Network::server::MACAddress; @@ -217,7 +217,7 @@ index 8e28b51..ebba151 100644 class Manager; // forward declaration of network manager. -@@ -244,6 +251,14 @@ class EthernetInterface : public Ifaces +@@ -247,6 +254,14 @@ class EthernetInterface : public Ifaces std::string defaultGateway6(std::string gateway) override; using EthernetInterfaceIntf::dhcpEnabled; @@ -232,11 +232,10 @@ index 8e28b51..ebba151 100644 using EthernetInterfaceIntf::interfaceName; using EthernetInterfaceIntf::linkUp; using EthernetInterfaceIntf::nicEnabled; -@@ -366,6 +381,26 @@ class EthernetInterface : public Ifaces - * @returns true/false value if the address is static +@@ -374,6 +389,25 @@ class EthernetInterface : public Ifaces + * @returns true/false value if the NIC is enabled */ - bool originIsManuallyAssigned(IP::AddressOrigin origin); -+ + bool queryNicEnabled() const; + /** @brief gets the channel privilege. + * @param[in] interfaceName - Network interface name. + * @returns privilege of the interface @@ -260,7 +259,7 @@ index 8e28b51..ebba151 100644 } // namespace network diff --git a/src/network_manager.cpp b/src/network_manager.cpp -index 881b767..847852f 100644 +index 9ae9c5b..2f5097a 100644 --- a/src/network_manager.cpp +++ b/src/network_manager.cpp @@ -36,6 +36,13 @@ extern std::unique_ptr<Timer> restartTimer; diff --git a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0004-Fix-for-updating-MAC-address-from-RedFish.patch b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0004-Fix-for-updating-MAC-address-from-RedFish.patch new file mode 100644 index 000000000..e4d9d2837 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network/0004-Fix-for-updating-MAC-address-from-RedFish.patch @@ -0,0 +1,110 @@ +From c139e292d43bdc9484f77ef2f75df5dc9ff14e15 Mon Sep 17 00:00:00 2001 +From: sunitakx <sunitax.kumari@linux.intel.com> +Date: Tue, 13 Jul 2021 12:54:01 +0000 +Subject: [PATCH] Fix for updating MAC address from RedFish + +Issue: When IP address source for an interface is DHCP and its MAC +address is patched using RedFish, response code is not reaching the +RedFish request initiator (client). + +RootCause: After bmcweb patches the MAC address, immediately IP address +of that interface also changes to new value (because of DHCP). +Due to this, success response from bmcweb is not reaching the client as +expected. + +Fix: Do MAC-ADDR patching after validating the request and responding +"200 OK" to RedFish client. i.e Start a timer which will modify the +MAC-ADDR at the end of its expiry. + +Tested: +Update the MAC address from RedFish. +PATCH: https://<bmc_ip>/redfish/v1/Managers/bmc/EthernetInterfaces/eth0 +Body: + {"MACAddress": "xx:xx:xx:xx:xx:xx"} + +Response code: {"200 OK"} received. + +Signed-off-by: sunitakx <sunitax.kumari@linux.intel.com> +--- + src/ethernet_interface.cpp | 19 +++++++++++++------ + src/ethernet_interface.hpp | 4 ++++ + 2 files changed, 17 insertions(+), 6 deletions(-) + +diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp +index 9a4d95a..95cd70b 100644 +--- a/src/ethernet_interface.cpp ++++ b/src/ethernet_interface.cpp +@@ -139,6 +139,8 @@ EthernetInterface::EthernetInterface(sdbusplus::bus::bus& bus, + { + this->emit_object_added(); + } ++ macUpdateTimer = std::make_unique<phosphor::Timer>( ++ [this](void) { macAddressTimeoutHandler(); }); + } + + static IP::Protocol convertFamily(int family) +@@ -1069,8 +1071,18 @@ void EthernetInterface::writeDHCPSection(std::fstream& stream) + } + } + ++void EthernetInterface::macAddressTimeoutHandler() ++{ ++ macUpdateTimer->stop(); ++ // TODO: would remove the call below and ++ // just restart systemd-netwokd ++ // through https://github.com/systemd/systemd/issues/6696 ++ execute("/sbin/ip", "ip", "link", "set", "dev", interfaceName().c_str(), ++ "down"); ++} + std::string EthernetInterface::macAddress(std::string value) + { ++ std::chrono::seconds usec(defaultTimeout); + ether_addr newMAC; + try + { +@@ -1104,12 +1116,7 @@ std::string EthernetInterface::macAddress(std::string value) + intf->MacAddressIntf::macAddress(validMAC); + } + MacAddressIntf::macAddress(validMAC); +- +- // TODO: would remove the call below and +- // just restart systemd-netwokd +- // through https://github.com/systemd/systemd/issues/6696 +- execute("/sbin/ip", "ip", "link", "set", "dev", interface.c_str(), +- "down"); ++ macUpdateTimer->start(usec); + manager.writeToConfigurationFile(); + } + +diff --git a/src/ethernet_interface.hpp b/src/ethernet_interface.hpp +index ebba151..ebe72a1 100644 +--- a/src/ethernet_interface.hpp ++++ b/src/ethernet_interface.hpp +@@ -11,6 +11,7 @@ + #include <sdbusplus/bus.hpp> + #include <sdbusplus/bus/match.hpp> + #include <sdbusplus/server/object.hpp> ++#include <sdbusplus/timer.hpp> + #include <string> + #include <xyz/openbmc_project/Collection/DeleteAll/server.hpp> + #include <xyz/openbmc_project/Network/EthernetInterface/server.hpp> +@@ -25,6 +26,7 @@ + #define nicEnabled nICEnabled + #define ntpServers nTPServers + #endif ++static constexpr const uint32_t defaultTimeout = 1; + + namespace phosphor + { +@@ -93,6 +95,8 @@ class EthernetInterface : public Ifaces + EthernetInterface& operator=(EthernetInterface&&) = delete; + virtual ~EthernetInterface() = default; + ++ std::unique_ptr<phosphor::Timer> macUpdateTimer; ++ void macAddressTimeoutHandler(); + /** @brief Constructor to put object onto bus at a dbus path. + * @param[in] bus - Bus to attach to. + * @param[in] objPath - Path to attach at. +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network_%.bbappend b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network_%.bbappend index 808380de7..be2c2c070 100644 --- a/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-network/network/phosphor-network_%.bbappend @@ -3,9 +3,10 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" DEPENDS += "nlohmann-json boost" SRC_URI = "git://github.com/openbmc/phosphor-networkd" -SRCREV = "d49c5c650bd6b13f267d59be452ac2b4493e8201" +SRCREV = "1ea359943afbd59168f490778a528c858903b74d" SRC_URI += " file://0003-Adding-channel-specific-privilege-to-network.patch \ + file://0004-Fix-for-updating-MAC-address-from-RedFish.patch \ " EXTRA_OECONF_append = " --enable-nic-ethtool=yes" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch index b44220e4b..0fea3e8a0 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0002-Entity-manager-Add-support-to-update-assetTag.patch @@ -1,4 +1,4 @@ -From 7ae5ebc43755631c1756bbc1e89b41f2a1da138c Mon Sep 17 00:00:00 2001 +From 0941036f4206d74bfc3d3e505a5d269fb39c48ff Mon Sep 17 00:00:00 2001 From: mansijos <mansi.joshi@intel.com> Date: Tue, 6 Apr 2021 02:12:56 +0530 Subject: [PATCH] Entity-manager: Add support to update assetTag @@ -15,21 +15,23 @@ The new value is preserved after BMC resets. Change-Id: If7fbfd8325488280f500ab0e2c8b38475813cc3f Signed-off-by: mansijos <mansi.joshi@intel.com> --- - src/EntityManager.cpp | 93 +++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 89 insertions(+), 4 deletions(-) + src/EntityManager.cpp | 95 +++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 91 insertions(+), 4 deletions(-) diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp -index 7cfcc6e..bf5e175 100644 +index 490c0f5..139ba9a 100644 --- a/src/EntityManager.cpp +++ b/src/EntityManager.cpp -@@ -48,9 +48,17 @@ constexpr const char* lastConfiguration = "/tmp/configuration/last.json"; +@@ -48,9 +48,19 @@ constexpr const char* lastConfiguration = "/tmp/configuration/last.json"; constexpr const char* currentConfiguration = "/var/configuration/system.json"; constexpr const char* globalSchema = "global.json"; - constexpr const int32_t MAX_MAPPER_DEPTH = 0; + constexpr const int32_t maxMapperDepth = 0; +constexpr const char* foundObject = "FoundProbe"; - constexpr const bool DEBUG = false; + constexpr const bool debug = false; ++ ++ +using foundProbeData = std::map<std::string, std::string>; +static foundProbeData foundData; +static std::map<std::string, foundProbeData> mapFoundData; @@ -37,10 +39,10 @@ index 7cfcc6e..bf5e175 100644 +constexpr const char* fruConn = "xyz.openbmc_project.FruDevice"; +constexpr const char* fruIntf = "xyz.openbmc_project.FruDevice"; + - struct cmp_str + struct CmpStr { bool operator()(const char* a, const char* b) const -@@ -576,6 +584,43 @@ void addArrayToDbus(const std::string& name, const nlohmann::json& array, +@@ -577,6 +587,43 @@ void addArrayToDbus(const std::string& name, const nlohmann::json& array, } } @@ -68,7 +70,7 @@ index 7cfcc6e..bf5e175 100644 + return false; + } + -+ SYSTEM_BUS->async_method_call( ++ systemBus->async_method_call( + [](const boost::system::error_code& ec) { + if (ec) + { @@ -84,7 +86,7 @@ index 7cfcc6e..bf5e175 100644 template <typename PropertyType> void addProperty(const std::string& propertyName, const PropertyType& value, sdbusplus::asio::dbus_interface* iface, -@@ -590,9 +635,18 @@ void addProperty(const std::string& propertyName, const PropertyType& value, +@@ -591,9 +638,18 @@ void addProperty(const std::string& propertyName, const PropertyType& value, } iface->register_property( propertyName, value, @@ -104,7 +106,7 @@ index 7cfcc6e..bf5e175 100644 val = newVal; if (!setJsonFromPointer(jsonPointerString, val, systemConfiguration)) -@@ -990,6 +1044,9 @@ void postToDbus(const nlohmann::json& newConfiguration, +@@ -993,6 +1049,9 @@ void postToDbus(const nlohmann::json& newConfiguration, populateInterfaceFromJson(systemConfiguration, jsonPointerPath, boardIface, boardValues, objServer); jsonPointerPath += "/"; @@ -114,7 +116,7 @@ index 7cfcc6e..bf5e175 100644 // iterate through board properties for (auto& boardField : boardValues.items()) { -@@ -999,9 +1056,28 @@ void postToDbus(const nlohmann::json& newConfiguration, +@@ -1002,9 +1061,28 @@ void postToDbus(const nlohmann::json& newConfiguration, createInterface(objServer, boardName, boardField.key(), boardKeyOrig); @@ -146,7 +148,7 @@ index 7cfcc6e..bf5e175 100644 } } -@@ -1357,6 +1433,11 @@ void PerformScan::run() +@@ -1362,6 +1440,11 @@ void PerformScan::run() { continue; // non-numeric replacement } @@ -158,7 +160,7 @@ index 7cfcc6e..bf5e175 100644 usedNames.insert(nameIt.value()); auto usedIt = std::find(indexes.begin(), indexes.end(), index); -@@ -1434,6 +1515,10 @@ void PerformScan::run() +@@ -1439,6 +1522,10 @@ void PerformScan::run() } } @@ -170,5 +172,5 @@ index 7cfcc6e..bf5e175 100644 { std::cerr << "Duplicates found, replacing " -- -2.30.2 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend index 9447fb3cb..3c9b75210 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,6 +1,6 @@ # this is here just to bump faster than upstream # SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "c02d8cbbe8ded5368014d66bcf3279de758011d9" +SRCREV = "ee70147add704c40e1999900ec8e67d1213729cc" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0007-ipmi-set-BIOS-id.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0007-ipmi-set-BIOS-id.patch index c87b2d89d..2c443726d 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0007-ipmi-set-BIOS-id.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0007-ipmi-set-BIOS-id.patch @@ -1,22 +1,22 @@ -From 49debd0955b672d591f35e74119b288bd6df2992 Mon Sep 17 00:00:00 2001 +From bc282f4e9537b115e32733dfc6e16c303f81b3e3 Mon Sep 17 00:00:00 2001 From: "Jia, Chunhui" <chunhui.jia@intel.com> Date: Tue, 24 Jul 2018 11:40:49 +0800 -Subject: [PATCH] [ipmi] set BIOS id +Subject: [PATCH] set BIOS id change#2 add new dbus interface for BIOS attributes Signed-off-by: Jia, Chunhui <chunhui.jia@intel.com> --- - xyz/openbmc_project/Inventory/Item/Bios.interface.yaml | 9 +++++++++ + .../openbmc_project/Inventory/Item/Bios.interface.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) - create mode 100644 xyz/openbmc_project/Inventory/Item/Bios.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml -diff --git a/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml b/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml b/yaml/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml new file mode 100644 -index 0000000..d7a6b95 +index 000000000000..d7a6b95bfdce --- /dev/null -+++ b/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml ++++ b/yaml/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml @@ -0,0 +1,9 @@ +description: > + Implement to provide BIOS attributes. @@ -28,5 +28,5 @@ index 0000000..d7a6b95 + +# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 -- -2.16.2 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0010-Increase-the-default-watchdog-timeout-value.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0010-Increase-the-default-watchdog-timeout-value.patch index 2c9344306..7f315db86 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0010-Increase-the-default-watchdog-timeout-value.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0010-Increase-the-default-watchdog-timeout-value.patch @@ -1,4 +1,4 @@ -From 631deef0ca88a77283741edeae8078d2185f414c Mon Sep 17 00:00:00 2001 +From 479b46d2ed42b576cf2aee2ecbd76de7940d0cfe Mon Sep 17 00:00:00 2001 From: Yong Li <yong.b.li@linux.intel.com> Date: Fri, 10 Aug 2018 16:23:13 +0800 Subject: [PATCH] Increase the default watchdog timeout value @@ -13,13 +13,13 @@ Will adjust this value in the future Signed-off-by: Yong Li <yong.b.li@linux.intel.com> --- - xyz/openbmc_project/State/Watchdog.interface.yaml | 2 +- + yaml/xyz/openbmc_project/State/Watchdog.interface.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/xyz/openbmc_project/State/Watchdog.interface.yaml b/xyz/openbmc_project/State/Watchdog.interface.yaml -index f76dbf2..402e1a8 100644 ---- a/xyz/openbmc_project/State/Watchdog.interface.yaml -+++ b/xyz/openbmc_project/State/Watchdog.interface.yaml +diff --git a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml +index f54ec3b6e4fb..ede961da1942 100644 +--- a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml ++++ b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml @@ -37,7 +37,7 @@ properties: type: uint64 description: > @@ -30,5 +30,5 @@ index f76dbf2..402e1a8 100644 type: uint64 description: > -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0012-Add-RestoreDelay-interface-for-power-restore-delay.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0012-Add-RestoreDelay-interface-for-power-restore-delay.patch index 9052435ca..aae1e0248 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0012-Add-RestoreDelay-interface-for-power-restore-delay.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0012-Add-RestoreDelay-interface-for-power-restore-delay.patch @@ -1,4 +1,4 @@ -From eeac4cf4528994aeb213d549daf4c033ac9d3bbc Mon Sep 17 00:00:00 2001 +From 6e8b18e2258c7b6327a9b26901846088dd82a663 Mon Sep 17 00:00:00 2001 From: Kuiying Wang <kuiying.wang@intel.com> Date: Fri, 24 Aug 2018 17:55:35 +0800 Subject: [PATCH] Add RestoreDelay interface for power restore delay @@ -10,13 +10,13 @@ Signed-off-by: Kuiying Wang <kuiying.wang@intel.com> --- .../Control/Power/RestoreDelay.interface.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) - create mode 100644 xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml -diff --git a/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml b/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml b/yaml/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml new file mode 100644 -index 0000000..55ee80a +index 000000000000..55ee80a75f7b --- /dev/null -+++ b/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml ++++ b/yaml/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml @@ -0,0 +1,11 @@ +description: > + Implement to specify power transition behavior on a BMC reset. @@ -30,5 +30,5 @@ index 0000000..55ee80a + The delay time for power restore. + Power Restore Delay is NOT applied on power policy is "Always Off" -- -2.17.0 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0013-Add-ErrConfig.yaml-interface-for-processor-error-config.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0013-Add-ErrConfig.yaml-interface-for-processor-error-config.patch index 9471c7ab2..17aef45bf 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0013-Add-ErrConfig.yaml-interface-for-processor-error-config.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0013-Add-ErrConfig.yaml-interface-for-processor-error-config.patch @@ -1,4 +1,4 @@ -From 7260c24b201759f3a5168eebfee215072c13e641 Mon Sep 17 00:00:00 2001 +From 571ab872be4b486b98bfbed159630b5e21d9a586 Mon Sep 17 00:00:00 2001 From: Kuiying Wang <kuiying.wang@intel.com> Date: Thu, 30 Aug 2018 16:22:43 +0800 Subject: [PATCH] Add ErrConfig.yaml interface for processor error @@ -40,13 +40,13 @@ Signed-off-by: Kuiying Wang <kuiying.wang@intel.com> --- .../Processor/ErrConfig.interface.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) - create mode 100644 xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml -diff --git a/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml b/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml b/yaml/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml new file mode 100644 -index 0000000..2304263 +index 000000000000..23042633ca13 --- /dev/null -+++ b/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml ++++ b/yaml/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml @@ -0,0 +1,33 @@ +description: > + This defines processor error configuration. @@ -82,5 +82,5 @@ index 0000000..2304263 + 01b: Enabled + 11b: Not Present -- -2.17.0 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0024-Add-the-pre-timeout-interrupt-defined-in-IPMI-spec.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0024-Add-the-pre-timeout-interrupt-defined-in-IPMI-spec.patch index 67fa59090..06eed126f 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0024-Add-the-pre-timeout-interrupt-defined-in-IPMI-spec.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0024-Add-the-pre-timeout-interrupt-defined-in-IPMI-spec.patch @@ -1,4 +1,4 @@ -From 6e9a19c43acac7d4254910906329d98d7b59085a Mon Sep 17 00:00:00 2001 +From 45f4457c23a8da9d246bd33c3d426b52186b39f0 Mon Sep 17 00:00:00 2001 From: Ren Yu <yux.ren@intel.com> Date: Fri, 24 May 2019 14:55:10 +0800 Subject: [PATCH] Add the pre-timeout interrupt defined in IPMI spec @@ -9,13 +9,13 @@ IPMI set/get watchdog commands will use it. Signed-off-by: Ren Yu <yux.ren@intel.com> --- - xyz/openbmc_project/State/Watchdog.interface.yaml | 22 ++++++++++++++++++++++ + .../State/Watchdog.interface.yaml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) -diff --git a/xyz/openbmc_project/State/Watchdog.interface.yaml b/xyz/openbmc_project/State/Watchdog.interface.yaml -index 2fc47d8..6dfa9b9 100644 ---- a/xyz/openbmc_project/State/Watchdog.interface.yaml -+++ b/xyz/openbmc_project/State/Watchdog.interface.yaml +diff --git a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml +index ede961da1942..a67a6a30ea2c 100644 +--- a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml ++++ b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml @@ -33,6 +33,11 @@ properties: description: > The action the watchdog should perform when it expires. @@ -53,5 +53,5 @@ index 2fc47d8..6dfa9b9 100644 description: > The type of timer use. -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0025-Add-PreInterruptFlag-properity-in-DBUS.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0025-Add-PreInterruptFlag-properity-in-DBUS.patch index d7e66abd2..54920fee3 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0025-Add-PreInterruptFlag-properity-in-DBUS.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0025-Add-PreInterruptFlag-properity-in-DBUS.patch @@ -1,4 +1,4 @@ -From b7c487750c05dcc081219ccdd4ef539beef6aa30 Mon Sep 17 00:00:00 2001 +From c71c17951e5f00195c9cacd6829a359c3d253714 Mon Sep 17 00:00:00 2001 From: Ren Yu <yux.ren@intel.com> Date: Mon, 29 Jul 2019 10:51:12 +0800 Subject: [PATCH] Add PreInterruptFlag properity in DBUS. @@ -15,13 +15,13 @@ pre-timeout interrupt occurred. Signed-off-by: Ren Yu <yux.ren@intel.com> --- - xyz/openbmc_project/State/Watchdog.interface.yaml | 5 +++++ + yaml/xyz/openbmc_project/State/Watchdog.interface.yaml | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/xyz/openbmc_project/State/Watchdog.interface.yaml b/xyz/openbmc_project/State/Watchdog.interface.yaml -index bf4cca0..6579368 100644 ---- a/xyz/openbmc_project/State/Watchdog.interface.yaml -+++ b/xyz/openbmc_project/State/Watchdog.interface.yaml +diff --git a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml +index a67a6a30ea2c..d1ae8e3411e6 100644 +--- a/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml ++++ b/yaml/xyz/openbmc_project/State/Watchdog.interface.yaml @@ -59,6 +59,11 @@ properties: description: > The timer user at the time of expiration. @@ -35,5 +35,5 @@ index bf4cca0..6579368 100644 enumerations: - name: Action -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch index 36c63ec58..25ed9a403 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch @@ -1,4 +1,4 @@ -From 0d6556539be9bda478a3cabb6127eace5764fa11 Mon Sep 17 00:00:00 2001 +From 826946ecad67b34818db0634367c4cf7100d0890 Mon Sep 17 00:00:00 2001 From: Vikram Bodireddy <vikram.bodireddy@intel.com> Date: Wed, 15 Jan 2020 10:01:04 +0800 Subject: [PATCH] Add StandbySpare support for software inventory @@ -11,13 +11,13 @@ image. Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com> --- - xyz/openbmc_project/Software/Activation.interface.yaml | 12 ++++++++++++ + .../Software/Activation.interface.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git a/xyz/openbmc_project/Software/Activation.interface.yaml b/xyz/openbmc_project/Software/Activation.interface.yaml -index efeeeb6..6c9ce75 100644 ---- a/xyz/openbmc_project/Software/Activation.interface.yaml -+++ b/xyz/openbmc_project/Software/Activation.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Software/Activation.interface.yaml b/yaml/xyz/openbmc_project/Software/Activation.interface.yaml +index 6af2984b7b2e..26ab87b0262d 100644 +--- a/yaml/xyz/openbmc_project/Software/Activation.interface.yaml ++++ b/yaml/xyz/openbmc_project/Software/Activation.interface.yaml @@ -28,12 +28,20 @@ enumerations: - name: Activating description: > @@ -39,7 +39,7 @@ index efeeeb6..6c9ce75 100644 - name: Staged description: > The Software.Version is currently in staged flash area. -@@ -48,6 +56,10 @@ enumerations: +@@ -52,6 +60,10 @@ enumerations: - name: Active description: > The Software.Version has been requested for Activation. @@ -51,5 +51,5 @@ index efeeeb6..6c9ce75 100644 # due to current system state. Currently, sdbusplus does not support # errors on properties. -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch index e6afc0117..677b699be 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch @@ -1,4 +1,4 @@ -From 65d1772312a76ebfdac6391bb97287c62f18c43f Mon Sep 17 00:00:00 2001 +From 2c270f8fd9f45ff0792d2730c25eb2f673314115 Mon Sep 17 00:00:00 2001 From: "Kowalski, Mariusz" <mariusz.kowalski@intel.com> Date: Thu, 27 Feb 2020 15:48:56 +0100 Subject: [PATCH] MCTP Daemon D-Bus interface definition. @@ -12,27 +12,24 @@ Signed-off-by: Mariusz Kowalski <mariusz.kowalski@intel.com> Signed-off-by: Karol Wachowski <karol.wachowski@intel.com> Change-Id: Ida66f8ffcf00003655edcb0fb0112202797b8e1a --- - xyz/openbmc_project/MCTP/Base.interface.yaml | 227 ++++++++++++++++++ + .../openbmc_project/MCTP/Base.interface.yaml | 227 ++++++++++++++++++ .../MCTP/Binding/PCIe.interface.yaml | 29 +++ .../MCTP/Binding/SMBus.interface.yaml | 17 ++ .../MCTP/BusOwner.interface.yaml | 17 ++ - .../MCTP/Endpoint.interface.yaml | 13 + - xyz/openbmc_project/MCTP/README.md | 43 ++++ + .../MCTP/Endpoint.interface.yaml | 4 + .../MCTP/SupportedMessageTypes.interface.yaml | 36 +++ - 7 files changed, 382 insertions(+) - create mode 100644 xyz/openbmc_project/MCTP/Base.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/BusOwner.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/Endpoint.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/README.md - create mode 100644 xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml + 6 files changed, 330 insertions(+) + create mode 100644 yaml/xyz/openbmc_project/MCTP/Base.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/MCTP/BusOwner.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml -diff --git a/xyz/openbmc_project/MCTP/Base.interface.yaml b/xyz/openbmc_project/MCTP/Base.interface.yaml +diff --git a/yaml/xyz/openbmc_project/MCTP/Base.interface.yaml b/yaml/xyz/openbmc_project/MCTP/Base.interface.yaml new file mode 100644 -index 0000000..9438551 +index 000000000000..9438551e648e --- /dev/null -+++ b/xyz/openbmc_project/MCTP/Base.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/Base.interface.yaml @@ -0,0 +1,227 @@ +description: > + Mandatory interface for each instance of the MCTP Daemon to expose @@ -261,11 +258,11 @@ index 0000000..9438551 + - name: SPDM + - name: VDPCI + - name: VDIANA -diff --git a/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml b/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml +diff --git a/yaml/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml b/yaml/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml new file mode 100644 -index 0000000..1bd2881 +index 000000000000..1bd28818b39a --- /dev/null -+++ b/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml @@ -0,0 +1,29 @@ +description: > + Interface exposed by MCTP daemon for PCIe binding @@ -296,11 +293,11 @@ index 0000000..1bd2881 + - name: Discovered + - name: Undiscovered + - name: NotApplicable -diff --git a/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml b/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml +diff --git a/yaml/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml b/yaml/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml new file mode 100644 -index 0000000..9219ad0 +index 000000000000..9219ad02af06 --- /dev/null -+++ b/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml @@ -0,0 +1,17 @@ +description: > + Interface exposed by MCTP daemon for SMBus binding @@ -319,11 +316,11 @@ index 0000000..9219ad0 + - name: SlaveAddress + type: byte + description: Slave address to be used for this medium -diff --git a/xyz/openbmc_project/MCTP/BusOwner.interface.yaml b/xyz/openbmc_project/MCTP/BusOwner.interface.yaml +diff --git a/yaml/xyz/openbmc_project/MCTP/BusOwner.interface.yaml b/yaml/xyz/openbmc_project/MCTP/BusOwner.interface.yaml new file mode 100644 -index 0000000..d46298e +index 000000000000..d46298ed35b4 --- /dev/null -+++ b/xyz/openbmc_project/MCTP/BusOwner.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/BusOwner.interface.yaml @@ -0,0 +1,17 @@ +description: > + Interface exposed by MCTP root object, when executing in Bus Owner mode. @@ -342,79 +339,26 @@ index 0000000..d46298e + - name: OwnEidPool + type: boolean + description: Indicates Eid pool is managed by self -diff --git a/xyz/openbmc_project/MCTP/Endpoint.interface.yaml b/xyz/openbmc_project/MCTP/Endpoint.interface.yaml -new file mode 100644 -index 0000000..e4ba4d0 ---- /dev/null -+++ b/xyz/openbmc_project/MCTP/Endpoint.interface.yaml -@@ -0,0 +1,13 @@ -+description: -+ Interface exposed by discovered MCTP endpoints. -+ -+properties: +diff --git a/yaml/xyz/openbmc_project/MCTP/Endpoint.interface.yaml b/yaml/xyz/openbmc_project/MCTP/Endpoint.interface.yaml +index 119f1c673c2c..abb3ac930236 100644 +--- a/yaml/xyz/openbmc_project/MCTP/Endpoint.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/Endpoint.interface.yaml +@@ -6,6 +6,10 @@ description: > + MCTP-capable management controllers and managed devices. + + properties: + - name: Mode + type: enum[xyz.openbmc_project.MCTP.Base.BindingModeTypes] -+ description: Endpoint / BusOwner / Bridge -+ -+ - name: NetworkId -+ type: uint16 + description: > -+ MCTP network ID a unique identifier to distinguish each independent -+ MCTP network within a platform. -diff --git a/xyz/openbmc_project/MCTP/README.md b/xyz/openbmc_project/MCTP/README.md -new file mode 100644 -index 0000000..c819dbb ---- /dev/null -+++ b/xyz/openbmc_project/MCTP/README.md -@@ -0,0 +1,43 @@ -+# MCTP Daemon -+ -+## Overview -+MCTP service exposes D-Bus methods / properties / signals for managing -+MCTP devices or work as MCTP Endpoint. MCTP daemon will either -+work in Bus Owner or Endpoint mode for the specified physical medium. -+ -+### MCTP service -+MCTP service can be started either in Bus Owner mode or Endpoint mode. -+It will expose following objects. -+1. Base object -+2. MCTP Endpoints (discovered in case of Bus Owner mode, queried using -+routing table in case of Endpoint mode) -+Please refer individual yaml file for details about the -+methods / signals / properties exposed in the interfaces. -+ -+#### Base object -+Exposed under the path `/xyz/openbmc_project/mctp` with the following -+interfaces. -+1. `xyz.openbmc_project.MCTP.Base` which exposes all the common properties -+needed for MCTP Daemon. -+2. `xyz.openbmc_project.MCTP.BusOwner` available only in Bus Owner mode -+which exposes the properties needed by Bus Owner MCTP Daemon. -+3. `xyz.openbmc_project.MCTP.SupportedMessageTypes` which exposes the message -+types supported. -+4. Binding interface `xyz.openbmc_project.MCTP.Binding.PCIe` or -+`xyz.openbmc_project.MCTP.Binding.SMBus` as per the physical medium in which -+this MCTP Daemon is instantiated. -+5. Common UUID interface `xyz.openbmc_project.Common.UUID` which exposes UUID -+in RFC4122 format. -+ -+#### Endpoint object -+Exposed under the path `/xyz/openbmc_project/mctp/device/<eid>` with the -+following interfaces. -+1. `xyz.openbmc_project.MCTP.SupportedMessageTypes` which exposes supported MCTP -+message types for the discovered MCTP Endpoint. -+2. `xyz.openbmc_project.MCTP.Endpoint` which exposes properties like Network ID -+and endpoint mode (to identify Bus Owner or Bridge or Endpoint) for the discovered -+MCTP Endpoint. -+3. `xyz.openbmc_project.MCTP.Bridge` available only for discovered MCTP Bridges to -+expose properties like EID pool. (TBD) -+4. Common UUID interface `xyz.openbmc_project.Common.UUID` which exposes UUID -+in RFC4122 format. -diff --git a/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml b/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml ++ Endpoint / BusOwner / Bridge + + - name: NetworkId + type: size +diff --git a/yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml b/yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml new file mode 100644 -index 0000000..fa447ee +index 000000000000..fa447ee6a3bb --- /dev/null -+++ b/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml ++++ b/yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml @@ -0,0 +1,36 @@ +description: + Interface used to represent the supported MCTP message types. diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0029-Add-D-Bus-interfaces-for-PLDM-FW-update.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0029-Add-D-Bus-interfaces-for-PLDM-FW-update.patch index 5ee550eaa..6da1c2693 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0029-Add-D-Bus-interfaces-for-PLDM-FW-update.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0029-Add-D-Bus-interfaces-for-PLDM-FW-update.patch @@ -1,5 +1,5 @@ -From e7ba5f63a551099e1b5f934683e163963f28f28e Mon Sep 17 00:00:00 2001 -From: "Gade-RajasekharReddy@" <raja.sekhar.reddy.gade@linux.intel.com> +From 2da0a05ae9b69cd8da67ced1bcac6ae7c6c5f930 Mon Sep 17 00:00:00 2001 +From: "Gade-RajasekharReddy@" <Gade-RajasekharReddy@> Date: Wed, 16 Sep 2020 03:19:41 +0530 Subject: [PATCH] Add D-Bus interfaces for PLDM FW update @@ -24,26 +24,26 @@ Signed-off-by: Gade-RajasekharReddy@ <raja.sekhar.reddy.gade@linux.intel.com> ...endingComponentImageSetInfo.interface.yaml | 10 ++ .../FWU/PendingComponentInfo.interface.yaml | 40 +++++++ .../PLDM/FWU/PnPDescriptor.interface.yaml | 14 +++ - xyz/openbmc_project/PLDM/FWU/README.md | 103 ++++++++++++++++++ + yaml/xyz/openbmc_project/PLDM/FWU/README.md | 103 ++++++++++++++++++ 12 files changed, 378 insertions(+) - create mode 100644 xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml - create mode 100644 xyz/openbmc_project/PLDM/FWU/README.md + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml + create mode 100644 yaml/xyz/openbmc_project/PLDM/FWU/README.md -diff --git a/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml b/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml new file mode 100644 -index 0000000..e225bad +index 000000000000..e225bade0df0 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml @@ -0,0 +1,14 @@ +description : > + This interface has ACPI descriptor properties. @@ -59,11 +59,11 @@ index 0000000..e225bad + type : string + description: > + Property containing ACPI Product Identifier. -diff --git a/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml b/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml new file mode 100644 -index 0000000..94115a3 +index 000000000000..94115a33e1d9 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml @@ -0,0 +1,9 @@ +description : > + This interface has the PLDM FWU active component image set properties. @@ -74,11 +74,11 @@ index 0000000..94115a3 + type : string + description: > + String describing the active component image set version. -diff --git a/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml b/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml new file mode 100644 -index 0000000..77a7566 +index 000000000000..77a75669439b --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml @@ -0,0 +1,55 @@ +description: > + This interface has the component entries for all of the updatable @@ -135,11 +135,11 @@ index 0000000..77a7566 + type: string + description: > + String describing the active component version. -diff --git a/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml b/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml new file mode 100644 -index 0000000..36560ff +index 000000000000..36560ff0742b --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml @@ -0,0 +1,32 @@ +description : > + This interface describes the capabilities during update. @@ -173,11 +173,11 @@ index 0000000..36560ff + description: > + This property shows the component update failure recovery + capability. -diff --git a/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml b/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml new file mode 100644 -index 0000000..d5ec47c +index 000000000000..d5ec47cbc77f --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml @@ -0,0 +1,40 @@ +description: > + This interface has the component activation methods. @@ -219,11 +219,11 @@ index 0000000..d5ec47c + description: > + Property that tells whether the component can be activated + automatically once apply completes. -diff --git a/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml b/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml new file mode 100644 -index 0000000..2ba15e2 +index 000000000000..2ba15e26c690 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml @@ -0,0 +1,21 @@ +description: > + This interface provides a method to initiate the PLDM FW update. @@ -246,11 +246,11 @@ index 0000000..2ba15e2 + - xyz.openbmc_project.Common.Error.NotAllowed + - xyz.openbmc_project.Common.Error.InvalidArgument + - xyz.openbmc_project.Common.Error.ResourceNotFound -diff --git a/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml b/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml new file mode 100644 -index 0000000..c013955 +index 000000000000..c013955af3b6 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml @@ -0,0 +1,10 @@ +description : > + This interface has device identification info, in which IANA @@ -262,11 +262,11 @@ index 0000000..c013955 + type : string + description: > + Property containing the IANA Enterprise ID. -diff --git a/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml b/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml new file mode 100644 -index 0000000..8d758ed +index 000000000000..8d758ed51192 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml @@ -0,0 +1,30 @@ +description : > + This interface has device identification info,in which PCI Vendor ID @@ -298,11 +298,11 @@ index 0000000..8d758ed + type : string + description: > + Property containing the PCI Revision ID. -diff --git a/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml b/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml new file mode 100644 -index 0000000..3861572 +index 000000000000..3861572d81a4 --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml @@ -0,0 +1,10 @@ +description : > + This interface has the PLDM FWU pending component image set @@ -314,11 +314,11 @@ index 0000000..3861572 + type : string + description: > + String describing the pending component image set version. -diff --git a/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml b/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml new file mode 100644 -index 0000000..59a2ad8 +index 000000000000..59a2ad8dae8c --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml @@ -0,0 +1,40 @@ +description: > + This interface has the component entries for all of the pending @@ -360,11 +360,11 @@ index 0000000..59a2ad8 + PendingComponentComparisonStamp field for additional details. + If no pending firmware component exists, this field is zero + bytes in length. -diff --git a/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml b/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml b/yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml new file mode 100644 -index 0000000..801db6d +index 000000000000..801db6d6380c --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml @@ -0,0 +1,14 @@ +description : > + This interface has PnP descriptor properties. @@ -380,11 +380,11 @@ index 0000000..801db6d + type : string + description: > + Property containing the PnP Product Identifier. -diff --git a/xyz/openbmc_project/PLDM/FWU/README.md b/xyz/openbmc_project/PLDM/FWU/README.md +diff --git a/yaml/xyz/openbmc_project/PLDM/FWU/README.md b/yaml/xyz/openbmc_project/PLDM/FWU/README.md new file mode 100644 -index 0000000..2931739 +index 000000000000..293173933baf --- /dev/null -+++ b/xyz/openbmc_project/PLDM/FWU/README.md ++++ b/yaml/xyz/openbmc_project/PLDM/FWU/README.md @@ -0,0 +1,103 @@ +#PLDM FW Update + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0030-Add-PLDM-version-purpose-enumeration.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0030-Add-PLDM-version-purpose-enumeration.patch index 3a1ae57fb..0a57733aa 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0030-Add-PLDM-version-purpose-enumeration.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0030-Add-PLDM-version-purpose-enumeration.patch @@ -1,4 +1,4 @@ -From 007c07561e03a005e90858f77266f4fba3e8e2c9 Mon Sep 17 00:00:00 2001 +From 114687e8f5b4728bd5d82b3c2dbc97cb40273cb8 Mon Sep 17 00:00:00 2001 From: Ayushi Smriti <smriti.ayushi@intel.com> Date: Wed, 23 Sep 2020 22:01:25 +0530 Subject: [PATCH] Add PLDM version purpose enumeration @@ -9,13 +9,13 @@ of the version to support pldm type version purpose Change-Id: I7b914d4323bfe44a4e3cd60ed4a627aeceb6b56f Signed-off-by: Ayushi Smriti <smriti.ayushi@intel.com> --- - xyz/openbmc_project/Software/Version.interface.yaml | 3 +++ + yaml/xyz/openbmc_project/Software/Version.interface.yaml | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/xyz/openbmc_project/Software/Version.interface.yaml b/xyz/openbmc_project/Software/Version.interface.yaml -index 345e5b5..f2efbec 100644 ---- a/xyz/openbmc_project/Software/Version.interface.yaml -+++ b/xyz/openbmc_project/Software/Version.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Software/Version.interface.yaml b/yaml/xyz/openbmc_project/Software/Version.interface.yaml +index 345e5b51f653..f2efbecce938 100644 +--- a/yaml/xyz/openbmc_project/Software/Version.interface.yaml ++++ b/yaml/xyz/openbmc_project/Software/Version.interface.yaml @@ -38,3 +38,6 @@ enumerations: - name: PSU description: > diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch index fd31665dc..31c5ad95b 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch @@ -1,62 +1,60 @@ -From cd3c2ff290e6ff205c32b386c7c8a73d4a8980e5 Mon Sep 17 00:00:00 2001 +From 20357179065a9157ad89f7c717ba214bf4fe4ded Mon Sep 17 00:00:00 2001 From: Zhikui Ren <zhikui.ren@intel.com> Date: Tue, 8 Dec 2020 15:08:21 -0800 -Subject: [PATCH 1/4] update meson build files for control and bios +Subject: [PATCH] update meson build files for control and bios Signed-off-by: Zhikui Ren <zhikui.ren@intel.com> --- - .../Control/Power/RestoreDelay/meson.build | 14 ++++++++++++++ - gen/xyz/openbmc_project/Control/Power/meson.build | 15 +++++++++++++++ - .../Control/Processor/ErrConfig/meson.build | 14 ++++++++++++++ - .../openbmc_project/Control/Processor/meson.build | 15 +++++++++++++++ - .../Inventory/Item/Bios/meson.build | 14 ++++++++++++++ - .../openbmc_project/Inventory/Item/meson.build | 15 +++++++++++++++ - 6 files changed, 87 insertions(+) + .../Control/Power/RestoreDelay/meson.build | 13 +++++++++++++ + gen/xyz/openbmc_project/Control/Power/meson.build | 14 ++++++++++++++ + .../Control/Processor/ErrConfig/meson.build | 13 +++++++++++++ + .../openbmc_project/Control/Processor/meson.build | 13 +++++++++++++ + .../Inventory/Item/Bios/meson.build | 13 +++++++++++++ + gen/xyz/openbmc_project/Inventory/Item/meson.build | 14 ++++++++++++++ + 6 files changed, 80 insertions(+) create mode 100644 gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build create mode 100644 gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build create mode 100644 gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build diff --git a/gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build b/gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build new file mode 100644 -index 0000000..91581fd +index 000000000000..1afe8d26b87d --- /dev/null +++ b/gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/Control/Power/RestoreDelay__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/Control/Power/RestoreDelay', + ], +) -+ diff --git a/gen/xyz/openbmc_project/Control/Power/meson.build b/gen/xyz/openbmc_project/Control/Power/meson.build -index 05628ec..ad04479 100644 +index dbd3b409ead0..43ccf1958aa9 100644 --- a/gen/xyz/openbmc_project/Control/Power/meson.build +++ b/gen/xyz/openbmc_project/Control/Power/meson.build -@@ -29,6 +29,21 @@ generated_others += custom_target( - build_by_default: true, +@@ -41,6 +41,20 @@ generated_others += custom_target( + ], ) +subdir('RestoreDelay') +generated_others += custom_target( + 'xyz/openbmc_project/Control/Power/RestoreDelay__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml', ], + output: [ 'RestoreDelay.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/Control/Power/RestoreDelay', + ], -+ build_by_default: true, +) + subdir('RestorePolicy') @@ -64,88 +62,83 @@ index 05628ec..ad04479 100644 'xyz/openbmc_project/Control/Power/RestorePolicy__markdown'.underscorify(), diff --git a/gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build b/gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build new file mode 100644 -index 0000000..12961c2 +index 000000000000..937004d3d68b --- /dev/null +++ b/gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/Control/Processor/ErrConfig__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/Control/Processor/ErrConfig', + ], +) -+ diff --git a/gen/xyz/openbmc_project/Control/Processor/meson.build b/gen/xyz/openbmc_project/Control/Processor/meson.build -index adbff0a..816c30d 100644 +index fc32bf2f877f..cc2a1d6507b3 100644 --- a/gen/xyz/openbmc_project/Control/Processor/meson.build +++ b/gen/xyz/openbmc_project/Control/Processor/meson.build -@@ -14,3 +14,18 @@ generated_others += custom_target( - build_by_default: true, +@@ -13,3 +13,16 @@ generated_others += custom_target( + ], ) +subdir('ErrConfig') +generated_others += custom_target( + 'xyz/openbmc_project/Control/Processor/ErrConfig__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml', ], + output: [ 'ErrConfig.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/Control/Processor/ErrConfig', + ], -+ build_by_default: true, +) -+ diff --git a/gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build new file mode 100644 -index 0000000..5c6fce0 +index 000000000000..28fbf85dd97c --- /dev/null +++ b/gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/Inventory/Item/Bios__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Inventory/Item/Bios.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/Inventory/Item/Bios', + ], +) -+ diff --git a/gen/xyz/openbmc_project/Inventory/Item/meson.build b/gen/xyz/openbmc_project/Inventory/Item/meson.build -index 145bba2..3e036bd 100644 +index 77d9be8b6c03..7d22037b32b8 100644 --- a/gen/xyz/openbmc_project/Inventory/Item/meson.build +++ b/gen/xyz/openbmc_project/Inventory/Item/meson.build -@@ -27,6 +27,21 @@ generated_others += custom_target( - build_by_default: true, +@@ -40,6 +40,20 @@ generated_others += custom_target( + ], ) +subdir('Bios') +generated_others += custom_target( + 'xyz/openbmc_project/Inventory/Item/Bios__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/Inventory/Item/Bios.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/Inventory/Item/Bios.interface.yaml', ], + output: [ 'Bios.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/Inventory/Item/Bios', + ], -+ build_by_default: true, +) + subdir('Bmc') diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0032-update-meson-build-for-MCTP-interfaces.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0032-update-meson-build-for-MCTP-interfaces.patch index 5f41a1348..ab13f55fe 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0032-update-meson-build-for-MCTP-interfaces.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0032-update-meson-build-for-MCTP-interfaces.patch @@ -1,266 +1,209 @@ -From b25ae31fa674a287bc100081a9dfc243bcf53f19 Mon Sep 17 00:00:00 2001 +From f4eddacc871c6bb759e6e355a89ccaaa12c63396 Mon Sep 17 00:00:00 2001 From: Zhikui Ren <zhikui.ren@intel.com> Date: Tue, 8 Dec 2020 15:16:25 -0800 Subject: [PATCH] update meson build for MCTP interfaces Signed-off-by: Zhikui Ren <zhikui.ren@intel.com> --- - gen/xyz/openbmc_project/MCTP/Base/meson.build | 14 +++++ - .../MCTP/Binding/PCIe/meson.build | 14 +++++ - .../MCTP/Binding/SMBus/meson.build | 14 +++++ - .../openbmc_project/MCTP/Binding/meson.build | 31 ++++++++++ - .../openbmc_project/MCTP/BusOwner/meson.build | 14 +++++ - .../openbmc_project/MCTP/Endpoint/meson.build | 14 +++++ - .../MCTP/SupportedMessageTypes/meson.build | 14 +++++ - gen/xyz/openbmc_project/MCTP/meson.build | 62 +++++++++++++++++++ - gen/xyz/openbmc_project/meson.build | 1 + - 9 files changed, 178 insertions(+) + gen/xyz/openbmc_project/MCTP/Base/meson.build | 13 ++++++ + .../MCTP/Binding/PCIe/meson.build | 13 ++++++ + .../MCTP/Binding/SMBus/meson.build | 13 ++++++ + .../openbmc_project/MCTP/Binding/meson.build | 30 +++++++++++++ + .../openbmc_project/MCTP/BusOwner/meson.build | 13 ++++++ + .../MCTP/SupportedMessageTypes/meson.build | 13 ++++++ + gen/xyz/openbmc_project/MCTP/meson.build | 42 +++++++++++++++++++ + 7 files changed, 137 insertions(+) create mode 100644 gen/xyz/openbmc_project/MCTP/Base/meson.build create mode 100644 gen/xyz/openbmc_project/MCTP/Binding/PCIe/meson.build create mode 100644 gen/xyz/openbmc_project/MCTP/Binding/SMBus/meson.build create mode 100644 gen/xyz/openbmc_project/MCTP/Binding/meson.build create mode 100644 gen/xyz/openbmc_project/MCTP/BusOwner/meson.build - create mode 100644 gen/xyz/openbmc_project/MCTP/Endpoint/meson.build create mode 100644 gen/xyz/openbmc_project/MCTP/SupportedMessageTypes/meson.build - create mode 100644 gen/xyz/openbmc_project/MCTP/meson.build diff --git a/gen/xyz/openbmc_project/MCTP/Base/meson.build b/gen/xyz/openbmc_project/MCTP/Base/meson.build new file mode 100644 -index 0000000..81aeb86 +index 000000000000..c605b2d496ac --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/Base/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/MCTP/Base__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Base.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/MCTP/Base.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/MCTP/Base', + ], +) -+ diff --git a/gen/xyz/openbmc_project/MCTP/Binding/PCIe/meson.build b/gen/xyz/openbmc_project/MCTP/Binding/PCIe/meson.build new file mode 100644 -index 0000000..0da866c +index 000000000000..4573a64f4099 --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/Binding/PCIe/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/MCTP/Binding/PCIe__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/MCTP/Binding/PCIe', + ], +) -+ diff --git a/gen/xyz/openbmc_project/MCTP/Binding/SMBus/meson.build b/gen/xyz/openbmc_project/MCTP/Binding/SMBus/meson.build new file mode 100644 -index 0000000..a0f97bd +index 000000000000..bfb4d040a54c --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/Binding/SMBus/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/MCTP/Binding/SMBus__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/MCTP/Binding/SMBus', + ], +) -+ diff --git a/gen/xyz/openbmc_project/MCTP/Binding/meson.build b/gen/xyz/openbmc_project/MCTP/Binding/meson.build new file mode 100644 -index 0000000..6e3407c +index 000000000000..36a74ddac294 --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/Binding/meson.build -@@ -0,0 +1,31 @@ +@@ -0,0 +1,28 @@ +# Generated file; do not modify. +subdir('PCIe') +generated_others += custom_target( + 'xyz/openbmc_project/MCTP/Binding/PCIe__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml', ], + output: [ 'PCIe.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/MCTP/Binding/PCIe', + ], -+ build_by_default: true, +) + +subdir('SMBus') +generated_others += custom_target( + 'xyz/openbmc_project/MCTP/Binding/SMBus__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml', ], + output: [ 'SMBus.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/MCTP/Binding/SMBus', + ], -+ build_by_default: true, +) -+ diff --git a/gen/xyz/openbmc_project/MCTP/BusOwner/meson.build b/gen/xyz/openbmc_project/MCTP/BusOwner/meson.build new file mode 100644 -index 0000000..190a640 +index 000000000000..4b28bd6b34e7 --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/BusOwner/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/MCTP/BusOwner__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/BusOwner.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/MCTP/BusOwner.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/MCTP/BusOwner', + ], +) -+ -diff --git a/gen/xyz/openbmc_project/MCTP/Endpoint/meson.build b/gen/xyz/openbmc_project/MCTP/Endpoint/meson.build -new file mode 100644 -index 0000000..cababfb ---- /dev/null -+++ b/gen/xyz/openbmc_project/MCTP/Endpoint/meson.build -@@ -0,0 +1,14 @@ -+# Generated file; do not modify. -+generated_sources += custom_target( -+ 'xyz/openbmc_project/MCTP/Endpoint__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Endpoint.interface.yaml', ], -+ output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], -+ command: [ -+ sdbuspp_gen_meson_prog, '--command', 'cpp', -+ '--output', meson.current_build_dir(), -+ '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), -+ 'xyz/openbmc_project/MCTP/Endpoint', -+ ], -+) -+ diff --git a/gen/xyz/openbmc_project/MCTP/SupportedMessageTypes/meson.build b/gen/xyz/openbmc_project/MCTP/SupportedMessageTypes/meson.build new file mode 100644 -index 0000000..f58fa44 +index 000000000000..4fd46823ed17 --- /dev/null +++ b/gen/xyz/openbmc_project/MCTP/SupportedMessageTypes/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/MCTP/SupportedMessageTypes__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/MCTP/SupportedMessageTypes', + ], +) -+ diff --git a/gen/xyz/openbmc_project/MCTP/meson.build b/gen/xyz/openbmc_project/MCTP/meson.build -new file mode 100644 -index 0000000..94ab2c2 ---- /dev/null +index b9598adf6fa7..6b6d00b833d2 100644 +--- a/gen/xyz/openbmc_project/MCTP/meson.build +++ b/gen/xyz/openbmc_project/MCTP/meson.build -@@ -0,0 +1,62 @@ -+# Generated file; do not modify. +@@ -1,4 +1,33 @@ + # Generated file; do not modify. +subdir('Base') +generated_others += custom_target( + 'xyz/openbmc_project/MCTP/Base__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Base.interface.yaml', ], ++ input: [ '../../../../yaml/xyz/openbmc_project/MCTP/Base.interface.yaml', ], + output: [ 'Base.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../yaml', + 'xyz/openbmc_project/MCTP/Base', + ], -+ build_by_default: true, +) + +subdir('Binding') +subdir('BusOwner') +generated_others += custom_target( + 'xyz/openbmc_project/MCTP/BusOwner__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/BusOwner.interface.yaml', ], ++ input: [ '../../../../yaml/xyz/openbmc_project/MCTP/BusOwner.interface.yaml', ], + output: [ 'BusOwner.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../yaml', + 'xyz/openbmc_project/MCTP/BusOwner', + ], -+ build_by_default: true, -+) -+ -+subdir('Endpoint') -+generated_others += custom_target( -+ 'xyz/openbmc_project/MCTP/Endpoint__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/Endpoint.interface.yaml', ], -+ output: [ 'Endpoint.md' ], -+ command: [ -+ sdbuspp_gen_meson_prog, '--command', 'markdown', -+ '--output', meson.current_build_dir(), -+ '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), -+ 'xyz/openbmc_project/MCTP/Endpoint', -+ ], -+ build_by_default: true, +) + + subdir('Endpoint') + generated_others += custom_target( + 'xyz/openbmc_project/MCTP/Endpoint__markdown'.underscorify(), +@@ -13,3 +42,16 @@ generated_others += custom_target( + ], + ) + +subdir('SupportedMessageTypes') +generated_others += custom_target( + 'xyz/openbmc_project/MCTP/SupportedMessageTypes__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml', ], ++ input: [ '../../../../yaml/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml', ], + output: [ 'SupportedMessageTypes.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../yaml', + 'xyz/openbmc_project/MCTP/SupportedMessageTypes', + ], -+ build_by_default: true, +) -+ -diff --git a/gen/xyz/openbmc_project/meson.build b/gen/xyz/openbmc_project/meson.build -index 3c4750f..e4372b0 100644 ---- a/gen/xyz/openbmc_project/meson.build -+++ b/gen/xyz/openbmc_project/meson.build -@@ -68,6 +68,7 @@ generated_others += custom_target( - subdir('Ipmi') - subdir('Led') - subdir('Logging') -+subdir('MCTP') - subdir('Memory') - subdir('Network') - subdir('Nvme') -- 2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0033-update-meson-build-for-PLDM-FWU-interfaces.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0033-update-meson-build-for-PLDM-FWU-interfaces.patch index 9d3a8f197..6497d50d8 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0033-update-meson-build-for-PLDM-FWU-interfaces.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0033-update-meson-build-for-PLDM-FWU-interfaces.patch @@ -1,24 +1,24 @@ -From 32d4d17843bcc96a6d17b3d975fc92fac82ef081 Mon Sep 17 00:00:00 2001 +From f73c64bbe2cf9369892269a71893e2911753ba4d Mon Sep 17 00:00:00 2001 From: Zhikui Ren <zhikui.ren@intel.com> Date: Tue, 8 Dec 2020 15:28:42 -0800 Subject: [PATCH] update meson build for PLDM FWU interfaces Signed-off-by: Zhikui Ren <zhikui.ren@intel.com> --- - .../PLDM/FWU/ACPIDescriptor/meson.build | 14 ++ - .../ActiveComponentImageSetInfo/meson.build | 14 ++ - .../PLDM/FWU/ActiveComponentInfo/meson.build | 14 ++ - .../FWU/CapabilitiesDuringUpdate/meson.build | 14 ++ - .../ComponentActivationMethods/meson.build | 14 ++ - .../PLDM/FWU/FWUBase/meson.build | 14 ++ - .../PLDM/FWU/IANADescriptor/meson.build | 14 ++ - .../PLDM/FWU/PCIDescriptor/meson.build | 14 ++ - .../PendingComponentImageSetInfo/meson.build | 14 ++ - .../PLDM/FWU/PendingComponentInfo/meson.build | 14 ++ - .../PLDM/FWU/PnPDescriptor/meson.build | 14 ++ - gen/xyz/openbmc_project/PLDM/FWU/meson.build | 166 ++++++++++++++++++ + .../PLDM/FWU/ACPIDescriptor/meson.build | 13 ++ + .../ActiveComponentImageSetInfo/meson.build | 13 ++ + .../PLDM/FWU/ActiveComponentInfo/meson.build | 13 ++ + .../FWU/CapabilitiesDuringUpdate/meson.build | 13 ++ + .../ComponentActivationMethods/meson.build | 13 ++ + .../PLDM/FWU/FWUBase/meson.build | 13 ++ + .../PLDM/FWU/IANADescriptor/meson.build | 13 ++ + .../PLDM/FWU/PCIDescriptor/meson.build | 13 ++ + .../PendingComponentImageSetInfo/meson.build | 13 ++ + .../PLDM/FWU/PendingComponentInfo/meson.build | 13 ++ + .../PLDM/FWU/PnPDescriptor/meson.build | 13 ++ + gen/xyz/openbmc_project/PLDM/FWU/meson.build | 154 ++++++++++++++++++ gen/xyz/openbmc_project/PLDM/meson.build | 1 + - 13 files changed, 321 insertions(+) + 13 files changed, 298 insertions(+) create mode 100644 gen/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor/meson.build create mode 100644 gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo/meson.build create mode 100644 gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo/meson.build @@ -34,402 +34,379 @@ Signed-off-by: Zhikui Ren <zhikui.ren@intel.com> diff --git a/gen/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor/meson.build new file mode 100644 -index 0000000..2ec794d +index 000000000000..fbaf6c458645 --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor', + ], +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo/meson.build new file mode 100644 -index 0000000..d415ec9 +index 000000000000..af3df1483126 --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo', + ], +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo/meson.build new file mode 100644 -index 0000000..e2be862 +index 000000000000..e5ff324231f5 --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo', + ], +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate/meson.build new file mode 100644 -index 0000000..62d9894 +index 000000000000..03768e24090f --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate', + ], +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods/meson.build new file mode 100644 -index 0000000..2e379b6 +index 000000000000..31cffd2e311b --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods', + ], +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/FWU/FWUBase/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/FWUBase/meson.build new file mode 100644 -index 0000000..149662b +index 000000000000..3b90b51e1b7f --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/FWUBase/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/PLDM/FWU/FWUBase__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/FWUBase', + ], +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/FWU/IANADescriptor/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/IANADescriptor/meson.build new file mode 100644 -index 0000000..6661829 +index 000000000000..5d28fb5cca5a --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/IANADescriptor/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/PLDM/FWU/IANADescriptor__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/IANADescriptor', + ], +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/FWU/PCIDescriptor/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/PCIDescriptor/meson.build new file mode 100644 -index 0000000..00f54e2 +index 000000000000..0c2a5d572dd1 --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/PCIDescriptor/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/PLDM/FWU/PCIDescriptor__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/PCIDescriptor', + ], +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo/meson.build new file mode 100644 -index 0000000..5349f0f +index 000000000000..3fe7d85bbb29 --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo', + ], +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo/meson.build new file mode 100644 -index 0000000..5c44acf +index 000000000000..a4d11a3317a4 --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo', + ], +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/FWU/PnPDescriptor/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/PnPDescriptor/meson.build new file mode 100644 -index 0000000..d77e841 +index 000000000000..d0508ca366ae --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/PnPDescriptor/meson.build -@@ -0,0 +1,14 @@ +@@ -0,0 +1,13 @@ +# Generated file; do not modify. +generated_sources += custom_target( + 'xyz/openbmc_project/PLDM/FWU/PnPDescriptor__cpp'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml', ], ++ input: [ '../../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml', ], + output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'cpp', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/PnPDescriptor', + ], +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/FWU/meson.build b/gen/xyz/openbmc_project/PLDM/FWU/meson.build new file mode 100644 -index 0000000..27e89fc +index 000000000000..2bb71914b606 --- /dev/null +++ b/gen/xyz/openbmc_project/PLDM/FWU/meson.build -@@ -0,0 +1,166 @@ +@@ -0,0 +1,154 @@ +# Generated file; do not modify. +subdir('ACPIDescriptor') +generated_others += custom_target( + 'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ACPIDescriptor.interface.yaml', ], + output: [ 'ACPIDescriptor.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/ACPIDescriptor', + ], -+ build_by_default: true, +) + +subdir('ActiveComponentImageSetInfo') +generated_others += custom_target( + 'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo.interface.yaml', ], + output: [ 'ActiveComponentImageSetInfo.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/ActiveComponentImageSetInfo', + ], -+ build_by_default: true, +) + +subdir('ActiveComponentInfo') +generated_others += custom_target( + 'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo.interface.yaml', ], + output: [ 'ActiveComponentInfo.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/ActiveComponentInfo', + ], -+ build_by_default: true, +) + +subdir('CapabilitiesDuringUpdate') +generated_others += custom_target( + 'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate.interface.yaml', ], + output: [ 'CapabilitiesDuringUpdate.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/CapabilitiesDuringUpdate', + ], -+ build_by_default: true, +) + +subdir('ComponentActivationMethods') +generated_others += custom_target( + 'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods.interface.yaml', ], + output: [ 'ComponentActivationMethods.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/ComponentActivationMethods', + ], -+ build_by_default: true, +) + +subdir('FWUBase') +generated_others += custom_target( + 'xyz/openbmc_project/PLDM/FWU/FWUBase__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/FWUBase.interface.yaml', ], + output: [ 'FWUBase.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/FWUBase', + ], -+ build_by_default: true, +) + +subdir('IANADescriptor') +generated_others += custom_target( + 'xyz/openbmc_project/PLDM/FWU/IANADescriptor__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/IANADescriptor.interface.yaml', ], + output: [ 'IANADescriptor.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/IANADescriptor', + ], -+ build_by_default: true, +) + +subdir('PCIDescriptor') +generated_others += custom_target( + 'xyz/openbmc_project/PLDM/FWU/PCIDescriptor__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PCIDescriptor.interface.yaml', ], + output: [ 'PCIDescriptor.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/PCIDescriptor', + ], -+ build_by_default: true, +) + +subdir('PendingComponentImageSetInfo') +generated_others += custom_target( + 'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo.interface.yaml', ], + output: [ 'PendingComponentImageSetInfo.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/PendingComponentImageSetInfo', + ], -+ build_by_default: true, +) + +subdir('PendingComponentInfo') +generated_others += custom_target( + 'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PendingComponentInfo.interface.yaml', ], + output: [ 'PendingComponentInfo.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/PendingComponentInfo', + ], -+ build_by_default: true, +) + +subdir('PnPDescriptor') +generated_others += custom_target( + 'xyz/openbmc_project/PLDM/FWU/PnPDescriptor__markdown'.underscorify(), -+ input: [ meson.source_root() / 'xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml', ], ++ input: [ '../../../../../yaml/xyz/openbmc_project/PLDM/FWU/PnPDescriptor.interface.yaml', ], + output: [ 'PnPDescriptor.md' ], + command: [ + sdbuspp_gen_meson_prog, '--command', 'markdown', + '--output', meson.current_build_dir(), + '--tool', sdbusplusplus_prog, -+ '--directory', meson.source_root(), ++ '--directory', meson.current_source_dir() / '../../../../../yaml', + 'xyz/openbmc_project/PLDM/FWU/PnPDescriptor', + ], -+ build_by_default: true, +) -+ diff --git a/gen/xyz/openbmc_project/PLDM/meson.build b/gen/xyz/openbmc_project/PLDM/meson.build -index 9087286..02e4234 100644 +index 2be636cbaac0..35ff301901b3 100644 --- a/gen/xyz/openbmc_project/PLDM/meson.build +++ b/gen/xyz/openbmc_project/PLDM/meson.build -@@ -14,6 +14,7 @@ generated_others += custom_target( - build_by_default: true, +@@ -13,6 +13,7 @@ generated_others += custom_target( + ], ) +subdir('FWU') diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0034-Add-username-property-to-SessionInfo-interface.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0034-Add-username-property-to-SessionInfo-interface.patch index 29c49874a..f614f88c6 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0034-Add-username-property-to-SessionInfo-interface.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0034-Add-username-property-to-SessionInfo-interface.patch @@ -1,4 +1,4 @@ -From 3a507873ed733ed0e313f6efb89f7a491577e015 Mon Sep 17 00:00:00 2001 +From ee72d92baf3d64d066e0ec64cbd8723177219182 Mon Sep 17 00:00:00 2001 From: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> Date: Tue, 1 Jun 2021 12:27:50 +0000 Subject: [PATCH] Add username property to SessionInfo interface @@ -26,14 +26,14 @@ xyz.openbmc_project.Ipmi.SessionInfo interface - - - Signed-off-by: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> --- - xyz/openbmc_project/Ipmi/SESSION_README.md | 1 + - xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml | 6 ++++++ + yaml/xyz/openbmc_project/Ipmi/SESSION_README.md | 1 + + yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml | 6 ++++++ 2 files changed, 7 insertions(+) -diff --git a/xyz/openbmc_project/Ipmi/SESSION_README.md b/xyz/openbmc_project/Ipmi/SESSION_README.md -index c59b251..18ae66a 100644 ---- a/xyz/openbmc_project/Ipmi/SESSION_README.md -+++ b/xyz/openbmc_project/Ipmi/SESSION_README.md +diff --git a/yaml/xyz/openbmc_project/Ipmi/SESSION_README.md b/yaml/xyz/openbmc_project/Ipmi/SESSION_README.md +index c59b251bb88d..ed41c3bf181d 100644 +--- a/yaml/xyz/openbmc_project/Ipmi/SESSION_README.md ++++ b/yaml/xyz/openbmc_project/Ipmi/SESSION_README.md @@ -16,6 +16,7 @@ so that both phosphor-ipmi-host & phosphr-ipmi-net will be in sync. * RemotePort - Remote port address. * RemoteMACAddress -Remote MAC Address. @@ -42,10 +42,10 @@ index c59b251..18ae66a 100644 -diff --git a/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml b/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml -index 0ddc025..a7c3a90 100644 ---- a/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml -+++ b/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml +diff --git a/yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml b/yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml +index 0ddc0250db50..50aff5c26072 100644 +--- a/yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml ++++ b/yaml/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml @@ -46,6 +46,12 @@ properties: Session created by given user ID. errors: diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend index a90647b14..6e5d21ad4 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend @@ -1,7 +1,7 @@ # Keep this as a comment to enable the auto-bump script without # stomping on SRC_URI from previous .bbappend files #SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces.git" -SRCREV = "28dcc9a3bd3cf2e0f99f8d225dfd47b85815720e" +SRCREV = "5795dacbc5763a0f1d1e1ac59d73baf4ca2ae616" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index cdefe246f..f72287bc3 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -5,7 +5,7 @@ SYSTEMD_SERVICE_${PN} = "phosphor-pid-control.service" EXTRA_OECONF = "--enable-configure-dbus=yes" SRC_URI = "git://github.com/openbmc/phosphor-pid-control.git" -SRCREV = "18d5bb18dcb4ebf7340b0b7a0b39daa887d530ce" +SRCREV = "f7575a70018c09962500da8f4ba6883253651f62" SRC_URI += "\ file://0001-allow-dbus-sensors-without-thresholds.patch \ diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-configuration-changes.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-configuration-changes.patch index a76990262..b689748ea 100755..100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-configuration-changes.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0001-Firmware-update-configuration-changes.patch @@ -1,6 +1,6 @@ -From d5f2e8b00bc5f8a727a1ef678941c4993c3ea7a6 Mon Sep 17 00:00:00 2001 +From c65d6f4a6d2939335608957fba25e5c8a445813e Mon Sep 17 00:00:00 2001 From: Vikram Bodireddy <vikram.bodireddy@intel.com> -Date: Wed, 18 Nov 2020 17:14:41 +0530 +Date: Mon, 28 Jun 2021 21:56:18 +0530 Subject: [PATCH] Firmware update configuration changes This commit will provide user to PATCH the below firmware update @@ -39,24 +39,32 @@ Tested: - Successfully ran redfish validater with no new errors. -Change-Id: I44e1743fd76aa37c7b8affa49a3e05f808187037 Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com> -Signed-off-by: Helen Huang <he.huang@intel.com> -Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> --- - redfish-core/lib/update_service.hpp | 338 ++++++++++++++++-- + redfish-core/lib/update_service.hpp | 456 ++++++++++++++---- static/redfish/v1/$metadata/index.xml | 3 + - .../JsonSchemas/OemUpdateService/index.json | 69 ++++ - .../redfish/v1/schema/OemUpdateService_v1.xml | 40 +++ - 4 files changed, 421 insertions(+), 29 deletions(-) + .../JsonSchemas/OemUpdateService/index.json | 69 +++ + .../redfish/v1/schema/OemUpdateService_v1.xml | 40 ++ + 4 files changed, 481 insertions(+), 87 deletions(-) create mode 100644 static/redfish/v1/JsonSchemas/OemUpdateService/index.json create mode 100644 static/redfish/v1/schema/OemUpdateService_v1.xml diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp -index ca1234f..0a9f81a 100644 +index 663d48b..70c58d4 100644 --- a/redfish-core/lib/update_service.hpp +++ b/redfish-core/lib/update_service.hpp -@@ -32,6 +32,17 @@ static std::unique_ptr<sdbusplus::bus::match::match> fwUpdateErrorMatcher; +@@ -26,7 +26,9 @@ + + namespace redfish + { +- ++// params for multiple firmware targets ++std::vector<std::string> httpPushUriTargets; ++bool httpPushUriTargetBusy = false; + // Match signals added on software path + static std::unique_ptr<sdbusplus::bus::match::match> fwUpdateMatcher; + static std::unique_ptr<sdbusplus::bus::match::match> fwUpdateErrorMatcher; +@@ -34,6 +36,17 @@ static std::unique_ptr<sdbusplus::bus::match::match> fwUpdateErrorMatcher; static bool fwUpdateInProgress = false; // Timer for software available static std::unique_ptr<boost::asio::steady_timer> fwAvailableTimer; @@ -72,15 +80,15 @@ index ca1234f..0a9f81a 100644 +static constexpr const char* activationsStandBySpare = + "xyz.openbmc_project.Software.Activation.Activations.StandbySpare"; - static void cleanUp() + inline static void cleanUp() { -@@ -40,28 +51,120 @@ static void cleanUp() +@@ -42,28 +55,120 @@ inline static void cleanUp() fwUpdateErrorMatcher = nullptr; } - static void activateImage(const std::string& objPath, -- const std::string& service) -+ const std::string& service, -+ const std::vector<std::string>& imgUriTargets) + inline static void activateImage(const std::string& objPath, +- const std::string& service) ++ const std::string& service, ++ const std::vector<std::string>& imgUriTargets) { BMCWEB_LOG_DEBUG << "Activate image for " << objPath << " " << service; + // If targets is empty, it will apply to the active. @@ -113,14 +121,14 @@ index ca1234f..0a9f81a 100644 + const boost::system::error_code ec, + const crow::openbmc_mapper::GetSubTreeType& subtree) { + if (ec || !subtree.size()) - { -- BMCWEB_LOG_DEBUG << "error_code = " << errorCode; -- BMCWEB_LOG_DEBUG << "error msg = " << errorCode.message(); ++ { + return; + } + + for (const auto& [invObjPath, invDict] : subtree) -+ { + { +- BMCWEB_LOG_DEBUG << "error_code = " << errorCode; +- BMCWEB_LOG_DEBUG << "error msg = " << errorCode.message(); + std::size_t idPos = invObjPath.rfind("/"); + if ((idPos == std::string::npos) || + ((idPos + 1) >= invObjPath.size())) @@ -205,7 +213,7 @@ index ca1234f..0a9f81a 100644 sdbusplus::message::message& m, const crow::Request& req) { -@@ -74,22 +177,24 @@ static void +@@ -76,22 +181,24 @@ static void m.read(objPath, interfacesProperties); @@ -234,7 +242,7 @@ index ca1234f..0a9f81a 100644 BMCWEB_LOG_DEBUG << "error msg = " << errorCode.message(); if (asyncResp) -@@ -116,7 +221,7 @@ static void +@@ -118,7 +225,7 @@ static void // is added fwAvailableTimer = nullptr; @@ -243,7 +251,7 @@ index ca1234f..0a9f81a 100644 if (asyncResp) { std::shared_ptr<task::TaskData> task = -@@ -248,8 +353,7 @@ static void +@@ -250,8 +357,7 @@ static void "xyz.openbmc_project.ObjectMapper", "/xyz/openbmc_project/object_mapper", "xyz.openbmc_project.ObjectMapper", "GetObject", objPath.str, @@ -253,7 +261,7 @@ index ca1234f..0a9f81a 100644 } } } -@@ -259,7 +363,7 @@ static void +@@ -261,7 +367,7 @@ static void static void monitorForSoftwareAvailable( const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const crow::Request& req, const std::string& url, @@ -262,7 +270,7 @@ index ca1234f..0a9f81a 100644 { // Only allow one FW update at a time if (fwUpdateInProgress != false) -@@ -299,9 +403,10 @@ static void monitorForSoftwareAvailable( +@@ -301,9 +407,10 @@ static void monitorForSoftwareAvailable( } }); @@ -275,291 +283,412 @@ index ca1234f..0a9f81a 100644 }; fwUpdateInProgress = true; -@@ -477,12 +582,15 @@ class UpdateServiceActionsSimpleUpdate : public Node - std::string fwFile = imageURI.substr(separator + 1); - BMCWEB_LOG_DEBUG << "Server: " << tftpServer + " File: " << fwFile; +@@ -468,12 +575,15 @@ inline void requestRoutesUpdateServiceActionsSimpleUpdate(App& app) + std::string fwFile = imageURI.substr(separator + 1); + BMCWEB_LOG_DEBUG << "Server: " << tftpServer + " File: " << fwFile; -+ // We will pass empty targets and its handled in activation. -+ std::vector<std::string> httpUriTargets; ++ // We will pass empty targets and its handled in activation. ++ std::vector<std::string> httpUriTargets; + - // Setup callback for when new software detected - // Give TFTP 10 minutes to complete - monitorForSoftwareAvailable( - asyncResp, req, - "/redfish/v1/UpdateService/Actions/UpdateService.SimpleUpdate", -- 600); -+ httpUriTargets, 600); + // Setup callback for when new software detected + // Give TFTP 10 minutes to complete + monitorForSoftwareAvailable( + asyncResp, req, + "/redfish/v1/UpdateService/Actions/UpdateService.SimpleUpdate", +- 600); ++ httpUriTargets, 600); - // TFTP can take up to 10 minutes depending on image size and - // connection speed. Return to caller as soon as the TFTP operation -@@ -516,7 +624,8 @@ class UpdateServiceActionsSimpleUpdate : public Node - class UpdateService : public Node - { - public: -- UpdateService(App& app) : Node(app, "/redfish/v1/UpdateService/") -+ UpdateService(App& app) : -+ Node(app, "/redfish/v1/UpdateService/"), httpPushUriTargetBusy(false) - { - entityPrivileges = { - {boost::beast::http::verb::get, {{"Login"}}}, -@@ -528,6 +637,8 @@ class UpdateService : public Node - } - - private: -+ std::vector<std::string> httpPushUriTargets; -+ bool httpPushUriTargetBusy; - void doGet(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, - const crow::Request&, const std::vector<std::string>&) override - { -@@ -538,6 +649,9 @@ class UpdateService : public Node - asyncResp->res.jsonValue["Description"] = "Service for Software Update"; - asyncResp->res.jsonValue["Name"] = "Update Service"; - asyncResp->res.jsonValue["HttpPushUri"] = "/redfish/v1/UpdateService"; -+ asyncResp->res.jsonValue["HttpPushUriTargets"] = httpPushUriTargets; -+ asyncResp->res.jsonValue["HttpPushUriTargetsBusy"] = -+ httpPushUriTargetBusy; - // UpdateService cannot be disabled - asyncResp->res.jsonValue["ServiceEnabled"] = true; - asyncResp->res.jsonValue["FirmwareInventory"] = { -@@ -587,6 +701,32 @@ class UpdateService : public Node - "/xyz/openbmc_project/software/apply_time", - "org.freedesktop.DBus.Properties", "Get", - "xyz.openbmc_project.Software.ApplyTime", "RequestedApplyTime"); + // TFTP can take up to 10 minutes depending on image size and + // connection speed. Return to caller as soon as the TFTP operation +@@ -522,6 +632,9 @@ inline void requestRoutesUpdateService(App& app) + asyncResp->res.jsonValue["Name"] = "Update Service"; + asyncResp->res.jsonValue["HttpPushUri"] = + "/redfish/v1/UpdateService"; ++ asyncResp->res.jsonValue["HttpPushUriTargets"] = httpPushUriTargets; ++ asyncResp->res.jsonValue["HttpPushUriTargetsBusy"] = ++ httpPushUriTargetBusy; + // UpdateService cannot be disabled + asyncResp->res.jsonValue["ServiceEnabled"] = true; + asyncResp->res.jsonValue["FirmwareInventory"] = { +@@ -536,7 +649,8 @@ inline void requestRoutesUpdateService(App& app) + asyncResp->res + .jsonValue["Actions"]["#UpdateService.SimpleUpdate"]; + updateSvcSimpleUpdate["target"] = +- "/redfish/v1/UpdateService/Actions/UpdateService.SimpleUpdate"; ++ "/redfish/v1/UpdateService/Actions/" ++ "UpdateService.SimpleUpdate"; + updateSvcSimpleUpdate["TransferProtocol@Redfish.AllowableValues"] = + {"TFTP"}; + #endif +@@ -578,89 +692,258 @@ inline void requestRoutesUpdateService(App& app) + "/xyz/openbmc_project/software/apply_time", + "org.freedesktop.DBus.Properties", "Get", + "xyz.openbmc_project.Software.ApplyTime", "RequestedApplyTime"); + -+ // Get the ApplyOptions value -+ crow::connections::systemBus->async_method_call( -+ [asyncResp](const boost::system::error_code ec, -+ const std::variant<bool> applyOption) { -+ if (ec) -+ { -+ BMCWEB_LOG_DEBUG << "DBUS response error " << ec; -+ messages::internalError(asyncResp->res); -+ return; -+ } ++ // Get the ApplyOptions value ++ crow::connections::systemBus->async_method_call( ++ [asyncResp](const boost::system::error_code ec, ++ const std::variant<bool> applyOption) { ++ if (ec) ++ { ++ BMCWEB_LOG_DEBUG << "DBUS response error " << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } + -+ const bool* b = std::get_if<bool>(&applyOption); ++ const bool* b = std::get_if<bool>(&applyOption); + -+ if (b) -+ { -+ asyncResp->res -+ .jsonValue["Oem"]["ApplyOptions"]["@odata.type"] = -+ "#OemUpdateService.ApplyOptions"; -+ asyncResp->res -+ .jsonValue["Oem"]["ApplyOptions"]["ClearConfig"] = *b; -+ } -+ }, -+ "xyz.openbmc_project.Software.BMC.Updater", -+ "/xyz/openbmc_project/software", "org.freedesktop.DBus.Properties", -+ "Get", "xyz.openbmc_project.Software.ApplyOptions", "ClearConfig"); - } - - void doPatch(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -@@ -596,12 +736,61 @@ class UpdateService : public Node - BMCWEB_LOG_DEBUG << "doPatch..."; - - std::optional<nlohmann::json> pushUriOptions; -+ std::optional<std::vector<std::string>> imgTargets; -+ std::optional<bool> imgTargetBusy; -+ std::optional<nlohmann::json> oemProps; ++ if (b) ++ { ++ asyncResp->res ++ .jsonValue["Oem"]["ApplyOptions"]["@odata.type"] = ++ "#OemUpdateService.ApplyOptions"; ++ asyncResp->res ++ .jsonValue["Oem"]["ApplyOptions"]["ClearConfig"] = ++ *b; ++ } ++ }, ++ "xyz.openbmc_project.Software.BMC.Updater", ++ "/xyz/openbmc_project/software", ++ "org.freedesktop.DBus.Properties", "Get", ++ "xyz.openbmc_project.Software.ApplyOptions", "ClearConfig"); + }); + - if (!json_util::readJson(req, asyncResp->res, "HttpPushUriOptions", -- pushUriOptions)) -+ pushUriOptions, "HttpPushUriTargets", -+ imgTargets, "HttpPushUriTargetsBusy", -+ imgTargetBusy, "Oem", oemProps)) - { -+ BMCWEB_LOG_DEBUG << "UpdateService doPatch: Invalid request body"; - return; - } - -+ if (oemProps) -+ { -+ std::optional<nlohmann::json> applyOptions; + BMCWEB_ROUTE(app, "/redfish/v1/UpdateService/") + .privileges(redfish::privileges::patchUpdateService) +- .methods(boost::beast::http::verb::patch)( +- [](const crow::Request& req, +- const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { +- BMCWEB_LOG_DEBUG << "doPatch..."; ++ .methods( ++ boost::beast::http::verb:: ++ patch)([](const crow::Request& req, ++ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { ++ BMCWEB_LOG_DEBUG << "doPatch..."; + -+ if (!json_util::readJson(*oemProps, asyncResp->res, "ApplyOptions", -+ applyOptions)) ++ std::optional<nlohmann::json> pushUriOptions; ++ std::optional<std::vector<std::string>> imgTargets; ++ std::optional<bool> imgTargetBusy; ++ std::optional<nlohmann::json> oemProps; ++ if (!json_util::readJson(req, asyncResp->res, "HttpPushUriOptions", ++ pushUriOptions, "HttpPushUriTargets", ++ imgTargets, "HttpPushUriTargetsBusy", ++ imgTargetBusy, "Oem", oemProps)) + { ++ BMCWEB_LOG_DEBUG ++ << "UpdateService doPatch: Invalid request body"; + return; + } + -+ if (applyOptions) ++ if (oemProps) + { -+ std::optional<bool> clearConfig; -+ if (!json_util::readJson(*applyOptions, asyncResp->res, -+ "ClearConfig", clearConfig)) ++ std::optional<nlohmann::json> applyOptions; ++ ++ if (!json_util::readJson(*oemProps, asyncResp->res, ++ "ApplyOptions", applyOptions)) + { + return; + } + -+ if (clearConfig) ++ if (applyOptions) + { -+ // Set the requested image apply time value -+ crow::connections::systemBus->async_method_call( -+ [asyncResp](const boost::system::error_code ec) { -+ if (ec) -+ { -+ BMCWEB_LOG_ERROR << "D-Bus responses error: " -+ << ec; -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ messages::success(asyncResp->res); -+ }, -+ "xyz.openbmc_project.Software.BMC.Updater", -+ "/xyz/openbmc_project/software", -+ "org.freedesktop.DBus.Properties", "Set", -+ "xyz.openbmc_project.Software.ApplyOptions", -+ "ClearConfig", std::variant<bool>{*clearConfig}); ++ std::optional<bool> clearConfig; ++ if (!json_util::readJson(*applyOptions, asyncResp->res, ++ "ClearConfig", clearConfig)) ++ { ++ return; ++ } + +- std::optional<nlohmann::json> pushUriOptions; +- if (!json_util::readJson(req, asyncResp->res, +- "HttpPushUriOptions", pushUriOptions)) ++ if (clearConfig) ++ { ++ // Set the requested image apply time value ++ crow::connections::systemBus->async_method_call( ++ [asyncResp](const boost::system::error_code ec) { ++ if (ec) ++ { ++ BMCWEB_LOG_ERROR ++ << "D-Bus responses error: " << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ messages::success(asyncResp->res); ++ }, ++ "xyz.openbmc_project.Software.BMC.Updater", ++ "/xyz/openbmc_project/software", ++ "org.freedesktop.DBus.Properties", "Set", ++ "xyz.openbmc_project.Software.ApplyOptions", ++ "ClearConfig", std::variant<bool>{*clearConfig}); ++ } + } + } -+ } -+ - if (pushUriOptions) - { - std::optional<nlohmann::json> pushUriApplyTime; -@@ -666,6 +855,98 @@ class UpdateService : public Node - } - } - } -+ -+ if (imgTargetBusy) -+ { -+ if ((httpPushUriTargetBusy) && (*imgTargetBusy)) ++ if (pushUriOptions) + { -+ BMCWEB_LOG_DEBUG -+ << "Other client has reserved the HttpPushUriTargets " -+ "property for firmware updates."; -+ messages::resourceInUse(asyncResp->res); -+ return; ++ std::optional<nlohmann::json> pushUriApplyTime; ++ if (!json_util::readJson(*pushUriOptions, asyncResp->res, ++ "HttpPushUriApplyTime", ++ pushUriApplyTime)) + { + return; + } + +- if (pushUriOptions) ++ if (pushUriApplyTime) + { +- std::optional<nlohmann::json> pushUriApplyTime; +- if (!json_util::readJson(*pushUriOptions, asyncResp->res, +- "HttpPushUriApplyTime", +- pushUriApplyTime)) ++ std::optional<std::string> applyTime; ++ if (!json_util::readJson(*pushUriApplyTime, asyncResp->res, ++ "ApplyTime", applyTime)) + { + return; + } + +- if (pushUriApplyTime) ++ if (applyTime) + { +- std::optional<std::string> applyTime; +- if (!json_util::readJson(*pushUriApplyTime, +- asyncResp->res, "ApplyTime", +- applyTime)) ++ std::string applyTimeNewVal; ++ if (applyTime == "Immediate") ++ { ++ applyTimeNewVal = ++ "xyz.openbmc_project.Software.ApplyTime." ++ "RequestedApplyTimes.Immediate"; ++ } ++ else if (applyTime == "OnReset") + { ++ applyTimeNewVal = ++ "xyz.openbmc_project.Software.ApplyTime." ++ "RequestedApplyTimes.OnReset"; ++ } ++ else ++ { ++ BMCWEB_LOG_INFO ++ << "ApplyTime value is not in the list of " ++ "acceptable values"; ++ messages::propertyValueNotInList( ++ asyncResp->res, *applyTime, "ApplyTime"); + return; + } + +- if (applyTime) ++ // Set the requested image apply time value ++ crow::connections::systemBus->async_method_call( ++ [asyncResp](const boost::system::error_code ec) { ++ if (ec) ++ { ++ BMCWEB_LOG_ERROR ++ << "D-Bus responses error: " << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ messages::success(asyncResp->res); ++ }, ++ "xyz.openbmc_project.Settings", ++ "/xyz/openbmc_project/software/apply_time", ++ "org.freedesktop.DBus.Properties", "Set", ++ "xyz.openbmc_project.Software.ApplyTime", ++ "RequestedApplyTime", ++ std::variant<std::string>{applyTimeNewVal}); ++ } ++ } + } -+ -+ if (imgTargets) ++ if (imgTargetBusy) + { -+ if (!(*imgTargetBusy)) ++ if ((httpPushUriTargetBusy) && (*imgTargetBusy)) + { + BMCWEB_LOG_DEBUG -+ << "UpdateService doPatch: httpPushUriTargetBusy " -+ "should be " -+ "true before setting httpPushUriTargets"; -+ messages::invalidObject(asyncResp->res, -+ "HttpPushUriTargetsBusy"); ++ << "Other client has reserved the HttpPushUriTargets " ++ "property for firmware updates."; ++ messages::resourceInUse(asyncResp->res); + return; + } -+ if ((*imgTargets).size() != 0) ++ ++ if (imgTargets) + { -+ // TODO: Now we support max one target becuase -+ // software-manager code support one activation per object. -+ // It will be enhanced to multiple targets for single image -+ // in future. For now, consider first target alone. -+ if ((*imgTargets).size() != 1) ++ if (!(*imgTargetBusy)) + { ++ BMCWEB_LOG_DEBUG ++ << "UpdateService doPatch: httpPushUriTargetBusy " ++ "should be " ++ "true before setting httpPushUriTargets"; + messages::invalidObject(asyncResp->res, -+ "HttpPushUriTargets"); ++ "HttpPushUriTargetsBusy"); + return; + } -+ crow::connections::systemBus->async_method_call( -+ [this, asyncResp, uriTargets{*imgTargets}, -+ targetBusy{*imgTargetBusy}]( -+ const boost::system::error_code ec, -+ const std::vector<std::string> swInvPaths) { -+ if (ec) -+ { -+ return; -+ } -+ -+ bool swInvObjFound = false; -+ for (const std::string& path : swInvPaths) -+ { -+ std::size_t idPos = path.rfind("/"); -+ if ((idPos == std::string::npos) || -+ ((idPos + 1) >= path.size())) ++ if ((*imgTargets).size() != 0) ++ { ++ // TODO: Now we support max one target becuase ++ // software-manager code support one activation per ++ // object. It will be enhanced to multiple targets for ++ // single image in future. For now, consider first ++ // target alone. ++ if ((*imgTargets).size() != 1) + { +- std::string applyTimeNewVal; +- if (applyTime == "Immediate") +- { +- applyTimeNewVal = +- "xyz.openbmc_project.Software.ApplyTime." +- "RequestedApplyTimes.Immediate"; +- } +- else if (applyTime == "OnReset") +- { +- applyTimeNewVal = +- "xyz.openbmc_project.Software.ApplyTime." +- "RequestedApplyTimes.OnReset"; +- } +- else +- { +- BMCWEB_LOG_INFO +- << "ApplyTime value is not in the list of " +- "acceptable values"; +- messages::propertyValueNotInList( +- asyncResp->res, *applyTime, "ApplyTime"); +- return; +- } ++ messages::invalidObject(asyncResp->res, ++ "HttpPushUriTargets"); ++ return; ++ } ++ crow::connections::systemBus->async_method_call( ++ [asyncResp, uriTargets{*imgTargets}, ++ targetBusy{*imgTargetBusy}]( ++ const boost::system::error_code ec, ++ const std::vector<std::string> swInvPaths) { ++ if (ec) + { -+ messages::internalError(asyncResp->res); -+ BMCWEB_LOG_DEBUG -+ << "Can't parse firmware ID!!"; + return; + } -+ std::string swId = path.substr(idPos + 1); + +- // Set the requested image apply time value +- crow::connections::systemBus->async_method_call( +- [asyncResp]( +- const boost::system::error_code ec) { +- if (ec) ++ bool swInvObjFound = false; ++ for (const std::string& path : swInvPaths) ++ { ++ std::size_t idPos = path.rfind("/"); ++ if ((idPos == std::string::npos) || ++ ((idPos + 1) >= path.size())) + { +- BMCWEB_LOG_ERROR +- << "D-Bus responses error: " << ec; + messages::internalError(asyncResp->res); ++ BMCWEB_LOG_DEBUG ++ << "Can't parse firmware ID!!"; + return; + } +- messages::success(asyncResp->res); +- }, +- "xyz.openbmc_project.Settings", +- "/xyz/openbmc_project/software/apply_time", +- "org.freedesktop.DBus.Properties", "Set", +- "xyz.openbmc_project.Software.ApplyTime", +- "RequestedApplyTime", +- std::variant<std::string>{applyTimeNewVal}); +- } ++ std::string swId = path.substr(idPos + 1); + -+ if (swId == uriTargets[0]) ++ if (swId == uriTargets[0]) ++ { ++ swInvObjFound = true; ++ break; ++ } ++ } ++ if (!swInvObjFound) + { -+ swInvObjFound = true; -+ break; ++ messages::invalidObject( ++ asyncResp->res, "HttpPushUriTargets"); ++ return; + } -+ } -+ if (!swInvObjFound) -+ { -+ messages::invalidObject(asyncResp->res, -+ "HttpPushUriTargets"); -+ return; -+ } -+ this->httpPushUriTargetBusy = targetBusy; -+ this->httpPushUriTargets = uriTargets; -+ }, -+ "xyz.openbmc_project.ObjectMapper", -+ "/xyz/openbmc_project/object_mapper", -+ "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths", -+ "/", static_cast<int32_t>(0), -+ std::array<const char*, 1>{versionIntf}); -+ } ++ httpPushUriTargetBusy = targetBusy; ++ httpPushUriTargets = uriTargets; ++ }, ++ "xyz.openbmc_project.ObjectMapper", ++ "/xyz/openbmc_project/object_mapper", ++ "xyz.openbmc_project.ObjectMapper", ++ "GetSubTreePaths", "/", static_cast<int32_t>(0), ++ std::array<const char*, 1>{versionIntf}); ++ } ++ else ++ { ++ httpPushUriTargetBusy = *imgTargetBusy; ++ httpPushUriTargets = *imgTargets; + } + } +- }); + else + { + httpPushUriTargetBusy = *imgTargetBusy; -+ httpPushUriTargets = *imgTargets; + } + } -+ else -+ { -+ httpPushUriTargetBusy = *imgTargetBusy; -+ } -+ } - } - - void doPost(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -@@ -675,8 +956,8 @@ class UpdateService : public Node - BMCWEB_LOG_DEBUG << "doPost..."; ++ }); ++ + BMCWEB_ROUTE(app, "/redfish/v1/UpdateService/") + .privileges(redfish::privileges::postUpdateService) + .methods(boost::beast::http::verb::post)( +@@ -670,7 +953,8 @@ inline void requestRoutesUpdateService(App& app) - // Setup callback for when new software detected -- monitorForSoftwareAvailable(asyncResp, req, -- "/redfish/v1/UpdateService"); -+ monitorForSoftwareAvailable(asyncResp, req, "/redfish/v1/UpdateService", -+ httpPushUriTargets); + // Setup callback for when new software detected + monitorForSoftwareAvailable(asyncResp, req, +- "/redfish/v1/UpdateService"); ++ "/redfish/v1/UpdateService", ++ httpPushUriTargets); - std::string filepath( - "/tmp/images/" + -@@ -759,7 +1040,7 @@ class SoftwareInventoryCollection : public Node - "/xyz/openbmc_project/object_mapper", - "xyz.openbmc_project.ObjectMapper", "GetSubTree", - "/xyz/openbmc_project/software", static_cast<int32_t>(0), -- std::array<const char*, 1>{"xyz.openbmc_project.Software.Version"}); -+ std::array<const char*, 1>{versionIntf}); - } - }; + std::string filepath("/tmp/images/" + + boost::uuids::to_string( +@@ -683,7 +967,7 @@ inline void requestRoutesUpdateService(App& app) + out.close(); + BMCWEB_LOG_DEBUG << "file upload complete!!"; + }); +-} ++} // namespace redfish -@@ -940,7 +1221,7 @@ class SoftwareInventory : public Node - }, - obj.second[0].first, obj.first, - "org.freedesktop.DBus.Properties", "GetAll", -- "xyz.openbmc_project.Software.Version"); -+ versionIntf); - } - if (!found) - { -@@ -961,8 +1242,7 @@ class SoftwareInventory : public Node - "xyz.openbmc_project.ObjectMapper", - "/xyz/openbmc_project/object_mapper", - "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", -- static_cast<int32_t>(0), -- std::array<const char*, 1>{"xyz.openbmc_project.Software.Version"}); -+ static_cast<int32_t>(0), std::array<const char*, 1>{versionIntf}); - } - }; + inline void requestRoutesSoftwareInventoryCollection(App& app) + { +@@ -746,8 +1030,7 @@ inline void requestRoutesSoftwareInventoryCollection(App& app) + "/xyz/openbmc_project/object_mapper", + "xyz.openbmc_project.ObjectMapper", "GetSubTree", + "/xyz/openbmc_project/software", static_cast<int32_t>(0), +- std::array<const char*, 1>{ +- "xyz.openbmc_project.Software.Version"}); ++ std::array<const char*, 1>{versionIntf}); + }); + } + /* Fill related item links (i.e. bmc, bios) in for inventory */ +@@ -911,7 +1194,7 @@ inline void requestRoutesSoftwareInventory(App& app) + }, + obj.second[0].first, obj.first, + "org.freedesktop.DBus.Properties", "GetAll", +- "xyz.openbmc_project.Software.Version"); ++ versionIntf); + } + if (!found) + { +@@ -935,8 +1218,7 @@ inline void requestRoutesSoftwareInventory(App& app) + "/xyz/openbmc_project/object_mapper", + "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", + static_cast<int32_t>(0), +- std::array<const char*, 1>{ +- "xyz.openbmc_project.Software.Version"}); ++ std::array<const char*, 1>{versionIntf}); + }); + } diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml -index 9d9fd1f..6cbc0d1 100644 +index eba38bf..876ebfb 100644 --- a/static/redfish/v1/$metadata/index.xml +++ b/static/redfish/v1/$metadata/index.xml -@@ -2145,6 +2145,9 @@ +@@ -2346,6 +2346,9 @@ <edmx:Reference Uri="/redfish/v1/schema/OemComputerSystem_v1.xml"> <edmx:Include Namespace="OemComputerSystem"/> </edmx:Reference> diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0010-managers-add-attributes-for-Manager.CommandShell.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0010-managers-add-attributes-for-Manager.CommandShell.patch index d962d3872..e54e495bb 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0010-managers-add-attributes-for-Manager.CommandShell.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0010-managers-add-attributes-for-Manager.CommandShell.patch @@ -1,6 +1,6 @@ -From b5e4edfc26eec245427d3435de9acaa9363ae836 Mon Sep 17 00:00:00 2001 -From: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> -Date: Mon, 28 Dec 2020 18:55:57 +0000 +From 971aa5058ac4bb626eeadf8b00738737748ed549 Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Tue, 29 Jun 2021 15:25:38 +0000 Subject: [PATCH] managers: add attributes for Manager.CommandShell Issue: ConnectTypesSupported, ServiceEnabled and @@ -31,37 +31,30 @@ Response: .... Signed-off-by: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> +Change-Id: I2a56db912fc81064098f7aa9f4d110ac3baf361d --- - redfish-core/lib/managers.hpp | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) + redfish-core/lib/managers.hpp | 8 ++++++++ + 1 file changed, 8 insertions(+) diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp -index 67f8d99..dcbc347 100644 +index b286f19..186003b 100644 --- a/redfish-core/lib/managers.hpp +++ b/redfish-core/lib/managers.hpp -@@ -1830,6 +1830,13 @@ class Manager : public Node - asyncResp->res.jsonValue["SerialConsole"]["MaxConcurrentSessions"] = 15; - asyncResp->res.jsonValue["SerialConsole"]["ConnectTypesSupported"] = { - "IPMI", "SSH"}; +@@ -1998,6 +1998,14 @@ inline void requestRoutesManager(App& app) + 15; + asyncResp->res.jsonValue["SerialConsole"]["ConnectTypesSupported"] = + {"IPMI", "SSH"}; + -+ // Fill in CommandShell info -+ asyncResp->res.jsonValue["CommandShell"]["ServiceEnabled"] = true; -+ asyncResp->res.jsonValue["CommandShell"]["MaxConcurrentSessions"] = 4; -+ asyncResp->res.jsonValue["CommandShell"]["ConnectTypesSupported"] = { -+ "SSH", "IPMI"}; ++ // Fill in CommandShell info ++ asyncResp->res.jsonValue["CommandShell"]["ServiceEnabled"] = true; ++ asyncResp->res.jsonValue["CommandShell"]["MaxConcurrentSessions"] = ++ 4; ++ asyncResp->res.jsonValue["CommandShell"]["ConnectTypesSupported"] = ++ {"SSH", "IPMI"}; + #ifdef BMCWEB_ENABLE_KVM - // Fill in GraphicalConsole info - asyncResp->res.jsonValue["GraphicalConsole"]["ServiceEnabled"] = true; -@@ -2272,7 +2279,7 @@ class Manager : public Node - } - - std::string uuid; --}; -+}; // namespace redfish - - class ManagerCollection : public Node - { + // Fill in GraphicalConsole info + asyncResp->res.jsonValue["GraphicalConsole"]["ServiceEnabled"] = -- -2.17.1 +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0019-Add-generic-message-PropertySizeExceeded.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0019-Add-generic-message-PropertySizeExceeded.patch index 756ea24d7..028119249 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0019-Add-generic-message-PropertySizeExceeded.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0019-Add-generic-message-PropertySizeExceeded.patch @@ -1,6 +1,6 @@ -From da893566ec02aefe235685f1b6742269aab37909 Mon Sep 17 00:00:00 2001 -From: Nitin Wankhade <nitinx.arunrao.wankhade@intel.com> -Date: Thu, 24 Jun 2021 15:29:24 +0000 +From 2b865ad20ce0616b79a453d1571976bb2303050c Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Wed, 14 Jul 2021 13:55:27 +0000 Subject: [PATCH] Add generic message - PropertySizeExceeded Adding a generic error message "PropertySizeExceeded" @@ -19,13 +19,13 @@ Signed-off-by: Nitin Wankhade <nitinx.arunrao.wankhade@intel.com> 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/redfish-core/include/error_messages.hpp b/redfish-core/include/error_messages.hpp -index 922dae9..586246c 100644 +index 922dae9..f29e326 100644 --- a/redfish-core/include/error_messages.hpp +++ b/redfish-core/include/error_messages.hpp @@ -222,6 +222,18 @@ nlohmann::json propertyValueFormatError(const std::string& arg1, void propertyValueFormatError(crow::Response& res, const std::string& arg1, const std::string& arg2); - + +/** + * @brief Formats PropertySizeExceeded message into JSON + * Message body: "The property <arg1> is too long. The value exceeds its size @@ -42,19 +42,19 @@ index 922dae9..586246c 100644 * @brief Formats PropertyValueNotInList message into JSON * Message body: "The value <arg1> for the property <arg2> is not in the list of diff --git a/redfish-core/include/registries/base_message_registry.hpp b/redfish-core/include/registries/base_message_registry.hpp -index 7c385a0..79d324e 100644 +index 58156c8..ab9b046 100644 --- a/redfish-core/include/registries/base_message_registry.hpp +++ b/redfish-core/include/registries/base_message_registry.hpp @@ -36,7 +36,7 @@ const Header header = { constexpr const char* url = - "https://redfish.dmtf.org/registries/Base.1.8.1.json"; - --constexpr std::array<MessageEntry, 74> registry = { -+constexpr std::array<MessageEntry, 75> registry = { + "https://redfish.dmtf.org/registries/Base.1.10.0.json"; + +-constexpr std::array<MessageEntry, 87> registry = { ++constexpr std::array<MessageEntry, 88> registry = { MessageEntry{ "AccessDenied", { -@@ -592,6 +592,21 @@ constexpr std::array<MessageEntry, 74> registry = { +@@ -664,6 +664,21 @@ constexpr std::array<MessageEntry, 87> registry = { "Remove the property from the request body and resubmit " "the request if the operation failed.", }}, @@ -77,13 +77,13 @@ index 7c385a0..79d324e 100644 { "Indicates that an unknown property was included in the " diff --git a/redfish-core/src/error_messages.cpp b/redfish-core/src/error_messages.cpp -index 409adb1..11e59be 100644 +index 409adb1..bebb6d8 100644 --- a/redfish-core/src/error_messages.cpp +++ b/redfish-core/src/error_messages.cpp @@ -514,6 +514,33 @@ void propertyValueFormatError(crow::Response& res, const std::string& arg1, addMessageToJson(res.jsonValue, propertyValueFormatError(arg1, arg2), arg2); } - + +/** + * @internal + * @brief Formats PropertySizeExceeded message into JSON for the specified @@ -114,5 +114,6 @@ index 409adb1..11e59be 100644 /** * @internal * @brief Formats PropertyValueNotInList message into JSON for the specified -2.17.1 +-- +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0020-Redfish-Deny-set-AccountLockDuration-to-zero.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0020-Redfish-Deny-set-AccountLockDuration-to-zero.patch new file mode 100644 index 000000000..cc9da3b8b --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0020-Redfish-Deny-set-AccountLockDuration-to-zero.patch @@ -0,0 +1,85 @@ +From f75efac9eebea8bf8f548d10a8cbafa28f556a8f Mon Sep 17 00:00:00 2001 +From: Meera-Katta <meerax.katta@linux.intel.com> +Date: Wed, 7 Jul 2021 13:19:09 +0000 +Subject: [PATCH] Redfish: Deny set AccountLockDuration to zero +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Issue: Redfish schema says, no lockout shall occur in case of Account +LockoutDuration value is zero. But Linux PAM module documentation says, if +account lockout value is zero, account will be locked out indefinitely +after the number of failed login attempts. As per the current +implementation user can write any value into the PAM module. If user tried +to set unlock timeout value to zero, account will be locked out +indefinitely until administrator explicitly reenables it. + +Workaround: Denying user to set AccountLockDuration to zero from Redfish. +Setting ‘AccountLockDuration’ to 0 will be permitted only after +‘AccountLockoutCounterResetEnabled’ support is added. +Otherwise,account will be locked permanently after the AccountLockoutDuration +if ‘AccountLockDuration’ is set to zero, while +AccountLockoutThreshold is non zero. If someone wants no account lockout +irrespective of number of failed login attempts, it can be still achieved by +setting ‘AccountLockoutThreshold’ to zero +(instead of trying to set ‘AccountLockDuration’ to zero.) + +Tested: +1) Redfish Service Validator passed for this change. +2) Verified from Redfish +PATCH : https://<BMC IP>/redfish/v1/AccountService +Body: +{"AccountLockoutDuration":0} + +Response: +{ + "AccountLockoutDuration@Message.ExtendedInfo": [ + { + "@odata.type": "#Message.v1_1_1.Message", + "Message": "The value unlockTimeout for the property + AccountLockoutDuration is not in the list of acceptable values.", + "MessageArgs": [ + "unlockTimeout", + "AccountLockoutDuration" + ], + "MessageId": "Base.1.8.1.PropertyValueNotInList", + "MessageSeverity": "Warning", + "Resolution": "Choose a value from the enumeration list that the + implementation can support and resubmit the request if the + operation failed." + } + ] +} + +Signed-off-by: Meera-Katta <meerax.katta@linux.intel.com> +--- + redfish-core/lib/account_service.hpp | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/redfish-core/lib/account_service.hpp b/redfish-core/lib/account_service.hpp +index e6fe205..42085fa 100644 +--- a/redfish-core/lib/account_service.hpp ++++ b/redfish-core/lib/account_service.hpp +@@ -1448,6 +1448,19 @@ inline void requestAccountServiceRoutes(App& app) + + if (unlockTimeout) + { ++ // Account will be locked permanently after the N number ++ // of failed login attempts if we set unlockTimeout value ++ // to be 0. ++ if (unlockTimeout.value() == 0) ++ { ++ BMCWEB_LOG_INFO ++ << "Unlock timeout value must be greater" ++ "than zero"; ++ messages::propertyValueNotInList(asyncResp->res, ++ "unlockTimeout", ++ "AccountLockoutDuration"); ++ return; ++ } + crow::connections::systemBus->async_method_call( + [asyncResp](const boost::system::error_code ec) { + if (ec) +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0021-Add-message-registry-entry-for-FirmwareResiliencyErr.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0021-Add-message-registry-entry-for-FirmwareResiliencyErr.patch new file mode 100644 index 000000000..2b8f8987c --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0021-Add-message-registry-entry-for-FirmwareResiliencyErr.patch @@ -0,0 +1,84 @@ +From 35c9f6f0f4e1254f0512154cc46116d8047fe19b Mon Sep 17 00:00:00 2001 +From: Chalapathi Venkataramashetty <chalapathix.venkataramashetty@intel.com> +Date: Wed, 14 Jul 2021 20:44:06 +0000 +Subject: [PATCH] Add message registry entry for FirmwareResiliencyError + +Add an event log in redfish when firmware update failed due to +FirmwareResiliencyError. + +The existing message entries BMCFirmwareResiliencyError(for BMC update +failures) and BIOSFirmwareResiliencyError(for BIOS update failures) are +not useful for the new platform. The new platform's CPLD report common +error code for BMC, PCH or CPLD firmware update failures. Hence a common +message entry is required to capture the firmware update failure events. + +This event is Implemented in the following review. +https://gerrit.openbmc-project.xyz/c/openbmc/pfr-manager/+/43281 + +Tested: +Redfish Service Validator passed for this change. + +Update BMC firmware with mismatched SVN +POST: https://<BMC_IP>/redfish/v1/UpdateService/ + with <BMC_Update_Capsule> binary file +After BMC reboots check for Event log in Redfish +Command: GET: https://<BMC_IP>/redfish/v1/Systems/system/LogServices/ + EventLog/Entries +Response: +{ + "@odata.id": "/redfish/v1/Systems/system/LogServices/ + EventLog/Entries/1621435142_1", + "@odata.type": "#LogEntry.v1_4_0.LogEntry", + "Created": "2021-05-19T14:39:02+00:00", + "EntryType": "Event", + "Id": "1621435142_1", + "Message": "Firmware resiliency error. Error reason: + Firmware update failed(MinorCode:0x02).", + "MessageArgs": [ + "Firmware update failed(MinorCode:0x02)" + ], + "MessageId": "OpenBMC.0.1.FirmwareResiliencyError", + "Name": "System Event Log Entry", + "Severity": "Critical" + }, + +Signed-off-by: Chalapathi Venkataramashetty <chalapathix.venkataramashetty@intel.com> +--- + .../registries/openbmc_message_registry.hpp | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/redfish-core/include/registries/openbmc_message_registry.hpp b/redfish-core/include/registries/openbmc_message_registry.hpp +index a00d235..967713f 100644 +--- a/redfish-core/include/registries/openbmc_message_registry.hpp ++++ b/redfish-core/include/registries/openbmc_message_registry.hpp +@@ -29,7 +29,7 @@ const Header header = { + "0.2.0", + "OpenBMC", + }; +-constexpr std::array<MessageEntry, 196> registry = { ++constexpr std::array<MessageEntry, 197> registry = { + MessageEntry{ + "ADDDCCorrectable", + { +@@ -560,6 +560,18 @@ constexpr std::array<MessageEntry, 196> registry = { + {"string"}, + "None.", + }}, ++ MessageEntry{"FirmwareResiliencyError", ++ { ++ "Indicates firmware encountered resilience error.", ++ "Firmware resiliency error. Error reason: %1.", ++ "Critical", ++ "Critical", ++ 1, ++ { ++ "string", ++ }, ++ "None.", ++ }}, + MessageEntry{"FirmwareUpdateCompleted", + { + "Indicates a firmware update has completed successfully.", +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0023-Add-get-IPMI-session-id-s-to-Redfish.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0023-Add-get-IPMI-session-id-s-to-Redfish.patch new file mode 100644 index 000000000..b3feee39a --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0023-Add-get-IPMI-session-id-s-to-Redfish.patch @@ -0,0 +1,390 @@ +From 5c79e34be9357c2a2cd9bac61cd0162dbd342a2d Mon Sep 17 00:00:00 2001 +From: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> +Date: Fri, 30 Jul 2021 17:33:16 +0000 +Subject: [PATCH] Add/get IPMI session id's to Redfish + +As per existing implementation, Redfish supports to get only sessions +created on Redfish & EWS. But as per Redfish schema Redfish should +include to get IPMI sessions as well. +So add support to display IPMI session Id's as well on Redfish. +This commit will not impact any functionality/behavior of existing code. +Below functionalities implemented in this commit. +1. Get IPMI session collection +2. Get individual IPMI session information +3. Delete IPMI sessions - Respond with not supported as we can't delete + IPMI sessions from Redfish interface + +Tested: +1. Verified redfish validator passed with active IPMI session. +2. Get session details from Redfish +GET: https://<BMC-IP>/redfish/v1/SessionService/Sessions +Response: +{ + "@odata.id": "/redfish/v1/SessionService/Sessions/", + "@odata.type": "#SessionCollection.SessionCollection", + "Description": "Session Collection", + "Members": [ + { + "@odata.id": "/redfish/v1/SessionService/Sessions/TlFPbR9ZIn" + }, + { + "@odata.id": "/redfish/v1/SessionService/Sessions/184U3014ub" + }, + { + "@odata.id": "/redfish/v1/SessionService/Sessions/cV0xi5QoPy" + }, + { + "@odata.id": "/redfish/v1/SessionService/Sessions/8f6234d7_81" + } + ], + "Members@odata.count": 4, + "Name": "Session Collection" +} + +3. Get session details from RedFish +Case 1: RedFish session +GET: https://<BMC-IP>/redfish/v1/SessionService/Sessions/TlFPbR9ZIn +Response: +{ + "@odata.id": "/redfish/v1/SessionService/Sessions/TlFPbR9ZIn", + "@odata.type": "#Session.v1_3_0.Session", + "ClientOriginIPAddress": "::ffff:10.213.91.40", + "Description": "Manager User Session", + "Id": "TlFPbR9ZIn", + "Name": "User Session", + "UserName": "root" +} +Case 2: IPMI session +Verified and displayed IPMI session details on RedFish. +GET: https://<BMC-IP>/redfish/v1/SessionService/Sessions/8f6234d7_81 +Response: +{ + "@odata.id": "/redfish/v1/SessionService/Sessions/8f6234d7_81", + "@odata.type": "#Session.v1_3_0.Session", + "ClientOriginIPAddress": "xx.xx.xx.xx", + "Description": "Manager User Session", + "Id": "8f6234d7_81", + "Name": "User Session", + "UserName": "root" +} +4. Delete IPMI session: +Verified IPMI session is not allowed to delete from Redfish +DELETE: https://<BMC-IP>/redfish/v1/SessionService/Sessions/8f6234d7_81 +Response: +{ + "error": { + "@Message.ExtendedInfo": [ + { + "@odata.type": "#Message.v1_1_1.Message", + "Message": "The action deleting IPMI session from + Redfish is not supported by the resource.", + "MessageArgs": [ + "deleting IPMI session from Redfish" + ], + "MessageId": "Base.1.8.1.ActionNotSupported", + "MessageSeverity": "Critical", + "Resolution": "The action supplied cannot be resubmitted + to the implementation. Perhaps the action was invalid, + the wrong resource was the target or the implementation + documentation may be of assistance." + } + ], + "code": "Base.1.8.1.ActionNotSupported", + "message": "The action deleting IPMI session from Redfish is not + supported by the resource." + } +} +5. Delete RedFish session +Result: successfully deleted valid RedFish session. + +Signed-off-by: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> +--- + redfish-core/lib/redfish_sessions.hpp | 244 +++++++++++++++++++++++--- + 1 file changed, 222 insertions(+), 22 deletions(-) + +diff --git a/redfish-core/lib/redfish_sessions.hpp b/redfish-core/lib/redfish_sessions.hpp +index 929e0c8..3c7a968 100644 +--- a/redfish-core/lib/redfish_sessions.hpp ++++ b/redfish-core/lib/redfish_sessions.hpp +@@ -56,14 +56,127 @@ inline void requestRoutesSession(App& app) + auto session = persistent_data::SessionStore::getInstance() + .getSessionByUid(sessionId); + +- if (session == nullptr) ++ if (session) + { +- messages::resourceNotFound(asyncResp->res, "Session", +- sessionId); ++ fillSessionObject(asyncResp->res, *session); + return; + } + +- fillSessionObject(asyncResp->res, *session); ++ std::array<std::string, 1> interfaces = { ++ "xyz.openbmc_project.Ipmi.SessionInfo"}; ++ crow::connections::systemBus->async_method_call( ++ [asyncResp, sessionId](const boost::system::error_code ec, ++ const GetSubTreeType& subtree) { ++ if (ec) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Error in querying GetSubTree with " ++ "Object Mapper. " ++ << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ if (subtree.size() == 0) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Can't find Session Info Attributes!"; ++ messages::resourceNotFound(asyncResp->res, ++ "Session", sessionId); ++ return; ++ } ++ bool ipmiSessionFound = false; ++ std::string ipmiSessionService; ++ std::string ipmiSessionInfPath; ++ for (const auto& [ipmiSessionPath, object] : subtree) ++ { ++ if (ipmiSessionPath.empty() || object.empty()) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Session Info Attributes mapper error!"; ++ continue; ++ } ++ if (!boost::ends_with(ipmiSessionPath, sessionId)) ++ { ++ continue; ++ } ++ ipmiSessionFound = true; ++ ipmiSessionService = object[0].first; ++ ipmiSessionInfPath = ipmiSessionPath; ++ break; ++ } ++ if (!ipmiSessionFound) ++ { ++ messages::resourceNotFound(asyncResp->res, ++ "Session", sessionId); ++ return; ++ } ++ if (ipmiSessionService.empty()) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Session Info Attributes mapper " ++ "error!"; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ crow::connections::systemBus->async_method_call( ++ [asyncResp, sessionId]( ++ const boost::system::error_code ec, ++ const std::vector<std::pair< ++ std::string, ++ std::variant<std::monostate, std::string, ++ uint32_t>>>& properties) { ++ if (ec) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Error in querying Session " ++ "Info State property " ++ << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ std::string userName = ""; ++ uint32_t remoteIpAddr; ++ try ++ { ++ sdbusplus::unpackProperties( ++ properties, "Username", userName, ++ "RemoteIPAddr", remoteIpAddr); ++ asyncResp->res.jsonValue["Id"] = sessionId; ++ asyncResp->res.jsonValue["UserName"] = ++ userName; ++ asyncResp->res.jsonValue["@odata.id"] = ++ "/redfish/v1/SessionService/" ++ "Sessions/" + ++ sessionId; ++ asyncResp->res.jsonValue["@odata.type"] = ++ "#Session.v1_3_0.Session"; ++ asyncResp->res.jsonValue["Name"] = ++ "User Session"; ++ asyncResp->res.jsonValue["Description"] = ++ "Manager User Session"; ++ struct in_addr ipAddr; ++ ipAddr.s_addr = remoteIpAddr; ++ asyncResp->res ++ .jsonValue["ClientOriginIPAddress"] = ++ inet_ntoa(ipAddr); ++ } ++ catch (const sdbusplus::exception:: ++ UnpackPropertyError& error) ++ { ++ BMCWEB_LOG_ERROR << error.what(); ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ return; ++ }, ++ ipmiSessionService, ipmiSessionInfPath, ++ "org.freedesktop.DBus.Properties", "GetAll", ++ "xyz.openbmc_project.Ipmi.SessionInfo"); ++ }, ++ "xyz.openbmc_project.ObjectMapper", ++ "/xyz/openbmc_project/object_mapper", ++ "xyz.openbmc_project.ObjectMapper", "GetSubTree", "/", 0, ++ interfaces); + }); + + BMCWEB_ROUTE(app, "/redfish/v1/SessionService/Sessions/<str>/") +@@ -75,34 +188,79 @@ inline void requestRoutesSession(App& app) + auto session = persistent_data::SessionStore::getInstance() + .getSessionByUid(sessionId); + +- if (session == nullptr) +- { +- messages::resourceNotFound(asyncResp->res, "Session", +- sessionId); +- return; +- } +- + // Perform a proper ConfigureSelf authority check. If a + // session is being used to DELETE some other user's session, + // then the ConfigureSelf privilege does not apply. In that + // case, perform the authority check again without the user's + // ConfigureSelf privilege. +- if (session->username != req.session->username) ++ if (session) + { +- Privileges effectiveUserPrivileges = +- redfish::getUserPrivileges(req.userRole); +- +- if (!effectiveUserPrivileges.isSupersetOf( +- {"ConfigureUsers"})) ++ if (session->username != req.session->username) + { +- messages::insufficientPrivilege(asyncResp->res); +- return; ++ Privileges effectiveUserPrivileges = ++ redfish::getUserPrivileges(req.userRole); ++ ++ if (!effectiveUserPrivileges.isSupersetOf( ++ {"ConfigureUsers"})) ++ { ++ messages::insufficientPrivilege(asyncResp->res); ++ return; ++ } + } ++ persistent_data::SessionStore::getInstance().removeSession( ++ session); ++ messages::success(asyncResp->res); ++ return; + } + +- persistent_data::SessionStore::getInstance().removeSession( +- session); +- messages::success(asyncResp->res); ++ std::array<std::string, 1> interfaces = { ++ "xyz.openbmc_project.Ipmi.SessionInfo"}; ++ crow::connections::systemBus->async_method_call( ++ [asyncResp, ++ sessionId](const boost::system::error_code ec, ++ const std::vector<std::string>& ifaceList) { ++ if (ec) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Error in querying GetSubTreePaths " ++ "with Object Mapper. " ++ << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ if (ifaceList.size() == 0) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Can't find Session Info Attributes!"; ++ return; ++ } ++ bool ipmiSessionFound = false; ++ for (const std::string& ipmiSessionPath : ifaceList) ++ { ++ if (!boost::ends_with(ipmiSessionPath, sessionId)) ++ { ++ continue; ++ } ++ ipmiSessionFound = true; ++ break; ++ } ++ if (ipmiSessionFound) ++ { ++ BMCWEB_LOG_DEBUG << "Deleting IPMI session from " ++ "Redfish is not allowed."; ++ messages::actionNotSupported( ++ asyncResp->res, ++ "deleting IPMI session from Redfish"); ++ return; ++ } ++ messages::resourceNotFound(asyncResp->res, "Session", ++ sessionId); ++ return; ++ }, ++ "xyz.openbmc_project.ObjectMapper", ++ "/xyz/openbmc_project/object_mapper", ++ "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths", "/", ++ 0, interfaces); + }); + + BMCWEB_ROUTE(app, "/redfish/v1/SessionService/Sessions/") +@@ -131,6 +289,48 @@ inline void requestRoutesSession(App& app) + "/redfish/v1/SessionService/Sessions/"; + asyncResp->res.jsonValue["Name"] = "Session Collection"; + asyncResp->res.jsonValue["Description"] = "Session Collection"; ++ ++ std::array<std::string, 1> interfaces = { ++ "xyz.openbmc_project.Ipmi.SessionInfo"}; ++ crow::connections::systemBus->async_method_call( ++ [asyncResp](const boost::system::error_code ec, ++ const std::vector<std::string>& ifaceList) { ++ if (ec) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Error in querying GetSubTreePaths " ++ "with Object Mapper. " ++ << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ if (ifaceList.size() == 0) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Can't find Session Info Attributes!"; ++ return; ++ } ++ for (const std::string& ipmiSessionPath : ifaceList) ++ { ++ std::filesystem::path filePath(ipmiSessionPath); ++ std::string ipmiSessionID = ++ filePath.has_filename() ? filePath.filename() ++ : ""; ++ if (!ipmiSessionID.empty() && ipmiSessionID != "0") ++ { ++ asyncResp->res.jsonValue["Members"].push_back( ++ {{"@odata.id", ++ "/redfish/v1/SessionService/Sessions/" + ++ ipmiSessionID}}); ++ } ++ } ++ asyncResp->res.jsonValue["Members@odata.count"] = ++ asyncResp->res.jsonValue["Members"].size(); ++ }, ++ "xyz.openbmc_project.ObjectMapper", ++ "/xyz/openbmc_project/object_mapper", ++ "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths", "/", ++ 0, interfaces); + }); + + BMCWEB_ROUTE(app, "/redfish/v1/SessionService/Sessions/") +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0024-Add-count-sensor-type.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0024-Add-count-sensor-type.patch new file mode 100644 index 000000000..a9a4ab151 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0024-Add-count-sensor-type.patch @@ -0,0 +1,29 @@ +From fb337f868543f72bd8ba24db3c4b09b4c1d888ab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adrian=20Ambro=C5=BCewicz?= <adrian.ambrozewicz@intel.com> +Date: Fri, 30 Jul 2021 15:25:29 +0200 +Subject: [PATCH] Add 'count' sensor type + +PMT exposes data mainly in raw counter formats. This change makes +bmcweb aware of new sensor type. + +Testing: +- values of type 'count' from PMT exposed successfully on Redfish +--- + redfish-core/lib/sensors.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp +index cb7ea15..d72a572 100644 +--- a/redfish-core/lib/sensors.hpp ++++ b/redfish-core/lib/sensors.hpp +@@ -63,6 +63,7 @@ static const boost::container::flat_map<std::string_view, + {node::sensors, + {"/xyz/openbmc_project/sensors/power", + "/xyz/openbmc_project/sensors/current", ++ "/xyz/openbmc_project/sensors/count", + "/xyz/openbmc_project/sensors/airflow", + "/xyz/openbmc_project/sensors/utilization"}}, + {node::thermal, +-- +2.25.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0025-Revert-Support-new-boot-override-setting-design.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0025-Revert-Support-new-boot-override-setting-design.patch new file mode 100644 index 000000000..e0664a350 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0025-Revert-Support-new-boot-override-setting-design.patch @@ -0,0 +1,723 @@ +From c6ed122a09b1e41b9eab0032ff428b8b1a999534 Mon Sep 17 00:00:00 2001 +From: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> +Date: Wed, 4 Aug 2021 15:50:34 -0700 +Subject: [PATCH] Revert "Support new boot override setting design" + +This reverts commit c21865c469cfc9dffdc15d87710293115cf6d9e4. + +Change-Id: Icfd03551dd9ea2fb216519d8ab05b92521838542 +Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> +--- + redfish-core/lib/systems.hpp | 493 +++++++++++++++++------------------ + 1 file changed, 245 insertions(+), 248 deletions(-) + +diff --git a/redfish-core/lib/systems.hpp b/redfish-core/lib/systems.hpp +index fc6e2c78fd1f..5ad065b3518a 100644 +--- a/redfish-core/lib/systems.hpp ++++ b/redfish-core/lib/systems.hpp +@@ -769,8 +769,11 @@ inline int assignBootParameters(const std::shared_ptr<bmcweb::AsyncResp>& aResp, + const std::string& rfSource, + std::string& bootSource, std::string& bootMode) + { +- bootSource = "xyz.openbmc_project.Control.Boot.Source.Sources.Default"; +- bootMode = "xyz.openbmc_project.Control.Boot.Mode.Modes.Regular"; ++ // The caller has initialized the bootSource and bootMode to: ++ // bootMode = "xyz.openbmc_project.Control.Boot.Mode.Modes.Regular"; ++ // bootSource = "xyz.openbmc_project.Control.Boot.Source.Sources.Default"; ++ // Only modify the bootSource/bootMode variable needed to achieve the ++ // desired boot action. + + if (rfSource == "None") + { +@@ -917,14 +920,45 @@ inline void getBootProgress(const std::shared_ptr<bmcweb::AsyncResp>& aResp) + } + + /** +- * @brief Retrieves boot override type over DBUS and fills out the response ++ * @brief Checks if the current boot override state can be considered as ++ * Disabled + * + * @param[in] aResp Shared pointer for generating response message. + * + * @return None. + */ ++inline void ++ checkIfOverrideIsDisabled(const std::shared_ptr<bmcweb::AsyncResp>& aResp) ++{ ++ // If the BootSourceOverrideTarget is still "None" at the end, ++ // reset the BootSourceOverrideEnabled to indicate that ++ // overrides are disabled ++ if (aResp->res.jsonValue["Boot"]["BootSourceOverrideTarget"] == "None") ++ { ++ // If the BootSourceOverrideMode is supported we should ++ // check if it is still "UEFI" too ++ if (aResp->res.jsonValue["Boot"].contains("BootSourceOverrideMode")) ++ { ++ if (aResp->res.jsonValue["Boot"]["BootSourceOverrideMode"] != ++ "UEFI") ++ { ++ return; ++ } ++ } ++ aResp->res.jsonValue["Boot"]["BootSourceOverrideEnabled"] = "Disabled"; ++ } ++} + +-inline void getBootOverrideType(const std::shared_ptr<bmcweb::AsyncResp>& aResp) ++/** ++ * @brief Retrieves boot type over DBUS and fills out the response ++ * ++ * @param[in] aResp Shared pointer for generating response message. ++ * @param[in] bootDbusObj The dbus object to query for boot properties. ++ * ++ * @return None. ++ */ ++inline void getBootType(const std::shared_ptr<bmcweb::AsyncResp>& aResp, ++ const std::string& bootDbusObj) + { + crow::connections::systemBus->async_method_call( + [aResp](const boost::system::error_code ec, +@@ -932,6 +966,12 @@ inline void getBootOverrideType(const std::shared_ptr<bmcweb::AsyncResp>& aResp) + if (ec) + { + // not an error, don't have to have the interface ++ ++ // Support Disabled override state in a way: ++ // "BootSourceOverrideEnabled=Disabled" = ++ // "BootSourceOverrideMode=UEFI" + ++ // "BootSourceOverrideTarget=None" ++ checkIfOverrideIsDisabled(aResp); + return; + } + +@@ -958,26 +998,31 @@ inline void getBootOverrideType(const std::shared_ptr<bmcweb::AsyncResp>& aResp) + } + + aResp->res.jsonValue["Boot"]["BootSourceOverrideMode"] = rfType; ++ ++ // Support Disabled override state in a way: ++ // "BootSourceOverrideEnabled=Disabled" = ++ // "BootSourceOverrideMode=UEFI" + "BootSourceOverrideTarget=None" ++ checkIfOverrideIsDisabled(aResp); + }, +- "xyz.openbmc_project.Settings", +- "/xyz/openbmc_project/control/host0/boot", ++ "xyz.openbmc_project.Settings", bootDbusObj, + "org.freedesktop.DBus.Properties", "Get", + "xyz.openbmc_project.Control.Boot.Type", "BootType"); + } + + /** +- * @brief Retrieves boot override mode over DBUS and fills out the response ++ * @brief Retrieves boot mode over DBUS and fills out the response + * + * @param[in] aResp Shared pointer for generating response message. ++ * @param[in] bootDbusObj The dbus object to query for boot properties. + * + * @return None. + */ +- +-inline void getBootOverrideMode(const std::shared_ptr<bmcweb::AsyncResp>& aResp) ++inline void getBootMode(const std::shared_ptr<bmcweb::AsyncResp>& aResp, ++ const std::string& bootDbusObj) + { + crow::connections::systemBus->async_method_call( +- [aResp](const boost::system::error_code ec, +- const std::variant<std::string>& bootMode) { ++ [aResp, bootDbusObj](const boost::system::error_code ec, ++ const std::variant<std::string>& bootMode) { + if (ec) + { + BMCWEB_LOG_DEBUG << "DBUS response error " << ec; +@@ -1010,27 +1055,39 @@ inline void getBootOverrideMode(const std::shared_ptr<bmcweb::AsyncResp>& aResp) + rfMode; + } + } ++ ++ // Get BootType inside this async call as we need all of the ++ // BootSource/BootMode/BootType to support ++ // "BootSourceOverrideEnabled"="Disabled" state. ++ getBootType(aResp, bootDbusObj); + }, +- "xyz.openbmc_project.Settings", +- "/xyz/openbmc_project/control/host0/boot", ++ "xyz.openbmc_project.Settings", bootDbusObj, + "org.freedesktop.DBus.Properties", "Get", + "xyz.openbmc_project.Control.Boot.Mode", "BootMode"); + } + + /** +- * @brief Retrieves boot override source over DBUS ++ * @brief Retrieves boot source over DBUS + * + * @param[in] aResp Shared pointer for generating response message. ++ * @param[in] oneTimeEnable Boolean to indicate boot properties are one-time. + * + * @return None. + */ +- +-inline void +- getBootOverrideSource(const std::shared_ptr<bmcweb::AsyncResp>& aResp) ++inline void getBootSource(const std::shared_ptr<bmcweb::AsyncResp>& aResp, ++ bool oneTimeEnabled) + { ++ std::string bootDbusObj = ++ oneTimeEnabled ? "/xyz/openbmc_project/control/host0/boot/one_time" ++ : "/xyz/openbmc_project/control/host0/boot"; ++ ++ BMCWEB_LOG_DEBUG << "Is one time: " << oneTimeEnabled; ++ aResp->res.jsonValue["Boot"]["BootSourceOverrideEnabled"] = ++ (oneTimeEnabled) ? "Once" : "Continuous"; ++ + crow::connections::systemBus->async_method_call( +- [aResp](const boost::system::error_code ec, +- const std::variant<std::string>& bootSource) { ++ [aResp, bootDbusObj](const boost::system::error_code ec, ++ const std::variant<std::string>& bootSource) { + if (ec) + { + BMCWEB_LOG_DEBUG << "DBUS response error " << ec; +@@ -1057,43 +1114,32 @@ inline void + + // Get BootMode as BootSourceOverrideTarget is constructed + // from both BootSource and BootMode +- getBootOverrideMode(aResp); ++ getBootMode(aResp, bootDbusObj); + }, +- "xyz.openbmc_project.Settings", +- "/xyz/openbmc_project/control/host0/boot", ++ "xyz.openbmc_project.Settings", bootDbusObj, + "org.freedesktop.DBus.Properties", "Get", + "xyz.openbmc_project.Control.Boot.Source", "BootSource"); + } + + /** +- * @brief This functions abstracts all the logic behind getting a +- * "BootSourceOverrideEnabled" property from an overall boot override enable +- * state ++ * @brief Retrieves "One time" enabled setting over DBUS and calls function to ++ * get boot source and boot mode. + * + * @param[in] aResp Shared pointer for generating response message. + * + * @return None. + */ +- +-inline void +- processBootOverrideEnable(const std::shared_ptr<bmcweb::AsyncResp>& aResp, +- const bool bootOverrideEnableSetting) ++inline void getBootProperties(const std::shared_ptr<bmcweb::AsyncResp>& aResp) + { +- if (!bootOverrideEnableSetting) +- { +- aResp->res.jsonValue["Boot"]["BootSourceOverrideEnabled"] = "Disabled"; +- return; +- } ++ BMCWEB_LOG_DEBUG << "Get boot information."; + +- // If boot source override is enabled, we need to check 'one_time' +- // property to set a correct value for the "BootSourceOverrideEnabled" + crow::connections::systemBus->async_method_call( + [aResp](const boost::system::error_code ec, + const std::variant<bool>& oneTime) { + if (ec) + { + BMCWEB_LOG_DEBUG << "DBUS response error " << ec; +- messages::internalError(aResp->res); ++ // not an error, don't have to have the interface + return; + } + +@@ -1104,19 +1150,7 @@ inline void + messages::internalError(aResp->res); + return; + } +- +- bool oneTimeSetting = *oneTimePtr; +- +- if (oneTimeSetting) +- { +- aResp->res.jsonValue["Boot"]["BootSourceOverrideEnabled"] = +- "Once"; +- } +- else +- { +- aResp->res.jsonValue["Boot"]["BootSourceOverrideEnabled"] = +- "Continuous"; +- } ++ getBootSource(aResp, *oneTimePtr); + }, + "xyz.openbmc_project.Settings", + "/xyz/openbmc_project/control/host0/boot/one_time", +@@ -1124,60 +1158,6 @@ inline void + "xyz.openbmc_project.Object.Enable", "Enabled"); + } + +-/** +- * @brief Retrieves boot override enable over DBUS +- * +- * @param[in] aResp Shared pointer for generating response message. +- * +- * @return None. +- */ +- +-inline void +- getBootOverrideEnable(const std::shared_ptr<bmcweb::AsyncResp>& aResp) +-{ +- crow::connections::systemBus->async_method_call( +- [aResp](const boost::system::error_code ec, +- const std::variant<bool>& bootOverrideEnable) { +- if (ec) +- { +- BMCWEB_LOG_DEBUG << "DBUS response error " << ec; +- messages::internalError(aResp->res); +- return; +- } +- +- const bool* bootOverrideEnablePtr = +- std::get_if<bool>(&bootOverrideEnable); +- +- if (!bootOverrideEnablePtr) +- { +- messages::internalError(aResp->res); +- return; +- } +- +- processBootOverrideEnable(aResp, *bootOverrideEnablePtr); +- }, +- "xyz.openbmc_project.Settings", +- "/xyz/openbmc_project/control/host0/boot", +- "org.freedesktop.DBus.Properties", "Get", +- "xyz.openbmc_project.Object.Enable", "Enabled"); +-} +- +-/** +- * @brief Retrieves boot source override properties +- * +- * @param[in] aResp Shared pointer for generating response message. +- * +- * @return None. +- */ +-inline void getBootProperties(const std::shared_ptr<bmcweb::AsyncResp>& aResp) +-{ +- BMCWEB_LOG_DEBUG << "Get boot information."; +- +- getBootOverrideSource(aResp); +- getBootOverrideType(aResp); +- getBootOverrideEnable(aResp); +-} +- + /** + * @brief Retrieves the Last Reset Time + * +@@ -1479,47 +1459,59 @@ inline void getTrustedModuleRequiredToBoot( + * @brief Sets boot properties into DBUS object(s). + * + * @param[in] aResp Shared pointer for generating response message. ++ * @param[in] overrideEnabled The source override "enable". ++ * @param[in] bootObj Path to the DBUS object. + * @param[in] bootType The boot type to set. + * @return Integer error code. + */ + inline void setBootType(const std::shared_ptr<bmcweb::AsyncResp>& aResp, ++ const bool overrideEnabled, const std::string& bootObj, + const std::optional<std::string>& bootType) + { +- std::string bootTypeStr; +- +- if (!bootType) +- { +- return; +- } ++ std::string bootTypeStr = "xyz.openbmc_project.Control.Boot.Type.Types.EFI"; + +- // Source target specified +- BMCWEB_LOG_DEBUG << "Boot type: " << *bootType; +- // Figure out which DBUS interface and property to use +- if (*bootType == "Legacy") +- { +- bootTypeStr = "xyz.openbmc_project.Control.Boot.Type.Types.Legacy"; +- } +- else if (*bootType == "UEFI") ++ if (bootType && overrideEnabled) + { +- bootTypeStr = "xyz.openbmc_project.Control.Boot.Type.Types.EFI"; +- } +- else +- { +- BMCWEB_LOG_DEBUG << "Invalid property value for " +- "BootSourceOverrideMode: " +- << *bootType; +- messages::propertyValueNotInList(aResp->res, *bootType, +- "BootSourceOverrideMode"); +- return; ++ // Source target specified ++ BMCWEB_LOG_DEBUG << "Boot type: " << *bootType; ++ // Figure out which DBUS interface and property to use ++ if (*bootType == "Legacy") ++ { ++ bootTypeStr = "xyz.openbmc_project.Control.Boot.Type.Types.Legacy"; ++ } ++ else if (*bootType == "UEFI") ++ { ++ bootTypeStr = "xyz.openbmc_project.Control.Boot.Type.Types.EFI"; ++ } ++ else ++ { ++ BMCWEB_LOG_DEBUG << "Invalid property value for " ++ "BootSourceOverrideMode: " ++ << *bootType; ++ messages::propertyValueNotInList(aResp->res, *bootType, ++ "BootSourceOverrideMode"); ++ return; ++ } + } + + // Act on validated parameters + BMCWEB_LOG_DEBUG << "DBUS boot type: " << bootTypeStr; + + crow::connections::systemBus->async_method_call( +- [aResp](const boost::system::error_code ec) { ++ [aResp, bootType](const boost::system::error_code ec) { + if (ec) + { ++ if (!bootType) ++ { ++ // If bootType wasn't explicitly present in the incoming ++ // message don't output error. The error could come from a ++ // fact that the BootType interface may be not present in ++ // the settings object. It could happen because this ++ // interface is not relevant for some Host architectures ++ // (for example POWER). ++ return; ++ } ++ + BMCWEB_LOG_DEBUG << "DBUS response error " << ec; + if (ec.value() == boost::asio::error::host_unreachable) + { +@@ -1531,8 +1523,7 @@ inline void setBootType(const std::shared_ptr<bmcweb::AsyncResp>& aResp, + } + BMCWEB_LOG_DEBUG << "Boot type update done."; + }, +- "xyz.openbmc_project.Settings", +- "/xyz/openbmc_project/control/host0/boot", ++ "xyz.openbmc_project.Settings", bootObj, + "org.freedesktop.DBus.Properties", "Set", + "xyz.openbmc_project.Control.Boot.Type", "BootType", + std::variant<std::string>(bootTypeStr)); +@@ -1542,48 +1533,42 @@ inline void setBootType(const std::shared_ptr<bmcweb::AsyncResp>& aResp, + * @brief Sets boot properties into DBUS object(s). + * + * @param[in] aResp Shared pointer for generating response message. +- * @param[in] bootType The boot type to set. ++ * @param[in] overrideEnabled The source override "enable". ++ * @param[in] bootObj Path to the DBUS object. ++ * @param[in] bootSource The boot source to set. ++ * + * @return Integer error code. + */ +-inline void setBootEnable(const std::shared_ptr<bmcweb::AsyncResp>& aResp, +- const std::optional<std::string>& bootEnable) ++inline void setBootModeOrSource(const std::shared_ptr<bmcweb::AsyncResp>& aResp, ++ const bool overrideEnabled, ++ const std::string& bootObj, ++ const std::optional<std::string>& bootSource) + { +- if (!bootEnable) +- { +- return; +- } +- // Source target specified +- BMCWEB_LOG_DEBUG << "Boot enable: " << *bootEnable; ++ std::string bootSourceStr = ++ "xyz.openbmc_project.Control.Boot.Source.Sources.Default"; ++ std::string bootModeStr = ++ "xyz.openbmc_project.Control.Boot.Mode.Modes.Regular"; + +- bool bootOverrideEnable = false; +- bool bootOverridePersistent = false; +- // Figure out which DBUS interface and property to use +- if (*bootEnable == "Disabled") +- { +- bootOverrideEnable = false; +- } +- else if (*bootEnable == "Once") +- { +- bootOverrideEnable = true; +- bootOverridePersistent = false; +- } +- else if (*bootEnable == "Continuous") ++ if (bootSource && overrideEnabled) + { +- bootOverrideEnable = true; +- bootOverridePersistent = true; +- } +- else +- { +- BMCWEB_LOG_DEBUG << "Invalid property value for " +- "BootSourceOverrideEnabled: " +- << *bootEnable; +- messages::propertyValueNotInList(aResp->res, *bootEnable, +- "BootSourceOverrideEnabled"); +- return; ++ // Source target specified ++ BMCWEB_LOG_DEBUG << "Boot source: " << *bootSource; ++ // Figure out which DBUS interface and property to use ++ if (assignBootParameters(aResp, *bootSource, bootSourceStr, ++ bootModeStr)) ++ { ++ BMCWEB_LOG_DEBUG ++ << "Invalid property value for BootSourceOverrideTarget: " ++ << *bootSource; ++ messages::propertyValueNotInList(aResp->res, *bootSource, ++ "BootSourceTargetOverride"); ++ return; ++ } + } + + // Act on validated parameters +- BMCWEB_LOG_DEBUG << "DBUS boot override enable: " << bootOverrideEnable; ++ BMCWEB_LOG_DEBUG << "DBUS boot source: " << bootSourceStr; ++ BMCWEB_LOG_DEBUG << "DBUS boot mode: " << bootModeStr; + + crow::connections::systemBus->async_method_call( + [aResp](const boost::system::error_code ec) { +@@ -1593,23 +1578,12 @@ inline void setBootEnable(const std::shared_ptr<bmcweb::AsyncResp>& aResp, + messages::internalError(aResp->res); + return; + } +- BMCWEB_LOG_DEBUG << "Boot override enable update done."; ++ BMCWEB_LOG_DEBUG << "Boot source update done."; + }, +- "xyz.openbmc_project.Settings", +- "/xyz/openbmc_project/control/host0/boot", ++ "xyz.openbmc_project.Settings", bootObj, + "org.freedesktop.DBus.Properties", "Set", +- "xyz.openbmc_project.Object.Enable", "Enabled", +- std::variant<bool>(bootOverrideEnable)); +- +- if (!bootOverrideEnable) +- { +- return; +- } +- +- // In case boot override is enabled we need to set correct value for the +- // 'one_time' enable DBus interface +- BMCWEB_LOG_DEBUG << "DBUS boot override persistent: " +- << bootOverridePersistent; ++ "xyz.openbmc_project.Control.Boot.Source", "BootSource", ++ std::variant<std::string>(bootSourceStr)); + + crow::connections::systemBus->async_method_call( + [aResp](const boost::system::error_code ec) { +@@ -1619,86 +1593,45 @@ inline void setBootEnable(const std::shared_ptr<bmcweb::AsyncResp>& aResp, + messages::internalError(aResp->res); + return; + } +- BMCWEB_LOG_DEBUG << "Boot one_time update done."; ++ BMCWEB_LOG_DEBUG << "Boot mode update done."; + }, +- "xyz.openbmc_project.Settings", +- "/xyz/openbmc_project/control/host0/boot/one_time", ++ "xyz.openbmc_project.Settings", bootObj, + "org.freedesktop.DBus.Properties", "Set", +- "xyz.openbmc_project.Object.Enable", "Enabled", +- std::variant<bool>(!bootOverridePersistent)); ++ "xyz.openbmc_project.Control.Boot.Mode", "BootMode", ++ std::variant<std::string>(bootModeStr)); + } + + /** +- * @brief Sets boot properties into DBUS object(s). ++ * @brief Sets "One time" enabled setting into DBUS object + * +- * @param[in] aResp Shared pointer for generating response message. +- * @param[in] bootSource The boot source to set. ++ * @param[in] aResp Shared pointer for generating response message. ++ * @param[in] oneTime Enable property for one-time object + * + * @return Integer error code. + */ +-inline void setBootModeOrSource(const std::shared_ptr<bmcweb::AsyncResp>& aResp, +- const std::optional<std::string>& bootSource) ++inline void setOneTime(const std::shared_ptr<bmcweb::AsyncResp>& aResp, ++ bool oneTime) + { +- std::string bootSourceStr; +- std::string bootModeStr; +- +- if (!bootSource) +- { +- return; +- } +- +- // Source target specified +- BMCWEB_LOG_DEBUG << "Boot source: " << *bootSource; +- // Figure out which DBUS interface and property to use +- if (assignBootParameters(aResp, *bootSource, bootSourceStr, bootModeStr)) +- { +- BMCWEB_LOG_DEBUG +- << "Invalid property value for BootSourceOverrideTarget: " +- << *bootSource; +- messages::propertyValueNotInList(aResp->res, *bootSource, +- "BootSourceTargetOverride"); +- return; +- } +- +- // Act on validated parameters +- BMCWEB_LOG_DEBUG << "DBUS boot source: " << bootSourceStr; +- BMCWEB_LOG_DEBUG << "DBUS boot mode: " << bootModeStr; +- + crow::connections::systemBus->async_method_call( +- [aResp](const boost::system::error_code ec) { ++ [aResp{aResp}](const boost::system::error_code ec) { + if (ec) + { + BMCWEB_LOG_DEBUG << "DBUS response error " << ec; + messages::internalError(aResp->res); + return; + } +- BMCWEB_LOG_DEBUG << "Boot source update done."; ++ BMCWEB_LOG_DEBUG << "Boot enable update done."; + }, + "xyz.openbmc_project.Settings", +- "/xyz/openbmc_project/control/host0/boot", +- "org.freedesktop.DBus.Properties", "Set", +- "xyz.openbmc_project.Control.Boot.Source", "BootSource", +- std::variant<std::string>(bootSourceStr)); +- +- crow::connections::systemBus->async_method_call( +- [aResp](const boost::system::error_code ec) { +- if (ec) +- { +- BMCWEB_LOG_DEBUG << "DBUS response error " << ec; +- messages::internalError(aResp->res); +- return; +- } +- BMCWEB_LOG_DEBUG << "Boot mode update done."; +- }, +- "xyz.openbmc_project.Settings", +- "/xyz/openbmc_project/control/host0/boot", ++ "/xyz/openbmc_project/control/host0/boot/one_time", + "org.freedesktop.DBus.Properties", "Set", +- "xyz.openbmc_project.Control.Boot.Mode", "BootMode", +- std::variant<std::string>(bootModeStr)); ++ "xyz.openbmc_project.Object.Enable", "Enabled", ++ std::variant<bool>(oneTime)); + } + + /** +- * @brief Sets Boot source override properties. ++ * @brief Retrieves "One time" enabled setting over DBUS and calls function to ++ * set boot source/boot mode properties. + * + * @param[in] aResp Shared pointer for generating response message. + * @param[in] bootSource The boot source from incoming RF request. +@@ -1707,17 +1640,81 @@ inline void setBootModeOrSource(const std::shared_ptr<bmcweb::AsyncResp>& aResp, + * + * @return Integer error code. + */ +- +-inline void setBootProperties(const std::shared_ptr<bmcweb::AsyncResp>& aResp, +- const std::optional<std::string>& bootSource, +- const std::optional<std::string>& bootType, +- const std::optional<std::string>& bootEnable) ++inline void ++ setBootSourceProperties(const std::shared_ptr<bmcweb::AsyncResp>& aResp, ++ std::optional<std::string> bootSource, ++ std::optional<std::string> bootType, ++ std::optional<std::string> bootEnable) + { + BMCWEB_LOG_DEBUG << "Set boot information."; + +- setBootModeOrSource(aResp, bootSource); +- setBootType(aResp, bootType); +- setBootEnable(aResp, bootEnable); ++ crow::connections::systemBus->async_method_call( ++ [aResp, bootSource{std::move(bootSource)}, ++ bootType{std::move(bootType)}, ++ bootEnable{std::move(bootEnable)}](const boost::system::error_code ec, ++ const std::variant<bool>& oneTime) { ++ if (ec) ++ { ++ BMCWEB_LOG_DEBUG << "DBUS response error " << ec; ++ messages::internalError(aResp->res); ++ return; ++ } ++ ++ const bool* oneTimePtr = std::get_if<bool>(&oneTime); ++ ++ if (!oneTimePtr) ++ { ++ messages::internalError(aResp->res); ++ return; ++ } ++ ++ BMCWEB_LOG_DEBUG << "Got one time: " << *oneTimePtr; ++ ++ bool oneTimeSetting = *oneTimePtr; ++ bool overrideEnabled = true; ++ ++ // Validate incoming parameters ++ if (bootEnable) ++ { ++ if (*bootEnable == "Once") ++ { ++ oneTimeSetting = true; ++ } ++ else if (*bootEnable == "Continuous") ++ { ++ oneTimeSetting = false; ++ } ++ else if (*bootEnable == "Disabled") ++ { ++ BMCWEB_LOG_DEBUG << "Boot source override will be disabled"; ++ oneTimeSetting = false; ++ overrideEnabled = false; ++ } ++ else ++ { ++ BMCWEB_LOG_DEBUG << "Unsupported value for " ++ "BootSourceOverrideEnabled: " ++ << *bootEnable; ++ messages::propertyValueNotInList( ++ aResp->res, *bootEnable, "BootSourceOverrideEnabled"); ++ return; ++ } ++ } ++ ++ std::string bootObj = "/xyz/openbmc_project/control/host0/boot"; ++ if (oneTimeSetting) ++ { ++ bootObj += "/one_time"; ++ } ++ ++ setBootModeOrSource(aResp, overrideEnabled, bootObj, bootSource); ++ setBootType(aResp, overrideEnabled, bootObj, bootType); ++ setOneTime(aResp, oneTimeSetting); ++ }, ++ "xyz.openbmc_project.Settings", ++ "/xyz/openbmc_project/control/host0/boot/one_time", ++ "org.freedesktop.DBus.Properties", "Get", ++ "xyz.openbmc_project.Object.Enable", "Enabled"); + } + + /** +@@ -2806,11 +2803,11 @@ inline void requestRoutesSystems(App& app) + { + return; + } +- + if (bootSource || bootType || bootEnable) + { +- setBootProperties(asyncResp, bootSource, bootType, +- bootEnable); ++ setBootSourceProperties( ++ asyncResp, std::move(bootSource), ++ std::move(bootType), std::move(bootEnable)); + } + if (automaticRetryConfig) + { +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0001-Define-Redfish-interface-Registries-Bios.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0001-Define-Redfish-interface-Registries-Bios.patch index 9cf4653d6..93bbb7494 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0001-Define-Redfish-interface-Registries-Bios.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0001-Define-Redfish-interface-Registries-Bios.patch @@ -1,7 +1,7 @@ -From 72c273ae74bb6add062b89f59ebeee4d4eb7e523 Mon Sep 17 00:00:00 2001 +From 501003876765f51799152bace657d97b7fa2b60e Mon Sep 17 00:00:00 2001 From: Kuiying Wang <kuiying.wang@intel.com> Date: Fri, 4 Sep 2020 19:24:25 +0800 -Subject: [PATCH] Define Redfish interface "/Registries/Bios" and enable +Subject: [PATCH 1/5] Define Redfish interface "/Registries/Bios" and enable Attributes property 1. Define Redfish interface "/Registries/Bios" for BIOS Attribute Registry @@ -227,25 +227,25 @@ Change-Id: Iecc61018c350f0b8c89df59b2864b941508b1916 Signed-off-by: Kuiying Wang <kuiying.wang@intel.com> --- redfish-core/include/redfish.hpp | 2 + - .../include/registries/bios_registry.hpp | 31 ++ - redfish-core/lib/bios.hpp | 501 ++++++++++++++++++ - redfish-core/lib/message_registries.hpp | 9 +- - 4 files changed, 542 insertions(+), 1 deletion(-) + .../include/registries/bios_registry.hpp | 31 + + redfish-core/lib/bios.hpp | 528 ++++++++++++++++++ + redfish-core/lib/message_registries.hpp | 6 + + 4 files changed, 567 insertions(+) create mode 100644 redfish-core/include/registries/bios_registry.hpp diff --git a/redfish-core/include/redfish.hpp b/redfish-core/include/redfish.hpp -index db58d60..298ebb8 100644 +index c15062d..3388498 100644 --- a/redfish-core/include/redfish.hpp +++ b/redfish-core/include/redfish.hpp -@@ -156,6 +156,8 @@ class RedfishService - nodes.emplace_back(std::make_unique<SystemActionsReset>(app)); - nodes.emplace_back(std::make_unique<SystemResetActionInfo>(app)); - nodes.emplace_back(std::make_unique<BiosService>(app)); -+ nodes.emplace_back(std::make_unique<BiosSettings>(app)); -+ nodes.emplace_back(std::make_unique<BiosAttributeRegistry>(app)); - nodes.emplace_back(std::make_unique<BiosReset>(app)); +@@ -152,6 +152,8 @@ class RedfishService + requestRoutesSystemActionsReset(app); + requestRoutesSystemResetActionInfo(app); + requestRoutesBiosService(app); ++ requestRoutesBiosSettings(app); ++ requestRoutesBiosAttributeRegistry(app); + requestRoutesBiosReset(app); + #ifdef BMCWEB_ENABLE_VM_NBDPROXY - nodes.emplace_back(std::make_unique<VirtualMedia>(app)); diff --git a/redfish-core/include/registries/bios_registry.hpp b/redfish-core/include/registries/bios_registry.hpp new file mode 100644 index 0000000..88ef782 @@ -285,12 +285,12 @@ index 0000000..88ef782 +} // namespace redfish::message_registries::bios \ No newline at end of file diff --git a/redfish-core/lib/bios.hpp b/redfish-core/lib/bios.hpp -index 0917cc7..cb2b74d 100644 +index 604b8e7..c1a5c56 100644 --- a/redfish-core/lib/bios.hpp +++ b/redfish-core/lib/bios.hpp @@ -3,8 +3,140 @@ - #include "node.hpp" - + #include <app.hpp> + #include <registries/privilege_registry.hpp> #include <utils/fw_utils.hpp> + namespace redfish @@ -429,420 +429,435 @@ index 0917cc7..cb2b74d 100644 /** * BiosService class supports handle get method for bios. */ -@@ -33,6 +165,375 @@ class BiosService : public Node - // Get the ActiveSoftwareImage and SoftwareImages - fw_util::populateFirmwareInformation(asyncResp, fw_util::biosPurpose, - "", true); -+ asyncResp->res.jsonValue["@Redfish.Settings"] = { -+ {"@odata.type", "#Settings.v1_3_0.Settings"}, -+ {"SettingsObject", -+ {{"@odata.id", "/redfish/v1/Systems/system/Bios/Settings"}}}}; -+ asyncResp->res.jsonValue["AttributeRegistry"] = "BiosAttributeRegistry"; -+ asyncResp->res.jsonValue["Attributes"] = {}; -+ -+ crow::connections::systemBus->async_method_call( -+ [asyncResp](const boost::system::error_code ec, -+ const GetObjectType& getObjectType) { -+ if (ec) -+ { -+ BMCWEB_LOG_ERROR << "ObjectMapper::GetObject call failed: " -+ << ec; -+ messages::internalError(asyncResp->res); -+ -+ return; -+ } -+ const std::string& service = getObjectType.begin()->first; +@@ -29,8 +161,404 @@ inline void requestRoutesBiosService(App& app) + // Get the ActiveSoftwareImage and SoftwareImages + fw_util::populateFirmwareInformation( + asyncResp, fw_util::biosPurpose, "", true); ++ asyncResp->res.jsonValue["@Redfish.Settings"] = { ++ {"@odata.type", "#Settings.v1_3_0.Settings"}, ++ {"SettingsObject", ++ {{"@odata.id", ++ "/redfish/v1/Systems/system/Bios/Settings"}}}}; ++ asyncResp->res.jsonValue["AttributeRegistry"] = ++ "BiosAttributeRegistry"; ++ asyncResp->res.jsonValue["Attributes"] = {}; + + crow::connections::systemBus->async_method_call( -+ [asyncResp]( -+ const boost::system::error_code ec, -+ const std::variant<BiosBaseTableType>& retBiosTable) { ++ [asyncResp](const boost::system::error_code ec, ++ const GetObjectType& getObjectType) { + if (ec) + { -+ BMCWEB_LOG_ERROR << "getBiosAttributes DBUS error: " -+ << ec; -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ const BiosBaseTableType* baseBiosTable = -+ std::get_if<BiosBaseTableType>(&retBiosTable); -+ nlohmann::json& attributesJson = -+ asyncResp->res.jsonValue["Attributes"]; -+ if (baseBiosTable == nullptr) -+ { -+ BMCWEB_LOG_ERROR << "baseBiosTable == nullptr "; ++ BMCWEB_LOG_ERROR ++ << "ObjectMapper::GetObject call failed: " ++ << ec; + messages::internalError(asyncResp->res); ++ + return; + } -+ for (const BiosBaseTableItemType& item : *baseBiosTable) -+ { -+ const std::string& key = item.first; -+ const std::string& itemType = -+ std::get<biosBaseAttrType>(item.second); -+ std::string attrType = -+ mapAttrTypeToRedfish(itemType); -+ if (attrType == "String") -+ { -+ const std::string* currValue = -+ std::get_if<std::string>( -+ &std::get<biosBaseCurrValue>( -+ item.second)); -+ attributesJson.emplace(key, currValue != nullptr -+ ? *currValue -+ : ""); -+ } -+ else if (attrType == "Integer") -+ { -+ const int64_t* currValue = std::get_if<int64_t>( -+ &std::get<biosBaseCurrValue>(item.second)); -+ attributesJson.emplace( -+ key, currValue != nullptr ? *currValue : 0); -+ } -+ else -+ { -+ BMCWEB_LOG_ERROR -+ << "Unsupported attribute type."; -+ messages::internalError(asyncResp->res); -+ } -+ } ++ const std::string& service = ++ getObjectType.begin()->first; ++ ++ crow::connections::systemBus->async_method_call( ++ [asyncResp](const boost::system::error_code ec, ++ const std::variant<BiosBaseTableType>& ++ retBiosTable) { ++ if (ec) ++ { ++ BMCWEB_LOG_ERROR ++ << "getBiosAttributes DBUS error: " ++ << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ const BiosBaseTableType* baseBiosTable = ++ std::get_if<BiosBaseTableType>( ++ &retBiosTable); ++ nlohmann::json& attributesJson = ++ asyncResp->res.jsonValue["Attributes"]; ++ if (baseBiosTable == nullptr) ++ { ++ BMCWEB_LOG_ERROR ++ << "baseBiosTable == nullptr "; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ for (const BiosBaseTableItemType& item : ++ *baseBiosTable) ++ { ++ const std::string& key = item.first; ++ const std::string& itemType = ++ std::get<biosBaseAttrType>(item.second); ++ std::string attrType = ++ mapAttrTypeToRedfish(itemType); ++ if (attrType == "String") ++ { ++ const std::string* currValue = ++ std::get_if<std::string>( ++ &std::get<biosBaseCurrValue>( ++ item.second)); ++ attributesJson.emplace( ++ key, currValue != nullptr ++ ? *currValue ++ : ""); ++ } ++ else if (attrType == "Integer") ++ { ++ const int64_t* currValue = ++ std::get_if<int64_t>( ++ &std::get<biosBaseCurrValue>( ++ item.second)); ++ attributesJson.emplace( ++ key, currValue != nullptr ++ ? *currValue ++ : 0); ++ } ++ else ++ { ++ BMCWEB_LOG_ERROR ++ << "Unsupported attribute type."; ++ messages::internalError(asyncResp->res); ++ } ++ } ++ }, ++ service, "/xyz/openbmc_project/bios_config/manager", ++ "org.freedesktop.DBus.Properties", "Get", ++ "xyz.openbmc_project.BIOSConfig.Manager", ++ "BaseBIOSTable"); + }, -+ service, "/xyz/openbmc_project/bios_config/manager", -+ "org.freedesktop.DBus.Properties", "Get", -+ "xyz.openbmc_project.BIOSConfig.Manager", "BaseBIOSTable"); -+ }, -+ "xyz.openbmc_project.ObjectMapper", -+ "/xyz/openbmc_project/object_mapper", -+ "xyz.openbmc_project.ObjectMapper", "GetObject", -+ "/xyz/openbmc_project/bios_config/manager", -+ std::array<const char*, 0>()); -+ } -+}; ++ "xyz.openbmc_project.ObjectMapper", ++ "/xyz/openbmc_project/object_mapper", ++ "xyz.openbmc_project.ObjectMapper", "GetObject", ++ "/xyz/openbmc_project/bios_config/manager", ++ std::array<const char*, 0>()); + }); + } + +/** + * BiosSettings class supports handle GET/PATCH method for + * BIOS configuration pending settings. + */ -+class BiosSettings : public Node ++inline void requestRoutesBiosSettings(App& app) +{ -+ public: -+ BiosSettings(App& app) : -+ Node(app, "/redfish/v1/Systems/system/Bios/Settings") -+ { -+ entityPrivileges = {{boost::beast::http::verb::get, {{"Login"}}}}; -+ } -+ -+ private: -+ void doGet(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -+ const crow::Request&, const std::vector<std::string>&) override -+ { -+ asyncResp->res.jsonValue["@odata.id"] = -+ "/redfish/v1/Systems/system/Bios/Settings"; -+ asyncResp->res.jsonValue["@odata.type"] = "#Bios.v1_1_0.Bios"; -+ asyncResp->res.jsonValue["Name"] = "Bios Settings Version 1"; -+ asyncResp->res.jsonValue["Id"] = "BiosSettingsV1"; -+ asyncResp->res.jsonValue["AttributeRegistry"] = "BiosAttributeRegistry"; -+ asyncResp->res.jsonValue["Attributes"] = {}; -+ -+ crow::connections::systemBus->async_method_call( -+ [asyncResp](const boost::system::error_code ec, -+ const GetObjectType& getObjectType) { -+ if (ec) -+ { -+ BMCWEB_LOG_ERROR << "ObjectMapper::GetObject call failed: " -+ << ec; -+ messages::internalError(asyncResp->res); -+ -+ return; -+ } -+ std::string service = getObjectType.begin()->first; ++ BMCWEB_ROUTE(app, "/redfish/v1/Systems/system/Bios/Settings") ++ .privileges(redfish::privileges::getBios) ++ .methods(boost::beast::http::verb::get)( ++ [](const crow::Request&, ++ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { ++ asyncResp->res.jsonValue["@odata.id"] = ++ asyncResp->res.jsonValue["@odata.id"] = ++ "/redfish/v1/Systems/system/Bios/Settings"; ++ asyncResp->res.jsonValue["@odata.type"] = "#Bios.v1_1_0.Bios"; ++ asyncResp->res.jsonValue["Name"] = "Bios Settings Version 1"; ++ asyncResp->res.jsonValue["Id"] = "BiosSettingsV1"; ++ asyncResp->res.jsonValue["AttributeRegistry"] = ++ "BiosAttributeRegistry"; ++ asyncResp->res.jsonValue["Attributes"] = {}; + + crow::connections::systemBus->async_method_call( + [asyncResp](const boost::system::error_code ec, -+ const std::variant<PendingAttributesType>& -+ retPendingAttributes) { ++ const GetObjectType& getObjectType) { + if (ec) + { -+ BMCWEB_LOG_ERROR << "getBiosSettings DBUS error: " -+ << ec; -+ messages::resourceNotFound(asyncResp->res, -+ "Systems/system/Bios", -+ "Settings"); -+ return; -+ } -+ const PendingAttributesType* pendingAttributes = -+ std::get_if<PendingAttributesType>( -+ &retPendingAttributes); -+ nlohmann::json& attributesJson = -+ asyncResp->res.jsonValue["Attributes"]; -+ if (pendingAttributes == nullptr) -+ { -+ BMCWEB_LOG_ERROR << "pendingAttributes == nullptr "; ++ BMCWEB_LOG_ERROR ++ << "ObjectMapper::GetObject call failed: " ++ << ec; + messages::internalError(asyncResp->res); ++ + return; + } -+ for (const PendingAttributesItemType& item : -+ *pendingAttributes) -+ { -+ const std::string& key = item.first; -+ const std::string& itemType = -+ std::get<pendingAttrType>(item.second); -+ std::string attrType = -+ mapAttrTypeToRedfish(itemType); -+ if (attrType == "String") -+ { -+ const std::string* currValue = -+ std::get_if<std::string>( -+ &std::get<pendingAttrValue>( -+ item.second)); -+ attributesJson.emplace(key, currValue != nullptr -+ ? *currValue -+ : ""); -+ } -+ else if (attrType == "Integer") -+ { -+ const int64_t* currValue = std::get_if<int64_t>( -+ &std::get<pendingAttrValue>(item.second)); -+ attributesJson.emplace( -+ key, currValue != nullptr ? *currValue : 0); -+ } -+ else -+ { -+ BMCWEB_LOG_ERROR -+ << "Unsupported attribute type."; -+ messages::internalError(asyncResp->res); -+ } -+ } ++ std::string service = getObjectType.begin()->first; ++ ++ crow::connections::systemBus->async_method_call( ++ [asyncResp]( ++ const boost::system::error_code ec, ++ const std::variant<PendingAttributesType>& ++ retPendingAttributes) { ++ if (ec) ++ { ++ BMCWEB_LOG_ERROR ++ << "getBiosSettings DBUS error: " << ec; ++ messages::resourceNotFound( ++ asyncResp->res, "Systems/system/Bios", ++ "Settings"); ++ return; ++ } ++ const PendingAttributesType* pendingAttributes = ++ std::get_if<PendingAttributesType>( ++ &retPendingAttributes); ++ nlohmann::json& attributesJson = ++ asyncResp->res.jsonValue["Attributes"]; ++ if (pendingAttributes == nullptr) ++ { ++ BMCWEB_LOG_ERROR ++ << "pendingAttributes == nullptr "; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ for (const PendingAttributesItemType& item : ++ *pendingAttributes) ++ { ++ const std::string& key = item.first; ++ const std::string& itemType = ++ std::get<pendingAttrType>(item.second); ++ std::string attrType = ++ mapAttrTypeToRedfish(itemType); ++ if (attrType == "String") ++ { ++ const std::string* currValue = ++ std::get_if<std::string>( ++ &std::get<pendingAttrValue>( ++ item.second)); ++ attributesJson.emplace( ++ key, currValue != nullptr ++ ? *currValue ++ : ""); ++ } ++ else if (attrType == "Integer") ++ { ++ const int64_t* currValue = ++ std::get_if<int64_t>( ++ &std::get<pendingAttrValue>( ++ item.second)); ++ attributesJson.emplace( ++ key, currValue != nullptr ++ ? *currValue ++ : 0); ++ } ++ else ++ { ++ BMCWEB_LOG_ERROR ++ << "Unsupported attribute type."; ++ messages::internalError(asyncResp->res); ++ } ++ } ++ }, ++ service, "/xyz/openbmc_project/bios_config/manager", ++ "org.freedesktop.DBus.Properties", "Get", ++ "xyz.openbmc_project.BIOSConfig.Manager", ++ "PendingAttributes"); + }, -+ service, "/xyz/openbmc_project/bios_config/manager", -+ "org.freedesktop.DBus.Properties", "Get", -+ "xyz.openbmc_project.BIOSConfig.Manager", -+ "PendingAttributes"); -+ }, -+ "xyz.openbmc_project.ObjectMapper", -+ "/xyz/openbmc_project/object_mapper", -+ "xyz.openbmc_project.ObjectMapper", "GetObject", -+ "/xyz/openbmc_project/bios_config/manager", -+ std::array<const char*, 0>()); -+ } -+}; ++ "xyz.openbmc_project.ObjectMapper", ++ "/xyz/openbmc_project/object_mapper", ++ "xyz.openbmc_project.ObjectMapper", "GetObject", ++ "/xyz/openbmc_project/bios_config/manager", ++ std::array<const char*, 0>()); ++ }); ++} +/** + * BiosAttributeRegistry class supports handle get method for BIOS attribute + * registry. + */ -+class BiosAttributeRegistry : public Node ++inline void requestRoutesBiosAttributeRegistry(App& app) +{ -+ public: -+ BiosAttributeRegistry(App& app) : -+ Node(app, "/redfish/v1/Registries/BiosAttributeRegistry/" -+ "BiosAttributeRegistry") -+ { -+ entityPrivileges = {{boost::beast::http::verb::get, {{"Login"}}}}; -+ } -+ -+ private: -+ void doGet(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -+ const crow::Request&, const std::vector<std::string>&) override -+ { -+ asyncResp->res.jsonValue["@odata.id"] = -+ "/redfish/v1/Registries/BiosAttributeRegistry/" -+ "BiosAttributeRegistry"; -+ asyncResp->res.jsonValue["@odata.type"] = -+ "#AttributeRegistry.v1_3_2.AttributeRegistry"; -+ asyncResp->res.jsonValue["Name"] = "Bios Attribute Registry"; -+ asyncResp->res.jsonValue["Id"] = "BiosAttributeRegistry"; -+ asyncResp->res.jsonValue["RegistryVersion"] = "1.0.0"; -+ asyncResp->res.jsonValue["Language"] = "en"; -+ asyncResp->res.jsonValue["OwningEntity"] = "OpenBMC"; -+ asyncResp->res.jsonValue["RegistryEntries"]["Attributes"] = -+ nlohmann::json::array(); ++ BMCWEB_ROUTE( ++ app, ++ "/redfish/v1/Registries/BiosAttributeRegistry/BiosAttributeRegistry/") ++ .privileges(redfish::privileges::getBios) ++ .methods( ++ boost::beast::http::verb:: ++ get)([](const crow::Request&, ++ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { ++ asyncResp->res.jsonValue["@odata.id"] = ++ "/redfish/v1/Registries/BiosAttributeRegistry/" ++ "BiosAttributeRegistry"; ++ asyncResp->res.jsonValue["@odata.type"] = ++ "#AttributeRegistry.v1_3_2.AttributeRegistry"; ++ asyncResp->res.jsonValue["Name"] = "Bios Attribute Registry"; ++ asyncResp->res.jsonValue["Id"] = "BiosAttributeRegistry"; ++ asyncResp->res.jsonValue["RegistryVersion"] = "1.0.0"; ++ asyncResp->res.jsonValue["Language"] = "en"; ++ asyncResp->res.jsonValue["OwningEntity"] = "OpenBMC"; ++ asyncResp->res.jsonValue["RegistryEntries"]["Attributes"] = ++ nlohmann::json::array(); + -+ crow::connections::systemBus->async_method_call( -+ [asyncResp](const boost::system::error_code ec, -+ const GetObjectType& getObjectType) { -+ if (ec) -+ { -+ BMCWEB_LOG_ERROR << "ObjectMapper::GetObject call failed: " -+ << ec; -+ messages::internalError(asyncResp->res); ++ crow::connections::systemBus->async_method_call( ++ [asyncResp](const boost::system::error_code ec, ++ const GetObjectType& getObjectType) { ++ if (ec) ++ { ++ BMCWEB_LOG_ERROR ++ << "ObjectMapper::GetObject call failed: " << ec; ++ messages::internalError(asyncResp->res); + -+ return; -+ } -+ std::string service = getObjectType.begin()->first; ++ return; ++ } ++ std::string service = getObjectType.begin()->first; + -+ crow::connections::systemBus->async_method_call( -+ [asyncResp]( -+ const boost::system::error_code ec, -+ const std::variant<BiosBaseTableType>& retBiosTable) { -+ if (ec) -+ { -+ BMCWEB_LOG_ERROR -+ << "getBiosAttributeRegistry DBUS error: " -+ << ec; -+ messages::resourceNotFound( -+ asyncResp->res, "Registries/Bios", "Bios"); -+ return; -+ } -+ const BiosBaseTableType* baseBiosTable = -+ std::get_if<BiosBaseTableType>(&retBiosTable); -+ nlohmann::json& attributeArray = -+ asyncResp->res -+ .jsonValue["RegistryEntries"]["Attributes"]; -+ nlohmann::json optionsArray = nlohmann::json::array(); -+ if (baseBiosTable == nullptr) -+ { -+ BMCWEB_LOG_ERROR << "baseBiosTable == nullptr "; -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ for (const BiosBaseTableItemType& item : *baseBiosTable) -+ { -+ const std::string& itemType = -+ std::get<biosBaseAttrType>(item.second); -+ std::string attrType = -+ mapAttrTypeToRedfish(itemType); -+ if (attrType == "UNKNOWN") ++ crow::connections::systemBus->async_method_call( ++ [asyncResp](const boost::system::error_code ec, ++ const std::variant<BiosBaseTableType>& ++ retBiosTable) { ++ if (ec) + { -+ BMCWEB_LOG_ERROR << "attrType == UNKNOWN"; -+ messages::internalError(asyncResp->res); ++ BMCWEB_LOG_ERROR ++ << "getBiosAttributeRegistry DBUS error: " ++ << ec; ++ messages::resourceNotFound( ++ asyncResp->res, "Registries/Bios", "Bios"); + return; + } -+ nlohmann::json attributeItem; -+ attributeItem["AttributeName"] = item.first; -+ attributeItem["Type"] = attrType; -+ attributeItem["ReadOnly"] = -+ std::get<biosBaseReadonlyStatus>(item.second); -+ attributeItem["DisplayName"] = -+ std::get<biosBaseDisplayName>(item.second); -+ attributeItem["HelpText"] = -+ std::get<biosBaseDescription>(item.second); -+ attributeItem["MenuPath"] = -+ std::get<biosBaseMenuPath>(item.second); -+ -+ if (attrType == "String") -+ { -+ const std::string* currValue = -+ std::get_if<std::string>( -+ &std::get<biosBaseCurrValue>( -+ item.second)); -+ const std::string* defValue = -+ std::get_if<std::string>( -+ &std::get<biosBaseDefaultValue>( -+ item.second)); -+ attributeItem["CurrentValue"] = -+ currValue != nullptr ? *currValue : ""; -+ attributeItem["DefaultValue"] = -+ defValue != nullptr ? *defValue : ""; -+ } -+ else if (attrType == "Integer") -+ { -+ const int64_t* currValue = std::get_if<int64_t>( -+ &std::get<biosBaseCurrValue>(item.second)); -+ const int64_t* defValue = std::get_if<int64_t>( -+ &std::get<biosBaseDefaultValue>( -+ item.second)); -+ attributeItem["CurrentValue"] = -+ currValue != nullptr ? *currValue : 0; -+ attributeItem["DefaultValue"] = -+ defValue != nullptr ? *defValue : 0; -+ } -+ else ++ const BiosBaseTableType* baseBiosTable = ++ std::get_if<BiosBaseTableType>(&retBiosTable); ++ nlohmann::json& attributeArray = ++ asyncResp->res ++ .jsonValue["RegistryEntries"]["Attributes"]; ++ nlohmann::json optionsArray = ++ nlohmann::json::array(); ++ if (baseBiosTable == nullptr) + { -+ BMCWEB_LOG_ERROR -+ << "Unsupported attribute type."; ++ BMCWEB_LOG_ERROR << "baseBiosTable == nullptr "; + messages::internalError(asyncResp->res); + return; + } -+ -+ const std::vector<OptionsItemType>& optionsVector = -+ std::get<biosBaseOptions>(item.second); -+ for (const OptionsItemType& optItem : optionsVector) ++ for (const BiosBaseTableItemType& item : ++ *baseBiosTable) + { -+ nlohmann::json optItemJson; -+ const std::string& strOptItemType = -+ std::get<optItemType>(optItem); -+ std::string optItemTypeRedfish = -+ mapBoundTypeToRedfish(strOptItemType); -+ if (optItemTypeRedfish == "UNKNOWN") ++ const std::string& itemType = ++ std::get<biosBaseAttrType>(item.second); ++ std::string attrType = ++ mapAttrTypeToRedfish(itemType); ++ if (attrType == "UNKNOWN") + { -+ BMCWEB_LOG_ERROR -+ << "optItemTypeRedfish == UNKNOWN"; ++ BMCWEB_LOG_ERROR << "attrType == UNKNOWN"; + messages::internalError(asyncResp->res); + return; + } -+ if (optItemTypeRedfish == "OneOf") ++ nlohmann::json attributeItem; ++ attributeItem["AttributeName"] = item.first; ++ attributeItem["Type"] = attrType; ++ attributeItem["ReadOnly"] = ++ std::get<biosBaseReadonlyStatus>( ++ item.second); ++ attributeItem["DisplayName"] = ++ std::get<biosBaseDisplayName>(item.second); ++ attributeItem["HelpText"] = ++ std::get<biosBaseDescription>(item.second); ++ attributeItem["MenuPath"] = ++ std::get<biosBaseMenuPath>(item.second); ++ ++ if (attrType == "String") + { + const std::string* currValue = + std::get_if<std::string>( -+ &std::get<optItemValue>(optItem)); -+ optItemJson[optItemTypeRedfish] = ++ &std::get<biosBaseCurrValue>( ++ item.second)); ++ const std::string* defValue = ++ std::get_if<std::string>( ++ &std::get<biosBaseDefaultValue>( ++ item.second)); ++ attributeItem["CurrentValue"] = + currValue != nullptr ? *currValue : ""; ++ attributeItem["DefaultValue"] = ++ defValue != nullptr ? *defValue : ""; + } -+ else ++ else if (attrType == "Integer") + { + const int64_t* currValue = + std::get_if<int64_t>( -+ &std::get<optItemValue>(optItem)); -+ optItemJson[optItemTypeRedfish] = ++ &std::get<biosBaseCurrValue>( ++ item.second)); ++ const int64_t* defValue = ++ std::get_if<int64_t>( ++ &std::get<biosBaseDefaultValue>( ++ item.second)); ++ attributeItem["CurrentValue"] = + currValue != nullptr ? *currValue : 0; ++ attributeItem["DefaultValue"] = ++ defValue != nullptr ? *defValue : 0; ++ } ++ else ++ { ++ BMCWEB_LOG_ERROR ++ << "Unsupported attribute type."; ++ messages::internalError(asyncResp->res); ++ return; + } + -+ optionsArray.push_back(optItemJson); -+ } ++ const std::vector<OptionsItemType>& ++ optionsVector = ++ std::get<biosBaseOptions>(item.second); ++ for (const OptionsItemType& optItem : ++ optionsVector) ++ { ++ nlohmann::json optItemJson; ++ const std::string& strOptItemType = ++ std::get<optItemType>(optItem); ++ std::string optItemTypeRedfish = ++ mapBoundTypeToRedfish(strOptItemType); ++ if (optItemTypeRedfish == "UNKNOWN") ++ { ++ BMCWEB_LOG_ERROR ++ << "optItemTypeRedfish == UNKNOWN"; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ if (optItemTypeRedfish == "OneOf") ++ { ++ const std::string* currValue = ++ std::get_if<std::string>( ++ &std::get<optItemValue>( ++ optItem)); ++ optItemJson[optItemTypeRedfish] = ++ currValue != nullptr ? *currValue ++ : ""; ++ } ++ else ++ { ++ const int64_t* currValue = ++ std::get_if<int64_t>( ++ &std::get<optItemValue>( ++ optItem)); ++ optItemJson[optItemTypeRedfish] = ++ currValue != nullptr ? *currValue ++ : 0; ++ } + -+ attributeItem["Value"] = optionsArray; -+ attributeArray.push_back(attributeItem); -+ } -+ }, -+ service, "/xyz/openbmc_project/bios_config/manager", -+ "org.freedesktop.DBus.Properties", "Get", -+ "xyz.openbmc_project.BIOSConfig.Manager", "BaseBIOSTable"); -+ }, -+ "xyz.openbmc_project.ObjectMapper", -+ "/xyz/openbmc_project/object_mapper", -+ "xyz.openbmc_project.ObjectMapper", "GetObject", -+ "/xyz/openbmc_project/bios_config/manager", -+ std::array<const char*, 0>()); - } - }; ++ optionsArray.push_back(optItemJson); ++ } ++ ++ attributeItem["Value"] = optionsArray; ++ attributeArray.push_back(attributeItem); ++ } ++ }, ++ service, "/xyz/openbmc_project/bios_config/manager", ++ "org.freedesktop.DBus.Properties", "Get", ++ "xyz.openbmc_project.BIOSConfig.Manager", ++ "BaseBIOSTable"); ++ }, ++ "xyz.openbmc_project.ObjectMapper", ++ "/xyz/openbmc_project/object_mapper", ++ "xyz.openbmc_project.ObjectMapper", "GetObject", ++ "/xyz/openbmc_project/bios_config/manager", ++ std::array<const char*, 0>()); ++ }); ++} /** + * BiosReset class supports handle POST method for Reset bios. + * The class retrieves and sends data directly to D-Bus. diff --git a/redfish-core/lib/message_registries.hpp b/redfish-core/lib/message_registries.hpp -index 455bf70..7afbfc2 100644 +index e3bd5bf..f1f130a 100644 --- a/redfish-core/lib/message_registries.hpp +++ b/redfish-core/lib/message_registries.hpp -@@ -18,6 +18,7 @@ - #include "node.hpp" +@@ -17,6 +17,7 @@ + #include "registries.hpp" #include "registries/base_message_registry.hpp" +#include "registries/bios_registry.hpp" #include "registries/openbmc_message_registry.hpp" #include "registries/resource_event_message_registry.hpp" #include "registries/task_event_message_registry.hpp" -@@ -56,11 +57,12 @@ class MessageRegistryFileCollection : public Node - {"@odata.id", "/redfish/v1/Registries"}, - {"Name", "MessageRegistryFile Collection"}, - {"Description", "Collection of MessageRegistryFiles"}, -- {"Members@odata.count", 4}, -+ {"Members@odata.count", 5}, - {"Members", - {{{"@odata.id", "/redfish/v1/Registries/Base"}}, - {{"@odata.id", "/redfish/v1/Registries/TaskEvent"}}, - {{"@odata.id", "/redfish/v1/Registries/ResourceEvent"}}, -+ {{"@odata.id", "/redfish/v1/Registries/BiosAttributeRegistry"}}, - {{"@odata.id", "/redfish/v1/Registries/OpenBMC"}}}}}; - } - }; -@@ -116,6 +118,11 @@ class MessageRegistryFile : public Node - header = &message_registries::resource_event::header; - url = message_registries::resource_event::url; - } -+ else if (registry == "BiosAttributeRegistry") -+ { -+ header = &message_registries::bios::header; -+ dmtf.clear(); -+ } - else - { - messages::resourceNotFound( +@@ -87,6 +88,11 @@ inline void requestRoutesMessageRegistryFile(App& app) + header = &message_registries::resource_event::header; + url = message_registries::resource_event::url; + } ++ else if (registry == "BiosAttributeRegistry") ++ { ++ header = &message_registries::bios::header; ++ dmtf.clear(); ++ } + else + { + messages::resourceNotFound( -- 2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0002-BaseBiosTable-Add-support-for-PATCH-operation.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0002-BaseBiosTable-Add-support-for-PATCH-operation.patch index 21a21e8db..099e6ddf5 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0002-BaseBiosTable-Add-support-for-PATCH-operation.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0002-BaseBiosTable-Add-support-for-PATCH-operation.patch @@ -1,7 +1,7 @@ -From 9c498d683be59ce25dd0124ba7ec5e026c59bbbf Mon Sep 17 00:00:00 2001 -From: Kuiying Wang <kuiying.wang@intel.com> -Date: Wed, 23 Dec 2020 16:50:45 +0800 -Subject: [PATCH] BaseBiosTable: Add support for PATCH operation +From ffa924ef204930a5bb442bf654eac02543acfb8f Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Wed, 30 Jun 2021 15:18:46 +0000 +Subject: [PATCH 2/5] BaseBiosTable: Add support for PATCH operation This commit brings in support for PATCH operation of the bios variables that updates the BaseBiosTable. @@ -25,12 +25,13 @@ This makes use of the "Set" of "PendingAttributes" in the backend and that updates the BaseBiosTable. Signed-off-by: Kuiying Wang <kuiying.wang@intel.com> +Change-Id: I12e78e5ac623c264c7a3e1dd5198aca67172736d --- - redfish-core/lib/bios.hpp | 93 ++++++++++++++++++++++++++++++++++++++- - 1 file changed, 92 insertions(+), 1 deletion(-) + redfish-core/lib/bios.hpp | 95 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 95 insertions(+) diff --git a/redfish-core/lib/bios.hpp b/redfish-core/lib/bios.hpp -index cb2b74d..860a643 100644 +index c1a5c56..14d2171 100644 --- a/redfish-core/lib/bios.hpp +++ b/redfish-core/lib/bios.hpp @@ -96,6 +96,29 @@ static std::string mapAttrTypeToRedfish(const std::string_view typeDbus) @@ -63,88 +64,83 @@ index cb2b74d..860a643 100644 static std::string mapBoundTypeToRedfish(const std::string_view typeDbus) { std::string ret; -@@ -260,7 +283,9 @@ class BiosSettings : public Node - BiosSettings(App& app) : - Node(app, "/redfish/v1/Systems/system/Bios/Settings") - { -- entityPrivileges = {{boost::beast::http::verb::get, {{"Login"}}}}; -+ entityPrivileges = { -+ {boost::beast::http::verb::get, {{"Login"}}}, -+ {boost::beast::http::verb::patch, {{"ConfigureComponents"}}}}; - } - - private: -@@ -356,6 +381,72 @@ class BiosSettings : public Node - "/xyz/openbmc_project/bios_config/manager", - std::array<const char*, 0>()); - } -+ -+ void doPatch(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -+ const crow::Request& req, -+ const std::vector<std::string>&) override -+ { -+ nlohmann::json inpJson; +@@ -370,6 +393,78 @@ inline void requestRoutesBiosSettings(App& app) + "/xyz/openbmc_project/bios_config/manager", + std::array<const char*, 0>()); + }); + -+ if (!redfish::json_util::readJson(req, asyncResp->res, "data", inpJson)) -+ { -+ return; -+ } ++ BMCWEB_ROUTE(app, "/redfish/v1/Systems/system/Bios/Settings") ++ .privileges({{"ConfigureComponents"}}) ++ .methods(boost::beast::http::verb::patch)( ++ [](const crow::Request& req, ++ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { ++ nlohmann::json inpJson; + -+ for (auto& attrInfo : inpJson) -+ { -+ std::optional<std::string> attrName; -+ std::optional<std::string> attrType; -+ std::optional<std::string> attrValue; -+ if (!json_util::getValueFromJsonObject(attrInfo, "AttributeName", -+ attrName)) -+ { -+ messages::propertyMissing(asyncResp->res, "AttributeName"); -+ return; -+ } -+ if (!json_util::getValueFromJsonObject(attrInfo, "AttributeType", -+ attrType)) -+ { -+ messages::propertyMissing(asyncResp->res, "AttributeType"); -+ return; -+ } -+ if (!json_util::getValueFromJsonObject(attrInfo, "AttributeValue", -+ attrValue)) -+ { -+ messages::propertyMissing(asyncResp->res, "AttributeValue"); -+ return; -+ } -+ std::string biosAttrType = mapRedfishToAttrType(*attrType); ++ if (!redfish::json_util::readJson(req, asyncResp->res, "data", ++ inpJson)) ++ { ++ return; ++ } + -+ if (biosAttrType == "UNKNOWN") -+ { -+ BMCWEB_LOG_ERROR << "Invalid attribute type"; -+ messages::propertyValueNotInList(asyncResp->res, -+ "AttributeType", *attrType); -+ return; -+ } -+ -+ PendingAttributesType pendingAttributes; -+ pendingAttributes.emplace_back(std::make_pair( -+ *attrName, std::make_tuple(biosAttrType, *attrValue))); ++ for (auto& attrInfo : inpJson) ++ { ++ std::optional<std::string> attrName; ++ std::optional<std::string> attrType; ++ std::optional<std::string> attrValue; ++ if (!json_util::getValueFromJsonObject( ++ attrInfo, "AttributeName", attrName)) ++ { ++ messages::propertyMissing(asyncResp->res, ++ "AttributeName"); ++ return; ++ } ++ if (!json_util::getValueFromJsonObject( ++ attrInfo, "AttributeType", attrType)) ++ { ++ messages::propertyMissing(asyncResp->res, ++ "AttributeType"); ++ return; ++ } ++ if (!json_util::getValueFromJsonObject( ++ attrInfo, "AttributeValue", attrValue)) ++ { ++ messages::propertyMissing(asyncResp->res, ++ "AttributeValue"); ++ return; ++ } ++ std::string biosAttrType = mapRedfishToAttrType(*attrType); + -+ crow::connections::systemBus->async_method_call( -+ [asyncResp](const boost::system::error_code ec) { -+ if (ec) ++ if (biosAttrType == "UNKNOWN") + { -+ BMCWEB_LOG_ERROR << "doPatch resp_handler got error " -+ << ec; -+ messages::internalError(asyncResp->res); ++ BMCWEB_LOG_ERROR << "Invalid attribute type"; ++ messages::propertyValueNotInList( ++ asyncResp->res, "AttributeType", *attrType); + return; + } -+ }, -+ "xyz.openbmc_project.BIOSConfigManager", -+ "/xyz/openbmc_project/bios_config/manager", -+ "org.freedesktop.DBus.Properties", "Set", -+ "xyz.openbmc_project.BIOSConfig.Manager", "PendingAttributes", -+ std::variant<PendingAttributesType>(pendingAttributes)); -+ } -+ } - }; ++ ++ PendingAttributesType pendingAttributes; ++ pendingAttributes.emplace_back(std::make_pair( ++ *attrName, std::make_tuple(biosAttrType, *attrValue))); ++ ++ crow::connections::systemBus->async_method_call( ++ [asyncResp](const boost::system::error_code ec) { ++ if (ec) ++ { ++ BMCWEB_LOG_ERROR ++ << "doPatch resp_handler got error " << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ }, ++ "xyz.openbmc_project.BIOSConfigManager", ++ "/xyz/openbmc_project/bios_config/manager", ++ "org.freedesktop.DBus.Properties", "Set", ++ "xyz.openbmc_project.BIOSConfig.Manager", ++ "PendingAttributes", ++ std::variant<PendingAttributesType>(pendingAttributes)); ++ } ++ }); + } /** * BiosAttributeRegistry class supports handle get method for BIOS attribute -- diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0003-Add-support-to-ResetBios-action.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0003-Add-support-to-ResetBios-action.patch index 5a24996a0..028d09e74 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0003-Add-support-to-ResetBios-action.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0003-Add-support-to-ResetBios-action.patch @@ -1,7 +1,7 @@ -From 4e85ce8a5f34038c289504855d21ebfa3d6b94f0 Mon Sep 17 00:00:00 2001 -From: Kuiying Wang <kuiying.wang@intel.com> -Date: Wed, 23 Dec 2020 22:47:56 +0800 -Subject: [PATCH] Add support to ResetBios action +From 02e44acef17a2b0681fe019e090d09015f9412e0 Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Wed, 30 Jun 2021 15:27:16 +0000 +Subject: [PATCH 3/5] Add support to ResetBios action Tested: @@ -11,50 +11,48 @@ POST https://IP_ADDR/redfish/v1/Systems/system/Bios/Actions/Bios.ResetBios Change-Id: I5e5fbdd70d4a3ce3b976cc2eb0a7d9a2a3adb124 Signed-off-by: Kuiying Wang <kuiying.wang@intel.com> --- - redfish-core/lib/bios.hpp | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) + redfish-core/lib/bios.hpp | 18 +++++++++++------- + 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/redfish-core/lib/bios.hpp b/redfish-core/lib/bios.hpp -index 860a643..1eb7bef 100644 +index 14d2171..49c0fd0 100644 --- a/redfish-core/lib/bios.hpp +++ b/redfish-core/lib/bios.hpp -@@ -638,7 +638,7 @@ class BiosReset : public Node - Node(app, "/redfish/v1/Systems/system/Bios/Actions/Bios.ResetBios/") - { - entityPrivileges = { -- {boost::beast::http::verb::post, {{"ConfigureManager"}}}}; -+ {boost::beast::http::verb::post, {{"ConfigureComponents"}}}}; - } - - private: -@@ -649,19 +649,24 @@ class BiosReset : public Node - void doPost(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, - const crow::Request&, const std::vector<std::string>&) override - { -+ std::string resetFlag = -+ "xyz.openbmc_project.BIOSConfig.Manager.ResetFlag.FactoryDefaults"; - - crow::connections::systemBus->async_method_call( - [asyncResp](const boost::system::error_code ec) { - if (ec) - { -- BMCWEB_LOG_ERROR << "Failed to reset bios: " << ec; -+ BMCWEB_LOG_ERROR << "doPost bios reset got error " << ec; - messages::internalError(asyncResp->res); - return; - } -+ BMCWEB_LOG_DEBUG << "bios reset action is done"; - }, -- "org.open_power.Software.Host.Updater", -- "/xyz/openbmc_project/software", -- "xyz.openbmc_project.Common.FactoryReset", "Reset"); -+ "xyz.openbmc_project.BIOSConfigManager", -+ "/xyz/openbmc_project/bios_config/manager", -+ "org.freedesktop.DBus.Properties", "Set", -+ "xyz.openbmc_project.BIOSConfig.Manager", "ResetBIOSSettings", -+ std::variant<std::string>(resetFlag)); - } - }; +@@ -665,24 +665,28 @@ inline void requestRoutesBiosAttributeRegistry(App& app) + inline void requestRoutesBiosReset(App& app) + { + BMCWEB_ROUTE(app, "/redfish/v1/Systems/system/Bios/Actions/Bios.ResetBios/") +- // Incorrect Privilege; Should be ConfigureComponents +- //.privileges(redfish::privileges::postBios) +- .privileges({{"ConfigureManager"}}) ++ .privileges(redfish::privileges::postBios) + .methods(boost::beast::http::verb::post)( + [](const crow::Request&, + const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { ++ std::string resetFlag = "xyz.openbmc_project.BIOSConfig." ++ "Manager.ResetFlag.FactoryDefaults"; ++ + crow::connections::systemBus->async_method_call( + [asyncResp](const boost::system::error_code ec) { + if (ec) + { +- BMCWEB_LOG_ERROR << "Failed to reset bios: " << ec; ++ BMCWEB_LOG_ERROR << "doPost bios reset got error " ++ << ec; + messages::internalError(asyncResp->res); + return; + } + }, +- "org.open_power.Software.Host.Updater", +- "/xyz/openbmc_project/software", +- "xyz.openbmc_project.Common.FactoryReset", "Reset"); ++ "xyz.openbmc_project.BIOSConfigManager", ++ "/xyz/openbmc_project/bios_config/manager", ++ "org.freedesktop.DBus.Properties", "Set", ++ "xyz.openbmc_project.BIOSConfig.Manager", ++ "ResetBIOSSettings", std::variant<std::string>(resetFlag)); + }); + } } // namespace redfish -- 2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0004-Add-support-to-ChangePassword-action.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0004-Add-support-to-ChangePassword-action.patch index e87995aca..9a2fada9e 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0004-Add-support-to-ChangePassword-action.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0004-Add-support-to-ChangePassword-action.patch @@ -1,7 +1,7 @@ -From 0ce94f6caf5d76d7f1abc71f6f8f7dc320517984 Mon Sep 17 00:00:00 2001 -From: Kuiying Wang <kuiying.wang@intel.com> -Date: Wed, 23 Dec 2020 14:41:23 +0800 -Subject: [PATCH] Add support to ChangePassword action +From 34f8680b21a134e2133bdcf41e1e83e4b4a05d28 Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Wed, 30 Jun 2021 15:37:47 +0000 +Subject: [PATCH 4/5] Add support to ChangePassword action Tested: @@ -32,108 +32,85 @@ root@intel-obmc:~# cat /var/lib/bios-settings-manager/passwordData Change-Id: I90319a68da0b0a7f9c5cd65a8cb8cf52269a5f52 Signed-off-by: Kuiying Wang <kuiying.wang@intel.com> --- - redfish-core/include/redfish.hpp | 1 + - redfish-core/lib/bios.hpp | 70 ++++++++++++++++++++++++++++++++ - 2 files changed, 71 insertions(+) + redfish-core/lib/bios.hpp | 58 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 58 insertions(+) -diff --git a/redfish-core/include/redfish.hpp b/redfish-core/include/redfish.hpp -index 298ebb8..4418c3d 100644 ---- a/redfish-core/include/redfish.hpp -+++ b/redfish-core/include/redfish.hpp -@@ -159,6 +159,7 @@ class RedfishService - nodes.emplace_back(std::make_unique<BiosSettings>(app)); - nodes.emplace_back(std::make_unique<BiosAttributeRegistry>(app)); - nodes.emplace_back(std::make_unique<BiosReset>(app)); -+ nodes.emplace_back(std::make_unique<BiosChangePassword>(app)); - #ifdef BMCWEB_ENABLE_VM_NBDPROXY - nodes.emplace_back(std::make_unique<VirtualMedia>(app)); - nodes.emplace_back(std::make_unique<VirtualMediaCollection>(app)); diff --git a/redfish-core/lib/bios.hpp b/redfish-core/lib/bios.hpp -index 1eb7bef..12ec472 100644 +index 49c0fd0..0250c59 100644 --- a/redfish-core/lib/bios.hpp +++ b/redfish-core/lib/bios.hpp -@@ -184,6 +184,9 @@ class BiosService : public Node - asyncResp->res.jsonValue["Actions"]["#Bios.ResetBios"] = { - {"target", - "/redfish/v1/Systems/system/Bios/Actions/Bios.ResetBios"}}; -+ asyncResp->res.jsonValue["Actions"]["#Bios.ChangePassword"] = { -+ {"target", -+ "/redfish/v1/Systems/system/Bios/Actions/Bios.ChangePassword"}}; +@@ -180,6 +180,9 @@ inline void requestRoutesBiosService(App& app) + asyncResp->res.jsonValue["Actions"]["#Bios.ResetBios"] = { + {"target", + "/redfish/v1/Systems/system/Bios/Actions/Bios.ResetBios"}}; ++ asyncResp->res.jsonValue["Actions"]["#Bios.ChangePassword"] = { ++ {"target", "/redfish/v1/Systems/system/Bios/Actions/" ++ "Bios.ChangePassword"}}; + + // Get the ActiveSoftwareImage and SoftwareImages + fw_util::populateFirmwareInformation( +@@ -283,6 +286,61 @@ inline void requestRoutesBiosService(App& app) + }); + } - // Get the ActiveSoftwareImage and SoftwareImages - fw_util::populateFirmwareInformation(asyncResp, fw_util::biosPurpose, -@@ -669,4 +672,71 @@ class BiosReset : public Node - std::variant<std::string>(resetFlag)); - } - }; -+ +/** + * BiosChangePassword class supports handle POST method for change bios + * password. The class retrieves and sends data directly to D-Bus. + */ -+class BiosChangePassword : public Node ++inline void requestRoutesBiosChangePassword(App& app) +{ -+ public: -+ BiosChangePassword(App& app) : -+ Node(app, -+ "/redfish/v1/Systems/system/Bios/Actions/Bios.ChangePassword/") -+ { -+ entityPrivileges = { -+ {boost::beast::http::verb::post, {{"ConfigureComponents"}}}}; -+ } -+ -+ private: -+ /** -+ * Function handles POST method request. -+ * Analyzes POST body message before sends Reset request data to D-Bus. -+ */ -+ void doPost(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -+ const crow::Request& req, -+ const std::vector<std::string>&) override -+ { -+ std::string currentPassword, newPassword, userName; -+ if (!json_util::readJson(req, asyncResp->res, "NewPassword", -+ newPassword, "OldPassword", currentPassword, -+ "PasswordName", userName)) -+ { -+ return; -+ } -+ if (currentPassword.empty()) -+ { -+ messages::actionParameterUnknown(asyncResp->res, "ChangePassword", -+ "OldPassword"); -+ return; -+ } -+ if (newPassword.empty()) -+ { -+ messages::actionParameterUnknown(asyncResp->res, "ChangePassword", -+ "NewPassword"); -+ return; -+ } -+ if (userName.empty()) -+ { -+ messages::actionParameterUnknown(asyncResp->res, "ChangePassword", -+ "PasswordName"); -+ return; -+ } -+ crow::connections::systemBus->async_method_call( -+ [asyncResp](const boost::system::error_code ec) { -+ if (ec) ++ BMCWEB_ROUTE(app, "/redfish/v1/Systems/system/Bios/") ++ .privileges({{"ConfigureComponents"}}) ++ .methods(boost::beast::http::verb::post)( ++ [](const crow::Request& req, ++ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { ++ std::string currentPassword, newPassword, userName; ++ if (!json_util::readJson(req, asyncResp->res, "NewPassword", ++ newPassword, "OldPassword", ++ currentPassword, "PasswordName", ++ userName)) ++ { ++ return; ++ } ++ if (currentPassword.empty()) ++ { ++ messages::actionParameterUnknown( ++ asyncResp->res, "ChangePassword", "OldPassword"); ++ return; ++ } ++ if (newPassword.empty()) ++ { ++ messages::actionParameterUnknown( ++ asyncResp->res, "ChangePassword", "NewPassword"); ++ return; ++ } ++ if (userName.empty()) + { -+ BMCWEB_LOG_CRITICAL -+ << "Failed in doPost(BiosChangePassword) " << ec; -+ messages::internalError(asyncResp->res); ++ messages::actionParameterUnknown( ++ asyncResp->res, "ChangePassword", "PasswordName"); + return; + } -+ }, -+ "xyz.openbmc_project.BIOSConfigPassword", -+ "/xyz/openbmc_project/bios_config/password", -+ "xyz.openbmc_project.BIOSConfig.Password", "ChangePassword", -+ userName, currentPassword, newPassword); -+ } -+}; ++ crow::connections::systemBus->async_method_call( ++ [asyncResp](const boost::system::error_code ec) { ++ if (ec) ++ { ++ BMCWEB_LOG_CRITICAL ++ << "Failed in doPost(BiosChangePassword) " ++ << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ }, ++ "xyz.openbmc_project.BIOSConfigPassword", ++ "/xyz/openbmc_project/bios_config/password", ++ "xyz.openbmc_project.BIOSConfig.Password", "ChangePassword", ++ userName, currentPassword, newPassword); ++ }); ++} + - } // namespace redfish + /** + * BiosSettings class supports handle GET/PATCH method for + * BIOS configuration pending settings. -- 2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0005-Fix-remove-bios-user-pwd-change-option-via-Redfish.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0005-Fix-remove-bios-user-pwd-change-option-via-Redfish.patch index 75a78abb4..26393bfee 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0005-Fix-remove-bios-user-pwd-change-option-via-Redfish.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0005-Fix-remove-bios-user-pwd-change-option-via-Redfish.patch @@ -1,7 +1,7 @@ -From fedcdb7887b4d934ee763d75f7988825300c5cef Mon Sep 17 00:00:00 2001 -From: Ayushi Smriti <smriti.ayushi@intel.com> -Date: Thu, 6 May 2021 11:56:38 +0530 -Subject: [PATCH] Fix:remove bios user pwd change option via Redfish +From edc6925e8c0d9f60da1f70c524261efaf05b2710 Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Wed, 30 Jun 2021 15:42:06 +0000 +Subject: [PATCH 5/5] Fix:remove bios user pwd change option via Redfish BMC should not provide user bios setup password change option via Redfish as per bios security requirements. Only Admin BIOS setup @@ -15,30 +15,32 @@ https://<ip>/redfish/v1/Systems/system/Bios/Actions/Bios.ChangePassword error occurs for UserPassword parameter and allows for AdminPassword. Signed-off-by: Ayushi Smriti <smriti.ayushi@intel.com> +Change-Id: I169cc6a4f786625d9e8b8dfe56816d52b1740f4c --- - redfish-core/lib/bios.hpp | 9 +++++++++ - 1 file changed, 9 insertions(+) + redfish-core/lib/bios.hpp | 10 ++++++++++ + 1 file changed, 10 insertions(+) diff --git a/redfish-core/lib/bios.hpp b/redfish-core/lib/bios.hpp -index 12ec472..0416934 100644 +index 0250c59..360a749 100644 --- a/redfish-core/lib/bios.hpp +++ b/redfish-core/lib/bios.hpp -@@ -722,6 +722,15 @@ class BiosChangePassword : public Node - "PasswordName"); - return; - } +@@ -323,6 +323,16 @@ inline void requestRoutesBiosChangePassword(App& app) + asyncResp->res, "ChangePassword", "PasswordName"); + return; + } + -+ // In Intel BIOS, we are not supporting user password in BIOS setup -+ if (userName == "UserPassword") -+ { -+ messages::actionParameterUnknown(asyncResp->res, "ChangePassword", -+ "PasswordName"); -+ return; -+ } ++ // In Intel BIOS, we are not supporting user password in BIOS ++ // setup ++ if (userName == "UserPassword") ++ { ++ messages::actionParameterUnknown( ++ asyncResp->res, "ChangePassword", "PasswordName"); ++ return; ++ } + - crow::connections::systemBus->async_method_call( - [asyncResp](const boost::system::error_code ec) { - if (ec) + crow::connections::systemBus->async_method_call( + [asyncResp](const boost::system::error_code ec) { + if (ec) -- 2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0001-EventService-Fix-retry-handling-for-http-client.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0001-EventService-Fix-retry-handling-for-http-client.patch index bda893a81..7a6818008 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0001-EventService-Fix-retry-handling-for-http-client.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0001-EventService-Fix-retry-handling-for-http-client.patch @@ -1,4 +1,4 @@ -From 3d6c3b3e91c04ff8f10bff49bcf2a7d7206c53df Mon Sep 17 00:00:00 2001 +From f74393a9bca899e353be3d0e2dc5c224539fe432 Mon Sep 17 00:00:00 2001 From: Sunitha Harish <sunithaharish04@gmail.com> Date: Fri, 19 Feb 2021 13:38:31 +0530 Subject: [PATCH] EventService : Fix retry handling for http-client @@ -530,10 +530,10 @@ index 992ac2b..feabbba 100644 void setRetryConfig(const uint32_t retryAttempts, diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index fa4e41a..c999121 100644 +index 11190ef..a8f7517 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -423,7 +423,7 @@ class Subscription +@@ -422,7 +422,7 @@ class Subscription reqHeaders.emplace_back(std::pair(key, val)); } } @@ -543,5 +543,4 @@ index fa4e41a..c999121 100644 this->eventSeqNum++; } -- -2.17.1 - +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0002-EventService-https-client-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0002-EventService-https-client-support.patch index 7cbb406a5..eef0ff065 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0002-EventService-https-client-support.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0002-EventService-https-client-support.patch @@ -1,4 +1,4 @@ -From 5f19e5c8ebc5cb0ce331e4ef841526995b6bdb2e Mon Sep 17 00:00:00 2001 +From 4df4a36d6d2cc11c51cc9d53cd441178cc97e39b Mon Sep 17 00:00:00 2001 From: AppaRao Puli <apparao.puli@linux.intel.com> Date: Mon, 22 Feb 2021 17:07:47 +0000 Subject: [PATCH] EventService: https client support @@ -385,10 +385,10 @@ index feabbba..aaf1b2d 100644 { if ((state == ConnState::suspended) || (state == ConnState::terminated)) diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index c999121..267c857 100644 +index a8f7517..d4a5bc5 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -398,7 +398,7 @@ class Subscription +@@ -397,7 +397,7 @@ class Subscription { conn = std::make_shared<crow::HttpClient>( crow::connections::systemBus->get_io_context(), id, host, port, @@ -398,5 +398,4 @@ index c999121..267c857 100644 Subscription(const std::shared_ptr<boost::beast::tcp_stream>& adaptor) : -- -2.17.1 - +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0004-Add-Server-Sent-Events-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0004-Add-Server-Sent-Events-support.patch index cd59ed94d..64948ca0c 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0004-Add-Server-Sent-Events-support.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0004-Add-Server-Sent-Events-support.patch @@ -1,4 +1,4 @@ -From 0c531d959364192697290c1489d5f7b1bdd7a665 Mon Sep 17 00:00:00 2001 +From 882dc7755083eea32f3d14f7e6c7330d5a9ac66f Mon Sep 17 00:00:00 2001 From: AppaRao Puli <apparao.puli@linux.intel.com> Date: Fri, 12 Mar 2021 18:53:25 +0000 Subject: [PATCH] Add Server-Sent-Events support @@ -30,7 +30,7 @@ Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> create mode 100644 http/server_sent_event.hpp diff --git a/http/http_connection.hpp b/http/http_connection.hpp -index 6172b3a..fc9fc60 100644 +index fb64014..45b1a68 100644 --- a/http/http_connection.hpp +++ b/http/http_connection.hpp @@ -326,7 +326,7 @@ class Connection : @@ -63,10 +63,10 @@ index 6172b3a..fc9fc60 100644 // delete lambda with self shared_ptr // to enable connection destruction diff --git a/http/http_response.hpp b/http/http_response.hpp -index 7965704..29c56e1 100644 +index 72ff9e9..6bb3aa5 100644 --- a/http/http_response.hpp +++ b/http/http_response.hpp -@@ -13,10 +13,15 @@ namespace crow +@@ -15,10 +15,15 @@ namespace crow template <typename Adaptor, typename Handler> class Connection; @@ -82,7 +82,7 @@ index 7965704..29c56e1 100644 using response_type = boost::beast::http::response<boost::beast::http::string_body>; -@@ -136,8 +141,8 @@ struct Response +@@ -138,8 +143,8 @@ struct Response private: bool completed{}; @@ -93,7 +93,7 @@ index 7965704..29c56e1 100644 // In case of a JSON object, set the Content-Type header void jsonMode() diff --git a/http/routing.hpp b/http/routing.hpp -index dd07523..7ddc6b0 100644 +index af6269e..318fcfe 100644 --- a/http/routing.hpp +++ b/http/routing.hpp @@ -6,6 +6,7 @@ @@ -474,5 +474,4 @@ index 0000000..41d18ed +}; +} // namespace crow -- -2.17.1 - +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch index 37609c154..78b52eea1 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0005-Add-SSE-style-subscription-support-to-eventservice.patch @@ -1,4 +1,4 @@ -From bcb80fc9a86555c74b56b5b37615601d3fbfae31 Mon Sep 17 00:00:00 2001 +From a9d994919b677a2650b80fb449cf96baad4f04dd Mon Sep 17 00:00:00 2001 From: AppaRao Puli <apparao.puli@linux.intel.com> Date: Tue, 16 Mar 2021 15:37:24 +0000 Subject: [PATCH] Add SSE style subscription support to eventservice @@ -24,15 +24,15 @@ Change-Id: I7f4b7a34974080739c4ba968ed570489af0474de http/http_connection.hpp | 2 +- include/eventservice_sse.hpp | 75 +++++ .../include/event_service_manager.hpp | 109 +++++-- - redfish-core/include/server_sent_events.hpp | 291 ------------------ - redfish-core/lib/event_service.hpp | 4 +- + redfish-core/include/server_sent_events.hpp | 290 ------------------ + redfish-core/lib/event_service.hpp | 8 +- src/webserver_main.cpp | 2 + - 6 files changed, 163 insertions(+), 320 deletions(-) + 6 files changed, 164 insertions(+), 322 deletions(-) create mode 100644 include/eventservice_sse.hpp delete mode 100644 redfish-core/include/server_sent_events.hpp diff --git a/http/http_connection.hpp b/http/http_connection.hpp -index fc9fc60..3afb4da 100644 +index 45b1a68bf015..ccc2d6a753b7 100644 --- a/http/http_connection.hpp +++ b/http/http_connection.hpp @@ -350,7 +350,7 @@ class Connection : @@ -46,7 +46,7 @@ index fc9fc60..3afb4da 100644 << " is getting upgraded"; diff --git a/include/eventservice_sse.hpp b/include/eventservice_sse.hpp new file mode 100644 -index 0000000..6c98e6e +index 000000000000..14daf00852f5 --- /dev/null +++ b/include/eventservice_sse.hpp @@ -0,0 +1,75 @@ @@ -107,7 +107,7 @@ index 0000000..6c98e6e +inline void requestRoutes(App& app) +{ + BMCWEB_ROUTE(app, "/redfish/v1/EventService/Subscriptions/SSE") -+ .privileges({"ConfigureComponents", "ConfigureManager"}) ++ .privileges({{"ConfigureComponents", "ConfigureManager"}}) + .serverSentEvent() + .onopen([](std::shared_ptr<crow::SseConnection>& conn, + const crow::Request& req, crow::Response& res) { @@ -126,17 +126,19 @@ index 0000000..6c98e6e +} // namespace eventservice_sse +} // namespace redfish diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index fa4e41a..ac644c1 100644 +index ca46aa7dc62f..098134a3a259 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -23,13 +23,15 @@ +@@ -22,15 +22,17 @@ #include <sys/inotify.h> #include <boost/asio/io_context.hpp> +#include <boost/beast/core/span.hpp> #include <boost/container/flat_map.hpp> #include <error_messages.hpp> + #include <event_service_store.hpp> #include <http_client.hpp> + #include <persistent_data.hpp> #include <random.hpp> -#include <server_sent_events.hpp> +#include <server_sent_event.hpp> @@ -146,7 +148,7 @@ index fa4e41a..ac644c1 100644 #include <cstdlib> #include <ctime> #include <fstream> -@@ -46,9 +48,27 @@ using EventServiceConfig = std::tuple<bool, uint32_t, uint32_t>; +@@ -46,9 +48,27 @@ using ReadingsObjType = static constexpr const char* eventFormatType = "Event"; static constexpr const char* metricReportFormatType = "MetricReport"; @@ -199,8 +201,8 @@ index fa4e41a..ac644c1 100644 static const Message* getMsgFromRegistry(const std::string& messageKey, const boost::beast::span<const MessageEntry>& registry) -@@ -401,11 +403,9 @@ class Subscription - path); +@@ -388,11 +390,9 @@ class Subscription : public persistent_data::UserSubscription + path, uriProto); } - Subscription(const std::shared_ptr<boost::beast::tcp_stream>& adaptor) : @@ -214,7 +216,7 @@ index fa4e41a..ac644c1 100644 ~Subscription() = default; -@@ -430,7 +430,7 @@ class Subscription +@@ -417,7 +417,7 @@ class Subscription : public persistent_data::UserSubscription if (sseConn != nullptr) { @@ -223,7 +225,7 @@ index fa4e41a..ac644c1 100644 } } -@@ -520,6 +520,7 @@ class Subscription +@@ -508,6 +508,7 @@ class Subscription : public persistent_data::UserSubscription this->sendEvent( msg.dump(2, ' ', true, nlohmann::json::error_handler_t::replace)); @@ -231,7 +233,7 @@ index fa4e41a..ac644c1 100644 } #endif -@@ -590,14 +591,39 @@ class Subscription +@@ -578,14 +579,39 @@ class Subscription : public persistent_data::UserSubscription return eventSeqNum; } @@ -271,8 +273,8 @@ index fa4e41a..ac644c1 100644 + std::string subId; }; - static constexpr const bool defaultEnabledState = true; -@@ -988,6 +1014,8 @@ class EventServiceManager + class EventServiceManager +@@ -942,6 +968,8 @@ class EventServiceManager subValue->updateRetryConfig(retryAttempts, retryTimeoutInterval); subValue->updateRetryPolicy(); @@ -281,7 +283,7 @@ index fa4e41a..ac644c1 100644 return id; } -@@ -1012,11 +1040,40 @@ class EventServiceManager +@@ -970,11 +998,40 @@ class EventServiceManager } } @@ -324,10 +326,10 @@ index fa4e41a..ac644c1 100644 std::vector<std::string> idList; diff --git a/redfish-core/include/server_sent_events.hpp b/redfish-core/include/server_sent_events.hpp deleted file mode 100644 -index 578fa19..0000000 +index 7613d7ba6427..000000000000 --- a/redfish-core/include/server_sent_events.hpp +++ /dev/null -@@ -1,291 +0,0 @@ +@@ -1,290 +0,0 @@ - -/* -// Copyright (c) 2020 Intel Corporation @@ -345,7 +347,6 @@ index 578fa19..0000000 -// limitations under the License. -*/ -#pragma once --#include "node.hpp" - -#include <boost/asio/strand.hpp> -#include <boost/beast/core/span.hpp> @@ -620,32 +621,43 @@ index 578fa19..0000000 - -} // namespace crow diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp -index 64a2009..7c9bb7a 100644 +index f1d6f5007d79..4a2d58a2f1dd 100644 --- a/redfish-core/lib/event_service.hpp +++ b/redfish-core/lib/event_service.hpp -@@ -34,8 +34,6 @@ static constexpr const std::array<const char*, 1> supportedResourceTypes = { +@@ -37,8 +37,6 @@ static constexpr const std::array<const char*, 1> supportedResourceTypes = { "Task"}; #endif -static constexpr const uint8_t maxNoOfSubscriptions = 20; - - class EventService : public Node + inline void requestRoutesEventService(App& app) { - public: -@@ -59,6 +57,8 @@ class EventService : public Node - {"@odata.type", "#EventService.v1_5_0.EventService"}, - {"Id", "EventService"}, - {"Name", "Event Service"}, -+ {"ServerSentEventUri", -+ "/redfish/v1/EventService/Subscriptions/SSE"}, - {"Subscriptions", - {{"@odata.id", "/redfish/v1/EventService/Subscriptions"}}}, - {"Actions", + BMCWEB_ROUTE(app, "/redfish/v1/EventService/") +@@ -50,6 +48,8 @@ inline void requestRoutesEventService(App& app) + {"@odata.type", "#EventService.v1_5_0.EventService"}, + {"Id", "EventService"}, + {"Name", "Event Service"}, ++ {"ServerSentEventUri", ++ "/redfish/v1/EventService/Subscriptions/SSE"}, + {"Subscriptions", + {{"@odata.id", "/redfish/v1/EventService/Subscriptions"}}}, + {"Actions", +@@ -90,9 +90,7 @@ inline void requestRoutesEventService(App& app) + .privileges(redfish::privileges::patchEventService) + .methods(boost::beast::http::verb::patch)( + [](const crow::Request& req, +- const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) +- +- { ++ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { + std::optional<bool> serviceEnabled; + std::optional<uint32_t> retryAttemps; + std::optional<uint32_t> retryInterval; diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp -index 902c32b..d4bd48c 100644 +index c01accd2e93e..363005105d18 100644 --- a/src/webserver_main.cpp +++ b/src/webserver_main.cpp -@@ -5,6 +5,7 @@ +@@ -6,6 +6,7 @@ #include <cors_preflight.hpp> #include <dbus_monitor.hpp> #include <dbus_singleton.hpp> @@ -653,7 +665,7 @@ index 902c32b..d4bd48c 100644 #include <hostname_monitor.hpp> #include <ibm/management_console_rest.hpp> #include <image_upload.hpp> -@@ -81,6 +82,7 @@ int main(int /*argc*/, char** /*argv*/) +@@ -82,6 +83,7 @@ int main(int /*argc*/, char** /*argv*/) #endif #ifdef BMCWEB_ENABLE_REDFISH diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch index c3e3acbca..79b6e42d7 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch @@ -1,4 +1,4 @@ -From 3dc6f6d807060cf3b38486e4190fd1ba9c66c66b Mon Sep 17 00:00:00 2001 +From e8bf93f1cc374a986896174489719065d0cc49a0 Mon Sep 17 00:00:00 2001 From: AppaRao Puli <apparao.puli@linux.intel.com> Date: Wed, 17 Mar 2021 01:16:50 +0000 Subject: [PATCH] Add EventService SSE filter support @@ -33,18 +33,18 @@ Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> Signed-off-by: P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> Change-Id: I55c6f53bb5e57aa1f2d1601f1a16525a33b13bd2 --- - include/eventservice_sse.hpp | 141 +++++++++++++++++- + include/eventservice_sse.hpp | 145 +++++++++++++++++- redfish-core/include/error_messages.hpp | 9 ++ .../include/event_service_manager.hpp | 5 + redfish-core/lib/event_service.hpp | 5 - redfish-core/src/error_messages.cpp | 26 ++++ - 5 files changed, 177 insertions(+), 9 deletions(-) + 5 files changed, 181 insertions(+), 9 deletions(-) diff --git a/include/eventservice_sse.hpp b/include/eventservice_sse.hpp -index 6c98e6e..01e4126 100644 +index 14daf00..2f22f98 100644 --- a/include/eventservice_sse.hpp +++ b/include/eventservice_sse.hpp -@@ -23,16 +23,149 @@ static bool createSubscription(std::shared_ptr<crow::SseConnection>& conn, +@@ -23,16 +23,153 @@ static bool createSubscription(std::shared_ptr<crow::SseConnection>& conn, } BMCWEB_LOG_DEBUG << "Request query param size: " << req.urlParams.size(); @@ -143,6 +143,10 @@ index 6c98e6e..01e4126 100644 + registryPrefix.assign(supportedRegPrefixes.begin(), + supportedRegPrefixes.end()); + } ++ else ++ { ++ registryPrefix = regPrefixes; ++ } + + for (const std::string& id : msgIds) + { @@ -172,7 +176,7 @@ index 6c98e6e..01e4126 100644 + + if (!validId) + { -+ messages::propertyValueNotInList(res, id, "MessageId"); ++ messages::propertyValueNotInList(res, id, "MessageIds"); + res.end(); + return false; + } @@ -199,10 +203,10 @@ index 6c98e6e..01e4126 100644 std::string id = redfish::EventServiceManager::getInstance().addSubscription(subValue, diff --git a/redfish-core/include/error_messages.hpp b/redfish-core/include/error_messages.hpp -index 7dfdc80..922dae9 100644 +index 10567d1..f29e326 100644 --- a/redfish-core/include/error_messages.hpp +++ b/redfish-core/include/error_messages.hpp -@@ -959,6 +959,15 @@ nlohmann::json mutualExclusiveProperties(const std::string& arg1, +@@ -971,6 +971,15 @@ nlohmann::json mutualExclusiveProperties(const std::string& arg1, void mutualExclusiveProperties(crow::Response& res, const std::string& arg1, const std::string& arg2); @@ -219,7 +223,7 @@ index 7dfdc80..922dae9 100644 } // namespace redfish diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index e826207..f201134 100644 +index 098134a..c8fcb33 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp @@ -55,6 +55,11 @@ static constexpr const char* eventServiceFile = @@ -235,10 +239,10 @@ index e826207..f201134 100644 static std::optional<boost::asio::posix::stream_descriptor> inotifyConn; static constexpr const char* redfishEventLogDir = "/var/log"; diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp -index 7c9bb7a..297a4ea 100644 +index 4a2d58a..67abb95 100644 --- a/redfish-core/lib/event_service.hpp +++ b/redfish-core/lib/event_service.hpp -@@ -18,11 +18,6 @@ +@@ -21,11 +21,6 @@ namespace redfish { @@ -251,10 +255,10 @@ index 7c9bb7a..297a4ea 100644 "TerminateAfterRetries", "SuspendRetries", "RetryForever"}; diff --git a/redfish-core/src/error_messages.cpp b/redfish-core/src/error_messages.cpp -index ad5f819..409adb1 100644 +index 48edaf1..bebb6d8 100644 --- a/redfish-core/src/error_messages.cpp +++ b/redfish-core/src/error_messages.cpp -@@ -2147,6 +2147,32 @@ void mutualExclusiveProperties(crow::Response& res, const std::string& arg1, +@@ -2174,6 +2174,32 @@ void mutualExclusiveProperties(crow::Response& res, const std::string& arg1, addMessageToErrorJson(res.jsonValue, mutualExclusiveProperties(arg1, arg2)); } diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0007-EventService-Log-events-for-subscription-actions.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0007-EventService-Log-events-for-subscription-actions.patch index 0b12671e5..7749ddb72 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0007-EventService-Log-events-for-subscription-actions.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0007-EventService-Log-events-for-subscription-actions.patch @@ -1,6 +1,6 @@ -From 0a1390428fd6f5651669f4306f6105d33a24453c Mon Sep 17 00:00:00 2001 -From: Ayushi Smriti <smriti.ayushi@intel.com> -Date: Mon, 10 May 2021 13:03:37 +0530 +From dad35d6e6736f1c4ab6d739c62b22923ad749ad7 Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Tue, 13 Jul 2021 12:30:08 +0000 Subject: [PATCH] EventService: Log events for subscription actions Log redfish event for below 3 actions @@ -27,10 +27,10 @@ Signed-off-by: Ayushi Smriti <smriti.ayushi@intel.com> 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index 9952ef1..2b957ea 100644 +index a5b37e5..75f5615 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp -@@ -22,6 +22,7 @@ +@@ -20,6 +20,7 @@ #include "registries/task_event_message_registry.hpp" #include <sys/inotify.h> @@ -38,7 +38,7 @@ index 9952ef1..2b957ea 100644 #include <boost/asio/io_context.hpp> #include <boost/beast/core/span.hpp> -@@ -800,7 +801,7 @@ class EventServiceManager +@@ -813,7 +814,7 @@ class EventServiceManager return; } @@ -47,7 +47,7 @@ index 9952ef1..2b957ea 100644 { // Persist the config and subscription data. nlohmann::json jsonData; -@@ -897,7 +898,7 @@ class EventServiceManager +@@ -910,7 +911,7 @@ class EventServiceManager if (updateConfig) { @@ -56,7 +56,7 @@ index 9952ef1..2b957ea 100644 } if (updateRetryCfg) -@@ -992,7 +993,7 @@ class EventServiceManager +@@ -1005,7 +1006,7 @@ class EventServiceManager if (updateFile) { @@ -65,7 +65,7 @@ index 9952ef1..2b957ea 100644 } #ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES -@@ -1007,6 +1008,13 @@ class EventServiceManager +@@ -1020,6 +1021,13 @@ class EventServiceManager // Set Subscription ID for back trace subValue->setSubscriptionId(id); @@ -79,7 +79,7 @@ index 9952ef1..2b957ea 100644 return id; } -@@ -1027,7 +1035,14 @@ class EventServiceManager +@@ -1040,7 +1048,14 @@ class EventServiceManager { subscriptionsMap.erase(obj); updateNoOfSubscribersCount(); @@ -95,7 +95,7 @@ index 9952ef1..2b957ea 100644 } } -@@ -1049,6 +1064,18 @@ class EventServiceManager +@@ -1062,6 +1077,18 @@ class EventServiceManager } } @@ -115,18 +115,18 @@ index 9952ef1..2b957ea 100644 { return subscriptionsMap.size(); diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp -index 297a4ea..ed4955e 100644 +index 53a60d3..435c93d 100644 --- a/redfish-core/lib/event_service.hpp +++ b/redfish-core/lib/event_service.hpp -@@ -616,7 +616,7 @@ class EventDestination : public Node - subValue->updateRetryPolicy(); - } - -- EventServiceManager::getInstance().updateSubscriptionData(); -+ EventServiceManager::getInstance().updateSubscription(params[0]); - } +@@ -579,7 +579,7 @@ inline void requestRoutesEventDestination(App& app) + subValue->updateRetryPolicy(); + } - void doDelete(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, +- EventServiceManager::getInstance().updateSubscriptionData(); ++ EventServiceManager::getInstance().updateSubscription(param); + }); + BMCWEB_ROUTE(app, "/redfish/v1/EventService/Subscriptions/<str>/") + .privileges({{"ConfigureManager"}}) -- -2.17.1 +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0008-Add-checks-on-Event-Subscription-input-parameters.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0008-Add-checks-on-Event-Subscription-input-parameters.patch index 874c82e2f..84ceb4ba8 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0008-Add-checks-on-Event-Subscription-input-parameters.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0008-Add-checks-on-Event-Subscription-input-parameters.patch @@ -1,4 +1,4 @@ -From b43da33c7bc9ad4d5eea35c9ba68efdd6ed6d34d Mon Sep 17 00:00:00 2001 +From 05fdea2bb8e486b058d137a067ce1f5c885d2a96 Mon Sep 17 00:00:00 2001 From: Nitin Wankhade <nitinx.arunrao.wankhade@intel.com> Date: Mon, 28 Jun 2021 19:59:57 +0000 Subject: [PATCH] Add checks on Event Subscription input parameters @@ -17,16 +17,16 @@ Tested Change-Id: Iec2cd766c0e137b72706fc2da468d4fefd8fbaae Signed-off-by: Nitin Wankhade <nitinx.arunrao.wankhade@intel.com> --- - redfish-core/lib/event_service.hpp | 30 +++++++++++++++++++++++++++++- - 1 file changed, 29 insertions(+), 1 deletion(-) + redfish-core/lib/event_service.hpp | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp -index ed4955e..0cb0f00 100644 +index 52b01e5..f8a1671 100644 --- a/redfish-core/lib/event_service.hpp +++ b/redfish-core/lib/event_service.hpp -@@ -16,6 +16,10 @@ - #pragma once - #include "event_service_manager.hpp" +@@ -19,6 +19,10 @@ + #include <app.hpp> + #include <registries/privilege_registry.hpp> +#define MAX_CONTEXT_SIZE 256 +#define MAX_DESTINATION_SIZE 1024 @@ -35,50 +35,50 @@ index ed4955e..0cb0f00 100644 namespace redfish { static constexpr const std::array<const char*, 3> supportedRetryPolicies = { -@@ -243,7 +247,11 @@ class EventDestinationCollection : public Node - { - return; - } -- -+ if (destUrl.size() > MAX_DESTINATION_SIZE) -+ { -+ messages::propertySizeExceeded(asyncResp->res, "Destination"); -+ return; -+ } - if (regPrefixes && msgIds) - { - if (regPrefixes->size() && msgIds->size()) -@@ -350,11 +358,31 @@ class EventDestinationCollection : public Node +@@ -220,6 +224,12 @@ inline void requestRoutesEventDestinationCollection(App& app) + return; + } - if (context) - { -+ if (context->size() > MAX_CONTEXT_SIZE) -+ { -+ messages::propertySizeExceeded(asyncResp->res, "Context"); -+ return; -+ } - subValue->customText = *context; - } ++ if (destUrl.size() > MAX_DESTINATION_SIZE) ++ { ++ messages::propertySizeExceeded(asyncResp->res, "Destination"); ++ return; ++ } ++ + if (regPrefixes && msgIds) + { + if (regPrefixes->size() && msgIds->size()) +@@ -330,11 +340,31 @@ inline void requestRoutesEventDestinationCollection(App& app) - if (headers) - { -+ size_t cumulativeLen = 0; + if (context) + { ++ if (context->size() > MAX_CONTEXT_SIZE) ++ { ++ messages::propertySizeExceeded(asyncResp->res, "Context"); ++ return; ++ } + subValue->customText = *context; + } + + if (headers) + { ++ size_t cumulativeLen = 0; + -+ for (nlohmann::json& itr : *headers) -+ { -+ std::string hdr{itr.dump( -+ -1, ' ', true, nlohmann::json::error_handler_t::replace)}; -+ cumulativeLen += hdr.length(); ++ for (nlohmann::json& itr : *headers) ++ { ++ std::string hdr{itr.dump( ++ -1, ' ', true, nlohmann::json::error_handler_t::replace)}; ++ cumulativeLen += hdr.length(); + -+ if (cumulativeLen > MAX_HEADER_SIZE) -+ { -+ messages::propertySizeExceeded(asyncResp->res, ++ if (cumulativeLen > MAX_HEADER_SIZE) ++ { ++ messages::propertySizeExceeded(asyncResp->res, + "HttpHeaders"); -+ return; -+ } -+ } - subValue->httpHeaders = *headers; - } ++ return; ++ } ++ } + subValue->httpHeaders = *headers; + } -- 2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0009-Restructure-Redifsh-EventLog-Transmit-code-flow.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0009-Restructure-Redifsh-EventLog-Transmit-code-flow.patch new file mode 100644 index 000000000..6e635a828 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0009-Restructure-Redifsh-EventLog-Transmit-code-flow.patch @@ -0,0 +1,225 @@ +From 7f45c83c0b3acb08461461c23e0d7add46d9191c Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Wed, 14 Jul 2021 14:13:11 +0000 +Subject: [PATCH] Restructure Redfish EventLog Transmit code flow + +In the current implementation: + 1. When Event service is disabled and enabled back after a while, + all the logs during this time span between disable to enable + are dumped to the Event listener. + 2. When two events occur very close (in terms of microseconds) + and they trigger two different iNotify events, the listener + receives both of these events with the same Event ID. + +This occurs as the last log time stamp read from redfish file +and previous time stamp used to generate Event ID's are not +being updated continuously. + +This commit fixes this issue by tweaking the logic to continuously +update the time stamp values (even during when Event Service is +disabled), and also replaces multiple string operations with file +operations. i.e. Instead of looping through the entire Redfish file +until last time stamp read is reached, this fix makes use of +fseek to get to the last read position. + +Tested: + - Subscribed to an event and successfully received Event Logs. + - No Event Logs were received when Event Service was disabled. + - No Dump of past Events after Event Service was enabled. + - Redfish Validator passed + +Change-Id: I87136bee78076b1b3219930813702b3b9d20c157 +Signed-off-by: P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> +--- + .../include/event_service_manager.hpp | 108 ++++++++++++------ + 1 file changed, 76 insertions(+), 32 deletions(-) + +diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp +index 430767a..53ed3f6 100644 +--- a/redfish-core/include/event_service_manager.hpp ++++ b/redfish-core/include/event_service_manager.hpp +@@ -133,15 +133,10 @@ static const Message* formatMessage(const std::string_view& messageID) + + namespace event_log + { +-inline bool getUniqueEntryID(const std::string& logEntry, std::string& entryID, +- const bool firstEntry = true) ++inline bool getUniqueEntryID(const std::string& logEntry, std::string& entryID) + { + static time_t prevTs = 0; + static int index = 0; +- if (firstEntry) +- { +- prevTs = 0; +- } + + // Get the entry timestamp + std::time_t curTs = 0; +@@ -639,6 +634,7 @@ class EventServiceManager + } + + std::string lastEventTStr; ++ std::streampos redfishLogFilePosition{0}; + size_t noOfEventLogSubscribers{0}; + size_t noOfMetricReportSubscribers{0}; + std::shared_ptr<sdbusplus::bus::match::match> matchTelemetryMonitor; +@@ -1204,7 +1200,22 @@ class EventServiceManager + #ifndef BMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES + void cacheLastEventTimestamp() + { +- lastEventTStr.clear(); ++ // Control comes here when : ++ // 1. Subscription is added and lastEventTStr is empty ++ // 2. lastEventTStr is empty ++ // 3. When a new Redfish file is created ++ ++ if (!lastEventTStr.empty()) ++ { ++ // Control would be here when Redfish file is created. ++ // Reset File Position as new file is created ++ redfishLogFilePosition = 0; ++ return; ++ } ++ ++ // Open the redfish file and read till the last record to get the ++ // last event's time stamp. ++ + std::ifstream logStream(redfishEventLogFile); + if (!logStream.good()) + { +@@ -1212,27 +1223,44 @@ class EventServiceManager + return; + } + std::string logEntry; ++ std::string prev_logEntry; + while (std::getline(logStream, logEntry)) + { +- size_t space = logEntry.find_first_of(' '); +- if (space == std::string::npos) +- { +- // Shouldn't enter here but lets skip it. +- BMCWEB_LOG_DEBUG << "Invalid log entry found."; +- continue; +- } +- lastEventTStr = logEntry.substr(0, space); ++ prev_logEntry = logEntry; ++ redfishLogFilePosition = logStream.tellg(); ++ } ++ ++ if (prev_logEntry.empty()) ++ { ++ BMCWEB_LOG_ERROR ++ << "Last Event Time Stamp Caching Failed : No Records"; ++ redfishLogFilePosition = 0; ++ return; ++ } ++ ++ size_t space = prev_logEntry.find_first_of(' '); ++ if (space == std::string::npos) ++ { ++ // Shouldn't enter here but lets skip it. ++ BMCWEB_LOG_DEBUG << "Invalid log entry found."; ++ BMCWEB_LOG_ERROR << "Last Event Time Stamp Caching Failed"; ++ return; + } ++ lastEventTStr = prev_logEntry.substr(0, space); + BMCWEB_LOG_DEBUG << "Last Event time stamp set: " << lastEventTStr; ++ BMCWEB_LOG_DEBUG << "Next Log Position : " << redfishLogFilePosition; + } + + void readEventLogsFromFile() + { +- if (!serviceEnabled || !noOfEventLogSubscribers) ++ if (lastEventTStr.empty()) + { +- BMCWEB_LOG_DEBUG << "EventService disabled or no Subscriptions."; +- return; ++ // Shouldn't ideally enter here. ++ // Last event Time stamp would be set by now. ++ // Just incase of any failures before. ++ cacheLastEventTimestamp(); + } ++ + std::ifstream logStream(redfishEventLogFile); + if (!logStream.good()) + { +@@ -1242,27 +1270,21 @@ class EventServiceManager + + std::vector<EventLogObjectsType> eventRecords; + +- bool startLogCollection = false; +- bool firstEntry = true; +- + std::string logEntry; ++ ++ // Get the read pointer to the next log to be read. ++ logStream.seekg(redfishLogFilePosition); ++ + while (std::getline(logStream, logEntry)) + { +- if (!startLogCollection && !lastEventTStr.empty()) +- { +- if (boost::starts_with(logEntry, lastEventTStr)) +- { +- startLogCollection = true; +- } +- continue; +- } ++ // Update Pointer position ++ redfishLogFilePosition = logStream.tellg(); + + std::string idStr; +- if (!event_log::getUniqueEntryID(logEntry, idStr, firstEntry)) ++ if (!event_log::getUniqueEntryID(logEntry, idStr)) + { + continue; + } +- firstEntry = false; + + std::string timestamp; + std::string messageID; +@@ -1274,6 +1296,16 @@ class EventServiceManager + continue; + } + ++ lastEventTStr = timestamp; ++ ++ if (!serviceEnabled || !noOfEventLogSubscribers) ++ { ++ // If Service is not enabled, no need to compute ++ // the remaining items below. ++ // But, Loop must continue to keep track of Timestamp ++ continue; ++ } ++ + std::string registryName; + std::string messageKey; + event_log::getRegistryAndMessageKey(messageID, registryName, +@@ -1283,11 +1315,23 @@ class EventServiceManager + continue; + } + +- lastEventTStr = timestamp; + eventRecords.emplace_back(idStr, timestamp, messageID, registryName, + messageKey, messageArgs); + } + ++ if (!serviceEnabled || !noOfEventLogSubscribers) ++ { ++ BMCWEB_LOG_DEBUG << "EventService disabled or no Subscriptions."; ++ return; ++ } ++ ++ if (eventRecords.empty()) ++ { ++ // No Records to send ++ BMCWEB_LOG_DEBUG << "No log entries available to be transferred."; ++ return; ++ } ++ + for (const auto& it : this->subscriptionsMap) + { + std::shared_ptr<Subscription> entry = it.second; +-- +2.25.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README index ae010dafb..cd2e1c2bc 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/README @@ -4,16 +4,25 @@ thee gets merged upstream. Upstream revision information: - EventService : Fix retry handling for http-client - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/40731/20 + https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/40731/21 - EventService: https client support - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/31735/39 + https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/31735/40 - Add Server-Sent-Events support - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/41258/6 + https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/41258/7 - Add SSE style subscription support to eventservice - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/41319/6 + https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/41319/8 - Add EventService SSE filter support - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/41349/3 + https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/41349/5 + + - EventService Log events for subscription actions + file://telemetry/0007-EventService-Log-events-for-subscription-actions.patch + + - Add checks on Event-Subscription input parameters + file://telemetry/0008-Add-checks-on-Event-Subscription-input-parameters.patch + + - Restructure Redifsh EventLog Transmit code flow + file://telemetry/0009-Restructure-Redifsh-EventLog-Transmit-code-flow.patch diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-MetricDefinition-scheme.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-MetricDefinition-scheme.patch index f03e49223..f53b7013f 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-MetricDefinition-scheme.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0001-Add-support-for-MetricDefinition-scheme.patch @@ -1,4 +1,4 @@ -From 6acffea563905c00f4b6d00c738fe7516e03c724 Mon Sep 17 00:00:00 2001 +From e37e30943fcb1ba504658ed07d69f950ccf44585 Mon Sep 17 00:00:00 2001 From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> Date: Tue, 13 Apr 2021 13:00:18 +0000 Subject: [PATCH] Add support for MetricDefinition scheme @@ -12,28 +12,28 @@ Tested: - MetricDefinitions response is filled with existing sensors, it works with and without Telemetry service - Validated a presence of MetricDefinition members and its attributes - - Successfully passed RedfishServiceValidator.py using witherspoon image - on QEMU + - Successfully passed RedfishServiceValidator.py using witherspoon + image on QEMU Signed-off-by: Wludzik, Jozef <jozef.wludzik@intel.com> Signed-off-by: Krzysztof Grobelny <krzysztof.grobelny@intel.com> Change-Id: I3086e1302e1ba2e5442d1367939fd5507a0cbc00 --- redfish-core/include/redfish.hpp | 3 + - .../include/utils/get_chassis_names.hpp | 58 ++++ + .../include/utils/get_chassis_names.hpp | 58 +++++ .../include/utils/telemetry_utils.hpp | 2 + - redfish-core/lib/metric_definition.hpp | 264 ++++++++++++++++++ + redfish-core/lib/metric_definition.hpp | 242 ++++++++++++++++++ redfish-core/lib/sensors.hpp | 25 +- redfish-core/lib/telemetry_service.hpp | 2 + - 6 files changed, 342 insertions(+), 12 deletions(-) + 6 files changed, 320 insertions(+), 12 deletions(-) create mode 100644 redfish-core/include/utils/get_chassis_names.hpp create mode 100644 redfish-core/lib/metric_definition.hpp diff --git a/redfish-core/include/redfish.hpp b/redfish-core/include/redfish.hpp -index 4418c3d..594520d 100644 +index 1c7b695..9983b88 100644 --- a/redfish-core/include/redfish.hpp +++ b/redfish-core/include/redfish.hpp -@@ -25,6 +25,7 @@ +@@ -26,6 +26,7 @@ #include "../lib/managers.hpp" #include "../lib/memory.hpp" #include "../lib/message_registries.hpp" @@ -41,15 +41,15 @@ index 4418c3d..594520d 100644 #include "../lib/metric_report.hpp" #include "../lib/metric_report_definition.hpp" #include "../lib/network_protocol.hpp" -@@ -215,6 +216,8 @@ class RedfishService - nodes.emplace_back(std::make_unique<HypervisorResetActionInfo>(app)); +@@ -199,6 +200,8 @@ class RedfishService + requestRoutesMetricReportDefinition(app); + requestRoutesMetricReportCollection(app); + requestRoutesMetricReport(app); ++ requestRoutesMetricDefinitionCollection(app); ++ requestRoutesMetricDefinition(app); + } + }; - nodes.emplace_back(std::make_unique<TelemetryService>(app)); -+ nodes.emplace_back(std::make_unique<MetricDefinitionCollection>(app)); -+ nodes.emplace_back(std::make_unique<MetricDefinition>(app)); - nodes.emplace_back( - std::make_unique<MetricReportDefinitionCollection>(app)); - nodes.emplace_back(std::make_unique<MetricReportDefinition>(app)); diff --git a/redfish-core/include/utils/get_chassis_names.hpp b/redfish-core/include/utils/get_chassis_names.hpp new file mode 100644 index 0000000..0276b6f @@ -129,14 +129,13 @@ index 5872350..1b4f75d 100644 constexpr const char* metricReportUri = diff --git a/redfish-core/lib/metric_definition.hpp b/redfish-core/lib/metric_definition.hpp new file mode 100644 -index 0000000..072fe20 +index 0000000..2443996 --- /dev/null +++ b/redfish-core/lib/metric_definition.hpp -@@ -0,0 +1,264 @@ +@@ -0,0 +1,242 @@ +#pragma once + +#include "async_resp.hpp" -+#include "node.hpp" +#include "sensors.hpp" +#include "utils/get_chassis_names.hpp" +#include "utils/telemetry_utils.hpp" @@ -196,72 +195,67 @@ index 0000000..072fe20 + +} // namespace telemetry + -+class MetricDefinitionCollection : public Node ++inline void requestRoutesMetricDefinitionCollection(App& app) +{ -+ public: -+ MetricDefinitionCollection(App& app) : -+ Node(app, "/redfish/v1/TelemetryService/MetricDefinitions/") -+ { -+ entityPrivileges = { -+ {boost::beast::http::verb::get, {{"Login"}}}, -+ {boost::beast::http::verb::head, {{"Login"}}}, -+ {boost::beast::http::verb::patch, {{"ConfigureManager"}}}, -+ {boost::beast::http::verb::put, {{"ConfigureManager"}}}, -+ {boost::beast::http::verb::delete_, {{"ConfigureManager"}}}, -+ {boost::beast::http::verb::post, {{"ConfigureManager"}}}}; -+ } -+ -+ private: -+ void doGet(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -+ const crow::Request&, const std::vector<std::string>&) override -+ { -+ asyncResp->res.jsonValue["@odata.type"] = "#MetricDefinitionCollection." -+ "MetricDefinitionCollection"; -+ asyncResp->res.jsonValue["@odata.id"] = -+ "/redfish/v1/TelemetryService/MetricDefinitions"; -+ asyncResp->res.jsonValue["Name"] = "Metric Definition Collection"; -+ asyncResp->res.jsonValue["Members"] = nlohmann::json::array(); -+ asyncResp->res.jsonValue["Members@odata.count"] = 0; -+ -+ utils::getChassisNames( -+ [asyncResp](boost::system::error_code ec, -+ const std::vector<std::string>& chassisNames) { -+ if (ec) -+ { -+ messages::internalError(asyncResp->res); -+ BMCWEB_LOG_ERROR << "getChassisNames error: " << ec.value(); -+ return; -+ } -+ -+ auto handleRetrieveUriToDbusMap = -+ [asyncResp](const boost::beast::http::status status, -+ const boost::container::flat_map< -+ std::string, std::string>& uriToDbus) { -+ if (status != boost::beast::http::status::ok) ++ BMCWEB_ROUTE(app, "/redfish/v1/TelemetryService/MetricDefinitions/") ++ .privileges({{"Login"}}) ++ .methods(boost::beast::http::verb::get)( ++ [](const crow::Request&, ++ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp) { ++ asyncResp->res.jsonValue["@odata.type"] = ++ "#MetricDefinitionCollection." ++ "MetricDefinitionCollection"; ++ asyncResp->res.jsonValue["@odata.id"] = ++ "/redfish/v1/TelemetryService/MetricDefinitions"; ++ asyncResp->res.jsonValue["Name"] = ++ "Metric Definition Collection"; ++ asyncResp->res.jsonValue["Members"] = nlohmann::json::array(); ++ asyncResp->res.jsonValue["Members@odata.count"] = 0; ++ ++ utils::getChassisNames( ++ [asyncResp](boost::system::error_code ec, ++ const std::vector<std::string>& chassisNames) { ++ if (ec) + { -+ BMCWEB_LOG_ERROR -+ << "Failed to retrieve URI to dbus " -+ "sensors map with err " -+ << static_cast<unsigned>(status); + messages::internalError(asyncResp->res); ++ BMCWEB_LOG_ERROR << "getChassisNames error: " ++ << ec.value(); + return; + } -+ telemetry::addMembers(asyncResp->res, uriToDbus); -+ }; + -+ for (const std::string& chassisName : chassisNames) -+ { -+ for (const auto& [sensorNode, _] : sensors::dbus::paths) -+ { -+ BMCWEB_LOG_DEBUG << "Chassis: " << chassisName -+ << " sensor: " << sensorNode; -+ retrieveUriToDbusMap(chassisName, sensorNode.data(), -+ handleRetrieveUriToDbusMap); -+ } -+ } ++ auto handleRetrieveUriToDbusMap = ++ [asyncResp]( ++ const boost::beast::http::status status, ++ const boost::container::flat_map< ++ std::string, std::string>& uriToDbus) { ++ if (status != boost::beast::http::status::ok) ++ { ++ BMCWEB_LOG_ERROR ++ << "Failed to retrieve URI to dbus " ++ "sensors map with err " ++ << static_cast<unsigned>(status); ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ telemetry::addMembers(asyncResp->res, ++ uriToDbus); ++ }; ++ ++ for (const std::string& chassisName : chassisNames) ++ { ++ for (const auto& [sensorNode, _] : ++ sensors::dbus::paths) ++ { ++ BMCWEB_LOG_DEBUG << "Chassis: " << chassisName ++ << " sensor: " << sensorNode; ++ retrieveUriToDbusMap( ++ chassisName, sensorNode.data(), ++ handleRetrieveUriToDbusMap); ++ } ++ } ++ }); + }); -+ } -+}; ++} + +namespace telemetry +{ @@ -306,99 +300,83 @@ index 0000000..072fe20 + +} // namespace telemetry + -+class MetricDefinition : public Node ++inline void requestRoutesMetricDefinition(App& app) +{ -+ public: -+ MetricDefinition(App& app) : -+ Node(app, "/redfish/v1/TelemetryService/MetricDefinitions/<str>/", -+ std::string()) -+ { -+ entityPrivileges = { -+ {boost::beast::http::verb::get, {{"Login"}}}, -+ {boost::beast::http::verb::head, {{"Login"}}}, -+ {boost::beast::http::verb::patch, {{"ConfigureManager"}}}, -+ {boost::beast::http::verb::put, {{"ConfigureManager"}}}, -+ {boost::beast::http::verb::delete_, {{"ConfigureManager"}}}, -+ {boost::beast::http::verb::post, {{"ConfigureManager"}}}}; -+ } -+ -+ private: -+ void doGet(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -+ const crow::Request&, -+ const std::vector<std::string>& params) override -+ { -+ if (params.size() != 1) -+ { -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ -+ const std::string& readingType = params[0]; -+ -+ if (!telemetry::isSensorIdSupported(readingType)) -+ { -+ messages::resourceNotFound(asyncResp->res, "MetricDefinition", -+ readingType); -+ return; -+ } -+ -+ asyncResp->res.jsonValue["MetricProperties"] = nlohmann::json::array(); -+ asyncResp->res.jsonValue["Id"] = readingType; -+ asyncResp->res.jsonValue["Name"] = readingType; -+ asyncResp->res.jsonValue["@odata.id"] = -+ telemetry::metricDefinitionUri + readingType; -+ asyncResp->res.jsonValue["@odata.type"] = -+ "#MetricDefinition.v1_0_3.MetricDefinition"; -+ asyncResp->res.jsonValue["MetricDataType"] = "Decimal"; -+ asyncResp->res.jsonValue["MetricType"] = "Numeric"; -+ asyncResp->res.jsonValue["IsLinear"] = true; -+ asyncResp->res.jsonValue["Implementation"] = "PhysicalSensor"; -+ asyncResp->res.jsonValue["Units"] = -+ sensors::toReadingUnits(readingType); -+ -+ utils::getChassisNames([asyncResp, -+ readingType](boost::system::error_code ec, -+ const std::vector<std::string>& -+ chassisNames) { -+ if (ec) -+ { -+ messages::internalError(asyncResp->res); -+ BMCWEB_LOG_ERROR << "getChassisNames error: " << ec.value(); -+ return; -+ } -+ -+ auto handleRetrieveUriToDbusMap = -+ [asyncResp, readingType]( -+ const boost::beast::http::status status, -+ const boost::container::flat_map<std::string, std::string>& -+ uriToDbus) { -+ if (status != boost::beast::http::status::ok) -+ { -+ BMCWEB_LOG_ERROR << "Failed to retrieve URI to dbus " -+ "sensors map with err " -+ << static_cast<unsigned>(status); -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ telemetry::addMetricProperty(*asyncResp, readingType, -+ uriToDbus); -+ }; -+ -+ for (const std::string& chassisName : chassisNames) -+ { -+ for (const auto& [sensorNode, dbusPaths] : sensors::dbus::paths) ++ BMCWEB_ROUTE(app, "/redfish/v1/TelemetryService/MetricDefinitions/<str>/") ++ .privileges({{"Login"}}) ++ .methods(boost::beast::http::verb::get)( ++ [](const crow::Request&, ++ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, ++ const std::string& readingType) { ++ if (!telemetry::isSensorIdSupported(readingType)) + { -+ retrieveUriToDbusMap(chassisName, sensorNode.data(), -+ handleRetrieveUriToDbusMap); ++ messages::resourceNotFound(asyncResp->res, ++ "MetricDefinition", readingType); ++ return; + } -+ } -+ }); -+ } -+}; ++ ++ asyncResp->res.jsonValue["MetricProperties"] = ++ nlohmann::json::array(); ++ asyncResp->res.jsonValue["Id"] = readingType; ++ asyncResp->res.jsonValue["Name"] = readingType; ++ asyncResp->res.jsonValue["@odata.id"] = ++ telemetry::metricDefinitionUri + readingType; ++ asyncResp->res.jsonValue["@odata.type"] = ++ "#MetricDefinition.v1_0_3.MetricDefinition"; ++ asyncResp->res.jsonValue["MetricDataType"] = "Decimal"; ++ asyncResp->res.jsonValue["MetricType"] = "Numeric"; ++ asyncResp->res.jsonValue["IsLinear"] = true; ++ asyncResp->res.jsonValue["Implementation"] = "PhysicalSensor"; ++ asyncResp->res.jsonValue["Units"] = ++ sensors::toReadingUnits(readingType); ++ ++ utils::getChassisNames( ++ [asyncResp, readingType]( ++ boost::system::error_code ec, ++ const std::vector<std::string>& chassisNames) { ++ if (ec) ++ { ++ messages::internalError(asyncResp->res); ++ BMCWEB_LOG_ERROR << "getChassisNames error: " ++ << ec.value(); ++ return; ++ } ++ ++ auto handleRetrieveUriToDbusMap = ++ [asyncResp, readingType]( ++ const boost::beast::http::status status, ++ const boost::container::flat_map< ++ std::string, std::string>& uriToDbus) { ++ if (status != boost::beast::http::status::ok) ++ { ++ BMCWEB_LOG_ERROR ++ << "Failed to retrieve URI to dbus " ++ "sensors map with err " ++ << static_cast<unsigned>(status); ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ telemetry::addMetricProperty( ++ *asyncResp, readingType, uriToDbus); ++ }; ++ ++ for (const std::string& chassisName : chassisNames) ++ { ++ for (const auto& [sensorNode, dbusPaths] : ++ sensors::dbus::paths) ++ { ++ retrieveUriToDbusMap( ++ chassisName, sensorNode.data(), ++ handleRetrieveUriToDbusMap); ++ } ++ } ++ }); ++ }); ++} + +} // namespace redfish diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp -index e7f4cde..b16b014 100644 +index d986565..bccbb94 100644 --- a/redfish-core/lib/sensors.hpp +++ b/redfish-core/lib/sensors.hpp @@ -111,46 +111,47 @@ inline const char* toReadingType(const std::string& sensorType) @@ -474,18 +452,17 @@ index e7f4cde..b16b014 100644 else { diff --git a/redfish-core/lib/telemetry_service.hpp b/redfish-core/lib/telemetry_service.hpp -index 9ec0737..de9c800 100644 +index ad86d5c..c4962e9 100644 --- a/redfish-core/lib/telemetry_service.hpp +++ b/redfish-core/lib/telemetry_service.hpp -@@ -32,6 +32,8 @@ class TelemetryService : public Node - asyncResp->res.jsonValue["Id"] = "TelemetryService"; - asyncResp->res.jsonValue["Name"] = "Telemetry Service"; +@@ -29,6 +29,8 @@ inline void requestRoutesTelemetryService(App& app) + "/redfish/v1/TelemetryService/MetricReportDefinitions"; + asyncResp->res.jsonValue["MetricReports"]["@odata.id"] = + "/redfish/v1/TelemetryService/MetricReports"; ++ asyncResp->res.jsonValue["MetricDefinitions"]["@odata.id"] = ++ "/redfish/v1/TelemetryService/MetricDefinitions"; -+ asyncResp->res.jsonValue["MetricDefinitions"]["@odata.id"] = -+ "/redfish/v1/TelemetryService/MetricDefinitions"; - asyncResp->res.jsonValue["MetricReportDefinitions"]["@odata.id"] = - "/redfish/v1/TelemetryService/MetricReportDefinitions"; - asyncResp->res.jsonValue["MetricReports"]["@odata.id"] = + crow::connections::systemBus->async_method_call( + [asyncResp]( -- -2.17.1 - +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Sync-Telmetry-service-with-EventService.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Sync-Telmetry-service-with-EventService.patch index 9b77c29df..0ca58a114 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Sync-Telmetry-service-with-EventService.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0002-Sync-Telmetry-service-with-EventService.patch @@ -1,4 +1,4 @@ -From 206411b4c9b603e7b0edf63e03c0ef7bf10b09b2 Mon Sep 17 00:00:00 2001 +From 277d261ef3b1723c9d198baf4b84d2e01a7460b8 Mon Sep 17 00:00:00 2001 From: "Wludzik, Jozef" <jozef.wludzik@intel.com> Date: Tue, 15 Dec 2020 12:30:31 +0100 Subject: [PATCH] Sync Telmetry service with EventService @@ -22,7 +22,7 @@ Signed-off-by: Wludzik, Jozef <jozef.wludzik@intel.com> 2 files changed, 69 insertions(+), 115 deletions(-) diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp -index a1761bb..0e2ebfd 100644 +index 11190ef..ffe9435 100644 --- a/redfish-core/include/event_service_manager.hpp +++ b/redfish-core/include/event_service_manager.hpp @@ -14,6 +14,7 @@ @@ -30,10 +30,10 @@ index a1761bb..0e2ebfd 100644 */ #pragma once +#include "metric_report.hpp" - #include "node.hpp" #include "registries.hpp" #include "registries/base_message_registry.hpp" -@@ -523,47 +524,32 @@ class Subscription + #include "registries/openbmc_message_registry.hpp" +@@ -522,47 +523,32 @@ class Subscription } #endif @@ -92,7 +92,7 @@ index a1761bb..0e2ebfd 100644 this->sendEvent( msg.dump(2, ' ', true, nlohmann::json::error_handler_t::replace)); } -@@ -1359,75 +1345,6 @@ class EventServiceManager +@@ -1358,75 +1344,6 @@ class EventServiceManager } #endif @@ -168,7 +168,7 @@ index a1761bb..0e2ebfd 100644 void unregisterMetricReportSignal() { if (matchTelemetryMonitor) -@@ -1447,9 +1364,11 @@ class EventServiceManager +@@ -1446,9 +1363,11 @@ class EventServiceManager } BMCWEB_LOG_DEBUG << "Metrics report signal - Register"; @@ -183,7 +183,7 @@ index a1761bb..0e2ebfd 100644 matchTelemetryMonitor = std::make_shared<sdbusplus::bus::match::match>( *crow::connections::systemBus, matchStr, -@@ -1460,10 +1379,43 @@ class EventServiceManager +@@ -1459,10 +1378,43 @@ class EventServiceManager return; } @@ -232,10 +232,10 @@ index a1761bb..0e2ebfd 100644 } diff --git a/redfish-core/lib/metric_report.hpp b/redfish-core/lib/metric_report.hpp -index ad15a05..18a6dcc 100644 +index 66f4f93..a43f6a6 100644 --- a/redfish-core/lib/metric_report.hpp +++ b/redfish-core/lib/metric_report.hpp -@@ -31,16 +31,14 @@ inline nlohmann::json toMetricValues(const Readings& readings) +@@ -32,16 +32,14 @@ inline nlohmann::json toMetricValues(const Readings& readings) return metricValues; } @@ -258,7 +258,7 @@ index ad15a05..18a6dcc 100644 telemetry::metricReportDefinitionUri + id; const TimestampReadings* timestampReadings = -@@ -48,14 +46,14 @@ inline void fillReport(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, +@@ -49,14 +47,14 @@ inline void fillReport(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, if (!timestampReadings) { BMCWEB_LOG_ERROR << "Property type mismatch or property is missing"; @@ -277,18 +277,18 @@ index ad15a05..18a6dcc 100644 } } // namespace telemetry -@@ -145,7 +143,11 @@ class MetricReport : public Node - return; - } +@@ -117,7 +115,11 @@ inline void requestRoutesMetricReport(App& app) + return; + } -- telemetry::fillReport(asyncResp, id, ret); -+ if (!telemetry::fillReport(asyncResp->res.jsonValue, id, -+ ret)) -+ { -+ messages::internalError(asyncResp->res); -+ } - }, - telemetry::service, reportPath, - "org.freedesktop.DBus.Properties", "Get", +- telemetry::fillReport(asyncResp, id, ret); ++ if (!telemetry::fillReport( ++ asyncResp->res.jsonValue, id, ret)) ++ { ++ messages::internalError(asyncResp->res); ++ } + }, + telemetry::service, reportPath, + "org.freedesktop.DBus.Properties", "Get", -- 2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0003-Revert-Remove-LogService-from-TelemetryService.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0003-Revert-Remove-LogService-from-TelemetryService.patch index 645351a51..987a43b4c 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0003-Revert-Remove-LogService-from-TelemetryService.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0003-Revert-Remove-LogService-from-TelemetryService.patch @@ -1,6 +1,6 @@ -From dc7e43c70285596195efd9d328b303091794278c Mon Sep 17 00:00:00 2001 +From 472ac5f15a19917042852b243e8b668b3ab49e32 Mon Sep 17 00:00:00 2001 From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> -Date: Mon, 31 May 2021 10:08:57 +0000 +Date: Tue, 22 Jun 2021 13:59:48 +0000 Subject: [PATCH] Revert "Remove LogService from TelemetryService" This reverts commit 2b3da45876aac57a36d3093379a992d699e7e396. @@ -9,18 +9,18 @@ This reverts commit 2b3da45876aac57a36d3093379a992d699e7e396. 1 file changed, 2 insertions(+) diff --git a/redfish-core/lib/telemetry_service.hpp b/redfish-core/lib/telemetry_service.hpp -index de9c800..f05bf6d 100644 +index 37221c3..f3a1efb 100644 --- a/redfish-core/lib/telemetry_service.hpp +++ b/redfish-core/lib/telemetry_service.hpp -@@ -38,6 +38,8 @@ class TelemetryService : public Node - "/redfish/v1/TelemetryService/MetricReportDefinitions"; - asyncResp->res.jsonValue["MetricReports"]["@odata.id"] = - "/redfish/v1/TelemetryService/MetricReports"; -+ asyncResp->res.jsonValue["LogService"]["@odata.id"] = -+ "/redfish/v1/Managers/bmc/LogServices/Journal"; +@@ -30,6 +30,8 @@ inline void requestRoutesTelemetryService(App& app) + "/redfish/v1/TelemetryService/MetricReports"; + asyncResp->res.jsonValue["MetricDefinitions"]["@odata.id"] = + "/redfish/v1/TelemetryService/MetricDefinitions"; ++ asyncResp->res.jsonValue["LogService"]["@odata.id"] = ++ "/redfish/v1/Managers/bmc/LogServices/Journal"; - crow::connections::systemBus->async_method_call( - [asyncResp]( + crow::connections::systemBus->async_method_call( + [asyncResp]( -- 2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0005-Switched-bmcweb-to-use-new-telemetry-service-API.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0005-Switched-bmcweb-to-use-new-telemetry-service-API.patch new file mode 100644 index 000000000..4e326ff88 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0005-Switched-bmcweb-to-use-new-telemetry-service-API.patch @@ -0,0 +1,301 @@ +From 51869fd549cd826981ad30c6cdea4c4e94a972db Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Thu, 17 Jun 2021 13:37:57 +0000 +Subject: [PATCH] Switched bmcweb to use new telemetry service API + +Added support for multiple MetricProperties. Added support for new +parameters: CollectionTimeScope, CollectionDuration. + +Tested: + - It is possible to create MetricReportDefinitions with multiple + MetricProperties. + - Stub values for new parameters are correctly passed to telemetry + service. + - All existing telemetry service functionalities remain unchanged. + +Change-Id: I2cd17069e3ea015c8f5571c29278f1d50536272a +Signed-off-by: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +--- + redfish-core/lib/metric_report_definition.hpp | 212 ++++++++++-------- + 1 file changed, 114 insertions(+), 98 deletions(-) + +diff --git a/redfish-core/lib/metric_report_definition.hpp b/redfish-core/lib/metric_report_definition.hpp +index a0c4f1d..7c26787 100644 +--- a/redfish-core/lib/metric_report_definition.hpp ++++ b/redfish-core/lib/metric_report_definition.hpp +@@ -7,6 +7,8 @@ + #include <app.hpp> + #include <boost/container/flat_map.hpp> + #include <registries/privilege_registry.hpp> ++#include <sdbusplus/asio/property.hpp> ++#include <sdbusplus/unpack_properties.hpp> + + #include <tuple> + #include <variant> +@@ -17,87 +19,90 @@ namespace redfish + namespace telemetry + { + +-using ReadingParameters = +- std::vector<std::tuple<sdbusplus::message::object_path, std::string, +- std::string, std::string>>; ++using ReadingParameters = std::vector< ++ std::tuple<std::vector<sdbusplus::message::object_path>, std::string, ++ std::string, std::string, std::string, uint64_t>>; + + inline void fillReportDefinition( + const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, const std::string& id, + const std::vector< +- std::pair<std::string, std::variant<std::string, bool, uint64_t, +- ReadingParameters>>>& ret) ++ std::pair<std::string, std::variant<std::monostate, std::string, bool, ++ uint64_t, ReadingParameters>>>& ++ properties) + { +- asyncResp->res.jsonValue["@odata.type"] = +- "#MetricReportDefinition.v1_3_0.MetricReportDefinition"; +- asyncResp->res.jsonValue["@odata.id"] = +- telemetry::metricReportDefinitionUri + id; +- asyncResp->res.jsonValue["Id"] = id; +- asyncResp->res.jsonValue["Name"] = id; +- asyncResp->res.jsonValue["MetricReport"]["@odata.id"] = +- telemetry::metricReportUri + id; +- asyncResp->res.jsonValue["Status"]["State"] = "Enabled"; +- asyncResp->res.jsonValue["ReportUpdates"] = "Overwrite"; +- +- const bool* emitsReadingsUpdate = nullptr; +- const bool* logToMetricReportsCollection = nullptr; +- const ReadingParameters* readingParams = nullptr; +- const std::string* reportingType = nullptr; +- const uint64_t* interval = nullptr; +- for (const auto& [key, var] : ret) ++ try + { +- if (key == "EmitsReadingsUpdate") ++ bool emitsReadingsUpdate = false; ++ bool logToMetricReportsCollection = false; ++ ReadingParameters readingParams; ++ std::string reportingType; ++ uint64_t interval = 0u; ++ ++ sdbusplus::unpackProperties( ++ properties, "EmitsReadingsUpdate", emitsReadingsUpdate, ++ "LogToMetricReportsCollection", logToMetricReportsCollection, ++ "ReadingParametersFutureVersion", readingParams, "ReportingType", ++ reportingType, "Interval", interval); ++ ++ std::vector<std::string> redfishReportActions; ++ redfishReportActions.reserve(2); ++ if (emitsReadingsUpdate) + { +- emitsReadingsUpdate = std::get_if<bool>(&var); ++ redfishReportActions.emplace_back("RedfishEvent"); + } +- else if (key == "LogToMetricReportsCollection") ++ if (logToMetricReportsCollection) + { +- logToMetricReportsCollection = std::get_if<bool>(&var); ++ redfishReportActions.emplace_back("LogToMetricReportsCollection"); + } +- else if (key == "ReadingParameters") +- { +- readingParams = std::get_if<ReadingParameters>(&var); +- } +- else if (key == "ReportingType") +- { +- reportingType = std::get_if<std::string>(&var); +- } +- else if (key == "Interval") ++ ++ nlohmann::json metrics = nlohmann::json::array(); ++ for (auto& [sensorPath, operationType, id, metadata, ++ collectionTimeScope, collectionDuration] : readingParams) + { +- interval = std::get_if<uint64_t>(&var); ++ std::vector<std::string> metricProperties; ++ ++ nlohmann::json parsedMetadata = nlohmann::json::parse(metadata); ++ if (!json_util::readJson(parsedMetadata, asyncResp->res, ++ "MetricProperties", metricProperties)) ++ { ++ BMCWEB_LOG_ERROR << "Failed to read metadata"; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ ++ metrics.push_back({ ++ {"MetricId", id}, ++ {"MetricProperties", std::move(metricProperties)}, ++ }); + } +- } +- if (!emitsReadingsUpdate || !logToMetricReportsCollection || +- !readingParams || !reportingType || !interval) +- { +- BMCWEB_LOG_ERROR << "Property type mismatch or property is missing"; +- messages::internalError(asyncResp->res); +- return; +- } + +- std::vector<std::string> redfishReportActions; +- redfishReportActions.reserve(2); +- if (*emitsReadingsUpdate) +- { +- redfishReportActions.emplace_back("RedfishEvent"); ++ asyncResp->res.jsonValue["@odata.type"] = ++ "#MetricReportDefinition.v1_3_0.MetricReportDefinition"; ++ asyncResp->res.jsonValue["@odata.id"] = ++ telemetry::metricReportDefinitionUri + id; ++ asyncResp->res.jsonValue["Id"] = id; ++ asyncResp->res.jsonValue["Name"] = id; ++ asyncResp->res.jsonValue["MetricReport"]["@odata.id"] = ++ telemetry::metricReportUri + id; ++ asyncResp->res.jsonValue["Status"]["State"] = "Enabled"; ++ asyncResp->res.jsonValue["ReportUpdates"] = "Overwrite"; ++ asyncResp->res.jsonValue["Metrics"] = metrics; ++ asyncResp->res.jsonValue["MetricReportDefinitionType"] = reportingType; ++ asyncResp->res.jsonValue["ReportActions"] = redfishReportActions; ++ asyncResp->res.jsonValue["Schedule"]["RecurrenceInterval"] = ++ time_utils::toDurationString(std::chrono::milliseconds(interval)); + } +- if (*logToMetricReportsCollection) ++ catch (const sdbusplus::exception::UnpackPropertyError& error) + { +- redfishReportActions.emplace_back("LogToMetricReportsCollection"); ++ BMCWEB_LOG_ERROR << error.what() << ", property: " ++ << error.propertyName + ", reason: " << error.reason; ++ messages::internalError(asyncResp->res); + } +- +- nlohmann::json metrics = nlohmann::json::array(); +- for (auto& [sensorPath, operationType, id, metadata] : *readingParams) ++ catch (const nlohmann::json::parse_error& e) + { +- metrics.push_back({ +- {"MetricId", id}, +- {"MetricProperties", {metadata}}, +- }); ++ BMCWEB_LOG_ERROR << "Failed to parse metadata: " << e.what(); ++ messages::internalError(asyncResp->res); + } +- asyncResp->res.jsonValue["Metrics"] = metrics; +- asyncResp->res.jsonValue["MetricReportDefinitionType"] = *reportingType; +- asyncResp->res.jsonValue["ReportActions"] = redfishReportActions; +- asyncResp->res.jsonValue["Schedule"]["RecurrenceInterval"] = +- time_utils::toDurationString(std::chrono::milliseconds(*interval)); + } + + struct AddReportArgs +@@ -275,6 +280,11 @@ class AddReport + + for (const auto& [id, uris] : args.metrics) + { ++ std::vector<sdbusplus::message::object_path> dbusPaths; ++ dbusPaths.reserve(uris.size()); ++ nlohmann::json metadata; ++ metadata["MetricProperties"] = nlohmann::json::array(); ++ + for (size_t i = 0; i < uris.size(); i++) + { + const std::string& uri = uris[i]; +@@ -291,8 +301,12 @@ class AddReport + } + + const std::string& dbusPath = el->second; +- readingParams.emplace_back(dbusPath, "SINGLE", id, uri); ++ dbusPaths.emplace_back(dbusPath); ++ metadata["MetricProperties"].emplace_back(uri); + } ++ ++ readingParams.emplace_back(dbusPaths, "SINGLE", id, metadata.dump(), ++ "Point", 0u); + } + const std::shared_ptr<bmcweb::AsyncResp> aResp = asyncResp; + crow::connections::systemBus->async_method_call( +@@ -330,10 +344,10 @@ class AddReport + messages::created(aResp->res); + }, + telemetry::service, "/xyz/openbmc_project/Telemetry/Reports", +- "xyz.openbmc_project.Telemetry.ReportManager", "AddReport", +- "TelemetryService/" + args.name, args.reportingType, +- args.emitsReadingsUpdate, args.logToMetricReportsCollection, +- args.interval, readingParams); ++ "xyz.openbmc_project.Telemetry.ReportManager", ++ "AddReportFutureVersion", "TelemetryService/" + args.name, ++ args.reportingType, args.emitsReadingsUpdate, ++ args.logToMetricReportsCollection, args.interval, readingParams); + } + + void insert(const boost::container::flat_map<std::string, std::string>& el) +@@ -415,37 +429,39 @@ inline void requestRoutesMetricReportDefinition(App& app) + BMCWEB_ROUTE(app, + "/redfish/v1/TelemetryService/MetricReportDefinitions/<str>/") + .privileges(redfish::privileges::getMetricReportDefinition) +- .methods(boost::beast::http::verb::get)( +- [](const crow::Request&, +- const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, +- const std::string& id) { +- crow::connections::systemBus->async_method_call( +- [asyncResp, id]( +- const boost::system::error_code ec, +- const std::vector<std::pair< +- std::string, +- std::variant<std::string, bool, uint64_t, +- telemetry::ReadingParameters>>>& ret) { +- if (ec.value() == EBADR || +- ec == boost::system::errc::host_unreachable) +- { +- messages::resourceNotFound( +- asyncResp->res, "MetricReportDefinition", id); +- return; +- } +- if (ec) +- { +- BMCWEB_LOG_ERROR << "respHandler DBus error " << ec; +- messages::internalError(asyncResp->res); +- return; +- } ++ .methods( ++ boost::beast::http::verb::get)([](const crow::Request&, ++ const std::shared_ptr< ++ bmcweb::AsyncResp>& asyncResp, ++ const std::string& id) { ++ sdbusplus::asio::getAllProperties( ++ *crow::connections::systemBus, telemetry::service, ++ telemetry::getDbusReportPath(id), telemetry::reportInterface, ++ [asyncResp, ++ id](boost::system::error_code ec, ++ const std::vector<std::pair< ++ std::string, ++ std::variant<std::monostate, std::string, bool, ++ uint64_t, telemetry::ReadingParameters>>>& ++ properties) { ++ if (ec.value() == EBADR || ++ ec == boost::system::errc::host_unreachable) ++ { ++ messages::resourceNotFound( ++ asyncResp->res, "MetricReportDefinition", id); ++ return; ++ } ++ if (ec) ++ { ++ BMCWEB_LOG_ERROR << "respHandler DBus error " << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ ++ telemetry::fillReportDefinition(asyncResp, id, properties); ++ }); ++ }); + +- telemetry::fillReportDefinition(asyncResp, id, ret); +- }, +- telemetry::service, telemetry::getDbusReportPath(id), +- "org.freedesktop.DBus.Properties", "GetAll", +- telemetry::reportInterface); +- }); + BMCWEB_ROUTE(app, + "/redfish/v1/TelemetryService/MetricReportDefinitions/<str>/") + .privileges(redfish::privileges::deleteMetricReportDefinitionCollection) +-- +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0006-Add-support-for-MetricDefinition-property-in-MetricReport.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0006-Add-support-for-MetricDefinition-property-in-MetricReport.patch new file mode 100644 index 000000000..d3a7c0a35 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0006-Add-support-for-MetricDefinition-property-in-MetricReport.patch @@ -0,0 +1,268 @@ +From d37ba16f837380ea5fbd7fae2d0f2e229c601754 Mon Sep 17 00:00:00 2001 +From: Szymon Dompke <szymon.dompke@intel.com> +Date: Mon, 28 Jun 2021 11:10:23 +0200 +Subject: [PATCH] Add support for MetricDefinition property in MetricReport + +Added MetricDefinition as part of MetricValues array returned by +MetricReport. It contains single @odata.id with URI to proper +MetricDefinition resource - depending on MetricProperty. + +Testing done: +- GET request on redfish/v1/TelemetryService/MetricReports + got response with MetricDefinition and proper id inside + MetricValues array. + +Testing steps: +1. POST on redfish/v1/TelemetryService/MetricReportDefinitions + with body: +{ + "Id": "PeriodicReport_1", + "MetricReportDefinitionType": "Periodic", + "ReportActions": [ + "LogToMetricReportsCollection", + "RedfishEvent" + ], + "Metrics": [ + { + "MetricId": "sensor_1", + "MetricProperties": [ + "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/1/Reading" + ] + } + ], + "Schedule": { + "RecurrenceInterval": "PT10S" + } +} + +2. GET on redfish/v1/TelemetryService/MetricReports/PeriodicReport_1 + should return: +{ + "@odata.id": + "/redfish/v1/TelemetryService/MetricReports/PeriodicReport_1", + "@odata.type": "#MetricReport.v1_3_0.MetricReport", + "Id": "PeriodicReport_1", + "MetricReportDefinition": { + "@odata.id": + "/redfish/v1/TelemetryService/MetricReportDefinitions/PeriodicReport_1" + }, + "MetricValues": [ + { + "MetricDefinition": { + "@odata.id": + "/redfish/v1/TelemetryService/MetricDefinitions/Rotational" + }, + "MetricId": "sensor_1", + "MetricProperty": + "/redfish/v1/Chassis/AC_Baseboard/Thermal#/Fans/1/Reading", + "MetricValue": "nan", + "Timestamp": "1970-01-01T00:03:21+00:00" + } + ], + "Name": "PeriodicReport_1", + "Timestamp": "1970-01-01T00:03:21+00:00" +} + +Change-Id: I7181c612f9b443015d551259bae25303aa436822 +Signed-off-by: Szymon Dompke <szymon.dompke@intel.com> +--- + meson.build | 4 +- + .../include/utils/telemetry_utils.hpp | 40 ++++++++++++ + redfish-core/lib/metric_report.hpp | 64 +++++++++++++++---- + redfish-core/lib/sensors.hpp | 2 + + 4 files changed, 95 insertions(+), 15 deletions(-) + +diff --git a/meson.build b/meson.build +index bdc514b..aadfd7d 100644 +--- a/meson.build ++++ b/meson.build +@@ -354,6 +354,8 @@ srcfiles_unittest = ['include/ut/dbus_utility_test.cpp', + 'redfish-core/ut/time_utils_test.cpp', + 'http/ut/utility_test.cpp'] + ++srcfiles_unittest_dependencies = ['redfish-core/src/error_messages.cpp'] ++ + # Gather the Configuration data + + conf_data = configuration_data() +@@ -411,7 +413,7 @@ executable('bmcweb',srcfiles_bmcweb, + if(get_option('tests').enabled()) + foreach src_test : srcfiles_unittest + testname = src_test.split('/')[-1].split('.')[0] +- test(testname,executable(testname,src_test, ++ test(testname,executable(testname,[src_test] + srcfiles_unittest_dependencies, + include_directories : incdir, + install_dir: bindir, + dependencies: [ +diff --git a/redfish-core/include/utils/telemetry_utils.hpp b/redfish-core/include/utils/telemetry_utils.hpp +index 1b4f75d..c0c5ba3 100644 +--- a/redfish-core/include/utils/telemetry_utils.hpp ++++ b/redfish-core/include/utils/telemetry_utils.hpp +@@ -17,6 +17,46 @@ constexpr const char* metricReportDefinitionUri = + constexpr const char* metricReportUri = + "/redfish/v1/TelemetryService/MetricReports/"; + ++inline std::optional<nlohmann::json> ++ getMetadataJson(const std::string& metadataStr) ++{ ++ std::optional<nlohmann::json> res = ++ nlohmann::json::parse(metadataStr, nullptr, false); ++ if (res->is_discarded()) ++ { ++ BMCWEB_LOG_ERROR << "Malformed reading metatadata JSON provided by " ++ "telemetry service."; ++ return std::nullopt; ++ } ++ return res; ++} ++ ++inline std::optional<std::string> ++ readStringFromMetadata(const nlohmann::json& metadataJson, const char* key) ++{ ++ std::optional<std::string> res; ++ if (auto it = metadataJson.find(key); it != metadataJson.end()) ++ { ++ if (const std::string* value = it->get_ptr<const std::string*>()) ++ { ++ res = *value; ++ } ++ else ++ { ++ BMCWEB_LOG_ERROR << "Incorrect reading metatadata JSON provided by " ++ "telemetry service. Missing key '" ++ << key << "'."; ++ } ++ } ++ else ++ { ++ BMCWEB_LOG_ERROR << "Incorrect reading metatadata JSON provided by " ++ "telemetry service. Key '" ++ << key << "' has a wrong type."; ++ } ++ return res; ++} ++ + inline void + getReportCollection(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, + const std::string& uri) +diff --git a/redfish-core/lib/metric_report.hpp b/redfish-core/lib/metric_report.hpp +index 7fe281d..13bf792 100644 +--- a/redfish-core/lib/metric_report.hpp ++++ b/redfish-core/lib/metric_report.hpp +@@ -1,5 +1,6 @@ + #pragma once + ++#include "sensors.hpp" + #include "utils/telemetry_utils.hpp" + + #include <app.hpp> +@@ -15,34 +16,56 @@ using Readings = + std::vector<std::tuple<std::string, std::string, double, uint64_t>>; + using TimestampReadings = std::tuple<uint64_t, Readings>; + +-inline nlohmann::json toMetricValues(const Readings& readings) ++inline bool fillMetricValues(nlohmann::json& metricValues, ++ const Readings& readings) + { +- nlohmann::json metricValues = nlohmann::json::array_t(); +- +- for (auto& [id, metadata, sensorValue, timestamp] : readings) ++ for (auto& [id, metadataStr, sensorValue, timestamp] : readings) + { ++ std::optional<nlohmann::json> readingMetadataJson = ++ getMetadataJson(metadataStr); ++ if (!readingMetadataJson) ++ { ++ return false; ++ } ++ ++ std::optional<std::string> sensorDbusPath = ++ readStringFromMetadata(*readingMetadataJson, "SensorDbusPath"); ++ if (!sensorDbusPath) ++ { ++ return false; ++ } ++ ++ std::optional<std::string> sensorRedfishUri = ++ readStringFromMetadata(*readingMetadataJson, "SensorRedfishUri"); ++ if (!sensorRedfishUri) ++ { ++ return false; ++ } ++ ++ std::string metricDefinition = ++ std::string(metricDefinitionUri) + ++ sensors::toReadingType( ++ sdbusplus::message::object_path(*sensorDbusPath) ++ .parent_path() ++ .filename()); ++ + metricValues.push_back({ ++ {"MetricDefinition", ++ nlohmann::json{{"@odata.id", metricDefinition}}}, + {"MetricId", id}, +- {"MetricProperty", metadata}, ++ {"MetricProperty", *sensorRedfishUri}, + {"MetricValue", std::to_string(sensorValue)}, + {"Timestamp", + crow::utility::getDateTime(static_cast<time_t>(timestamp))}, + }); + } + +- return metricValues; ++ return true; + } + + inline bool fillReport(nlohmann::json& json, const std::string& id, + const std::variant<TimestampReadings>& var) + { +- json["@odata.type"] = "#MetricReport.v1_3_0.MetricReport"; +- json["@odata.id"] = telemetry::metricReportUri + id; +- json["Id"] = id; +- json["Name"] = id; +- json["MetricReportDefinition"]["@odata.id"] = +- telemetry::metricReportDefinitionUri + id; +- + const TimestampReadings* timestampReadings = + std::get_if<TimestampReadings>(&var); + if (!timestampReadings) +@@ -52,9 +75,22 @@ inline bool fillReport(nlohmann::json& json, const std::string& id, + } + + const auto& [timestamp, readings] = *timestampReadings; ++ nlohmann::json metricValues = nlohmann::json::array(); ++ if (!fillMetricValues(metricValues, readings)) ++ { ++ return false; ++ } ++ ++ json["@odata.type"] = "#MetricReport.v1_3_0.MetricReport"; ++ json["@odata.id"] = telemetry::metricReportUri + id; ++ json["Id"] = id; ++ json["Name"] = id; ++ json["MetricReportDefinition"]["@odata.id"] = ++ telemetry::metricReportDefinitionUri + id; + json["Timestamp"] = + crow::utility::getDateTime(static_cast<time_t>(timestamp)); +- json["MetricValues"] = toMetricValues(readings); ++ json["MetricValues"] = metricValues; ++ + return true; + } + } // namespace telemetry +diff --git a/redfish-core/lib/sensors.hpp b/redfish-core/lib/sensors.hpp +index bccbb94..3e1d003 100644 +--- a/redfish-core/lib/sensors.hpp ++++ b/redfish-core/lib/sensors.hpp +@@ -21,6 +21,8 @@ + #include <boost/container/flat_map.hpp> + #include <boost/range/algorithm/replace_copy_if.hpp> + #include <dbus_singleton.hpp> ++#include <dbus_utility.hpp> ++#include <error_messages.hpp> + #include <registries/privilege_registry.hpp> + #include <utils/json_utils.hpp> + +-- +2.25.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0007-Generalize-ReadingType-in-MetricDefinition.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0007-Generalize-ReadingType-in-MetricDefinition.patch new file mode 100644 index 000000000..1cdd59d4b --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/0007-Generalize-ReadingType-in-MetricDefinition.patch @@ -0,0 +1,168 @@ +From 872a7bdb9c272944914d7c5babc751e6bb33afec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adrian=20Ambro=C5=BCewicz?= <adrian.ambrozewicz@intel.com> +Date: Tue, 3 Aug 2021 13:59:31 +0200 +Subject: [PATCH] Generalize ReadingType in MetricDefinition + +Recent addition of PMT required adding new type of sensor 'count', which +doesnt comply with any of Redfish-defined Sensor.ReadingType values. + +To support property of this kind MetricDefinition implementation was +altered to support sensor types not covered by Redfish types by +a 'fallback' to direct usage of sensor type. Populating 'Units' was also +modified, so it won't be shown if value does not have any units mapped. + +Testing: +- PMT counters are shown properly in MetricDefinitions/Count +- Redfish Validator passes +--- + redfish-core/lib/metric_definition.hpp | 63 ++++++++++++++++---------- + 1 file changed, 39 insertions(+), 24 deletions(-) + +diff --git a/redfish-core/lib/metric_definition.hpp b/redfish-core/lib/metric_definition.hpp +index 2443996..fcab44d 100644 +--- a/redfish-core/lib/metric_definition.hpp ++++ b/redfish-core/lib/metric_definition.hpp +@@ -11,6 +11,18 @@ namespace redfish + namespace telemetry + { + ++std::string groupName(const std::string& sensorType) ++{ ++ std::string group = sensors::toReadingType(sensorType); ++ if (group.empty()) ++ { ++ // Fallback for types not covered by standard Redfish Sensor.ReadingType ++ group = sensorType; ++ group[0] = static_cast<char>(std::toupper(group[0])); ++ } ++ return group; ++} ++ + void addMembers(crow::Response& res, + const boost::container::flat_map<std::string, std::string>& el) + { +@@ -30,8 +42,7 @@ void addMembers(crow::Response& res, + nlohmann::json& members = res.jsonValue["Members"]; + + const std::string odataId = +- std::string(telemetry::metricDefinitionUri) + +- sensors::toReadingType(type); ++ std::string(telemetry::metricDefinitionUri) + groupName(type); + + const auto it = std::find_if(members.begin(), members.end(), + [&odataId](const nlohmann::json& item) { +@@ -125,15 +136,15 @@ inline void requestRoutesMetricDefinitionCollection(App& app) + namespace telemetry + { + +-bool isSensorIdSupported(std::string_view readingType) ++bool isSensorIdSupported(std::string_view group) + { + for (const std::pair<std::string_view, std::vector<const char*>>& + typeToPaths : sensors::dbus::paths) + { + for (const char* supportedPath : typeToPaths.second) + { +- if (readingType == +- sensors::toReadingType( ++ if (group == ++ groupName( + sdbusplus::message::object_path(supportedPath).filename())) + { + return true; +@@ -144,7 +155,7 @@ bool isSensorIdSupported(std::string_view readingType) + } + + void addMetricProperty( +- bmcweb::AsyncResp& asyncResp, const std::string& readingType, ++ bmcweb::AsyncResp& asyncResp, const std::string& group, + const boost::container::flat_map<std::string, std::string>& el) + { + nlohmann::json& metricProperties = +@@ -155,7 +166,7 @@ void addMetricProperty( + std::string sensorId; + if (dbus::utility::getNthStringFromPath(dbusSensor, 3, sensorId)) + { +- if (sensors::toReadingType(sensorId) == readingType) ++ if (groupName(sensorId) == group) + { + metricProperties.push_back(redfishSensor); + } +@@ -172,33 +183,37 @@ inline void requestRoutesMetricDefinition(App& app) + .methods(boost::beast::http::verb::get)( + [](const crow::Request&, + const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, +- const std::string& readingType) { +- if (!telemetry::isSensorIdSupported(readingType)) ++ const std::string& group) { ++ if (!telemetry::isSensorIdSupported(group)) + { + messages::resourceNotFound(asyncResp->res, +- "MetricDefinition", readingType); ++ "MetricDefinition", group); + return; + } + + asyncResp->res.jsonValue["MetricProperties"] = + nlohmann::json::array(); +- asyncResp->res.jsonValue["Id"] = readingType; +- asyncResp->res.jsonValue["Name"] = readingType; ++ asyncResp->res.jsonValue["Id"] = group; ++ asyncResp->res.jsonValue["Name"] = group; + asyncResp->res.jsonValue["@odata.id"] = +- telemetry::metricDefinitionUri + readingType; ++ telemetry::metricDefinitionUri + group; + asyncResp->res.jsonValue["@odata.type"] = + "#MetricDefinition.v1_0_3.MetricDefinition"; + asyncResp->res.jsonValue["MetricDataType"] = "Decimal"; + asyncResp->res.jsonValue["MetricType"] = "Numeric"; + asyncResp->res.jsonValue["IsLinear"] = true; + asyncResp->res.jsonValue["Implementation"] = "PhysicalSensor"; +- asyncResp->res.jsonValue["Units"] = +- sensors::toReadingUnits(readingType); ++ ++ std::string readingUnits = sensors::toReadingUnits(group); ++ if (!readingUnits.empty()) ++ { ++ asyncResp->res.jsonValue["Units"] = readingUnits; ++ } + + utils::getChassisNames( +- [asyncResp, readingType]( +- boost::system::error_code ec, +- const std::vector<std::string>& chassisNames) { ++ [asyncResp, ++ group](boost::system::error_code ec, ++ const std::vector<std::string>& chassisNames) { + if (ec) + { + messages::internalError(asyncResp->res); +@@ -208,10 +223,10 @@ inline void requestRoutesMetricDefinition(App& app) + } + + auto handleRetrieveUriToDbusMap = +- [asyncResp, readingType]( +- const boost::beast::http::status status, +- const boost::container::flat_map< +- std::string, std::string>& uriToDbus) { ++ [asyncResp, ++ group](const boost::beast::http::status status, ++ const boost::container::flat_map< ++ std::string, std::string>& uriToDbus) { + if (status != boost::beast::http::status::ok) + { + BMCWEB_LOG_ERROR +@@ -221,8 +236,8 @@ inline void requestRoutesMetricDefinition(App& app) + messages::internalError(asyncResp->res); + return; + } +- telemetry::addMetricProperty( +- *asyncResp, readingType, uriToDbus); ++ telemetry::addMetricProperty(*asyncResp, group, ++ uriToDbus); + }; + + for (const std::string& chassisName : chassisNames) +-- +2.25.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/README b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/README index ea6ac73bd..cd15a815c 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/README +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/telemetry/README @@ -3,13 +3,22 @@ Until change is integrated they will be manually merged here to enable feature i Current revisions: - Add support for MetricDefinition scheme - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/33363/80 + https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/33363/89 - Sync Telmetry service with EventService - https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/38798/31 + https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/38798/36 - LogService field, actual implementation will be upstreamed with triggers feature file://telemetry/0003-Revert-Remove-LogService-from-TelemetryService.patch - Event service fix for Context field file://telemetry/0004-event-service-fix-added-Context-field-to-response.patch + +- Switched bmcweb to use new telemetry service API + https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/44270/4 + +- Add support for MetricDefinition property in MetricReport + https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/44512/8 + +- Generalize ReadingType in MetricDefinition + file://telemetry/0007-Generalize-ReadingType-in-MetricDefinition.patch
\ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch index 3e3f69d1c..d41383836 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch @@ -1,32 +1,35 @@ -From 95f002dc969d7d6d64dbf2ee0db7dc1c1c6a9173 Mon Sep 17 00:00:00 2001 -From: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com> -Date: Thu, 18 Mar 2021 11:30:28 +0100 +From 3ee7fe58b2acec0a6ae4eabad91a9dd609268870 Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Wed, 14 Jul 2021 09:04:42 +0000 Subject: [PATCH] Revert "Disable nbd proxy from the build" NBD Proxy has been disabled upstream. Reenable as we use it for Virtual Media This reverts commit efb8062c306474942bc94f15d748b2eb0b58fbb6. + +Change-Id: I19a88b30c1074dd376f2df8f5668245b638b881f --- - meson.build | 2 +- - meson_options.txt | 9 +-------- - 2 files changed, 2 insertions(+), 9 deletions(-) + meson.build | 3 ++- + meson_options.txt | 10 ++-------- + 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build -index 66a066b..cef0a49 100644 +index bdc514b..19364a8 100644 --- a/meson.build +++ b/meson.build -@@ -81,7 +81,7 @@ feature_map = { +@@ -78,7 +78,8 @@ feature_map = { + 'rest' : '-DBMCWEB_ENABLE_DBUS_REST', 'static-hosting' : '-DBMCWEB_ENABLE_STATIC_HOSTING', 'insecure-tftp-update' : '-DBMCWEB_INSECURE_ENABLE_REDFISH_FW_TFTP_UPDATE', - 'validate-unsecure-feature' : '-DBMCWEB_ENABLE_VALIDATION_UNSECURE_FEATURE', -#'vm-nbdproxy' : '-DBMCWEB_ENABLE_VM_NBDPROXY', ++'validate-unsecure-feature' : '-DBMCWEB_ENABLE_VALIDATION_UNSECURE_FEATURE', +'vm-nbdproxy' : '-DBMCWEB_ENABLE_VM_NBDPROXY', 'vm-websocket' : '-DBMCWEB_ENABLE_VM_WEBSOCKET', } diff --git a/meson_options.txt b/meson_options.txt -index 9611631..7ee3ebb 100644 +index 0ab31b8..ea0f2fc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,14 +3,7 @@ option('yocto-deps', type: 'feature', value: 'disabled', description : 'Use YOCT @@ -45,6 +48,14 @@ index 9611631..7ee3ebb 100644 option('rest', type : 'feature', value : 'enabled', description : '''Enable Phosphor REST (D-Bus) APIs. Paths directly map Phosphor D-Bus object paths, for example, \'/xyz/openbmc_project/logging/entry/enumerate\'. See https://github.com/openbmc/docs/blob/master/rest-api.md.''') option('redfish', type : 'feature',value : 'enabled', description: 'Enable Redfish APIs. Paths are under \'/redfish/v1/\'. See https://github.com/openbmc/bmcweb/blob/master/DEVELOPING.md#redfish.') option('host-serial-socket', type : 'feature', value : 'enabled', description : 'Enable host serial console WebSocket. Path is \'/console0\'. See https://github.com/openbmc/docs/blob/master/console.md.') +@@ -37,6 +30,7 @@ option ('https_port', type : 'integer', min : 1, max : 65535, value : 443, descr + # the implications of doing so.In general, enabling these options will cause security + # problems of varying degrees + ++option ('validate-unsecure-feature', type : 'feature', value : 'disabled', description : '''Enables unsecure features required by validation. Note: mustbe turned off for production images.''') + option ('insecure-disable-csrf', type : 'feature', value : 'disabled', description : 'Disable CSRF prevention checks.Should be set to false for production systems.') + option ('insecure-disable-ssl', type : 'feature', value : 'disabled', description : 'Disable SSL ports. Should be set to false for production systems.') + option ('insecure-disable-auth', type : 'feature', value : 'disabled', description : 'Disable authentication on all ports. Should be set to false for production systems') -- -2.26.2 +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0002-bmcweb-handle-device-or-resource-busy-exception.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0002-bmcweb-handle-device-or-resource-busy-exception.patch index 01c1c858c..e267dc60f 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0002-bmcweb-handle-device-or-resource-busy-exception.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0002-bmcweb-handle-device-or-resource-busy-exception.patch @@ -1,6 +1,6 @@ -From 76480c6a5b1708113f28aecab32a85984371243c Mon Sep 17 00:00:00 2001 -From: Karol Wachowski <karol.wachowski@intel.com> -Date: Fri, 10 Jul 2020 09:54:06 +0000 +From bbb69d73ca8b74d34fa250813123de4274d5327b Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Fri, 23 Jul 2021 12:07:02 +0000 Subject: [PATCH] bmcweb handle device or resource busy exception Use async_method_call_timed() for mount/unmount dbus oprations. @@ -21,23 +21,23 @@ Tested: Verified that after mounting non-existing HTTPS resource Signed-off-by: Karol Wachowski <karol.wachowski@intel.com> Change-Id: Ica62c34db0cce24c4c6169fc661edfde49e948d0 --- - redfish-core/lib/virtual_media.hpp | 144 ++++++++++++++++++++++------- - 1 file changed, 110 insertions(+), 34 deletions(-) + redfish-core/lib/virtual_media.hpp | 142 +++++++++++++++++++++-------- + 1 file changed, 105 insertions(+), 37 deletions(-) diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp -index 95a8881..188248a 100644 +index 6e69f20..7fcbf73 100644 --- a/redfish-core/lib/virtual_media.hpp +++ b/redfish-core/lib/virtual_media.hpp -@@ -24,6 +24,8 @@ - #include <account_service.hpp> +@@ -26,6 +26,8 @@ #include <boost/url/url_view.hpp> + #include <registries/privilege_registry.hpp> +#include <chrono> + namespace redfish - { -@@ -160,6 +162,26 @@ static void vmParseInterfaceObject(const DbusInterfaceType& interface, + /** +@@ -162,6 +164,26 @@ inline void } } @@ -64,156 +64,151 @@ index 95a8881..188248a 100644 /** * @brief Fill template for Virtual Media Item. */ -@@ -856,22 +878,54 @@ class VirtualMediaActionInsertMedia : public Node - } +@@ -712,22 +734,57 @@ inline void doMountVmLegacy(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, + } - crow::connections::systemBus->async_method_call( -- [asyncResp, secretPipe](const boost::system::error_code ec, -- bool success) { -+ [asyncResp, service, name, imageUrl, rw, unixFd, -+ secretPipe](const boost::system::error_code ec, -+ const std::variant<int> timeoutProperty) { - if (ec) - { - BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec; - messages::internalError(asyncResp->res); -+ return; - } -- else if (!success) + crow::connections::systemBus->async_method_call( +- [asyncResp, secretPipe](const boost::system::error_code ec, +- bool success) { ++ [asyncResp, service, name, imageUrl, rw, unixFd, ++ secretPipe](const boost::system::error_code ec, ++ const std::variant<int> timeoutProperty) { + if (ec) + { + BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec; + messages::internalError(asyncResp->res); ++ return; + } +- else if (!success) + -+ auto timeout = vmParseTimeoutProperty(timeoutProperty); -+ if (timeout == std::nullopt) - { -- BMCWEB_LOG_ERROR << "Service responded with error"; -- messages::generalError(asyncResp->res); -+ BMCWEB_LOG_ERROR << "Timeout property is empty."; -+ messages::internalError(asyncResp->res); -+ return; - } ++ auto timeout = vmParseTimeoutProperty(timeoutProperty); ++ if (timeout == std::nullopt) + { +- BMCWEB_LOG_ERROR << "Service responded with error"; +- messages::generalError(asyncResp->res); ++ BMCWEB_LOG_ERROR << "Timeout property is empty."; ++ messages::internalError(asyncResp->res); ++ return; + } + -+ crow::connections::systemBus->async_method_call_timed( -+ [asyncResp, secretPipe](const boost::system::error_code ec, -+ bool success) { -+ if (ec) ++ crow::connections::systemBus->async_method_call_timed( ++ [asyncResp, secretPipe](const boost::system::error_code ec, ++ bool success) { ++ if (ec) ++ { ++ BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec; ++ if (ec == boost::system::errc::device_or_resource_busy) + { -+ BMCWEB_LOG_ERROR << "Bad D-Bus request error: " -+ << ec; -+ if (ec == -+ boost::system::errc::device_or_resource_busy) -+ { -+ messages::resourceInUse(asyncResp->res); -+ } -+ else -+ { -+ messages::internalError(asyncResp->res); -+ } ++ messages::resourceInUse(asyncResp->res); + } -+ else if (!success) ++ else if (ec == boost::system::errc::permission_denied) + { -+ BMCWEB_LOG_ERROR << "Service responded with error"; -+ messages::generalError(asyncResp->res); ++ messages::accessDenied(asyncResp->res, ++ "VirtualMedia.Insert"); + } -+ }, -+ service, "/xyz/openbmc_project/VirtualMedia/Legacy/" + name, -+ "xyz.openbmc_project.VirtualMedia.Legacy", "Mount", -+ *timeout, imageUrl, rw, unixFd); - }, - service, "/xyz/openbmc_project/VirtualMedia/Legacy/" + name, -- "xyz.openbmc_project.VirtualMedia.Legacy", "Mount", imageUrl, rw, -- unixFd); -+ "org.freedesktop.DBus.Properties", "Get", -+ "xyz.openbmc_project.VirtualMedia.MountPoint", "Timeout"); - } - }; ++ else ++ { ++ messages::internalError(asyncResp->res); ++ } ++ } ++ else if (!success) ++ { ++ BMCWEB_LOG_ERROR << "Service responded with error "; ++ messages::generalError(asyncResp->res); ++ } ++ }, ++ service, "/xyz/openbmc_project/VirtualMedia/Legacy/" + name, ++ "xyz.openbmc_project.VirtualMedia.Legacy", "Mount", *timeout, ++ imageUrl, rw, unixFd); + }, + service, "/xyz/openbmc_project/VirtualMedia/Legacy/" + name, +- "xyz.openbmc_project.VirtualMedia.Legacy", "Mount", imageUrl, rw, +- unixFd); ++ "org.freedesktop.DBus.Properties", "Get", ++ "xyz.openbmc_project.VirtualMedia.MountPoint", "Timeout"); + } -@@ -1003,38 +1057,60 @@ class VirtualMediaActionEjectMedia : public Node - const std::string& service, const std::string& name, - bool legacy) - { -- -- // Legacy mount requires parameter with image -+ std::string objectPath = "/xyz/openbmc_project/VirtualMedia/"; -+ std::string ifaceName = "xyz.openbmc_project.VirtualMedia"; - if (legacy) - { -- crow::connections::systemBus->async_method_call( -- [asyncResp](const boost::system::error_code ec) { -- if (ec) -- { -- BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec; -- -- messages::internalError(asyncResp->res); -- return; -- } -- }, -- service, "/xyz/openbmc_project/VirtualMedia/Legacy/" + name, -- "xyz.openbmc_project.VirtualMedia.Legacy", "Unmount"); -+ objectPath += "Legacy/"; -+ ifaceName += ".Legacy"; - } -- else // proxy -+ else - { -- crow::connections::systemBus->async_method_call( -- [asyncResp](const boost::system::error_code ec) { -- if (ec) -- { -- BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec; + /** +@@ -739,38 +796,49 @@ inline void doVmAction(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, + const std::string& service, const std::string& name, + bool legacy) + { ++ const std::string vmMode = legacy ? "Legacy" : "Proxy"; ++ const std::string objectPath = ++ "/xyz/openbmc_project/VirtualMedia/" + vmMode + "/" + name; ++ const std::string ifaceName = "xyz.openbmc_project.VirtualMedia." + vmMode; + +- // Legacy mount requires parameter with image +- if (legacy) +- { +- crow::connections::systemBus->async_method_call( +- [asyncResp](const boost::system::error_code ec) { +- if (ec) +- { +- BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec; - -- messages::internalError(asyncResp->res); -- return; -- } -- }, -- service, "/xyz/openbmc_project/VirtualMedia/Proxy/" + name, -- "xyz.openbmc_project.VirtualMedia.Proxy", "Unmount"); -+ objectPath += "Proxy/"; -+ ifaceName += ".Proxy"; - } -+ objectPath += name; -+ -+ crow::connections::systemBus->async_method_call( -+ [asyncResp, service, name, objectPath, -+ ifaceName](const boost::system::error_code ec, -+ const std::variant<int> timeoutProperty) { -+ if (ec) -+ { -+ BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec; -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ -+ auto timeout = vmParseTimeoutProperty(timeoutProperty); -+ if (timeout == std::nullopt) -+ { -+ BMCWEB_LOG_ERROR << "Timeout property is empty."; -+ messages::internalError(asyncResp->res); -+ return; -+ } -+ crow::connections::systemBus->async_method_call_timed( -+ [asyncResp](const boost::system::error_code ec) { -+ if (ec) +- messages::internalError(asyncResp->res); +- return; +- } +- }, +- service, "/xyz/openbmc_project/VirtualMedia/Legacy/" + name, +- "xyz.openbmc_project.VirtualMedia.Legacy", "Unmount"); +- } +- else // proxy +- { +- crow::connections::systemBus->async_method_call( +- [asyncResp](const boost::system::error_code ec) { +- if (ec) +- { +- BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec; ++ crow::connections::systemBus->async_method_call( ++ [asyncResp, service, name, objectPath, ++ ifaceName](const boost::system::error_code ec, ++ const std::variant<int> timeoutProperty) { ++ if (ec) ++ { ++ BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec; ++ messages::internalError(asyncResp->res); ++ return; ++ } + +- messages::internalError(asyncResp->res); +- return; +- } +- }, +- service, "/xyz/openbmc_project/VirtualMedia/Proxy/" + name, +- "xyz.openbmc_project.VirtualMedia.Proxy", "Unmount"); +- } ++ auto timeout = vmParseTimeoutProperty(timeoutProperty); ++ if (timeout == std::nullopt) ++ { ++ BMCWEB_LOG_ERROR << "Timeout property is empty."; ++ messages::internalError(asyncResp->res); ++ return; ++ } ++ crow::connections::systemBus->async_method_call_timed( ++ [asyncResp](const boost::system::error_code ec) { ++ if (ec) ++ { ++ BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec; ++ if (ec == boost::system::errc::device_or_resource_busy) + { -+ BMCWEB_LOG_ERROR << "Bad D-Bus request error: " -+ << ec; -+ if (ec == -+ boost::system::errc::device_or_resource_busy) -+ { -+ messages::resourceInUse(asyncResp->res); -+ } -+ else -+ { -+ messages::internalError(asyncResp->res); -+ } -+ return; ++ messages::resourceInUse(asyncResp->res); + } -+ }, -+ service, objectPath, ifaceName, "Unmount", *timeout); -+ }, -+ service, objectPath, "org.freedesktop.DBus.Properties", "Get", -+ "xyz.openbmc_project.VirtualMedia.MountPoint", "Timeout"); - } - }; ++ else ++ { ++ messages::internalError(asyncResp->res); ++ } ++ return; ++ } ++ }, ++ service, objectPath, ifaceName, "Unmount", *timeout); ++ }, ++ service, objectPath, "org.freedesktop.DBus.Properties", "Get", ++ "xyz.openbmc_project.VirtualMedia.MountPoint", "Timeout"); + } + inline void requestNBDVirtualMediaRoutes(App& app) -- -2.17.1 +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch index 3a9e67217..b29082dce 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch @@ -1,8 +1,8 @@ -From 805641a2d189da9befc05168f51cef76da1ba326 Mon Sep 17 00:00:00 2001 -From: Alicja Rybak <alicja.rybak@intel.com> -Date: Tue, 20 Apr 2021 16:32:37 +0200 -Subject: [PATCH] Invalid status code from InsertMedia REST methods GET, - PUT, DELETE, PATCH in proxy mode +From 95f7ca477a8353fa7b99f463de9ee310dda13735 Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Thu, 1 Jul 2021 10:08:27 +0000 +Subject: [PATCH] Invalid status code from InsertMedia REST methods GET, PUT, + DELETE, PATCH in proxy mode Add handlers for GET, PUT, DELETE, PATCH method and function that checks which mode is used and set suitable status code: @@ -11,175 +11,156 @@ Not allowed for Legacy and Not found for Proxy. Change-Id: Ib4c0a3e9a2a8853caa74c59239d9fcfed99c5e8b Signed-off-by: Alicja Rybak <alicja.rybak@intel.com> --- - redfish-core/lib/virtual_media.hpp | 155 +++++++++++++++++++++++++++++ - 1 file changed, 155 insertions(+) + redfish-core/lib/virtual_media.hpp | 129 +++++++++++++++++++++++++++++ + 1 file changed, 129 insertions(+) diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp -index aa7c639..3e28164 100644 +index a834c69..186c04b 100644 --- a/redfish-core/lib/virtual_media.hpp +++ b/redfish-core/lib/virtual_media.hpp -@@ -548,6 +548,161 @@ class VirtualMediaActionInsertMedia : public Node - return true; - } +@@ -28,6 +28,109 @@ -+ /** -+ * @brief Function checks if insert media request is Legacy or Proxy type -+ * and sets suitable response code for unsupported REST method. -+ * -+ */ -+ void CheckProxyMode(const std::shared_ptr<bmcweb::AsyncResp>& aResp, -+ const crow::Request& req, -+ const std::vector<std::string>& params) + namespace redfish + { ++ ++/** ++ * @brief Function checks if insert media request is Legacy or Proxy type ++ * and sets suitable response code for unsupported REST method. ++ * ++ */ ++void CheckProxyMode(const std::shared_ptr<bmcweb::AsyncResp>& aResp, ++ const crow::Request& req, const std::string& name, ++ const std::string& resName) ++{ ++ if (name != "bmc") + { -+ if (params.size() != 2) -+ { -+ messages::internalError(aResp->res); -+ return; -+ } -+ -+ // take resource name from URL -+ const std::string& resName = params[1]; -+ -+ if (params[0] != "bmc") -+ { -+ messages::resourceNotFound(aResp->res, "VirtualMedia.Insert", -+ resName); -+ -+ return; -+ } -+ -+ crow::connections::systemBus->async_method_call( -+ [this, aResp{std::move(aResp)}, req, -+ resName](const boost::system::error_code ec, -+ const GetObjectType& getObjectType) { -+ if (ec) -+ { -+ BMCWEB_LOG_ERROR << "ObjectMapper::GetObject call failed: " -+ << ec; -+ aResp->res.result(boost::beast::http::status::not_found); ++ messages::resourceNotFound(aResp->res, "VirtualMedia.Insert", resName); + -+ return; -+ } -+ std::string service = getObjectType.begin()->first; -+ BMCWEB_LOG_DEBUG << "GetObjectType: " << service; ++ return; ++ } + -+ crow::connections::systemBus->async_method_call( -+ [this, service, resName, req, -+ aResp{aResp}](const boost::system::error_code ec, -+ ManagedObjectType& subtree) { -+ if (ec) ++ crow::connections::systemBus->async_method_call( ++ [aResp, req, resName](const boost::system::error_code ec, ++ const GetObjectType& getObjectType) { ++ if (ec) ++ { ++ BMCWEB_LOG_ERROR << "ObjectMapper::GetObject call failed: " ++ << ec; ++ aResp->res.result(boost::beast::http::status::not_found); ++ ++ return; ++ } ++ std::string service = getObjectType.begin()->first; ++ BMCWEB_LOG_DEBUG << "GetObjectType: " << service; ++ ++ crow::connections::systemBus->async_method_call( ++ [service, resName, req, ++ aResp](const boost::system::error_code ec, ++ ManagedObjectType& subtree) { ++ if (ec) ++ { ++ BMCWEB_LOG_DEBUG << "DBUS response error"; ++ ++ return; ++ } ++ ++ for (auto& item : subtree) ++ { ++ std::string thispath = item.first.filename(); ++ if (thispath.empty()) + { -+ BMCWEB_LOG_DEBUG << "DBUS response error"; ++ continue; ++ } + -+ return; ++ if (thispath != resName) ++ { ++ continue; + } + -+ for (auto& item : subtree) ++ auto mode = item.first.parent_path(); ++ auto type = mode.parent_path(); ++ if (mode.filename().empty() || type.filename().empty()) + { -+ std::string thispath = item.first.filename(); -+ if (thispath.empty()) -+ { -+ continue; -+ } -+ -+ if (thispath != resName) -+ { -+ continue; -+ } -+ -+ auto mode = item.first.parent_path(); -+ auto type = mode.parent_path(); -+ if (mode.filename().empty() || -+ type.filename().empty()) -+ { -+ continue; -+ } -+ -+ if (type.filename() != "VirtualMedia") -+ { -+ continue; -+ } -+ -+ // Check if dbus path is Legacy type -+ if (mode.filename() == "Legacy") -+ { -+ BMCWEB_LOG_DEBUG << "InsertMedia only allowed " -+ "with POST method " -+ "in legacy mode"; -+ aResp->res.result(boost::beast::http::status:: -+ method_not_allowed); -+ -+ return; -+ } -+ // Check if dbus path is Proxy type -+ if (mode.filename() == "Proxy") -+ { -+ // Not possible in proxy mode -+ BMCWEB_LOG_DEBUG << "InsertMedia not " -+ "allowed in proxy mode"; -+ aResp->res.result( -+ boost::beast::http::status::not_found); -+ -+ return; -+ } ++ continue; + } + -+ BMCWEB_LOG_DEBUG << "Parent item not found"; -+ aResp->res.result( -+ boost::beast::http::status::not_found); -+ }, -+ service, "/xyz/openbmc_project/VirtualMedia", -+ "org.freedesktop.DBus.ObjectManager", "GetManagedObjects"); -+ }, -+ "xyz.openbmc_project.ObjectMapper", -+ "/xyz/openbmc_project/object_mapper", -+ "xyz.openbmc_project.ObjectMapper", "GetObject", -+ "/xyz/openbmc_project/VirtualMedia", std::array<const char*, 0>()); -+ } ++ if (type.filename() != "VirtualMedia") ++ { ++ continue; ++ } + -+ /** -+ * @brief Function handles GET method request. -+ */ -+ void doGet(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -+ const crow::Request& req, -+ const std::vector<std::string>& params) override -+ { -+ CheckProxyMode(asyncResp, req, params); -+ } ++ // Check if dbus path is Legacy type ++ if (mode.filename() == "Legacy") ++ { ++ BMCWEB_LOG_DEBUG << "InsertMedia only allowed " ++ "with POST method " ++ "in legacy mode"; ++ aResp->res.result( ++ boost::beast::http::status::method_not_allowed); + -+ /** -+ * @brief Function handles PATCH method request. -+ */ -+ void doPatch(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -+ const crow::Request& req, -+ const std::vector<std::string>& params) override -+ { -+ CheckProxyMode(asyncResp, req, params); -+ } ++ return; ++ } ++ // Check if dbus path is Proxy type ++ if (mode.filename() == "Proxy") ++ { ++ // Not possible in proxy mode ++ BMCWEB_LOG_DEBUG << "InsertMedia not " ++ "allowed in proxy mode"; ++ aResp->res.result( ++ boost::beast::http::status::not_found); + -+ /** -+ * @brief Function handles PUT method request. -+ */ -+ void doPut(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -+ const crow::Request& req, -+ const std::vector<std::string>& params) override -+ { -+ CheckProxyMode(asyncResp, req, params); -+ } ++ return; ++ } ++ } + -+ /** -+ * @brief Function handles DELETE method request. -+ */ -+ void doDelete(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, -+ const crow::Request& req, -+ const std::vector<std::string>& params) override ++ BMCWEB_LOG_DEBUG << "Parent item not found"; ++ aResp->res.result(boost::beast::http::status::not_found); ++ }, ++ service, "/xyz/openbmc_project/VirtualMedia", ++ "org.freedesktop.DBus.ObjectManager", "GetManagedObjects"); ++ }, ++ "xyz.openbmc_project.ObjectMapper", ++ "/xyz/openbmc_project/object_mapper", ++ "xyz.openbmc_project.ObjectMapper", "GetObject", ++ "/xyz/openbmc_project/VirtualMedia", std::array<const char*, 0>()); ++} ++ + /** + * @brief Function extracts transfer protocol name from URI. + */ +@@ -829,6 +932,32 @@ inline void doVmAction(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, + + inline void requestNBDVirtualMediaRoutes(App& app) + { ++ BMCWEB_ROUTE(app, "/redfish/v1/Managers/<str>/VirtualMedia/<str>/Actions/" ++ "VirtualMedia.InsertMedia") ++ .privileges({{"Login"}}) ++ .methods(boost::beast::http::verb::get)( ++ [](const crow::Request& req, ++ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, ++ const std::string& name, const std::string& resName) { ++ CheckProxyMode(asyncResp, req, name, resName); ++ }); ++ ++ for (auto method : ++ {boost::beast::http::verb::patch, boost::beast::http::verb::put, ++ boost::beast::http::verb::delete_}) + { -+ CheckProxyMode(asyncResp, req, params); ++ BMCWEB_ROUTE(app, ++ "/redfish/v1/Managers/<str>/VirtualMedia/<str>/Actions/" ++ "VirtualMedia.InsertMedia") ++ .privileges({{"ConfigureManager"}}) ++ .methods(method)( ++ [](const crow::Request& req, ++ const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, ++ const std::string& name, const std::string& resName) { ++ CheckProxyMode(asyncResp, req, name, resName); ++ }); + } + - /** - * @brief Function handles POST method request. - * + BMCWEB_ROUTE(app, "/redfish/v1/Managers/<str>/VirtualMedia/<str>/Actions/" + "VirtualMedia.InsertMedia") + .privileges({{"ConfigureManager"}}) -- -2.17.1 +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0006-Bmcweb-handle-permission-denied-exception.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0006-Bmcweb-handle-permission-denied-exception.patch index efce3e72c..6ad7cf174 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0006-Bmcweb-handle-permission-denied-exception.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0006-Bmcweb-handle-permission-denied-exception.patch @@ -1,6 +1,6 @@ -From e7018ea9e3ad1a17e096aec3717a4764c3feac2e Mon Sep 17 00:00:00 2001 -From: Alicja Rybak <alicja.rybak@intel.com> -Date: Wed, 14 Apr 2021 16:26:59 +0200 +From 1d69a22d0ec1eddbe6d703d6824f413f6b68399e Mon Sep 17 00:00:00 2001 +From: Krzysztof Grobelny <krzysztof.grobelny@intel.com> +Date: Thu, 1 Jul 2021 10:41:47 +0000 Subject: [PATCH] Bmcweb handle permission denied exception Add handling of permission denied exception (EPERM) that @@ -13,35 +13,25 @@ VirtualMedia returns EPERM, which bmcweb handles as 403 status code. Change-Id: Ibc18d5ec822c5072605b1fc4651389982002798b Signed-off-by: Alicja Rybak <alicja.rybak@intel.com> --- - redfish-core/lib/virtual_media.hpp | 8 ++++++++ - 1 file changed, 8 insertions(+) + redfish-core/lib/virtual_media.hpp | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp -index 4c475b7..8151ac0 100644 +index 186c04b..8e7c2e4 100644 --- a/redfish-core/lib/virtual_media.hpp +++ b/redfish-core/lib/virtual_media.hpp -@@ -1073,6 +1073,10 @@ class VirtualMediaActionInsertMedia : public Node - { - messages::resourceInUse(asyncResp->res); - } -+ else if (ec == boost::system::errc::permission_denied) -+ { -+ messages::accessDenied(asyncResp->res, "VirtualMedia.Insert"); -+ } - else - { - messages::internalError(asyncResp->res); -@@ -1267,6 +1271,10 @@ class VirtualMediaActionEjectMedia : public Node - { - messages::resourceInUse(asyncResp->res); - } -+ else if (ec == boost::system::errc::permission_denied) -+ { -+ messages::accessDenied(asyncResp->res, "VirtualMedia.Eject"); -+ } - else - { - messages::internalError(asyncResp->res); +@@ -917,6 +917,11 @@ inline void doVmAction(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, + { + messages::resourceInUse(asyncResp->res); + } ++ else if (ec == boost::system::errc::permission_denied) ++ { ++ messages::accessDenied(asyncResp->res, ++ "VirtualMedia.Insert"); ++ } + else + { + messages::internalError(asyncResp->res); -- -2.17.1 +2.25.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0008-Fix-VM-NBDPROXY-build-issue-with-AsyncResp.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0008-Fix-VM-NBDPROXY-build-issue-with-AsyncResp.patch deleted file mode 100644 index c188b2105..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0008-Fix-VM-NBDPROXY-build-issue-with-AsyncResp.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d31d913a8c5dbacf6a36407532cf777852099ced Mon Sep 17 00:00:00 2001 -From: AppaRao Puli <apparao.puli@linux.intel.com> -Date: Sun, 2 May 2021 11:07:16 +0000 -Subject: [PATCH] Fix VM NBDPROXY build issue with AsyncResp - -8d1b46d7 moves bmcweb to using AsyncResp everywhere, and not have -each individual handler creating its own object. - -This commit fixes the build failure when enabling virtual media -compile flag(BMCWEB_ENABLE_VM_NBDPROXY). This is caused by above -mentioned recent change. - -Tested: - - Build is successful with enabled virtual media flag. - -Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> -Change-Id: I363a41a08fae9dc05b3553695b96ffd26948f696 ---- - redfish-core/lib/virtual_media.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp -index 685ee5c..99542c4 100644 ---- a/redfish-core/lib/virtual_media.hpp -+++ b/redfish-core/lib/virtual_media.hpp -@@ -635,7 +635,7 @@ class VirtualMediaActionInsertMedia : public Node - } - - bool paramsValid = validateParams( -- asyncResp->res, imageUrl, inserted, -+ asyncResp, imageUrl, inserted, - transferMethod, transferProtocolType); - - if (paramsValid == false) --- -2.17.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend index 2a7221b7b..b448121bf 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/openbmc/bmcweb.git" -SRCREV = "eb75770c6c4369984cb150ded4f5ace410ed24a9" +SRCREV = "e6a716506447d2d03b99f1cd2007e207a6dfcae0" DEPENDS += "boost-url" RDEPENDS_${PN} += "phosphor-nslcd-authority-cert-config" @@ -24,6 +24,11 @@ SRC_URI += "file://0001-Firmware-update-configuration-changes.patch \ file://0017-Add-msg-registry-for-subscription-related-actions.patch \ file://0018-bmcweb-Add-BMC-Time-update-log-to-the-registry.patch \ file://0019-Add-generic-message-PropertySizeExceeded.patch \ + file://0020-Redfish-Deny-set-AccountLockDuration-to-zero.patch \ + file://0021-Add-message-registry-entry-for-FirmwareResiliencyErr.patch \ + file://0023-Add-get-IPMI-session-id-s-to-Redfish.patch \ + file://0024-Add-count-sensor-type.patch \ + file://0025-Revert-Support-new-boot-override-setting-design.patch \ " # OOB Bios Config: @@ -42,7 +47,6 @@ SRC_URI += "file://vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch \ file://vm/0005-Set-Inserted-redfish-property-for-not-inserted-resou.patch \ file://vm/0006-Bmcweb-handle-permission-denied-exception.patch \ file://vm/0007-Fix-unmounting-image-in-proxy-mode.patch \ - file://vm/0008-Fix-VM-NBDPROXY-build-issue-with-AsyncResp.patch \ " # EventService: Temporary pulled to downstream. See eventservice\README for details @@ -53,6 +57,7 @@ SRC_URI += "file://eventservice/0001-EventService-Fix-retry-handling-for-http-cl file://eventservice/0006-Add-EventService-SSE-filter-support.patch \ file://eventservice/0007-EventService-Log-events-for-subscription-actions.patch \ file://eventservice/0008-Add-checks-on-Event-Subscription-input-parameters.patch \ + file://eventservice/0009-Restructure-Redifsh-EventLog-Transmit-code-flow.patch \ " # Temporary downstream mirror of upstream patches, see telemetry\README for details @@ -60,6 +65,9 @@ SRC_URI += " file://telemetry/0001-Add-support-for-MetricDefinition-scheme.patch file://telemetry/0002-Sync-Telmetry-service-with-EventService.patch \ file://telemetry/0003-Revert-Remove-LogService-from-TelemetryService.patch \ file://telemetry/0004-event-service-fix-added-Context-field-to-response.patch \ + file://telemetry/0005-Switched-bmcweb-to-use-new-telemetry-service-API.patch \ + file://telemetry/0006-Add-support-for-MetricDefinition-property-in-MetricReport.patch \ + file://telemetry/0007-Generalize-ReadingType-in-MetricDefinition.patch \ " # Temporary fix: Move it to service file @@ -78,6 +86,4 @@ EXTRA_OEMESON += " -Dvm-nbdproxy=enabled" EXTRA_OEMESON += " -Dvm-websocket=disabled" RDEPENDS_${PN}_remove += "jsnbd" -# Enable Validation unsecure based on IMAGE_FEATURES -EXTRA_OEMESON += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-Dvalidate-unsecure-feature=enabled', '', d)}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch index 941e356ed..0d86a4223 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch @@ -13,7 +13,7 @@ and fix the issue, clear SMS_ATN after every time power cycle happen. Unit Test: After entered OS, force reset system, after enter OS again, OS can start normally without keep sending READ EVENT MESSAGE BUFFER command. - After power on system, enter EFI SHELL, check cmdtool.efi can work + After power on system, enter EFI SHELL, check IPMI can work correctly through KCS channel. --- host-cmd-manager.cpp | 33 ++++++++++++++++++++++++--------- diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-chassishandler-Fix-for-BIOS-boot-type-Legacy.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-chassishandler-Fix-for-BIOS-boot-type-Legacy.patch new file mode 100644 index 000000000..ff1d0baea --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-chassishandler-Fix-for-BIOS-boot-type-Legacy.patch @@ -0,0 +1,51 @@ +From 90df4bce744fdff6de98f63a320c50e24d40a0d4 Mon Sep 17 00:00:00 2001 +From: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> +Date: Mon, 2 Aug 2021 16:16:50 +0000 +Subject: [PATCH] Fix for BIOS boot type Legacy + +If user trying to set BIOS boot type as Legacy in Set System boot +options IPMI command is getting success for boot option parameter 5 +(boot flags). +Legacy boot type is not supported in Intel platforms, so returning +InvalidFieldRequest. This can't be pushed to upstream as OEM's in +community supports it. + +Tested: +Verified using IPMI commands. +//Set system boot options +Command : ipmitool raw 0x00 0x08 0x05 0x80 0x18 0x00 0x00 0x00 +Response: Unable to send RAW command (channel=0x0 netfn=0x0 lun=0x0 + cmd=0x8 rsp=0xcc): Invalid data field in request +Command: ipmitool raw 0x00 0x08 0x05 0xa0 0x18 0x00 0x00 0x00 +Response: //Success +//Get System boot options +Command : ipmitool raw 0x00 0x09 0x05 0x00 0x00 +Response: 01 05 a0 18 00 00 00 + +Signed-off-by: Jayaprakash Mutyala <mutyalax.jayaprakash@intel.com> +--- + chassishandler.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/chassishandler.cpp b/chassishandler.cpp +index f7820af..abc84b6 100644 +--- a/chassishandler.cpp ++++ b/chassishandler.cpp +@@ -1875,6 +1875,14 @@ ipmi::RspType<> ipmiChassisSetSysBootOptions(ipmi::Context::ptr ctx, + { + return ipmi::responseInvalidFieldRequest(); + } ++ constexpr auto biosBootTypeLegacy = 0; ++ if (biosBootType == biosBootTypeLegacy) ++ { ++ // return error if BIOS boot type is legacy ++ log<level::ERR>("ipmiChassisSetSysBootOptions: BIOS boot type " ++ "Legacy is not supported"); ++ return ipmi::responseInvalidFieldRequest(); ++ } + + using namespace chassis::internal; + using namespace chassis::internal::cache; +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 677641faf..84ae31e5c 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -8,6 +8,7 @@ SRC_URI += "file://phosphor-ipmi-host.service \ file://0060-Move-Get-SOL-config-parameter-to-host-ipmid.patch \ file://0062-Update-IPMI-Chassis-Control-command.patch \ file://0063-Save-the-pre-timeout-interrupt-in-dbus-property.patch \ + file://0064-chassishandler-Fix-for-BIOS-boot-type-Legacy.patch \ " EXTRA_OECONF_append = " --disable-i2c-whitelist-check" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend index 7a36ac50e..759306cd0 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -3,7 +3,7 @@ inherit useradd # TODO: This should be removed, once up-stream bump up # issue is resolved SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "ecc8efad10bc2101a434a0c1fbd253eeaa1a3a99" +SRCREV = "b88599a2cef6b4fd2272f065a37ce0f70ca8dd38" USERADD_PACKAGES = "${PN}" # add a group called ipmi diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb index f1327dbbd..3ca492ebd 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/phosphor-u-boot-mgr/phosphor-u-boot-mgr_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-u-boot-env-mgr.git;protocol=ssh" -SRCREV = "6707fc81f48634599df3fce764578d6d9661881f" +SRCREV = "1979d3b31a96e9359402ac4d7867ec5dddbece7e" inherit cmake systemd SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.U_Boot.Environment.Manager.service" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb index 8d965268f..4a8a5068b 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libmctp-intel_git.bb @@ -2,7 +2,7 @@ SUMMARY = "libmctp_intel" DESCRIPTION = "Implementation of MCTP(DMTF DSP0236)" SRC_URI = "git://github.com/Intel-BMC/libmctp.git;protocol=ssh" -SRCREV = "ba0ec42a97e5e87c04b67473e32f14b7bdc7e930" +SRCREV = "5126468ca6c3ae139d1ab9853074246bbe70dd74" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libpldm-intel_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libpldm-intel_git.bb index cc611e3db..caa3cc915 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libpldm-intel_git.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/libpldm-intel_git.bb @@ -2,7 +2,7 @@ SUMMARY = "libpldm_intel" DESCRIPTION = "Provides encode/decode APIs for PLDM specifications" SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "7c8ae26530a7634ed75cf28f52fb97431bd046ce" +SRCREV = "a328510479aad6fd97e958759522ec9bcdc9e8d0" S = "${WORKDIR}/git/libpldm_intel" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb index 78c5d7823..7fb440c68 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-emulator.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=bcd9ada3a943f58551867d72893cc9ab" SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "7c8ae26530a7634ed75cf28f52fb97431bd046ce" +SRCREV = "a328510479aad6fd97e958759522ec9bcdc9e8d0" S = "${WORKDIR}/git/mctp_emulator" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-wrapper.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-wrapper.bb index 7a8bd2bc4..f616a9d5d 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-wrapper.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctp-wrapper.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=bcd9ada3a943f58551867d72893cc9ab" SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "7c8ae26530a7634ed75cf28f52fb97431bd046ce" +SRCREV = "a328510479aad6fd97e958759522ec9bcdc9e8d0" S = "${WORKDIR}/git/mctp_wrapper" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb index 4588c399b..299e4f006 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${PN}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "7c8ae26530a7634ed75cf28f52fb97431bd046ce" +SRCREV = "a328510479aad6fd97e958759522ec9bcdc9e8d0" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb index aa9eb1fac..936cd7bd3 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=615045c30a05cde5c0e924854d43c327" SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "7c8ae26530a7634ed75cf28f52fb97431bd046ce" +SRCREV = "a328510479aad6fd97e958759522ec9bcdc9e8d0" S = "${WORKDIR}/git/mctpwplus" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb index 965ed2543..489ea8117 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/Intel-BMC/nvme-mi.git;protocol=ssh" -SRCREV = "a7b519e7e67b45aec7022c7fb608bcd9a4b9c91b" +SRCREV = "b0b93949733398d56b2bda5ef57c8a50a477ff47" S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb index d2790db29..1428e0f15 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "7c8ae26530a7634ed75cf28f52fb97431bd046ce" +SRCREV = "a328510479aad6fd97e958759522ec9bcdc9e8d0" S = "${WORKDIR}/git/pldmd" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pmci-launcher.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pmci-launcher.bb index b9bf23609..c7be89f41 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pmci-launcher.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pmci-launcher.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/Intel-BMC/pmci.git;protocol=ssh" -SRCREV = "7c8ae26530a7634ed75cf28f52fb97431bd046ce" +SRCREV = "a328510479aad6fd97e958759522ec9bcdc9e8d0" S = "${WORKDIR}/git/pmci_launcher" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index e5c229ac7..18be4b189 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,4 +1,4 @@ # Enable downstream autobump SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git" -SRCREV = "486e42e9db215070d631b7ac1f8f32537cb3bfe7" +SRCREV = "e9da2599f10f1b696f61c97f8c8036acfde05e18" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend index 95c9000c3..fbaf497b3 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -1,7 +1,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" PROJECT_SRC_DIR := "${THISDIR}/${PN}" -SRCREV = "8685b17ab14a187eae08399153b9ec6bace2ab9b" +SRCREV = "5cf0f99210890d0cd52d5929e919316d238a5701" #SRC_URI = "git://github.com/openbmc/dbus-sensors.git" SRC_URI += "\ @@ -32,6 +32,9 @@ PACKAGECONFIG += " \ PACKAGECONFIG[nvmesensor] = "-Dnvme=enabled, -Dnvme=disabled" +# Enable Validation unsecure based on IMAGE_FEATURES +EXTRA_OEMESON += "${@bb.utils.contains('EXTRA_IMAGE_FEATURES', 'validation-unsecure', '-Dvalidate-unsecure-feature=enabled', '', d)}" + SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'nvmesensor', \ 'xyz.openbmc_project.nvmesensor.service', \ '', d)}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend index d23480a05..aef2a020f 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,5 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" DEPENDS += "gtest" - -SYSTEMD_SERVICE_${PN}-bmc += "obmc-mapper.target" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb index e0e10f7b7..635d0a136 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/system/callback-manager.bb @@ -7,7 +7,7 @@ inherit cmake systemd DEPENDS = "boost sdbusplus" PV = "0.1+git${SRCPV}" -SRCREV = "52639bebada24990c3514786d65598dc5557477a" +SRCREV = "1a9dde9b193a34392ab11a14d9cd0310f9abb930" S = "${WORKDIR}/git/callback-manager" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/telemetry/telemetry_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/telemetry/telemetry_%.bbappend index 3183745ce..b9a65cc75 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/telemetry/telemetry_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/telemetry/telemetry_%.bbappend @@ -1,5 +1,5 @@ SRC_URI = "git://github.com/openbmc/telemetry.git" -SRCREV = "4ab1d496d8a50d0466afb7f49668c40758bfe6a9" +SRCREV = "a74e44f6ef7db43d38eb600fbfee152b31b30514" EXTRA_OEMESON += " -Dmax-reports=10" EXTRA_OEMESON += " -Dmax-reading-parameters=200" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend index 398dced5c..cf54a7906 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/webui/webui-vue_%.bbappend @@ -1,6 +1,6 @@ # Enable downstream autobump SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "240c056c8989c5e3e0f0ff640f38f3e4cdbc6ac5" +SRCREV = "03dc2b7b9f0672aac84349fbc77aab55403447e0" do_compile_prepend() { cp -vf ${S}/.env.intel ${S}/.env diff --git a/meta-openbmc-mods/meta-common/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch b/meta-openbmc-mods/meta-common/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch deleted file mode 100644 index a7db1b3c9..000000000 --- a/meta-openbmc-mods/meta-common/recipes-support/curl/curl/0001-replace-krb5-config-with-pkg-config.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ed70f0623708b8a6c1f58a5d243d87c5ff45b24d Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> -Date: Tue, 26 Apr 2016 13:13:01 +0800 -Subject: [PATCH] replace krb5-config with pkg-config - -Upstream-Status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> - ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5569a26..56b0380 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -1290,7 +1290,7 @@ AC_ARG_WITH(gssapi, - fi - ]) - --: ${KRB5CONFIG:="$GSSAPI_ROOT/bin/krb5-config"} -+KRB5CONFIG=`which pkg-config` - - save_CPPFLAGS="$CPPFLAGS" - AC_MSG_CHECKING([if GSS-API support is requested]) -@@ -1301,7 +1301,7 @@ if test x"$want_gss" = xyes; then - if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then - GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` - elif test -f "$KRB5CONFIG"; then -- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` -+ GSSAPI_INCS=`$KRB5CONFIG --cflags mit-krb5-gssapi` - elif test "$GSSAPI_ROOT" != "yes"; then - GSSAPI_INCS="-I$GSSAPI_ROOT/include" - fi -@@ -1394,7 +1394,7 @@ if test x"$want_gss" = xyes; then - elif test -f "$KRB5CONFIG"; then - dnl krb5-config doesn't have --libs-only-L or similar, put everything - dnl into LIBS -- gss_libs=`$KRB5CONFIG --libs gssapi` -+ gss_libs=`$KRB5CONFIG --libs mit-krb5-gssapi` - LIBS="$gss_libs $LIBS" - else - case $host in diff --git a/meta-openbmc-mods/meta-common/recipes-support/curl/curl_7.76.0.bb b/meta-openbmc-mods/meta-common/recipes-support/curl/curl_7.76.0.bb deleted file mode 100644 index bd7d8005c..000000000 --- a/meta-openbmc-mods/meta-common/recipes-support/curl/curl_7.76.0.bb +++ /dev/null @@ -1,90 +0,0 @@ -SUMMARY = "Command line tool and library for client-side URL transfers" -HOMEPAGE = "http://curl.haxx.se/" -BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker" -SECTION = "console/network" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=425f6fdc767cc067518eef9bbdf4ab7b" - -SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ - file://0001-replace-krb5-config-with-pkg-config.patch \ -" - -SRC_URI[sha256sum] = "e29bfe3633701590d75b0071bbb649ee5ca4ca73f00649268bd389639531c49a" - -# Curl has used many names over the years... -CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" - -inherit autotools pkgconfig binconfig multilib_header - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} gnutls libidn proxy threaded-resolver verbose zlib" -PACKAGECONFIG_class-native = "ipv6 proxy ssl threaded-resolver verbose zlib" -PACKAGECONFIG_class-nativesdk = "ipv6 proxy ssl threaded-resolver verbose zlib" - -# 'ares' and 'threaded-resolver' are mutually exclusive -PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" -PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" -PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" -PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" -PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," -PACKAGECONFIG[imap] = "--enable-imap,--disable-imap," -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," -PACKAGECONFIG[krb5] = "--with-gssapi,--without-gssapi,krb5" -PACKAGECONFIG[ldap] = "--enable-ldap,--disable-ldap," -PACKAGECONFIG[ldaps] = "--enable-ldaps,--disable-ldaps," -PACKAGECONFIG[libidn] = "--with-libidn2,--without-libidn2,libidn2" -PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2" -PACKAGECONFIG[mbedtls] = "--with-mbedtls=${STAGING_DIR_TARGET},--without-mbedtls,mbedtls" -PACKAGECONFIG[mqtt] = "--enable-mqtt,--disable-mqtt," -PACKAGECONFIG[nghttp2] = "--with-nghttp2,--without-nghttp2,nghttp2" -PACKAGECONFIG[pop3] = "--enable-pop3,--disable-pop3," -PACKAGECONFIG[proxy] = "--enable-proxy,--disable-proxy," -PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" -PACKAGECONFIG[rtsp] = "--enable-rtsp,--disable-rtsp," -PACKAGECONFIG[smb] = "--enable-smb,--disable-smb," -PACKAGECONFIG[smtp] = "--enable-smtp,--disable-smtp," -PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl" -PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" -PACKAGECONFIG[telnet] = "--enable-telnet,--disable-telnet," -PACKAGECONFIG[tftp] = "--enable-tftp,--disable-tftp," -PACKAGECONFIG[threaded-resolver] = "--enable-threaded-resolver,--disable-threaded-resolver,,,,ares" -PACKAGECONFIG[verbose] = "--enable-verbose,--disable-verbose" -PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" - -EXTRA_OECONF = " \ - --disable-libcurl-option \ - --disable-ntlm-wb \ - --enable-crypto-auth \ - --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ - --without-libmetalink \ - --without-libpsl \ - --enable-debug \ - --enable-optimize \ - --disable-curldebug \ -" - -# Move to ssl as TLS backend for cipher suite limitation support. -# It does not work with gnutls backend. -PACKAGECONFIG_remove = "gnutls" -PACKAGECONFIG += "ssl" - -do_install_append_class-target() { - # cleanup buildpaths from curl-config - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - ${D}${bindir}/curl-config -} - -PACKAGES =+ "lib${BPN}" - -FILES_lib${BPN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${BPN} += "ca-certificates" - -FILES_${PN} += "${datadir}/zsh" - -inherit multilib_script -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/curl-config" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend index f7576c55f..6a25bc6e1 100755 --- a/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,6 +1,6 @@ # Enable downstream autobump SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "b4d03b1399ef12242cee7716617bef9a3935cf0c" +SRCREV = "ec972d8b56fe84f8aa6d18f63e64e3fb0e7a9eaf" FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" diff --git a/meta-openembedded/meta-filesystems/README b/meta-openembedded/meta-filesystems/README index edcf8bfee..78a4429ce 100644 --- a/meta-openembedded/meta-filesystems/README +++ b/meta-openembedded/meta-filesystems/README @@ -30,7 +30,7 @@ When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix=meta-filesystems][PATCH + --subject-prefix='meta-filesystems][PATCH' Table of Contents @@ -99,4 +99,3 @@ II. Misc --- xfsprogs --- It provides XFS filesystem utilities. - diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.1.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb index 1db328465..2debc6d8b 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.1.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.2.bb @@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 fuse3" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/libfuse/sshfs" -SRCREV = "8059e2ce630dd2b984f7a6c44a2b5291b0fe2abc" +SRCREV = "9700b353700589dcc462205c638bcb40219a49c2" S = "${WORKDIR}/git" inherit meson ptest diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.3.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.4.bb index 72d0cd3e4..32dab3e35 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.3.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.10.4.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://GPL2.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "eb8373f208b05a39702f9f437f6e49caf4b1ace26a9acb68110b49912078560f" +SRC_URI[sha256sum] = "9365b74fd8471caecdb3cc5adf25a821f70a931317ee9103d15bd39089e3590d" S = "${WORKDIR}/fuse-${PV}" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize/0001-build-Do-not-build-.sgml-file.patch b/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize/0001-build-Do-not-build-.sgml-file.patch new file mode 100644 index 000000000..c754f21d0 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize/0001-build-Do-not-build-.sgml-file.patch @@ -0,0 +1,27 @@ +From b16373da7e5a45cf92df83b39e2fdee939439c84 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 17 Jul 2021 08:55:42 -0700 +Subject: [PATCH] build: Do not build .sgml file + +It needs docbook-to-man tool which we do not have recipe for + +Upstream-Status: OE-Specific [needs native docbook-to-man tool] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 2becb84..858df00 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,4 +14,4 @@ SUFFIXES = .1 + CLEANFILES = $(man_MANS) + + .sgml.1: +- docbook-to-man $< > $@ ++ @echo "Needs docbook-to-man" +-- +2.32.0 + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.0.2.bb b/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb index 88d495b68..ec7e7f968 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.0.2.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb @@ -1,12 +1,14 @@ SUMMARY = "Resize FAT partitions using libparted" SECTION = "console/tools" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https" -SRCREV = "3f80afc76ad82d4a1b852a6c8dea24cd9f5e7a24" +SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https \ + file://0001-build-Do-not-build-.sgml-file.patch \ + " +SRCREV = "12da22087de2ec43f0fe5af1237389e94619c483" -PV = "1.0.2-11" +PV = "1.1.0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.10.0.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.12.0.bb index 509dbd620..c2d059529 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.10.0.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_5.12.0.bb @@ -12,7 +12,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ file://0002-include-include-xfs-linux.h-after-sys-mman.h.patch \ file://0001-support-usrmerge.patch \ " -SRC_URI[sha256sum] = "e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9" +SRC_URI[sha256sum] = "bec44445cf18f49e63971d4f27dc4e90a17b118b852714a1104b621ea30e3507" inherit autotools-brokensep PACKAGES =+ "${PN}-fsck ${PN}-mkfs ${PN}-repair libhandle" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.86.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.88.bb index d264bf8c5..e35044c41 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.86.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.88.bb @@ -15,6 +15,6 @@ CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore " CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore " SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[sha256sum] = "0b3f595159ad1b216cd729c0504c3a5f6cf780c641f4dc63fc164f3c0382c8f0" +SRC_URI[sha256sum] = "4f0d7f4aaa0bb2e725f349adf7b351a957d9fb26d555d9895a7af816b4167039" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb index bb0cd1f8a..1fc883225 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.30.bb @@ -6,7 +6,6 @@ DEPENDS = " \ intltool-native \ babl \ glib-2.0 \ - pango \ cairo \ expat \ zlib \ @@ -28,7 +27,7 @@ SRC_URI = " \ " SRC_URI[sha256sum] = "c112782cf4096969e23217ccdfabe42284e35d5435ff0c43d40e4c70faeca8dd" -PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg poppler sdl2" +PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg pango poppler sdl2" PACKAGECONFIG_class-native = "libpng librsvg" PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper" @@ -40,6 +39,7 @@ PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav" PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng" PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw" PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg" +PACKAGECONFIG[pango] = "-Dpango=enabled -Dpangocairo=enabled,-Dpango=disabled -Dpangocairo=disabled,pango" PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler" PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl" PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb index e729d9deb..be05354da 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.24.bb @@ -51,11 +51,6 @@ EXTRA_OECONF = "--disable-python \ --disable-check-update \ --without-wmf" -EXTRA_OECONF_append_mipsarch = " --disable-vector-icons" -EXTRA_OECONF_append_libc-musl_riscv32 = " --disable-vector-icons" -EXTRA_OECONF_append_libc-musl_x86 = " --disable-vector-icons" -EXTRA_OECONF_append_toolchain-clang_arm = " --disable-vector-icons" - do_configure_append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb index 162748d30..b1604e8df 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb @@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" -SRC_URI[archive.sha256sum] = "45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58" +SRC_URI[archive.sha256sum] = "cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533" DEPENDS = "dbus glib-2.0 intltool-native" @@ -18,6 +18,7 @@ EXTRA_OEMESON_append_class-native = " -Dbash_completion=false" FILES_${PN} += " \ ${datadir}/dbus-1 \ + ${systemd_user_unitdir} \ ${libdir}/gio/modules/*.so \ " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_40.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_40.2.bb index 3b1a978c6..fa5125b53 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_40.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_40.2.bb @@ -24,7 +24,7 @@ inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection g def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "7a666363c350af2e3bbba7f14b3c1befc5012f9ed3d9d073447f4c59f33dcf2d" +SRC_URI[archive.sha256sum] = "0ff7ec79376a8a97ac4cd274d32e804c7e236ef2d2d5d3f646de6eb882a63c77" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 870a9c0e9..86c7dea44 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "eac75f348aa5defbe9473fa30ab6084635ee64d8e3eaaec60a62c27f149c3e22" -PV = "3.40.1" +SRC_URI[archive.sha256sum] = "ec82951639f32a5cece80a8b0b9aa3f66b7d318e3ee2c1c35234f2e2bde8a418" +PV = "3.40.2" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb index 379857c94..e4aeea26f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.38.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb @@ -13,11 +13,11 @@ DEPENDS = " \ inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg -SRC_URI[archive.sha256sum] = "94a0130e12d321aa119793a14d09716523e2e4a61f29570cee53fd88dd6abc57" +SRC_URI[archive.sha256sum] = "4a2886a3966200fb0a9cbba4e2b79f8dad9d26556498aacdaed71775590b3c0d" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}" -PACKAGECONFIG[nautilus] = "-Dnautilus-actions=true,-Dnautilus-actions=false,nautilus" +PACKAGECONFIG[nautilus] = "-Dnautilus-actions=enabled,-Dnautilus-actions=disabled,nautilus" PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false," FILES_${PN} += " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.3.bb index 8eba85941..5d7a9a657 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.3.3.bb @@ -9,8 +9,7 @@ DEPENDS = " \ inherit gnomebase gobject-introspection gtk-doc vala -SRC_URI[archive.md5sum] = "3c8da1a8489255f2aaa5fdb690308e5d" -SRC_URI[archive.sha256sum] = "a48c4d5ce9a9ed05ba8bc8fdeb9af2d1a7bd8091c2911d6c37223c4f488f7c72" +SRC_URI[archive.sha256sum] = "272400f73a375a7e88fdf1e12591bfb8f3f03edf01780cadcd74f70b613e5c04" do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_40.1.bb index 1045dea25..869f820fa 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.36.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_40.1.bb @@ -12,11 +12,12 @@ DEPENDS = " \ libsecret \ libpwquality \ udisks2 \ + libhandy \ " GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg +inherit gnomebase gsettings gtk-icon-cache gettext features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11 polkit" @@ -25,7 +26,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" # As soon as elogind is of interest this needs rework: meson option is combo PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" -SRC_URI[archive.sha256sum] = "dd033d3f36ab070bc72317cf3045e5b4927765543f1bce7612b2c7f96595167a" +SRC_URI[archive.sha256sum] = "2a4b99ac11ca23394b28c5584b9e96284e8c5a4da65cf06207de54f42b1ff141" FILES_${PN} += " \ ${datadir}/metainfo \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.36.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.40.0.bb index 6dd989415..e6d946cb3 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.36.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.40.0.bb @@ -18,8 +18,7 @@ DEPENDS += " \ gnome-panel \ " -SRC_URI[archive.md5sum] = "690b0d78c7d9265183ef18387b12fa50" -SRC_URI[archive.sha256sum] = "2dba9ea40f2da81c22954a8ccc29f8f1fa4ca8395a6bb552506635832751c1a7" +SRC_URI[archive.sha256sum] = "e03f33100f1982019c2e59bbdcd664549ec5caa0ef2d99e2c0e1272cea08bb3b" do_install_append() { # no oe-layer has compiz -> remove dead session diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_40.0.bb index cf202256b..a2f0af679 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_40.0.bb @@ -7,16 +7,16 @@ SECTION = "x11/gnome" DEPENDS = " \ gtk+3 \ gnome-desktop3 \ + libhandy \ " GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg +inherit gnomebase gtk-icon-cache gettext features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "76004a8986ea622b09c408b01a6f42e5" -SRC_URI[archive.sha256sum] = "aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b" +SRC_URI[archive.sha256sum] = "d2cc7686946690dc274a5d0c72841d358d0ccd42d3f34993c698bdf13588fe42" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb index 3fc16bb0a..fce28bd86 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb @@ -17,12 +17,11 @@ DEPENDS = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ " -inherit gnomebase gsettings features_check remove-libtool gettext upstream-version-is-even +inherit gnomebase gsettings features_check remove-libtool gettext REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "38f0732845a510a8dff4f154c3406f65" -SRC_URI[archive.sha256sum] = "a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87" +SRC_URI[archive.sha256sum] = "a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931" SRC_URI += " \ file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \ file://musl.patch \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.40.0.bb index c3142ad9f..4b79fe2aa 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.40.0.bb @@ -11,8 +11,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS = "glib-2.0" -SRC_URI[archive.md5sum] = "44a37e1f8d4cac1dca0c41b57b49c2d0" -SRC_URI[archive.sha256sum] = "1c8f62990833ca41188dbb80c5e99d99b57a62608ca675bbcd37bc2244742f2e" +SRC_URI[archive.sha256sum] = "585c4f979f6f543b77bfdb4fb01eb18ba25c2aec5b7866c676d929616fb2c3fa" # backend is required for gnome-control-center PACKAGECONFIG = "backend other" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.5.bb index 9619628c8..77b9015d4 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.5.bb @@ -49,6 +49,8 @@ do_install_append() { done } +GSETTINGS_PACKAGE = "${PN}-gsettings" + FILES_${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/gnome-control-center \ @@ -56,9 +58,9 @@ FILES_${PN} += " \ ${systemd_user_unitdir} \ " -RDEPENDS_${PN} += "gsettings-desktop-schemas gdm-base librsvg-gtk" +RDEPENDS_${PN} += "gsettings-desktop-schemas gdm-base librsvg-gtk ${PN}-gsettings" -PACKAGES =+ "${PN}-tools" +PACKAGES =+ "${PN}-tools ${PN}-gsettings" FILES_${PN}-tools = "${bindir}/*-tool" RDEPENDS_${PN}-tools = "python3-core" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.40.2.bb index ce54faab2..62534a94a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.40.2.bb @@ -11,6 +11,7 @@ DEPENDS = " \ glib-2.0-native \ intltool-native \ yelp-tools-native \ + docbook-xsl-stylesheets-native libxslt-native \ desktop-file-utils-native \ gtk+3 \ gsettings-desktop-schemas \ @@ -19,8 +20,7 @@ DEPENDS = " \ libpcre2 \ " -SRC_URI[archive.md5sum] = "08150cbf2e23dd4f60f959a6eca8ef0c" -SRC_URI[archive.sha256sum] = "41d1b6a3dc97c066e294acdb7f36931e81668638dcc92ffa25bca3ddebacdf46" +SRC_URI[archive.sha256sum] = "4c79af8ffe8bd3a5daca1911ea2c0acd6872860a1dd5d7eea219f4ab4ae556ac" SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" EXTRA_OECONF += " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.6.bb index ef1898610..2e0d50268 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.6.bb @@ -9,8 +9,10 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gtk-doc -SRC_URI[archive.md5sum] = "a2c26c4f44a02ca053e0e9afb63cc94c" -SRC_URI[archive.sha256sum] = "e97de8208f1aac4f913d4fa71ab73a7034e807186feb2abe55876e51c425a7f6" +SRC_URI[archive.md5sum] = "390139e704772b915ff2b7cac56c24ae" +SRC_URI[archive.sha256sum] = "80ae57723e4608e6875626a88aaa6f56dd25df75024bd16e9d77e718c3560b25" + +PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled," GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb index f7f493dc3..d6de146b1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.8.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb @@ -7,4 +7,4 @@ DEPENDS = "gtk+3 iso-codes enchant2" inherit gnomebase gettext gobject-introspection -SRC_URI[archive.sha256sum] = "cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4" +SRC_URI[archive.sha256sum] = "dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.10.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.10.3.bb new file mode 100644 index 000000000..00b187345 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.10.3.bb @@ -0,0 +1,31 @@ +SUMMARY = "Image viewer and browser" +LICENSE="GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +GNOMEBASEBUILDCLASS = "meson" + +REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" + +DEPENDS = " \ + glib-2.0-native \ + bison-native \ + yelp-tools-native \ + gtk+3 \ + gsettings-desktop-schemas \ + zlib \ + jpeg \ + exiv2 \ + colord \ + lcms \ + libraw \ + librsvg \ + libsoup-2.4 \ + json-glib \ + libsecret \ +" + +inherit features_check gnomebase gnome-help gsettings itstool mime-xdg + +SRC_URI[archive.sha256sum] = "dab73f77cc2963ebe90112972c301441d228af3003cfef3f8b7300a6d5d3c212" + +FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.1.bb index 5a420e615..f7d040d73 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.1.bb @@ -16,9 +16,8 @@ inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspecti REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.6/${PNAME}-${PV}.tar.xz" -SRC_URI[md5sum] = "4d4cff3a57a371bff4793e97d50404ef" -SRC_URI[sha256sum] = "63f487a7ab59612ffa9e7be1883dbd274ab1016afcede3239b93b0fc384df874" +SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz" +SRC_URI[sha256sum] = "d163d71b5fcafbc5b1eec6dd841edbdbcddd3a7511cd5fdcffd86b8bbfe69ac1" GIR_MESON_OPTION = 'gir' GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb index c8c16a3c5..39f681f4e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.48.1.bb @@ -11,8 +11,7 @@ DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ RDEPENDS_${PN} += "gsettings-desktop-schemas" SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.md5sum] = "72383474f52d05c21ef2be96d0b91974" -SRC_URI[archive.sha256sum] = "50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46" +SRC_URI[archive.sha256sum] = "b2ea4f271aad2711f16b43c03151e2ec5a9874ff1a21142ef6d6406486a19dc2" # depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.13.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb index de33fd829..a65ed051c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.13.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb @@ -30,4 +30,4 @@ PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" EXTRA_OEMESON = "-Dalways_build_tests=false" -SRC_URI[archive.sha256sum] = "eab9ef792c3c2b9ece19d45aea15225aba8df2521bc12785b1b2d3318d8c472e" +SRC_URI[archive.sha256sum] = "dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.36.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb index 0cb59cdc9..5865ca73d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.36.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb @@ -13,6 +13,8 @@ DEPENDS = " \ startup-notification \ libcanberra \ libgtop \ + libxres \ + libxpresent \ " @@ -21,8 +23,7 @@ REQUIRED_DISTRO_FEATURES = "x11" inherit gnomebase gsettings gettext upstream-version-is-even features_check -SRC_URI[archive.md5sum] = "d1171705829bbebd42ac08ec49a9a90a" -SRC_URI[archive.sha256sum] = "11f07693e2b266840759063a4bc807346070e8e7fec8f53cd0757f6662c1b323" +SRC_URI[archive.sha256sum] = "224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5" SRC_URI += "file://0001-drop-zenity-detection.patch" PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_40.2.bb index 75fc03237..ee58df2b3 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_40.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_40.2.bb @@ -22,7 +22,7 @@ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "8ecfb90174a0bd5815b1ceb9cbfcd91fec0fb5e34907a4f2df2d05e5d6c99d33" +SRC_URI[archive.sha256sum] = "b71ef2fe07e5eea89a2bb1e5bd30947bd18873bfb30f79cbf17edfbd4d20f60d" REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch index c9eb7994e..53c5f2664 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch @@ -23,8 +23,8 @@ diff --git a/meson.build b/meson.build index 71a9df4..1eaa1a0 100644 --- a/meson.build +++ b/meson.build -@@ -279,7 +279,7 @@ cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) - seccomp_required = system_supports_seccomp and cpu_supports_seccomp +@@ 299,7 +299,7 @@ cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) + seccomp_required = system_supports_seccomp and cpu_supports_seccomp and get_option('seccomp') and get_option('extract') if not libseccomp.found() and seccomp_required - error('Libseccomp is mandatory for sandboxed metadata extraction') diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.1.1.bb index 6672195e0..7287ec23d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.0.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.1.1.bb @@ -15,7 +15,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection vala bash-completion features_check -SRC_URI[archive.sha256sum] = "c9be14871b1398e6e656a354a8f8f59e69e93169017f2b28308ef439324fd12b" +SRC_URI[archive.sha256sum] = "e4d361351b156f2862a524415fbebf0539c781cd87c6629662f0265b4803b8b8" SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch" # gobject-introspection is mandatory and cannot be configured @@ -34,6 +34,7 @@ PACKAGECONFIG ??= " \ png \ tiff \ xml \ + ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ " PACKAGECONFIG[battery] = "-Dbattery_detection=upower,-Dbattery_detection=none,upower" @@ -54,7 +55,7 @@ PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=dis # For security reasons it is strongly recommended to set add meta-security in # your layers and 'libseccomp' to PACKAGECONFIG". -PACKAGECONFIG[libseccomp] = ",,libseccomp" +PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" # not yet in meta-gnome PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.1.1.bb index 82e3d006e..7d9fe9b8e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.0.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.1.1.bb @@ -21,7 +21,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check -SRC_URI[archive.sha256sum] = "c120d81f2df94aa794b1a7953b55cfa46de318ed68e6f3b5ad4fce0c729c2483" +SRC_URI[archive.sha256sum] = "4376e2e98454066f44f7a242e45b99b3bfe4c03b67fab19abb0ed586ca748ae7" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_40.0.bb index af2bab380..f58c9ee4d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_40.0.bb @@ -5,17 +5,19 @@ LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ " +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase itstool DEPENDS += " \ libxslt-native \ libxml2-native \ + python3-lxml-native \ yelp-xsl \ " -SRC_URI[archive.md5sum] = "7856f9ad0492aaf9adf097f5058bfc2e" -SRC_URI[archive.sha256sum] = "183856b5ed0b0bb2c05dd1204af023946ed436943e35e789afb0295e5e71e8f9" +SRC_URI[archive.sha256sum] = "664bacf2f3dd65ef00a43f79487351ab64a6c4c629c56ac0ceb1723c2eb66aae" -RDEPENDS_${PN} += "yelp-xsl" +RDEPENDS_${PN} += "python3-core yelp-xsl" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_40.2.bb index 14a885056..99b666760 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_40.2.bb @@ -1,7 +1,7 @@ SUMMARY = "XSL stylesheets for the yelp help browser" -LICENSE = "LGPLv2.1 & GPLv2" +LICENSE = "LGPLv2.1 & GPLv2 & BSD-3-Clause" LIC_FILES_CHKSUM = " \ - file://COPYING;md5=3e2bad3c5e3990988f9fa1bc5785b147 \ + file://COPYING;md5=8ca13a5a6972ac1620a1e42a3dacd774 \ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " @@ -10,8 +10,7 @@ inherit gnomebase gettext itstool DEPENDS += "libxml2" -SRC_URI[archive.md5sum] = "7d71af68fff4a92bcb2b8989f126be6c" -SRC_URI[archive.sha256sum] = "4fe51c0233b79a4c204c68498d45f09b342c30ed02c4e418506c0e35f0904ec3" +SRC_URI[archive.sha256sum] = "919c552f846aaec741fe51d5af416b469bcdb25c77effc3b5a15a4b4b7ff814e" RDEPENDS_${PN}_append_class-target = " libxml2 itstool" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_40.3.bb index b9263f50c..3ea497845 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_40.3.bb @@ -9,8 +9,7 @@ inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc features # for webkitgtk REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "32f879293f79b4042edc46aa13d82c71" -SRC_URI[archive.sha256sum] = "fd4b3e23d31ad2bebe42ac8f80242b2d9bef51418bf62b59acdf2440bd94ed24" +SRC_URI[archive.sha256sum] = "a173847851f26189be78ecbb10015d539d8cceffc7c23e8635492bc3ada5ee23" DEPENDS += " \ libxml2-native \ diff --git a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb index 593e5866d..a45dfdeda 100644 --- a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb +++ b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 polkit gobject-introspection-data" RDEPENDS_${PN} = " \ evolution-data-server \ @@ -17,6 +17,7 @@ RDEPENDS_${PN} = " \ gnome-font-viewer \ gnome-photos \ gnome-terminal \ + gthumb \ libwnck3 \ nautilus \ ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'gnome-system-monitor gnome-disk-utility', '', d)} \ diff --git a/meta-openembedded/meta-initramfs/README b/meta-openembedded/meta-initramfs/README index 79244d43f..a8f17ba85 100644 --- a/meta-openembedded/meta-initramfs/README +++ b/meta-openembedded/meta-initramfs/README @@ -23,7 +23,7 @@ Send patches / pull requests to openembedded-devel@lists.openembedded.org with '[meta-initramfs]' in the subject. When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-initramfs][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][PATCH' Interm layer maintainer: Khem Raj <raj.khem@gmail.com> diff --git a/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-debug-image.bb b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-debug-image.bb index c3dcd2b82..601056b7e 100644 --- a/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-debug-image.bb +++ b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-debug-image.bb @@ -11,7 +11,12 @@ IMAGE_FEATURES = "" export IMAGE_BASENAME = "initramfs-debug-image" IMAGE_LINGUAS = "" -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +# Some BSPs use IMAGE_FSTYPES_<machine override> which would override +# an assignment to IMAGE_FSTYPES so we need anon python +python () { + d.setVar("IMAGE_FSTYPES", d.getVar("INITRAMFS_FSTYPES")) +} + inherit core-image IMAGE_ROOTFS_SIZE = "8192" diff --git a/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb index 9a686f366..dd082ba52 100644 --- a/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb +++ b/meta-openembedded/meta-initramfs/recipes-core/images/initramfs-kexecboot-image.bb @@ -1,9 +1,13 @@ SUMMARY = "Initramfs image for kexecboot kernel" DESCRIPTION = "This image provides kexecboot (linux as bootloader) and helpers." -inherit image +# Some BSPs use IMAGE_FSTYPES_<machine override> which would override +# an assignment to IMAGE_FSTYPES so we need anon python +python () { + d.setVar("IMAGE_FSTYPES", d.getVar("INITRAMFS_FSTYPES")) +} -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +inherit image # avoid circular dependencies EXTRA_IMAGEDEPENDS = "" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index ce975f5a1..4d702dc56 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -66,3 +66,6 @@ RRECOMMENDS_${PN} = " \ busybox \ coreutils \ " + +# CVE-2010-4176 affects only Fedora +CVE_CHECK_WHITELIST += "CVE-2010-4176" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch index 56905a515..431c75e3a 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch +++ b/meta-openembedded/meta-initramfs/recipes-devtools/klibc/files/klcc-cross-accept-clang-options.patch @@ -5,7 +5,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/klcc/klcc.in +++ b/klcc/klcc.in -@@ -207,6 +207,24 @@ while ( defined($a = shift(@ARGV)) ) { +@@ -207,6 +207,27 @@ while ( defined($a = shift(@ARGV)) ) { } elsif ( $a =~ /^--([sysroot=])(.*)$/ ) { # Override gcc encoded sysroot push(@ccopt, $a); @@ -27,6 +27,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + } elsif ( $a =~ '--unwindlib=.*' ) { + # Allow clang options + push(@ccopt, $a); ++ } elsif ( $a =~ '-rtlib=.*' ) { ++ # Allow clang options ++ push(@ccopt, $a); } else { die "$0: unknown option: $a\n"; } diff --git a/meta-openembedded/meta-multimedia/README b/meta-openembedded/meta-multimedia/README index b4c2455a1..9c649ff87 100644 --- a/meta-openembedded/meta-multimedia/README +++ b/meta-openembedded/meta-multimedia/README @@ -9,10 +9,10 @@ layers: meta-oe branch: master revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia]' in the subject When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-multimedia][PATCH +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-multimedia][PATCH' You are encouraged to fork the mirror on github https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like GitLab, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch <remote>' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch deleted file mode 100644 index ef0c945d0..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-Fix-build-with-hardened-security-flags.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 6eba07bd195e0a1199a0fc62d7cc31ec376bc3dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Mon, 31 May 2021 17:44:29 +0200 -Subject: [PATCH] Fix build with hardened security flags -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -| ../gupnp-1.2.6/examples/get-volume.c: In function 'on_introspection': -| ../gupnp-1.2.6/examples/get-volume.c:53:17: error: format not a string literal and no format arguments [-Werror=format-security] -| 53 | g_critical (error->message); -| | ^~~~~~~~~~ -| ../gupnp-1.2.6/examples/get-volume.c:114:17: error: format not a string literal and no format arguments [-Werror=format-security] -| 114 | g_critical (error->message); -| | ^~~~~~~~~~ -| ../gupnp-1.2.6/examples/get-volume.c: In function 'main': -| ../gupnp-1.2.6/examples/get-volume.c:150:17: error: format not a string literal and no format arguments [-Werror=format-security] -| 150 | g_error (error->message); -| | ^~~~~~~ - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/17] ---- - examples/get-volume.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/examples/get-volume.c b/examples/get-volume.c -index 4601014..923581c 100644 ---- a/examples/get-volume.c -+++ b/examples/get-volume.c -@@ -50,7 +50,7 @@ on_introspection (GObject *object, GAsyncResult *res, gpointer user_data) - &error); - - if (error != NULL) { -- g_critical (error->message); -+ g_critical ("%s", error->message); - g_clear_error (&error); - } - -@@ -111,7 +111,7 @@ on_introspection (GObject *object, GAsyncResult *res, gpointer user_data) - g_list_free (out_names); - - if (error != NULL) { -- g_critical (error->message); -+ g_critical ("%s", error->message); - g_clear_error (&error); - } else { - g_print ("Current volume: %s\n", -@@ -147,7 +147,7 @@ int main(int argc, char *argv[]) - GUPnPContext *context = gupnp_context_new ("wlp3s0", 0, &error); - - if (error != NULL) { -- g_error (error->message); -+ g_error ("%s", error->message); - } - - GUPnPControlPoint *cp = gupnp_control_point_new (context, CONTENT_DIR); --- -2.31.1 - diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb deleted file mode 100644 index 294c361db..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.6.bb +++ /dev/null @@ -1,10 +0,0 @@ -require gupnp.inc - -SRC_URI = " \ - ${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz \ - file://0001-Fix-build-with-hardened-security-flags.patch \ -" -SRC_URI[sha256sum] = "00b20f1e478a72deac92c34723693a2ac55789ed1e4bb4eed99eb4d62092aafd" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb new file mode 100644 index 000000000..7ad594f02 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.7.bb @@ -0,0 +1,7 @@ +require gupnp.inc + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "8441276f1afd0176e6f595026a3a507eed1809abfa04026bad3f21622b3523ec" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb index 3fc845051..01705a8f7 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb @@ -12,7 +12,10 @@ DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstream RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback shared-mime-info" RRECOMMENDS_${PN} = "rygel-plugin-media-export" -inherit gnomebase vala gobject-introspection gettext systemd +inherit gnomebase vala gobject-introspection gettext systemd features_check + +# gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" SRC_URI[archive.md5sum] = "7f95401903a3f855b464d5152b9d4c07" SRC_URI[archive.sha256sum] = "08c21a577f7bdad26446a75ffa32778b26842c3b1188165f0b19818559747d00" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch new file mode 100644 index 000000000..68ccb6583 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-include-utility-for-std-forward.patch @@ -0,0 +1,43 @@ +From 9bb962148672a3c20fb0119d7f71789b8ef3dc02 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jun 2021 19:31:34 -0700 +Subject: [PATCH] include <utility> for std::forward + +Fixes +../git/src/Log.hxx:121:42: error: no member named 'forward' in namespace 'std' + LogFormat(LogLevel::ERROR, e, fmt, std::forward<Args>(args)...); + +Upstream-Status: Submitted [https://github.com/MusicPlayerDaemon/MPD/pull/1201] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/Log.hxx | 1 + + src/lib/expat/ExpatParser.hxx | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/Log.hxx b/src/Log.hxx +index a295ed9f6..87097b086 100644 +--- a/src/Log.hxx ++++ b/src/Log.hxx +@@ -24,6 +24,7 @@ + #include "util/Compiler.h" + + #include <exception> ++#include <utility> + + class Domain; + +diff --git a/src/lib/expat/ExpatParser.hxx b/src/lib/expat/ExpatParser.hxx +index e1723d109..4b5221e89 100644 +--- a/src/lib/expat/ExpatParser.hxx ++++ b/src/lib/expat/ExpatParser.hxx +@@ -25,6 +25,7 @@ + #include <expat.h> + + #include <stdexcept> ++#include <utility> + + class InputStream; + +-- +2.32.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb index b1fa96e1b..c112a40ce 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.9.bb @@ -19,9 +19,10 @@ DEPENDS += " \ SRC_URI = " \ git://github.com/MusicPlayerDaemon/MPD;branch=v0.22.x \ + file://0001-include-utility-for-std-forward.patch \ file://mpd.conf.in \ " -SRCREV = "938728820b11d4544a071994fe3c63c6ab710e8e" +SRCREV = "18628bf89ebfa5a806971479a71cf9b5764e500e" S = "${WORKDIR}/git" EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 73b852a4a..0601cdd99 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -85,7 +85,7 @@ RDEPENDS_packagegroup-meta-multimedia-connectivity = "\ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gupnp-tools", "", d)} \ gupnp \ libupnp \ - rygel \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "rygel", "", d)} \ " RDEPENDS_packagegroup-meta-multimedia-dvb = "\ oscam \ @@ -99,8 +99,7 @@ RDEPENDS_packagegroup-meta-multimedia-mkv = "\ RDEPENDS_packagegroup-meta-multimedia-support = "\ crossguid \ - libmediaart-2.0 \ - libmediaart \ + ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "libmediaart-2.0", "", d)} \ gst-instruments \ libsrtp \ srt \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.24.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.31.bb index 25c87d26d..3e8792118 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.24.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_0.3.31.bb @@ -2,16 +2,16 @@ SUMMARY = "Multimedia processing server for Linux" DESCRIPTION = "Linux server for handling and routing audio and video streams between applications and multimedia I/O devices" HOMEPAGE = "https://pipewire.org/" BUGTRACKER = "https://gitlab.freedesktop.org/pipewire/pipewire/issues" -LICENSE = "MIT" +LICENSE = "MIT & LGPL-2.1-or-later & GPL-2.0-only" LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=e2c0b7d86d04e716a3c4c9ab34260e69 \ + file://LICENSE;md5=2158739e172e58dc9ab1bdd2d6ec9c72 \ file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a \ " SECTION = "multimedia" DEPENDS = "dbus" -SRCREV = "c81d44e8a9497899d01bcc3054b6aa845e7a066e" +SRCREV = "c43dabcc96e2e072cdf08e5f094bb677d9017c6b" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https" S = "${WORKDIR}/git" @@ -91,7 +91,7 @@ remove_unused_installed_files() { # Remove it if pipewire-jack is not built to avoid creating the # pipewire-jack package. if ${@bb.utils.contains('PACKAGECONFIG', 'pipewire-jack', 'false', 'true', d)}; then - rm -f "${D}${sysconfdir}/pipewire/jack.conf" + rm -f "${D}${datadir}/pipewire/jack.conf" fi } @@ -189,9 +189,9 @@ PACKAGES =+ "\ PACKAGES_DYNAMIC = "^${PN}-spa-plugins.* ^${PN}-modules.*" SYSTEMD_SERVICE_${PN} = "pipewire.service" -CONFFILES_${PN} += "${sysconfdir}/pipewire/pipewire.conf" +CONFFILES_${PN} += "${datadir}/pipewire/pipewire.conf" FILES_${PN} = " \ - ${sysconfdir}/pipewire/pipewire.conf \ + ${datadir}/pipewire/pipewire.conf \ ${systemd_user_unitdir}/pipewire.* \ ${bindir}/pipewire \ " @@ -200,9 +200,9 @@ FILES_${PN}-dev += " \ ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so \ " -CONFFILES_libpipewire += "${sysconfdir}/pipewire/client.conf" +CONFFILES_libpipewire += "${datadir}/pipewire/client.conf" FILES_libpipewire = " \ - ${sysconfdir}/pipewire/client.conf \ + ${datadir}/pipewire/client.conf \ ${libdir}/libpipewire-*.so.* \ " # Add the bare minimum modules and plugins required to be able @@ -220,9 +220,9 @@ FILES_${PN}-tools = " \ # This is a shim daemon that is intended to be used as a # drop-in PulseAudio replacement, providing a pulseaudio-compatible # socket that can be used by applications that use libpulse. -CONFFILES_${PN}-pulse += "${sysconfdir}/pipewire/pipewire-pulse.conf" +CONFFILES_${PN}-pulse += "${datadir}/pipewire/pipewire-pulse.conf" FILES_${PN}-pulse = " \ - ${sysconfdir}/pipewire/pipewire-pulse.conf \ + ${datadir}/pipewire/pipewire-pulse.conf \ ${systemd_user_unitdir}/pipewire-pulse.* \ ${bindir}/pipewire-pulse \ " @@ -237,18 +237,18 @@ FILES_${PN}-alsa = "\ " # jack drop-in libraries to redirect audio to pipewire -CONFFILES_${PN}-jack = "${sysconfdir}/pipewire/jack.conf" +CONFFILES_${PN}-jack = "${datadir}/pipewire/jack.conf" FILES_${PN}-jack = "\ - ${sysconfdir}/pipewire/jack.conf \ + ${datadir}/pipewire/jack.conf \ ${libdir}/${PW_MODULE_SUBDIR}/jack/libjack*.so.* \ " # Example session manager. Not intended for use in production. -CONFFILES_${PN}-media-session = "${sysconfdir}/pipewire/media-session.d/*" +CONFFILES_${PN}-media-session = "${datadir}/pipewire/media-session.d/*" SYSTEMD_SERVICE_${PN}-media-session = "pipewire-media-session.service" FILES_${PN}-media-session = " \ ${bindir}/pipewire-media-session \ - ${sysconfdir}/pipewire/media-session.d/* \ + ${datadir}/pipewire/media-session.d/* \ ${systemd_system_unitdir}/pipewire-media-session.service \ " RPROVIDES_${PN}-media-session = "virtual/pipewire-sessionmanager" @@ -265,11 +265,16 @@ FILES_${PN}-spa-tools = " \ FILES_${PN}-modules = "" RRECOMMENDS_${PN}-modules += "${PN}-modules-meta" -CONFFILES_${PN}-modules-rtkit = "${sysconfdir}/pipewire/client-rt.conf" +CONFFILES_${PN}-modules-rtkit = "${datadir}/pipewire/client-rt.conf" FILES_${PN}-modules-rtkit += " \ - ${sysconfdir}/pipewire/client-rt.conf \ + ${datadir}/pipewire/client-rt.conf \ " +CONFFILES_${PN}-modules-filter-chain = "${datadir}/pipewire/filter-chain/*" +FILES_${PN}-modules-filter-chain += " \ + ${datadir}/pipewire/filter-chain/* \ +" + FILES_${PN}-alsa-card-profile = " \ ${datadir}/alsa-card-profile/* \ ${nonarch_base_libdir}/udev/rules.d/90-pipewire-alsa.rules \ diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb deleted file mode 100644 index 56a7873fc..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -require libmediaart.inc - -SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz" -SRC_URI[md5sum] = "9b960a6a764fba38135fb57219f2e6b4" -SRC_URI[sha256sum] = "a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d" - -S = "${WORKDIR}/libmediaart-${PV}" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb new file mode 100644 index 000000000..31fe43bfa --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart-2.0_1.9.5.bb @@ -0,0 +1,23 @@ +SUMMARY = "Library tasked with managing, extracting and handling media art caches" + +LICENSE = "LGPLv2+ & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ + file://libmediaart/extract.c;endline=18;md5=dff2b6328ab067b5baadc135f9876c36 \ + file://tests/mediaarttest.c;endline=18;md5=067106eaa1f7a9d918759a096667f18e" + +DEPENDS = "glib-2.0 gdk-pixbuf" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection vala features_check + +SRC_URI = "${GNOME_MIRROR}/libmediaart/1.9/libmediaart-${PV}.tar.xz" +SRC_URI[sha256sum] = "07def5a42c482ae71d3e1f77a4d0fdc337f74226059a65284d6d5a241f0e9cd6" + +S = "${WORKDIR}/libmediaart-${PV}" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +UNKNOWN_CONFIGURE_WHITELIST = "introspection" + +EXTRA_OEMESON = "-Dimage_library=gdk-pixbuf" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart.inc b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart.inc deleted file mode 100644 index c7b368de3..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart.inc +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Library tasked with managing, extracting and handling media art caches" - -LICENSE = "LGPLv2+ & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c \ - file://libmediaart/extract.c;endline=18;md5=dff2b6328ab067b5baadc135f9876c36 \ - file://tests/mediaarttest.c;endline=18;md5=067106eaa1f7a9d918759a096667f18e" - -DEPENDS = "glib-2.0 gdk-pixbuf" - -inherit gnomebase gtk-doc gobject-introspection - -EXTRA_OECONF = "--disable-qt --enable-gdkpixbuf" diff --git a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb b/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb deleted file mode 100644 index ae95d4f69..000000000 --- a/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require libmediaart.inc - -SRC_URI[archive.md5sum] = "1a44933d4cd0064e3c76d8d0ddacddc9" -SRC_URI[archive.sha256sum] = "3a9dffcad862aed7c0921579b93080d694b8a66f3676bfee8037867f653a1cd3" - -EXTRA_OECONF_append = " --disable-gtk-doc" diff --git a/meta-openembedded/meta-networking/MAINTAINERS b/meta-openembedded/meta-networking/MAINTAINERS index 5c4c4ce05..77e90668c 100644 --- a/meta-openembedded/meta-networking/MAINTAINERS +++ b/meta-openembedded/meta-networking/MAINTAINERS @@ -8,7 +8,7 @@ When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix=meta-networking][PATCH + --subject-prefix='meta-networking][PATCH' You may also contact the maintainers directly. diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch index 55d1ac94c..282d82137 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch @@ -22,13 +22,13 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> --- blueman/Functions.py | 10 ++++++++++ blueman/plugins/applet/PowerManager.py | 4 ++++ - 2 files changed, 15 insertions(+), 1 deletion(-) + 2 files changed, 14 insertions(+) diff --git a/blueman/Functions.py b/blueman/Functions.py -index 3b76271..c5eeb27 100644 +index 3917f42..b4d5eae 100644 --- a/blueman/Functions.py +++ b/blueman/Functions.py -@@ -86,6 +86,16 @@ def check_bluetooth_status(message, exitfunc): +@@ -80,6 +80,16 @@ def check_bluetooth_status(message: str, exitfunc: Callable[[], Any]) -> None: return applet.SetBluetoothStatus('(b)', True) @@ -46,27 +46,27 @@ index 3b76271..c5eeb27 100644 print('Failed to enable bluetooth') exitfunc() diff --git a/blueman/plugins/applet/PowerManager.py b/blueman/plugins/applet/PowerManager.py -index 8ec9fc4..29a0fb0 100644 +index c2f7bc3..bf6c99f 100644 --- a/blueman/plugins/applet/PowerManager.py +++ b/blueman/plugins/applet/PowerManager.py -@@ -48,6 +48,7 @@ class PowerManager(AppletPlugin): +@@ -63,6 +63,7 @@ class PowerManager(AppletPlugin, StatusIconProvider): self._add_dbus_signal("BluetoothStatusChanged", "b") self._add_dbus_method("SetBluetoothStatus", ("b",), "", self.request_power_state) self._add_dbus_method("GetBluetoothStatus", (), "b", self.get_bluetooth_status) + self._add_dbus_method("GetRequestStatus", (), "b", self.get_request_status) - def on_unload(self): + def on_unload(self) -> None: self.parent.Plugins.Menu.unregister(self) -@@ -182,6 +183,9 @@ class PowerManager(AppletPlugin): - def get_bluetooth_status(self): +@@ -196,6 +197,9 @@ class PowerManager(AppletPlugin, StatusIconProvider): + def get_bluetooth_status(self) -> bool: return self.current_state + def get_request_status(self): + return self.request_in_progress + - def on_adapter_property_changed(self, _path, key, value): + def on_adapter_property_changed(self, _path: str, key: str, value: Any) -> None: if key == "Powered": if value and not self.current_state: -- -2.20.1 +2.31.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb index 29bef230e..3cb01ff71 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.1.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.2.1.bb @@ -4,14 +4,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "bluez5 python3-pygobject python3-cython-native python3-setuptools-native intltool-native" -inherit autotools systemd gsettings python3native gtk-icon-cache +inherit autotools gettext systemd gsettings python3native gtk-icon-cache SRC_URI = " \ https://github.com/blueman-project/blueman/releases/download/${PV}/blueman-${PV}.tar.xz \ file://0001-Search-for-cython3.patch \ file://0002-fix-fail-to-enable-bluetooth.patch \ " -SRC_URI[sha256sum] = "1d9c3d39a564d88851aa8de509f16bfa586b0b50f4307dc6c6347ba4833664da" +SRC_URI[sha256sum] = "fcc10a2259bef2c5ac63f577010d76caed460d68810b7f70fecf056bf10a1a72" EXTRA_OECONF = " \ --disable-appindicator \ @@ -48,12 +48,10 @@ FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/_blueman.a" do_install_append() { sed -i "1s/.*/#!\/usr\/bin\/env python3/" ${D}${prefix}/libexec/blueman-rfcomm-watcher \ ${D}${prefix}/libexec/blueman-mechanism \ - ${D}${bindir}/blueman-tray \ - ${D}${bindir}/blueman-services \ - ${D}${bindir}/blueman-sendto \ - ${D}${bindir}/blueman-report \ - ${D}${bindir}/blueman-manager \ - ${D}${bindir}/blueman-assistant \ + ${D}${bindir}/blueman-adapters \ ${D}${bindir}/blueman-applet \ - ${D}${bindir}/blueman-adapters + ${D}${bindir}/blueman-manager \ + ${D}${bindir}/blueman-sendto \ + ${D}${bindir}/blueman-services \ + ${D}${bindir}/blueman-tray } diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb index b178180ec..6ea5b4b27 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/dhcp-relay_4.4.2p1.bb @@ -10,20 +10,25 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=004a4db50a1e20972e924a8618747 DEPENDS = "openssl libcap zlib" -SRC_URI = "https://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \ +SRC_URI = "https://ftp.isc.org/isc/dhcp/4.4.2-P1/dhcp-4.4.2-P1.tar.gz \ + https://ftp.isc.org/isc/bind9/9.11.32/bind-9.11.32.tar.gz;name=bind;downloadfilename=bind.tar.gz;unpack=0 \ file://default-relay \ file://init-relay \ file://dhcrelay.service \ file://0001-Makefile.am-only-build-dhcrelay.patch \ + file://0002-bind-version-update-to-latest-version.patch \ + file://0003-bind-Makefile.in-disable-backtrace.patch \ " -SRC_URI[md5sum] = "2afdaf8498dc1edaf3012efdd589b3e1" -SRC_URI[sha256sum] = "1a7ccd64a16e5e68f7b5e0f527fd07240a2892ea53fe245620f4f5f607004521" +SRC_URI[md5sum] = "3089a1ebd20a802ec0870ae337d43907" +SRC_URI[sha256sum] = "b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a" +SRC_URI[bind.md5sum] = "0d029dd06ca60c6739c3189c999ef757" +SRC_URI[bind.sha256sum] = "cbf8cb4b74dd1452d97c3a2a8c625ea346df8516b4b3508ef07443121a591342" UPSTREAM_CHECK_URI = "http://ftp.isc.org/isc/dhcp/" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.\d+\.(\d+?))/" -S = "${WORKDIR}/dhcp-${PV}" +S = "${WORKDIR}/dhcp-4.4.2-P1" inherit autotools-brokensep systemd @@ -43,15 +48,18 @@ EXTRA_OEMAKE += "LIBTOOL='${S}/${HOST_SYS}-libtool'" # Enable shared libs per dhcp README do_configure_prepend () { cp configure.ac+lt configure.ac + rm ${S}/bind/bind.tar.gz + mv ${WORKDIR}/bind.tar.gz ${S}/bind/ } + do_compile_prepend() { - rm -rf ${S}/bind/bind-9.11.14/ + rm -rf ${S}/bind/bind-9.11.32/ tar xf ${S}/bind/bind.tar.gz -C ${S}/bind - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.14/ - install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/bind/bind-9.11.14/ - cp -fpR ${S}/m4/*.m4 ${S}/bind/bind-9.11.14/libtool.m4/ - rm -rf ${S}/bind/bind-9.11.14/libtool - install -m 0755 ${S}/${HOST_SYS}-libtool ${S}/bind/bind-9.11.14/ + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/bind/bind-9.11.32/ + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/bind/bind-9.11.32/ + cp -fpR ${S}/m4/*.m4 ${S}/bind/bind-9.11.32/libtool.m4/ + rm -rf ${S}/bind/bind-9.11.32/libtool + install -m 0755 ${S}/${HOST_SYS}-libtool ${S}/bind/bind-9.11.32/ } do_install_append () { diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch new file mode 100644 index 000000000..5c7a5f058 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0002-bind-version-update-to-latest-version.patch @@ -0,0 +1,30 @@ +From edb68972f8dc636e6208e78f02dec6f9805e4c0b Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 26 May 2021 11:39:00 +0800 +Subject: [PATCH] bind/version: update to latest version + +Update the bundled bind from 9.11.14 to 9.11.32. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + bind/version.tmp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bind/version.tmp b/bind/version.tmp +index cf52f1b..4cc538e 100644 +--- a/bind/version.tmp ++++ b/bind/version.tmp +@@ -5,7 +5,7 @@ PRODUCT=BIND + DESCRIPTION="(Extended Support Version)" + MAJORVER=9 + MINORVER=11 +-PATCHVER=14 ++PATCHVER=32 + RELEASETYPE= + RELEASEVER= + EXTENSIONS= +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch new file mode 100644 index 000000000..51520bc62 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/dhcp/files/0003-bind-Makefile.in-disable-backtrace.patch @@ -0,0 +1,31 @@ +From bc9c5d64ad4829c7830ef70fcaff94470974247c Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Tue, 8 Jun 2021 10:13:57 +0800 +Subject: [PATCH] bind/Makefile.in: disable backtrace + +Fixes build error for qemuarm on musl: +libisc.so: undefined reference to `_Unwind_GetIP' + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + bind/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bind/Makefile.in b/bind/Makefile.in +index 8fe8883..1058160 100644 +--- a/bind/Makefile.in ++++ b/bind/Makefile.in +@@ -22,7 +22,7 @@ prefix = @prefix@ + exec_prefix = @exec_prefix@ + + bindconfig = --without-openssl --without-libxml2 --without-libjson \ +- --without-gssapi --disable-threads --without-lmdb \ ++ --without-gssapi --disable-threads --without-lmdb --disable-backtrace \ + --includedir=@includedir@ --libdir=@libdir@ --without-python\ + @BINDLT@ @BINDIOMUX@ @BINDCONFIG@ --enable-full-report + +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb index 9aad510b4..b8025c707 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.3.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/firewalld_0.9.4.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://firewalld.init \ " -SRC_URI[sha256sum] = "5998894db976d77996ca0a6b700a2f4125b9f283465fb255da9bddfb1640cb27" +SRC_URI[sha256sum] = "52c5e3d5b1e2efc0e86c22b2bc1f7fd80908cc2d8130157dc2a3517a59b0a760" # glib-2.0-native is needed for GSETTINGS_RULES autoconf macro from gsettings.m4 DEPENDS = "intltool-native glib-2.0-native nftables" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb index 481e7ea94..3c7df4451 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.25.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.26.0.bb @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "libs" S = "${WORKDIR}/git" -SRCREV = "1c54b5410fd48d6bcada97e30cac417c5c7eea67" +SRCREV = "e483a77c85e1f9c1dd2eb1c5a8f552d2617fe400" SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=development" SRC_URI += "file://0001-ssl_tls-Increase-size-of-padbuf-to-64.patch" @@ -32,6 +32,7 @@ inherit cmake PACKAGECONFIG ??= "shared-libs programs" PACKAGECONFIG[shared-libs] = "-DUSE_SHARED_MBEDTLS_LIBRARY=ON,-DUSE_SHARED_MBEDTLS_LIBRARY=OFF" PACKAGECONFIG[programs] = "-DENABLE_PROGRAMS=ON,-DENABLE_PROGRAMS=OFF" +PACKAGECONFIG[werror] = "-DMBEDTLS_FATAL_WARNINGS=ON,-DMBEDTLS_FATAL_WARNINGS=OFF" EXTRA_OECMAKE = "-DENABLE_TESTING=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.10.bb b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.11.bb index b815ac3b4..9f1c024bb 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.10.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mosquitto/mosquitto_2.0.11.bb @@ -10,7 +10,7 @@ LICENSE = "EPL-2.0 | EDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca9a8f366c6babf593e374d0d7d58749 \ file://edl-v10;md5=c09f121939f063aeb5235972be8c722c \ file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ - file://notice.html;md5=541f8f37af492858dab8d2c1b69ede69 \ + file://NOTICE.md;md5=a7a91b4754c6f7995020d1b49bc829c6 \ " DEPENDS = "uthash cjson dlt-daemon" @@ -19,8 +19,8 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://1571.patch \ " -SRC_URI[md5sum] = "3d1c327d8c5881f56983bee1e3c8f068" -SRC_URI[sha256sum] = "0188f7b21b91d6d80e992b8d6116ba851468b3bd154030e8a003ed28fb6f4a44" +SRC_URI[md5sum] = "638d801e6aac611b41de76d030951612" +SRC_URI[sha256sum] = "7b36a7198bce85cf31b132f5c6ee36dcf5dadf86fb768501eb1e11ce95d4f78a" inherit systemd update-rc.d useradd cmake diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Handle-enum-element-override.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Handle-enum-element-override.patch new file mode 100644 index 000000000..dfc6f90c4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-Handle-enum-element-override.patch @@ -0,0 +1,34 @@ +From 6d284f1ff81494a5fca91a399b92b218ea1a9ea8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 8 Jun 2021 08:53:30 -0700 +Subject: [PATCH] Handle enum element override + +NETPLAN_DEF_TYPE_VIRTUAL and NETPLAN_DEF_TYPE_BRIDGE point +to same value in enum, however here they are assigned individually +which results in overriding the initialization of the objects + +Fixes +src/netplan.h:85:33: error: initializer overrides prior initialization of this subobject [-Werror,-Winitializer-overrides] + [NETPLAN_DEF_TYPE_BRIDGE] = "bridges", + ^~~~~~~~~ +Upstream-Status: Submitted [https://github.com/canonical/netplan/pull/213] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/netplan.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/netplan.h b/src/netplan.h +index d2c538b..26574f8 100644 +--- a/src/netplan.h ++++ b/src/netplan.h +@@ -81,7 +81,6 @@ static const char* const netplan_def_type_to_str[NETPLAN_DEF_TYPE_MAX_] = { + [NETPLAN_DEF_TYPE_ETHERNET] = "ethernets", + [NETPLAN_DEF_TYPE_WIFI] = "wifis", + [NETPLAN_DEF_TYPE_MODEM] = "modems", +- [NETPLAN_DEF_TYPE_VIRTUAL] = NULL, + [NETPLAN_DEF_TYPE_BRIDGE] = "bridges", + [NETPLAN_DEF_TYPE_BOND] = "bonds", + [NETPLAN_DEF_TYPE_VLAN] = "vlans", +-- +2.32.0 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch deleted file mode 100644 index 407e24ca0..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch +++ /dev/null @@ -1,59 +0,0 @@ -Subject: [PATCH 1/2] dbus: Remove unused variabes - -This issue is seen when using clang to compile it - -Same fix is needed for parse.c and networkd.c, - -Fixes -src/dbus.c:49:23: error: unused variable 'stdout' [-Werror,-Wunused-variable] -g_autofree gchar *stdout = NULL; -^ -Upstream-Status: Submitted [https://github.com/CanonicalLtd/netplan/pull/175] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/dbus.c | 3 --- - src/networkd.c | 1 - - src/parse.c | 1 - - 3 files changed, 5 deletions(-) - -diff --git a/src/dbus.c b/src/dbus.c -index 9606fea..8e1ed9d 100644 ---- a/src/dbus.c -+++ b/src/dbus.c -@@ -242,9 +242,6 @@ static int - method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) - { - sd_bus_message *reply = NULL; -- g_autoptr(GError) err = NULL; -- g_autofree gchar *stdout = NULL; -- g_autofree gchar *stderr = NULL; - gint exit_status = 0; - - exit_status = sd_bus_message_new_method_return(m, &reply); -diff --git a/src/networkd.c b/src/networkd.c -index 7c86cd6..7200740 100644 ---- a/src/networkd.c -+++ b/src/networkd.c -@@ -897,7 +897,6 @@ append_wpa_auth_conf(GString* s, const NetplanAuthenticationSettings* auth, cons - static void - write_wpa_unit(const NetplanNetDefinition* def, const char* rootdir) - { -- g_autoptr(GError) err = NULL; - g_autofree gchar *stdouth = NULL; - - stdouth = systemd_escape(def->id); -diff --git a/src/parse.c b/src/parse.c -index 033c657..faca27f 100644 ---- a/src/parse.c -+++ b/src/parse.c -@@ -1899,7 +1899,6 @@ handle_wireguard_peers(yaml_document_t* doc, yaml_node_t* node, const void* _, G - } - - for (yaml_node_item_t *i = node->data.sequence.items.start; i < node->data.sequence.items.top; i++) { -- g_autofree char* addr = NULL; - yaml_node_t *entry = yaml_document_get_node(doc, *i); - assert_type(entry, YAML_MAPPING_NODE); - --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch index dab8693c7..0fa6ba48a 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch @@ -8,13 +8,11 @@ Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> src/util.c | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/src/util.c b/src/util.c -index 7e59985..eb8e573 100644 --- a/src/util.c +++ b/src/util.c -@@ -23,6 +23,12 @@ - +@@ -24,6 +24,12 @@ #include "util.h" + #include "netplan.h" +/* Don't fail if the standard library + * doesn't provide brace expansion */ @@ -25,6 +23,3 @@ index 7e59985..eb8e573 100644 GHashTable* wifi_frequency_24; GHashTable* wifi_frequency_5; --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch deleted file mode 100644 index 68aabd6a4..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch +++ /dev/null @@ -1,32 +0,0 @@ -Subject: [PATCH 2/2] Makefile: Exclude .h files from target rule - -This ensures that src/_features.h is not added to compiler cmdline which -can confuse the compilers e.g. clang as it may not like .h as valid input -and complain - -| clang-11: error: cannot specify -o when generating multiple output files -| make: *** [Makefile:50: netplan-dbus] Error 1 -| make: *** Waiting for unfinished jobs.... - -Upstream-Status: Submitted [https://github.com/CanonicalLtd/netplan/pull/175] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 4fa6bd8..567d326 100644 ---- a/Makefile -+++ b/Makefile -@@ -46,7 +46,7 @@ generate: libnetplan.so.$(NETPLAN_SOVER) nm.o networkd.o openvswitch.o generate. - $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -L. -lnetplan `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` - - netplan-dbus: src/dbus.c src/_features.h util.o -- $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0` -+ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(patsubst %.h,,$^) `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0` - - src/_features.h: src/[^_]*.[hc] - printf "#include <stddef.h>\nstatic const char *feature_flags[] __attribute__((__unused__)) = {\n" > $@ --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.101.bb b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.102.bb index a3afcd2d5..3328dfbbb 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.101.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan_0.102.bb @@ -11,13 +11,12 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" S = "${WORKDIR}/git" -SRCREV = "e445b87b9dff439ec564c245d030b03d61eb0f24" -PV = "0.101+git${SRCPV}" +SRCREV = "62701436991e42606c4e9e8dbdcdc5067d64f69b" +PV = "0.102+git${SRCPV}" SRC_URI = " \ git://github.com/CanonicalLtd/netplan.git \ - file://0001-dbus-Remove-unused-variabes.patch \ - file://0002-Makefile-Exclude-.h-files-from-target-rule.patch \ + file://0001-Handle-enum-element-override.patch \ " SRC_URI_append_libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch index 0a86abafc..86e8eaafc 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch @@ -1,6 +1,6 @@ From d0dead0478a070b96f37bd3b310443eaa8c93a25 Mon Sep 17 00:00:00 2001 -From: Vinicius Aquino <voa.aquino@gmail.com> -Date: Thu, 1 Apr 2021 14:13:07 -0300 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 5 Jul 2021 00:42:23 +0200 Subject: [PATCH] Do not create settings settings/property documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -15,34 +15,35 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com> --- - Makefile.am | 4 ---- + Makefile.am | 5 ----- configure.ac | 5 ----- - 2 files changed, 9 deletions(-) + 2 files changed, 10 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 9279672c1..2e52acbb2 100644 +index 5a62070..3d0ebcd 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -1686,14 +1686,10 @@ libnm/libnm.typelib: libnm/libnm.gir - INTROSPECTION_GIRS += libnm/NM-1.0.gir +@@ -1860,15 +1860,10 @@ src/libnm-client-impl/libnm.typelib: src/libnm-client-impl/libnm.gir + INTROSPECTION_GIRS += src/libnm-client-impl/NM-1.0.gir libnm_noinst_data = \ -- clients/cli/generate-docs-nm-settings-nmcli.xml \ - libnm/nm-property-infos-dbus.xml \ - libnm/nm-property-infos-ifcfg-rh.xml \ - libnm/nm-property-infos-keyfile.xml \ - libnm/nm-property-infos-nmcli.xml \ -- libnm/nm-settings-docs-gir.xml \ +- src/nmcli/generate-docs-nm-settings-nmcli.xml \ - man/nm-settings-docs-dbus.xml \ - man/nm-settings-docs-nmcli.xml \ + src/libnm-client-impl/nm-property-infos-dbus.xml \ + src/libnm-client-impl/nm-property-infos-ifcfg-rh.xml \ + src/libnm-client-impl/nm-property-infos-keyfile.xml \ + src/libnm-client-impl/nm-property-infos-nmcli.xml \ +- src/libnm-client-impl/nm-settings-docs-gir.xml \ +- src/libnmc-setting/settings-docs-input.xml \ $(NULL) noinst_DATA += $(libnm_noinst_data) diff --git a/configure.ac b/configure.ac -index 784ac4695..681e6cb32 100644 +index 8fe23de..dc24850 100644 --- a/configure.ac +++ b/configure.ac -@@ -1241,11 +1241,6 @@ GTK_DOC_CHECK(1.0) +@@ -1258,11 +1258,6 @@ GTK_DOC_CHECK(1.0) # check if we can build setting property documentation build_docs=no if test -n "$INTROSPECTION_MAKEFILE"; then @@ -55,5 +56,5 @@ index 784ac4695..681e6cb32 100644 if test -z "$PERL"; then AC_MSG_ERROR([--enable-introspection requires perl]) -- -2.20.1 +2.31.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch deleted file mode 100644 index 692f1ffa4..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0001-Fix-build-with-musl-systemd-specific.patch +++ /dev/null @@ -1,154 +0,0 @@ -From 44884c7e7655b889f41cb02ffc8ab72a29b52ebf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Tue, 2 Apr 2019 01:34:35 +0200 -Subject: [PATCH 1/2] Fix build with musl - systemd specific -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Networkmanager imported some code from systemd. This requires some adjustments -for musl. - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> -Signed-off-by: Vinicius Aquino <voa.aquino@gmail.com> ---- - shared/systemd/src/basic/in-addr-util.c | 1 + - shared/systemd/src/basic/process-util.c | 9 +++++++++ - shared/systemd/src/basic/socket-util.h | 6 ++++++ - shared/systemd/src/basic/sort-util.h | 13 ++++--------- - shared/systemd/src/basic/stdio-util.h | 2 ++ - shared/systemd/src/basic/string-util.h | 5 +++++ - 6 files changed, 27 insertions(+), 9 deletions(-) - -diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c -index c315dcbb8..5b7e04eb7 100644 ---- a/shared/systemd/src/basic/in-addr-util.c -+++ b/shared/systemd/src/basic/in-addr-util.c -@@ -15,6 +15,7 @@ - #include "in-addr-util.h" - #include "macro.h" - #include "parse-util.h" -+#include "string-util.h" - #include "random-util.h" - #include "string-util.h" - #include "strxcpyx.h" -diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c -index 0e25b0200..ea2c0fbb4 100644 ---- a/shared/systemd/src/basic/process-util.c -+++ b/shared/systemd/src/basic/process-util.c -@@ -17,6 +17,9 @@ - #include <sys/wait.h> - #include <syslog.h> - #include <unistd.h> -+#ifndef __GLIBC__ -+#include <pthread.h> -+#endif - #if 0 /* NM_IGNORED */ - #if HAVE_VALGRIND_VALGRIND_H - #include <valgrind/valgrind.h> -@@ -1152,11 +1155,13 @@ void reset_cached_pid(void) { - cached_pid = CACHED_PID_UNSET; - } - -+#ifdef __GLIBC__ - /* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc - * headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against - * libpthread, as it is part of glibc anyway. */ - extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle); - extern void* __dso_handle _weak_; -+#endif - - pid_t getpid_cached(void) { - static bool installed = false; -@@ -1185,7 +1190,11 @@ pid_t getpid_cached(void) { - * only half-documented (glibc doesn't document it but LSB does — though only superficially) - * we'll check for errors only in the most generic fashion possible. */ - -+#ifdef __GLIBC__ - if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) { -+#else -+ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) { -+#endif - /* OOM? Let's try again later */ - cached_pid = CACHED_PID_UNSET; - return new_pid; -diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h -index 1de069476..f6834fbd2 100644 ---- a/shared/systemd/src/basic/socket-util.h -+++ b/shared/systemd/src/basic/socket-util.h -@@ -14,6 +14,12 @@ - #include <sys/types.h> - #include <sys/un.h> - -+#if !defined(__GLIBC__) -+/* SIOCGSTAMPNS from linux/asm-generic.h -+ * for src/systemd/src/libsystemd-network/sd-lldp.c */ -+#include <linux/sockios.h> -+#endif -+ - #include "macro.h" - #include "missing_network.h" - #include "missing_socket.h" -diff --git a/shared/systemd/src/basic/sort-util.h b/shared/systemd/src/basic/sort-util.h -index a8984fc16..5fb90f8c5 100644 ---- a/shared/systemd/src/basic/sort-util.h -+++ b/shared/systemd/src/basic/sort-util.h -@@ -5,15 +5,10 @@ - - #include "macro.h" - --void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, -- __compar_d_fn_t compar, void *arg); -- --#define typesafe_bsearch_r(k, b, n, func, userdata) \ -- ({ \ -- const typeof(b[0]) *_k = k; \ -- int (*_func_)(const typeof(b[0])*, const typeof(b[0])*, typeof(userdata)) = func; \ -- xbsearch_r((const void*) _k, (b), (n), sizeof((b)[0]), (__compar_d_fn_t) _func_, userdata); \ -- }) -+#if !defined(__GLIBC__) -+typedef int (*__compar_fn_t) (const void*, const void*); -+typedef __compar_fn_t comparison_fn_t; -+#endif - - /** - * Normal bsearch requires base to be nonnull. Here were require -diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h -index d45d3c1a6..fee1a57ca 100644 ---- a/shared/systemd/src/basic/stdio-util.h -+++ b/shared/systemd/src/basic/stdio-util.h -@@ -2,7 +2,9 @@ - #pragma once - - #if 0 /* NM_IGNORED */ -+#if defined(__GLIBC__) - #include <printf.h> -+#endif - #endif /* NM_IGNORED */ - #include <stdarg.h> - #include <stdio.h> -diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h -index 593cf04ae..541c393f6 100644 ---- a/shared/systemd/src/basic/string-util.h -+++ b/shared/systemd/src/basic/string-util.h -@@ -26,6 +26,11 @@ - #define strcaseeq(a,b) (strcasecmp((a),(b)) == 0) - #define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0) - -+/* musl does not know strndupa */ -+#if !defined(__GLIBC__) -+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s) -+#endif -+ - int strcmp_ptr(const char *a, const char *b) _pure_; - int strcasecmp_ptr(const char *a, const char *b) _pure_; - --- -2.20.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch deleted file mode 100644 index d83efd39e..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager/musl/0002-Fix-build-with-musl-systemd-specific.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7d9a11a17da425d106791ada7100d7a6559e6065 Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer <adrian.freihofer@siemens.com> -Date: Sat, 7 Mar 2020 14:24:01 +0100 -Subject: [PATCH 2/2] Fix build with musl - systemd specific - ---- - src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c -index 3fafd3c0e..79d6096c2 100644 ---- a/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c -+++ b/src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c -@@ -8,7 +8,9 @@ - #include <errno.h> - #include <sys/ioctl.h> - #if 0 /* NM_IGNORED */ -+#ifdef __GLIBC__ /* musl supplies full set of userspace headers */ - #include <linux/if_arp.h> -+#endif - #else /* NM_IGNORED */ - #include <net/if_arp.h> - #endif /* NM_IGNORED */ --- -2.20.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.32.2.bb index 7c07b0a34..a01e53009 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.30.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.32.2.bb @@ -27,11 +27,7 @@ SRC_URI = " \ file://0002-Do-not-create-settings-settings-property-documentati.patch \ file://0003-install-firewalld-to-var-libdir-rather-than-hardcod-.patch \ " -SRC_URI_append_libc-musl = " \ - file://musl/0001-Fix-build-with-musl-systemd-specific.patch \ - file://musl/0002-Fix-build-with-musl-systemd-specific.patch \ -" -SRC_URI[sha256sum] = "6050b724212ea3ce7386113359bea9afa1f679a54f60d999a5999892e672c190" +SRC_URI[sha256sum] = "701d511067f757d0f92f412c98cdb49a74a6ba69448aabb1beadacbc171e3873" S = "${WORKDIR}/NetworkManager-${PV}" @@ -56,7 +52,7 @@ CFLAGS_append_libc-musl = " \ " do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs" + export GIR_EXTRA_LIBS_PATH="${B}/src/libnm-client-impl/.libs" } PACKAGECONFIG ??= "nss ifupdown dnsmasq nmcli \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch index 8ca7a52ed..f4668dc6f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/16-do-not-check-xsltproc-manpages.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-Don-t-check-xsltproc-manpages.patch @@ -1,12 +1,14 @@ -From 2214c2d1e455a38c891d17e421b438e3f7c495d8 Mon Sep 17 00:00:00 2001 +From 3bc1ebc3d2758af4067b3aace7ddd0ea0cb0b57b Mon Sep 17 00:00:00 2001 From: Bian Naimeng <biannm@cn.fujitsu.com> Date: Mon, 18 Apr 2016 17:00:53 -0400 Subject: [PATCH] Don't check xsltproc manpages Upstream-Status: Pending - + Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> +Rebase to 4.14.4 +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- lib/ldb/wscript | 2 +- lib/talloc/wscript | 2 +- @@ -14,10 +16,10 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ldb/wscript b/lib/ldb/wscript -index 5ea5231..d94086b 100644 +index bf6129b..c515deb 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript -@@ -98,7 +98,7 @@ def configure(conf): +@@ -143,7 +143,7 @@ def configure(conf): conf.DEFINE('EXPECTED_SYSTEM_LDB_VERSION_RELEASE', int(v[2])) if conf.env.standalone_ldb: @@ -27,10 +29,10 @@ index 5ea5231..d94086b 100644 # we need this for the ldap backend if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): diff --git a/lib/talloc/wscript b/lib/talloc/wscript -index df7e6be..b3305cf 100644 +index a767477..f754819 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript -@@ -49,7 +49,7 @@ def configure(conf): +@@ -48,7 +48,7 @@ def configure(conf): conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' conf.env.TALLOC_VERSION = VERSION @@ -40,18 +42,18 @@ index df7e6be..b3305cf 100644 conf.CHECK_HEADERS('sys/auxv.h') conf.CHECK_FUNCS('getauxval') diff --git a/lib/tdb/wscript b/lib/tdb/wscript -index 4782550..6bb3fa1 100644 +index e56ddd0..467dd65 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript -@@ -89,7 +89,7 @@ def configure(conf): +@@ -95,7 +95,7 @@ def configure(conf): not conf.env.disable_tdb_mutex_locking): conf.define('USE_TDB_MUTEX_LOCKING', 1) - conf.CHECK_XSLTPROC_MANPAGES() + #conf.CHECK_XSLTPROC_MANPAGES() - if not conf.env.disable_python: - # also disable if we don't have the python libs installed + conf.SAMBA_CHECK_PYTHON() + conf.SAMBA_CHECK_PYTHON_HEADERS() -- -2.14.3 +2.17.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch deleted file mode 100644 index de7f31183..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3a935c638605bfb392ca7780d22c08c1a0a71e71 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 5 Sep 2019 21:37:33 -0700 -Subject: [PATCH 1/2] lib/replace/wscript: Avoid generating nested main - function - -clang is not happy when it sees another main nested inside the main -function and fails the test for prctl syscall, therefore avoid adding -implicit main() here - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - lib/replace/wscript | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/replace/wscript b/lib/replace/wscript -index a7fd25d..d6767fc 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript -@@ -137,6 +137,7 @@ def configure(conf): - } - ''', - 'HAVE_PRCTL', -+ addmain=False, - headers='sys/prctl.h', - msg='Checking for prctl syscall') - --- -2.23.0 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch deleted file mode 100644 index 2dbabdaa4..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 9aba5ac17bb822f91f6b214f5b82dd1eb8c47616 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 22 Jul 2020 22:42:09 -0700 -Subject: [PATCH] nsswitch/nsstest.c: Avoid nss function conflicts with glibc nss.h - -glibc 2.32 will define these varibles [1] which results in conflicts -with these static function names, therefore prefix these function names -with samba_ to avoid it - -[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=499a92df8b9fc64a054cf3b7f728f8967fc1da7d - -Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/-/merge_requests/1477] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - nsswitch/nsstest.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/nsswitch/nsstest.c b/nsswitch/nsstest.c -index 6d92806..46f9679 100644 ---- a/nsswitch/nsstest.c -+++ b/nsswitch/nsstest.c -@@ -137,7 +137,7 @@ static struct passwd *nss_getpwuid(uid_t uid) - return &pwd; - } - --static void nss_setpwent(void) -+static void samba_nss_setpwent(void) - { - NSS_STATUS (*_nss_setpwent)(void) = - (NSS_STATUS(*)(void))find_fn("setpwent"); -@@ -152,7 +152,7 @@ static void nss_setpwent(void) - } - } - --static void nss_endpwent(void) -+static void samba_nss_endpwent(void) - { - NSS_STATUS (*_nss_endpwent)(void) = - (NSS_STATUS (*)(void))find_fn("endpwent"); -@@ -284,7 +284,7 @@ again: - return &grp; - } - --static void nss_setgrent(void) -+static void samba_nss_setgrent(void) - { - NSS_STATUS (*_nss_setgrent)(void) = - (NSS_STATUS (*)(void))find_fn("setgrent"); -@@ -299,7 +299,7 @@ static void nss_setgrent(void) - } - } - --static void nss_endgrent(void) -+static void samba_nss_endgrent(void) - { - NSS_STATUS (*_nss_endgrent)(void) = - (NSS_STATUS (*)(void))find_fn("endgrent"); -@@ -396,7 +396,7 @@ static void nss_test_users(void) - { - struct passwd *pwd; - -- nss_setpwent(); -+ samba_nss_setpwent(); - /* loop over all users */ - while ((pwd = nss_getpwent())) { - printf("Testing user %s\n", pwd->pw_name); -@@ -418,14 +418,14 @@ static void nss_test_users(void) - printf("initgroups: "); nss_test_initgroups(pwd->pw_name, pwd->pw_gid); - printf("\n"); - } -- nss_endpwent(); -+ samba_nss_endpwent(); - } - - static void nss_test_groups(void) - { - struct group *grp; - -- nss_setgrent(); -+ samba_nss_setgrent(); - /* loop over all groups */ - while ((grp = nss_getgrent())) { - printf("Testing group %s\n", grp->gr_name); -@@ -446,7 +446,7 @@ static void nss_test_groups(void) - printf("getgrgid: "); print_group(grp); - printf("\n"); - } -- nss_endgrent(); -+ samba_nss_endgrent(); - } - - static void nss_test_errors(void) --- -2.27.0 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-waf-add-support-of-cross_compile.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-waf-add-support-of-cross_compile.patch deleted file mode 100644 index 23b35a814..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-waf-add-support-of-cross_compile.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 4b8463ff43f8983a706b181c5292491f9f954be1 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Fri, 25 Jan 2019 15:00:59 +0800 -Subject: [PATCH] waf: add support of cross_compile - -After upgrade, waf also upgraded - -on 1.5.19, for cross_compile, subprocess.Popen is set to be -samba_cross.cross_Popen, which will not execute testprog on -host, but only read result from cross-answers.txt which is -passed by option --cross-answer - -part of old code: - args = Utils.to_list(kw.get('exec_args', [])) - proc = Utils.pproc.Popen([lastprog] + args, stdout=Utils.pproc.PIPE, stderr=Utils.pproc.PIPE) - -but on new version, exec_args is not used and cause do_configure -failed with Exec format error - -fixed by append cross anser related args to cmd - -Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/merge_requests/211] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - third_party/waf/waflib/Tools/c_config.py | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/third_party/waf/waflib/Tools/c_config.py b/third_party/waf/waflib/Tools/c_config.py -index 7608215..767cf33 100644 ---- a/third_party/waf/waflib/Tools/c_config.py -+++ b/third_party/waf/waflib/Tools/c_config.py -@@ -660,20 +660,21 @@ class test_exec(Task.Task): - """ - color = 'PINK' - def run(self): -+ args = self.generator.bld.kw.get('exec_args', []) - if getattr(self.generator, 'rpath', None): - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) -- else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args) -+ else: -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args) - else: - env = self.env.env or {} - env.update(dict(os.environ)) - for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): - env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args, env=env) - else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args, env=env) - - @feature('test_exec') - @after_method('apply_link') --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch index 3f2921ed3..292e614eb 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-do-not-import-target-module-while-cross-compile.patch @@ -1,4 +1,4 @@ -From cc0576405803bcae45ee353c4333c449cead9207 Mon Sep 17 00:00:00 2001 +From 9ebea97a52e4f70e831dd6402b865c77753ce1cc Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Tue, 25 Jun 2019 14:25:08 +0800 Subject: [PATCH] do not import target module while cross compile @@ -12,10 +12,10 @@ update to version 4.10.5, and switch to python3 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) + 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py -index 60ce7da..5468a36 100644 +index 5f080dd..cdc115e 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -4,6 +4,7 @@ import sys @@ -63,5 +63,5 @@ index 60ce7da..5468a36 100644 Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion)) sys.exit(1) -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util_sec.c-Move-__thread-variable-to-global-scope.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util_sec.c-Move-__thread-variable-to-global-scope.patch deleted file mode 100644 index 6fc849337..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0002-util_sec.c-Move-__thread-variable-to-global-scope.patch +++ /dev/null @@ -1,58 +0,0 @@ -From c62a6f32ab965de2ec77a614f20f04568116835b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 5 Sep 2019 21:39:05 -0700 -Subject: [PATCH 2/2] util_sec.c: Move __thread variable to global scope - -Make clang happy otherwise it complains about variable scope - -fixes - -source3/./lib/util_sec.c:470:4: error: '__thread' variables must have global storage - } __thread cache; - ^ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - source3/lib/util_sec.c | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/source3/lib/util_sec.c b/source3/lib/util_sec.c -index 9408269..7390318 100644 ---- a/source3/lib/util_sec.c -+++ b/source3/lib/util_sec.c -@@ -444,6 +444,17 @@ void become_user_permanently(uid_t uid, gid_t gid) - assert_gid(gid, gid); - } - -+#ifdef HAVE___THREAD -+ struct cache_t { -+ bool active; -+ uid_t uid; -+ gid_t gid; -+ size_t setlen; -+ uintptr_t gidset; -+ }; -+ -+static __thread struct cache_t cache; -+#endif - /********************************************************** - Function to set thread specific credentials. Leave - saved-set uid/gid alone.Must be thread-safe code. -@@ -461,14 +472,6 @@ int set_thread_credentials(uid_t uid, - * available. - */ - #ifdef HAVE___THREAD -- static struct { -- bool active; -- uid_t uid; -- gid_t gid; -- size_t setlen; -- uintptr_t gidset; -- } __thread cache; -- - if (cache.active && - cache.uid == uid && - cache.gid == gid && --- -2.23.0 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch index 46a6f0626..93ca005d6 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/21-add-config-option-without-valgrind.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0003-Add-config-option-without-valgrind.patch @@ -1,4 +1,4 @@ -From 87bc8e7eafc7d12a1d3a143ebb9e43cf5fbafb72 Mon Sep 17 00:00:00 2001 +From 6455448eb060d03a534539f1a424e2d3e44319e1 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 20 Jun 2019 14:11:16 +0800 Subject: [PATCH] Add config option without-valgrind @@ -15,10 +15,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index a7fd25d..a19ae68 100644 +index 2c856b6..bc726f7 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -110,8 +110,9 @@ def configure(conf): +@@ -121,8 +121,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') @@ -31,10 +31,10 @@ index a7fd25d..a19ae68 100644 conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') diff --git a/wscript b/wscript -index e38a8e9..38b7230 100644 +index 83d9421..969b07a 100644 --- a/wscript +++ b/wscript -@@ -105,6 +105,10 @@ def options(opt): +@@ -123,6 +123,10 @@ def options(opt): help=("Disable RELRO builds"), action="store_false", dest='enable_relro') @@ -46,5 +46,5 @@ index e38a8e9..38b7230 100644 opt.load('python') # options for disabling pyc or pyo compilation -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-Add-options-to-configure-the-use-of-libbsd.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch index 80cdd3955..5fd32f385 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-Add-options-to-configure-the-use-of-libbsd.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0004-Add-options-to-configure-the-use-of-libbsd.patch @@ -1,19 +1,21 @@ -From 1e8d31c138395122df4cc2a3e0edd6cd3fad736c Mon Sep 17 00:00:00 2001 +From 5abf3c2efa1cd4e16878b6b26068ff153973ebd3 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <pkj@axis.com> Date: Tue, 28 Apr 2020 02:05:33 +0200 Subject: [PATCH] Add options to configure the use of libbsd Upstream-Status: Inappropriate [oe deterministic build specific] Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> + +Rebase to 4.14.4 +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - buildtools/wafsamba/wscript | 7 +++++++ - lib/crypto/wscript_configure | 2 +- - lib/replace/wscript | 29 +++++++++++++++-------------- - lib/texpect/wscript | 7 ++++++- - 4 files changed, 29 insertions(+), 16 deletions(-) + buildtools/wafsamba/wscript | 7 +++++++ + lib/replace/wscript | 29 +++++++++++++++-------------- + lib/texpect/wscript | 8 +++++++- + 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript -index 7b8fb01..a8e4b0a 100644 +index 1aadb95..e7b47c0 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -88,6 +88,13 @@ def options(opt): @@ -30,24 +32,11 @@ index 7b8fb01..a8e4b0a 100644 gr = opt.option_group('developer options') gr.add_option('-C', -diff --git a/lib/crypto/wscript_configure b/lib/crypto/wscript_configure -index 09dfe04..e871718 100644 ---- a/lib/crypto/wscript_configure -+++ b/lib/crypto/wscript_configure -@@ -2,7 +2,7 @@ - from waflib import Options - from waflib import Errors, Logs - --if not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h', -+if not Options.options.enable_libbsd or not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h', - checklibc=True): - conf.CHECK_FUNCS_IN('MD5Init', 'md5', headers='sys/md5.h', - checklibc=True) diff --git a/lib/replace/wscript b/lib/replace/wscript -index 0020d2a..cd9228f 100644 +index bc726f7..44ad0d6 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -407,20 +407,21 @@ def configure(conf): +@@ -419,20 +419,21 @@ def configure(conf): strlcpy_in_bsd = False @@ -84,13 +73,14 @@ index 0020d2a..cd9228f 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/lib/texpect/wscript b/lib/texpect/wscript -index e14c048..a91de59 100644 +index 82f6b25..33eea64 100644 --- a/lib/texpect/wscript +++ b/lib/texpect/wscript -@@ -1,7 +1,12 @@ +@@ -1,7 +1,13 @@ #!/usr/bin/env python -+from waflib import Options ++from waflib import Options ++ def configure(conf): - conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h bsd/libutil.h libutil.h') + hdrs = 'pty.h util.h' @@ -100,4 +90,7 @@ index e14c048..a91de59 100644 + conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers=hdrs) def build(bld): - bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util replace', install=False) + bld.SAMBA_BINARY('texpect', +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/dnsserver-4.7.0.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0005-samba-build-dnsserver_common-code.patch index 0c7592f8e..2abbe563a 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/dnsserver-4.7.0.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0005-samba-build-dnsserver_common-code.patch @@ -1,11 +1,19 @@ -samba: build dnsserver_common code +From 10d7abc8f1aa99ae45209aeb704978d206f329c0 Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Tue, 1 Jun 2021 11:09:19 +0800 +Subject: [PATCH] samba: build dnsserver_common code Just 'install' does not seem to do it. Upstream-Status: Pending Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + source4/dns_server/wscript_build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build +index e97c85d..a49fbb9 100644 --- a/source4/dns_server/wscript_build +++ b/source4/dns_server/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('dnsserver_common', @@ -17,3 +25,6 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> ) bld.SAMBA_MODULE('service_dns', +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch index 5ae8c5978..00b692b58 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/iconv-4.7.0.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch @@ -1,4 +1,7 @@ -samba: defeat iconv test +From 59f7098bfbd63f9b3c19d7d297a8f90870a1893d Mon Sep 17 00:00:00 2001 +From: Joe Slater <joe.slater@windriver.com> +Date: Mon, 31 May 2021 14:50:38 +0800 +Subject: [PATCH] samba: defeat iconv test A test was added when configuring samba which requires target code to be executed. In general, this will not work, so we eliminate it. @@ -6,10 +9,15 @@ to be executed. In general, this will not work, so we eliminate it. Upstream-Status: Pending Signed-off-by: Joe Slater <joe.slater@windriver.com> +--- + lib/util/charset/wscript_configure | 3 +++ + 1 file changed, 3 insertions(+) +diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure +index 9c27fc6..845eb36 100644 --- a/lib/util/charset/wscript_configure +++ b/lib/util/charset/wscript_configure -@@ -17,6 +17,8 @@ if (conf.CHECK_FUNCS_IN('iconv_open', 'i +@@ -17,6 +17,8 @@ if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h conf.DEFINE('HAVE_NATIVE_ICONV', 1) @@ -18,8 +26,14 @@ Signed-off-by: Joe Slater <joe.slater@windriver.com> conf.CHECK_CODE(''' uint8_t inbuf[2] = { 0x30, 0xdf }; uint8_t outbuf[4] = { 0 }; -@@ -36,3 +38,4 @@ conf.CHECK_CODE(''' +@@ -36,6 +38,7 @@ conf.CHECK_CODE(''' msg='Checking errno of iconv for illegal multibyte sequence', lib='iconv', headers='errno.h iconv.h') +""" + + if conf.CHECK_CFG(package='icu-i18n', + args='--cflags --libs', +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch new file mode 100644 index 000000000..0f843af20 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch @@ -0,0 +1,39 @@ +From a31a014c5d98501074fde1acb5c00162c927c361 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Mon, 31 May 2021 15:47:58 +0800 +Subject: [PATCH] wscript_configure_system_gnutls: disable check gnutls + AES_CFB8/AES_CMAC + +The CHECK_VALUEOF() can not work on cross-compilation. + +Fixes configure error: + Checking value of GNUTLS_CIPHER_AES_128_CFB8: UNKNOWN + Checking value of GNUTLS_MAC_AES_CMAC_128: UNKNOWN + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + wscript_configure_system_gnutls | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls +index 2ec217f..cd91b55 100644 +--- a/wscript_configure_system_gnutls ++++ b/wscript_configure_system_gnutls +@@ -39,6 +39,7 @@ if (parse_version(gnutls_version) > parse_version('3.6.14')): + if conf.CHECK_FUNCS_IN('gnutls_get_system_config_file', 'gnutls'): + conf.DEFINE('HAVE_GNUTLS_CRYPTO_POLICIES', 1) + ++""" + if conf.CHECK_VALUEOF('GNUTLS_CIPHER_AES_128_CFB8', headers='gnutls/gnutls.h'): + conf.DEFINE('HAVE_GNUTLS_AES_CFB8', 1) + else: +@@ -48,3 +49,4 @@ if conf.CHECK_VALUEOF('GNUTLS_MAC_AES_CMAC_128', headers='gnutls/gnutls.h'): + conf.DEFINE('HAVE_GNUTLS_AES_CMAC', 1) + else: + Logs.warn('No gnutls support for AES CMAC') ++""" +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch new file mode 100644 index 000000000..d4ceb5ce9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch @@ -0,0 +1,79 @@ +From ba6bc5459cf148dd617fd9cd38dd50c3a9b5d706 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Mon, 31 May 2021 15:50:48 +0800 +Subject: [PATCH] source3/wscript: disable check fcntl F_OWNER_EX + +It fails on cross-compilation. + +Fixes configure error: + Checking whether fcntl supports flags to send direct I/O availability signals: UNKNOWN + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + source3/wscript | 48 ------------------------------------------------ + 1 file changed, 48 deletions(-) + +diff --git a/source3/wscript b/source3/wscript +index adc31ce..f6de0a6 100644 +--- a/source3/wscript ++++ b/source3/wscript +@@ -1168,54 +1168,6 @@ err: + #include <fcntl.h> + #include <unistd.h> + #include <stdlib.h> +-#include <sys/socket.h> +- +-int main(void) +-{ +- int sockfd, ret; +- struct f_owner_ex owner, get_owner; +- +- sockfd = socket(AF_UNIX, SOCK_STREAM, 0); +- if (sockfd == -1) { +- goto err; +- } +- +- owner.type = F_OWNER_PID; +- owner.pid = getpid(); +- +- ret = fcntl(sockfd, F_SETOWN_EX, &owner); +- if (ret == -1) { +- goto err; +- } +- +- ret = fcntl(sockfd, F_GETOWN_EX, &get_owner); +- if (ret == -1) { +- goto err; +- } +- +- if (get_owner.type != F_OWNER_PID) { +- goto err; +- } +- +- if (get_owner.pid != getpid()) { +- goto err; +- } +- +- close(sockfd); +- exit(0); +-err: +- close(sockfd); +- exit(1); +-}''', +- 'HAVE_F_OWNER_EX', +- addmain=False, +- execute=True, +- msg="Checking whether fcntl supports flags to send direct I/O availability signals") +- +- conf.CHECK_CODE(''' +-#include <fcntl.h> +-#include <unistd.h> +-#include <stdlib.h> + #include <stdint.h> + + #define DATA "hinttest.fcntl" +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch new file mode 100644 index 000000000..a0b751034 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch @@ -0,0 +1,92 @@ +From 9942bca2e276c7b4c7696a08594258430c4c5bb5 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Thu, 3 Jun 2021 09:39:56 +0800 +Subject: [PATCH] source3/wscript: disable check fcntl RW_HINTS + +It fails on cross-compilation for musl. + +Fixes configure error: + Checking whether fcntl supports setting/geting hints: UNKNOWN + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + source3/wscript | 61 ------------------------------------------------- + 1 file changed, 61 deletions(-) + +diff --git a/source3/wscript b/source3/wscript +index f6de0a6..3e260c1 100644 +--- a/source3/wscript ++++ b/source3/wscript +@@ -1164,67 +1164,6 @@ err: + execute=True, + msg="Checking whether fcntl lock supports open file description locks") + +- conf.CHECK_CODE(''' +-#include <fcntl.h> +-#include <unistd.h> +-#include <stdlib.h> +-#include <stdint.h> +- +-#define DATA "hinttest.fcntl" +- +-int main(void) +-{ +- uint64_t hint, get_hint; +- int fd; +- +- fd = open(DATA, O_RDONLY | O_CREAT | O_EXCL); +- if (fd == -1) { +- goto err; +- } +- +- hint = RWH_WRITE_LIFE_SHORT; +- int ret = fcntl(fd, F_SET_RW_HINT, &hint); +- if (ret == -1) { +- goto err; +- } +- +- ret = fcntl(fd, F_GET_RW_HINT, &get_hint); +- if (ret == -1) { +- goto err; +- } +- +- if (get_hint != RWH_WRITE_LIFE_SHORT) { +- goto err; +- } +- +- hint = RWH_WRITE_LIFE_EXTREME; +- ret = fcntl(fd, F_SET_FILE_RW_HINT, &hint); +- if (ret == -1) { +- goto err; +- } +- +- ret = fcntl(fd, F_GET_FILE_RW_HINT, &get_hint); +- if (ret == -1) { +- goto err; +- } +- +- if (get_hint != RWH_WRITE_LIFE_EXTREME) { +- goto err; +- } +- +- close(fd); +- unlink(DATA); +- exit(0); +-err: +- close(fd); +- unlink(DATA); +- exit(1); +-}''', +- 'HAVE_RW_HINTS', +- addmain=False, +- execute=True, +- msg="Checking whether fcntl supports setting/geting hints") +- + conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtim.tv_nsec', + define='HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') # Linux, Solaris + conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtimensec', +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14318.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14318.patch deleted file mode 100644 index ff1225db0..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14318.patch +++ /dev/null @@ -1,142 +0,0 @@ -From ccf53dfdcd39f3526dbc2f20e1245674155380ff Mon Sep 17 00:00:00 2001 -From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> -Date: Fri, 11 Dec 2020 11:32:44 +0900 -Subject: [PATCH] s4: torture: Add smb2.notify.handle-permissions test. - -s3: smbd: Ensure change notifies can't get set unless the - directory handle is open for SEC_DIR_LIST. - -CVE-2020-14318 - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14434 - -Signed-off-by: Jeremy Allison <jra@samba.org> - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - source3/smbd/notify.c | 8 ++++ - source4/torture/smb2/notify.c | 82 ++++++++++++++++++++++++++++++++++- - 2 files changed, 89 insertions(+), 1 deletion(-) - -diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c -index 44c0b09..d23c03b 100644 ---- a/source3/smbd/notify.c -+++ b/source3/smbd/notify.c -@@ -283,6 +283,14 @@ NTSTATUS change_notify_create(struct files_struct *fsp, uint32_t filter, - char fullpath[len+1]; - NTSTATUS status = NT_STATUS_NOT_IMPLEMENTED; - -+ /* -+ * Setting a changenotify needs READ/LIST access -+ * on the directory handle. -+ */ -+ if (!(fsp->access_mask & SEC_DIR_LIST)) { -+ return NT_STATUS_ACCESS_DENIED; -+ } -+ - if (fsp->notify != NULL) { - DEBUG(1, ("change_notify_create: fsp->notify != NULL, " - "fname = %s\n", fsp->fsp_name->base_name)); -diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c -index ebb4f8a..a5c9b94 100644 ---- a/source4/torture/smb2/notify.c -+++ b/source4/torture/smb2/notify.c -@@ -2569,6 +2569,83 @@ done: - return ok; - } - -+/* -+ Test asking for a change notify on a handle without permissions. -+*/ -+ -+#define BASEDIR_HPERM BASEDIR "_HPERM" -+ -+static bool torture_smb2_notify_handle_permissions( -+ struct torture_context *torture, -+ struct smb2_tree *tree) -+{ -+ bool ret = true; -+ NTSTATUS status; -+ union smb_notify notify; -+ union smb_open io; -+ struct smb2_handle h1 = {{0}}; -+ struct smb2_request *req; -+ -+ smb2_deltree(tree, BASEDIR_HPERM); -+ smb2_util_rmdir(tree, BASEDIR_HPERM); -+ -+ torture_comment(torture, -+ "TESTING CHANGE NOTIFY " -+ "ON A HANDLE WITHOUT PERMISSIONS\n"); -+ -+ /* -+ get a handle on the directory -+ */ -+ ZERO_STRUCT(io.smb2); -+ io.generic.level = RAW_OPEN_SMB2; -+ io.smb2.in.create_flags = 0; -+ io.smb2.in.desired_access = SEC_FILE_READ_ATTRIBUTE; -+ io.smb2.in.create_options = NTCREATEX_OPTIONS_DIRECTORY; -+ io.smb2.in.file_attributes = FILE_ATTRIBUTE_NORMAL; -+ io.smb2.in.share_access = NTCREATEX_SHARE_ACCESS_READ | -+ NTCREATEX_SHARE_ACCESS_WRITE; -+ io.smb2.in.alloc_size = 0; -+ io.smb2.in.create_disposition = NTCREATEX_DISP_CREATE; -+ io.smb2.in.impersonation_level = SMB2_IMPERSONATION_ANONYMOUS; -+ io.smb2.in.security_flags = 0; -+ io.smb2.in.fname = BASEDIR_HPERM; -+ -+ status = smb2_create(tree, torture, &io.smb2); -+ CHECK_STATUS(status, NT_STATUS_OK); -+ h1 = io.smb2.out.file.handle; -+ -+ /* ask for a change notify, -+ on file or directory name changes */ -+ ZERO_STRUCT(notify.smb2); -+ notify.smb2.level = RAW_NOTIFY_SMB2; -+ notify.smb2.in.buffer_size = 1000; -+ notify.smb2.in.completion_filter = FILE_NOTIFY_CHANGE_NAME; -+ notify.smb2.in.file.handle = h1; -+ notify.smb2.in.recursive = true; -+ -+ req = smb2_notify_send(tree, ¬ify.smb2); -+ torture_assert_goto(torture, -+ req != NULL, -+ ret, -+ done, -+ "smb2_notify_send failed\n"); -+ -+ /* -+ * Cancel it, we don't really want to wait. -+ */ -+ smb2_cancel(req); -+ status = smb2_notify_recv(req, torture, ¬ify.smb2); -+ /* Handle h1 doesn't have permissions for ChangeNotify. */ -+ CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED); -+ -+done: -+ if (!smb2_util_handle_empty(h1)) { -+ smb2_util_close(tree, h1); -+ } -+ smb2_deltree(tree, BASEDIR_HPERM); -+ return ret; -+} -+ - /* - basic testing of SMB2 change notify - */ -@@ -2602,7 +2679,10 @@ struct torture_suite *torture_smb2_notify_init(TALLOC_CTX *ctx) - torture_smb2_notify_rmdir3); - torture_suite_add_2smb2_test(suite, "rmdir4", - torture_smb2_notify_rmdir4); -- -+ torture_suite_add_1smb2_test(suite, -+ "handle-permissions", -+ torture_smb2_notify_handle_permissions); -+ - suite->description = talloc_strdup(suite, "SMB2-NOTIFY tests"); - - return suite; --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14383.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14383.patch deleted file mode 100644 index 3341b80a3..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/CVE-2020-14383.patch +++ /dev/null @@ -1,112 +0,0 @@ -From ff17443fe761eda864d13957bec45f5bac478fe3 Mon Sep 17 00:00:00 2001 -From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> -Date: Fri, 11 Dec 2020 14:34:31 +0900 -Subject: [PATCH] CVE-2020-14383: s4/dns: Ensure variable initialization with - NULL. do not crash when additional data not found -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Found by Francis Brosnan Blázquez <francis@aspl.es>. -Based on patches from Francis Brosnan Blázquez <francis@aspl.es> -and Jeremy Allison <jra@samba.org> - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14472 -BUG: https://bugzilla.samba.org/show_bug.cgi?id=12795 - -Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> -Reviewed-by: Jeremy Allison <jra@samba.org> - -Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org> -Autobuild-Date(master): Mon Aug 24 00:21:41 UTC 2020 on sn-devel-184 - -(based on commit df98e7db04c901259dd089e20cd557bdbdeaf379) -(based on commit 7afe449e7201be92bed8e53cbb37b74af720ef4e - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - .../rpc_server/dnsserver/dcerpc_dnsserver.c | 31 ++++++++++--------- - 1 file changed, 17 insertions(+), 14 deletions(-) - -diff --git a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c -index 910de9a1..618c7096 100644 ---- a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c -+++ b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c -@@ -1754,15 +1754,17 @@ static WERROR dnsserver_enumerate_records(struct dnsserver_state *dsstate, - TALLOC_CTX *tmp_ctx; - char *name; - const char * const attrs[] = { "name", "dnsRecord", NULL }; -- struct ldb_result *res; -- struct DNS_RPC_RECORDS_ARRAY *recs; -+ struct ldb_result *res = NULL; -+ struct DNS_RPC_RECORDS_ARRAY *recs = NULL; - char **add_names = NULL; -- char *rname; -+ char *rname = NULL; - const char *preference_name = NULL; - int add_count = 0; - int i, ret, len; - WERROR status; -- struct dns_tree *tree, *base, *node; -+ struct dns_tree *tree = NULL; -+ struct dns_tree *base = NULL; -+ struct dns_tree *node = NULL; - - tmp_ctx = talloc_new(mem_ctx); - W_ERROR_HAVE_NO_MEMORY(tmp_ctx); -@@ -1845,15 +1847,15 @@ static WERROR dnsserver_enumerate_records(struct dnsserver_state *dsstate, - } - } - -- talloc_free(res); -- talloc_free(tree); -- talloc_free(name); -+ TALLOC_FREE(res); -+ TALLOC_FREE(tree); -+ TALLOC_FREE(name); - - /* Add any additional records */ - if (select_flag & DNS_RPC_VIEW_ADDITIONAL_DATA) { - for (i=0; i<add_count; i++) { -- struct dnsserver_zone *z2; -- -+ struct dnsserver_zone *z2 = NULL; -+ struct ldb_message *msg = NULL; - /* Search all the available zones for additional name */ - for (z2 = dsstate->zones; z2; z2 = z2->next) { - char *encoded_name; -@@ -1865,14 +1867,15 @@ static WERROR dnsserver_enumerate_records(struct dnsserver_state *dsstate, - LDB_SCOPE_ONELEVEL, attrs, - "(&(objectClass=dnsNode)(name=%s)(!(dNSTombstoned=TRUE)))", - encoded_name); -- talloc_free(name); -+ TALLOC_FREE(name); - if (ret != LDB_SUCCESS) { - continue; - } - if (res->count == 1) { -+ msg = res->msgs[0]; - break; - } else { -- talloc_free(res); -+ TALLOC_FREE(res); - continue; - } - } -@@ -1885,10 +1888,10 @@ static WERROR dnsserver_enumerate_records(struct dnsserver_state *dsstate, - } - status = dns_fill_records_array(tmp_ctx, NULL, DNS_TYPE_A, - select_flag, rname, -- res->msgs[0], 0, recs, -+ msg, 0, recs, - NULL, NULL); -- talloc_free(rname); -- talloc_free(res); -+ TALLOC_FREE(rname); -+ TALLOC_FREE(res); - } - } - --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch deleted file mode 100644 index d07ec0df1..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/glibc_only.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 062cf74b498c1d12fd76f9d9bca926ac806e0b99 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 20 Jun 2019 14:15:18 +0800 -Subject: [PATCH] glibc only fix - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - ctdb/tests/src/test_mutex_raw.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ctdb/tests/src/test_mutex_raw.c b/ctdb/tests/src/test_mutex_raw.c -index 926a525..814343f 100644 ---- a/ctdb/tests/src/test_mutex_raw.c -+++ b/ctdb/tests/src/test_mutex_raw.c -@@ -291,8 +291,10 @@ int main(int argc, const char **argv) - "failed\n"); - exit (EXIT_FAILURE); - } -+#ifdef __GLIBC__ - } else if (ret == EBUSY) { - printf("INFO: pid=%u\n", mutex->__data.__owner); -+#endif - } else if (ret == 0) { - pthread_mutex_unlock(mutex); - } --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-samba-fix-musl-lib-without-innetgr.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-fix-musl-lib-without-innetgr.patch index fb12a10e2..fb12a10e2 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/0001-samba-fix-musl-lib-without-innetgr.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/samba-fix-musl-lib-without-innetgr.patch diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb.conf b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb.conf index d6bde417f..588491ee6 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb.conf +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb.conf @@ -32,17 +32,6 @@ # Change this to the workgroup/NT-domain name your Samba server will part of workgroup = WORKGROUP -# Windows Internet Name Serving Support Section: -# WINS Support - Tells the NMBD component of Samba to enable its WINS Server -# wins support = no - -# WINS Server - Tells the NMBD components of Samba to be a WINS Client -# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both -; wins server = w.x.y.z - -# This will prevent nmbd to search for NetBIOS names through DNS. - dns proxy = no - #### Networking #### # The specific set of interfaces / networks to bind to @@ -68,14 +57,9 @@ # Cap the size of the individual log files (in KiB). max log size = 1000 -# If you want Samba to only log through syslog then set the following -# parameter to 'yes'. -# syslog only = no - -# We want Samba to log a minimum amount of information to syslog. Everything -# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log -# through syslog you should set the following parameter to something higher. - syslog = 0 +# We want Samba to only log to /var/log/samba/log.{smbd,nmbd}. +# Append syslog@1 if you want important messages to be sent to syslog too. + logging = file # Do something sensible when Samba crashes: mail the admin a backtrace panic action = /usr/share/samba/panic-action %d @@ -94,10 +78,6 @@ # new domain. server role = standalone server -# If you are using encrypted passwords, Samba will need to know what -# password database type you are using. - passdb backend = tdbsam - obey pam restrictions = yes # This boolean parameter controls whether Samba attempts to sync the Unix @@ -123,8 +103,8 @@ ########## Domains ########### # -# The following settings only takes effect if 'server role = primary -# classic domain controller', 'server role = backup domain controller' +# The following settings only takes effect if 'server role = classic +# primary domain controller', 'server role = classic backup domain controller' # or 'domain logons' is set # @@ -172,15 +152,17 @@ # Some defaults for winbind (make sure you're not using the ranges # for something else.) -; idmap uid = 10000-20000 -; idmap gid = 10000-20000 +; idmap config * : backend = tdb +; idmap config * : range = 3000-7999 +; idmap config YOURDOMAINHERE : backend = tdb +; idmap config YOURDOMAINHERE : range = 100000-999999 ; template shell = /bin/bash # Setup usershare options to enable non-root users to share folders # with the net usershare command. -# Maximum number of usershare. 0 (default) means that usershare is disabled. -; usershare max shares = 100 +# Maximum number of usershare. 0 means that usershare is disabled. +# usershare max shares = 100 # Allow users who've been granted usershare privileges to create # public shares, not just authenticated ones diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb_conf-4.7.0.patch b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb_conf-4.7.0.patch deleted file mode 100644 index 6ae292835..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/smb_conf-4.7.0.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f99b6a8617df6a46f41fb68ffafb2608dbb6681e Mon Sep 17 00:00:00 2001 -From: Joe Slater <joe.slater@windriver.com> -Date: Wed, 8 Nov 2017 11:58:05 -0800 -Subject: [PATCH] samba: correct log files location - -We use /var/log/samba. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - ---- - examples/smb.conf.default | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/smb.conf.default b/examples/smb.conf.default -index 2f20720..44c1aa8 100644 ---- a/examples/smb.conf.default -+++ b/examples/smb.conf.default -@@ -52,7 +52,7 @@ - - # this tells Samba to use a separate log file for each machine - # that connects -- log file = /usr/local/samba/var/log.%m -+ log file = /var/log/samba/log.%m - - # Put a capping on the size of the log files (in Kb). - max log size = 50 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb index 166bf5727..5c5ce3670 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.10.18.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.14.5.bb @@ -14,40 +14,40 @@ ${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://smb.conf \ - file://16-do-not-check-xsltproc-manpages.patch \ - file://20-do-not-import-target-module-while-cross-compile.patch \ - file://21-add-config-option-without-valgrind.patch \ - file://netdb_defines.patch \ - file://glibc_only.patch \ - file://iconv-4.7.0.patch \ - file://dnsserver-4.7.0.patch \ - file://smb_conf-4.7.0.patch \ file://volatiles.03_samba \ - file://0001-waf-add-support-of-cross_compile.patch \ - file://0001-lib-replace-wscript-Avoid-generating-nested-main-fun.patch \ - file://0002-util_sec.c-Move-__thread-variable-to-global-scope.patch \ - file://0001-Add-options-to-configure-the-use-of-libbsd.patch \ - file://0001-nsswitch-nsstest.c-Avoid-nss-function-conflicts-with.patch \ - file://CVE-2020-14318.patch \ - file://CVE-2020-14383.patch \ + file://0001-Don-t-check-xsltproc-manpages.patch \ + file://0002-do-not-import-target-module-while-cross-compile.patch \ + file://0003-Add-config-option-without-valgrind.patch \ + file://0004-Add-options-to-configure-the-use-of-libbsd.patch \ + file://0005-samba-build-dnsserver_common-code.patch \ + file://0006-samba-defeat-iconv-test.patch \ + file://0007-wscript_configure_system_gnutls-disable-check-gnutls.patch \ + file://0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch \ + file://0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch \ " + SRC_URI_append_libc-musl = " \ + file://netdb_defines.patch \ file://samba-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ file://cmocka-uintptr_t.patch \ - file://0001-samba-fix-musl-lib-without-innetgr.patch \ - " + file://samba-fix-musl-lib-without-innetgr.patch \ + " + +SRC_URI[md5sum] = "96d275e31387e6c403d6c16465d15b7e" +SRC_URI[sha256sum] = "bb6ef5d2f16b85288d823578abc453d9a80514c42e5a2ea2c4e3c60dc42335c3" -SRC_URI[md5sum] = "f006a3d1876113e4a049015969d20fe6" -SRC_URI[sha256sum] = "7dcfc2aaaac565b959068788e6a43fc79ce2a03e7d523f5843f7a9fddffc7c2c" +UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.14(\.\d+)+).tar.gz" -UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.10(\.\d+)+).tar.gz" +inherit systemd waf-samba cpan-base perlnative update-rc.d perl-version + +# CVE-2011-2411 is valnerble only on HP NonStop Servers. +CVE_CHECK_WHITELIST += "CVE-2011-2411" -inherit systemd waf-samba cpan-base perlnative update-rc.d # remove default added RDEPENDS on perl RDEPENDS_${PN}_remove = "perl" -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson" +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libaio libpam libtasn1 jansson libparse-yapp-perl-native gnutls" inherit features_check REQUIRED_DISTRO_FEATURES = "pam" @@ -56,6 +56,8 @@ DEPENDS_append_libc-musl = " libtirpc" CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" LDFLAGS_append_libc-musl = " -ltirpc" +COMPATIBLE_HOST_riscv32 = "null" + INITSCRIPT_NAME = "samba" INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." @@ -76,7 +78,7 @@ export WAF_NO_PREFORK="yes" # Use krb5. Build active domain controller. # PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd zeroconf', d)} \ - acl cups ad-dc gnutls ldap mitkrb5 \ + acl cups ad-dc ldap mitkrb5 \ " RDEPENDS_${PN}-ctdb-tests += "bash util-linux-getopt" @@ -96,19 +98,7 @@ PACKAGECONFIG[libunwind] = ", , libunwind" PACKAGECONFIG[gpgme] = ",--without-gpgme,," PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," PACKAGECONFIG[libbsd] = "--with-libbsd, --without-libbsd, libbsd" - -# Building the AD (Active Directory) DC (Domain Controller) requires GnuTLS, -# And ad-dc doesn't work with mitkrb5 for versions prior to 4.7.0 according to: -# http://samba.2283325.n4.nabble.com/samba-4-6-6-Unknown-dependency-kdc-in-service-kdc-objlist-td4722096.html -# So the working combination is: -# 1) ad-dc: enable, gnutls: enable, mitkrb5: disable -# 2) ad-dc: disable, gnutls: enable/disable, mitkrb5: enable -# -# We are now at 4.7.0, so take the above with a grain of salt. We do not need to know where -# krb5kdc is unless ad-dc is enabled, but we tell configure anyhow. -# -PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,," -PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," +PACKAGECONFIG[ad-dc] = "--with-experimental-mit-ad-dc,--without-ad-dc,python3-markdown python3-dnspython," PACKAGECONFIG[mitkrb5] = "--with-system-mitkrb5 --with-system-mitkdc=/usr/sbin/krb5kdc,,krb5," SAMBA4_IDMAP_MODULES="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2" @@ -140,6 +130,18 @@ EXTRA_OECONF += "--enable-fhs \ LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +do_configure_append () { + cd ${S}/pidl/ + perl Makefile.PL PREFIX=${prefix} + sed -e 's,VENDORPREFIX)/lib/perl,VENDORPREFIX)/${baselib}/perl,g' \ + -e 's,PERLPREFIX)/lib/perl,PERLPREFIX)/${baselib}/perl,g' -i Makefile + +} + +do_compile_append () { + oe_runmake -C ${S}/pidl +} + do_install_append() { for section in 1 5 7; do install -d ${D}${mandir}/man$section @@ -182,11 +184,11 @@ do_install_append() { install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/default/samba # the items are from ctdb/tests/run_tests.sh - for d in onnode takeover tool eventscripts cunit simple complex; do - testdir=${D}${datadir}/ctdb-tests/$d + for d in cunit eventd eventscripts onnode shellcheck takeover takeover_helper tool; do + testdir=${D}${datadir}/ctdb-tests/UNIT/$d install -d $testdir - cp ${S}/ctdb/tests/$d/*.sh $testdir - cp -r ${S}/ctdb/tests/$d/scripts ${S}/ctdb/tests/$d/stubs $testdir || true + cp ${S}/ctdb/tests/UNIT/$d/*.sh $testdir + cp -r ${S}/ctdb/tests/UNIT/$d/scripts ${S}/ctdb/tests/UNIT/$d/stubs $testdir || true done # fix file-rdeps qa warning @@ -197,7 +199,7 @@ do_install_append() { chmod 0750 ${D}${sysconfdir}/sudoers.d || true rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log - for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate; do + for f in samba-gpupdate samba_upgradedns samba_spnupdate samba_kcc samba_dnsupdate samba_downgrade_db; do if [ -f "${D}${sbindir}/$f" ]; then sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${sbindir}/$f fi @@ -205,7 +207,11 @@ do_install_append() { if [ -f "${D}${bindir}/samba-tool" ]; then sed -i -e 's,${PYTHON},/usr/bin/env python3,g' ${D}${bindir}/samba-tool fi - + + oe_runmake -C ${S}/pidl DESTDIR=${D} install_vendor + find ${D}${libdir}/ -type f -name "perllocal.pod" | xargs rm -f + rm -rf ${D}${libdir}/perl5/vendor_perl/${PERLVERSION}/${BUILD_SYS}/auto/Parse/Pidl/.packlist + sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${bindir}/pidl } PACKAGES =+ "${PN}-python3 ${PN}-pidl \ @@ -310,8 +316,10 @@ FILES_smbclient = "${bindir}/cifsdd \ ${bindir}/smbtree \ ${libdir}/samba/smbspool_krb5_wrapper" -RDEPENDS_${PN}-pidl_append = " perl" -FILES_${PN}-pidl = "${bindir}/pidl ${datadir}/perl5/Parse" +RDEPENDS_${PN}-pidl_append = " perl libparse-yapp-perl" +FILES_${PN}-pidl = "${bindir}/pidl \ + ${libdir}/perl5 \ + " RDEPENDS_${PN}-client = "\ smbclient \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/configure.in-disable-tirpc-checking-for-fedora.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/configure.in-disable-tirpc-checking-for-fedora.patch index 87fd05bfd..d8c945a48 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/configure.in-disable-tirpc-checking-for-fedora.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort/configure.in-disable-tirpc-checking-for-fedora.patch @@ -52,9 +52,9 @@ index 8662cdd..0ff7e27 100644 - fi -fi - - Z_LIB="" - AC_CHECK_HEADERS(zlib.h,, Z_LIB="no") - if test "x$Z_LIB" = "xno"; then + ################################################## + # Centos 8+ does not have inbuilt SunRPC support # + # in glibc and is separately availble in tirpc # -- 2.7.4 diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.17.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.bb index b5ff43099..cca18d726 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.17.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.18.bb @@ -14,7 +14,7 @@ SRC_URI = "https://www.snort.org/downloads/archive/snort/${BP}.tar.gz \ file://disable-run-test-program-while-cross-compiling.patch \ file://configure.in-disable-tirpc-checking-for-fedora.patch \ " -SRC_URI[sha256sum] = "303d3d5dc5affecfeaad3a331d3163f901d48d960fdd6598cb55c6d1591eed82" +SRC_URI[sha256sum] = "d0308642f69e0d36f70db9703e5766afce2f44ff05b7d2c9cc8e3ac8323b2c77" UPSTREAM_CHECK_URI = "https://www.snort.org/downloads" UPSTREAM_CHECK_REGEX = "snort-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb index 24b9a1b49..31f9aef48 100644 --- a/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb +++ b/meta-openembedded/meta-networking/recipes-core/packagegroups/packagegroup-meta-networking.bb @@ -67,6 +67,7 @@ RDEPENDS_packagegroup-meta-networking-connectivity = "\ wolfssl \ autossh \ bearssl \ + dhcp-relay \ " RDEPENDS_packagegroup-meta-networking-connectivity_remove_libc-musl = "rdist" diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch new file mode 100644 index 000000000..117b1e58a --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch @@ -0,0 +1,124 @@ +From 9fe90ab1e333b2e2bed370ff13ba552eb54c3aaf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 17 Jul 2021 09:56:28 -0700 +Subject: [PATCH] Define __SWORD_TYPE if undefined + +These fixes are inspired when building autofs on musl + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + daemon/automount.c | 20 ++++++++++++++------ + include/hash.h | 5 +++++ + lib/log.c | 6 +++++- + 3 files changed, 24 insertions(+), 7 deletions(-) + +diff --git a/daemon/automount.c b/daemon/automount.c +index e476f6b..3a1514b 100644 +--- a/daemon/automount.c ++++ b/daemon/automount.c +@@ -1,7 +1,7 @@ + /* ----------------------------------------------------------------------- * + * + * automount.c - Linux automounter daemon +- * ++ * + * Copyright 1997 Transmeta Corporation - All Rights Reserved + * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org> + * Copyright 2001-2005 Ian Kent <raven@themaw.net> +@@ -11,7 +11,7 @@ + * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, + * USA; either version 2 of the License, or (at your option) any later + * version. +- * ++ * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +@@ -40,6 +40,14 @@ + #include <systemd/sd-daemon.h> + #endif + ++#ifndef __SWORD_TYPE ++# if __WORDSIZE == 32 /* System word size */ ++# define __SWORD_TYPE int ++# else /* __WORDSIZE == 64 */ ++# define __SWORD_TYPE long int ++# endif ++#endif ++ + #include "automount.h" + #if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND) + #include <dlfcn.h> +@@ -282,7 +290,7 @@ int rmdir_path(struct autofs_point *ap, const char *path, dev_t dev) + dev, buf, st.st_dev); + return -1; + } +- ++ + /* + * Last element of path may be a symbolic link; all others + * are directories (and the last directory element is +@@ -455,7 +463,7 @@ int count_mounts(struct autofs_point *ap, const char *path, dev_t dev) + + counter.count = 0; + counter.dev = dev; +- ++ + if (walk_tree(path, counter_fn, 1, ap, &counter) == -1) + return -1; + +@@ -811,7 +819,7 @@ static char *automount_path_to_fifo(unsigned logopt, const char *path) + /* + * An automount path can be made up of subdirectories. So, to + * create the fifo name, we will just replace instances of '/' with +- * '-'. ++ * '-'. + */ + p = fifo_name + strlen(fifodir); + while (*p != '\0') { +@@ -1640,7 +1648,7 @@ static void return_start_status(void *arg) + sc->done = 1; + + /* +- * Startup condition mutex must be locked during ++ * Startup condition mutex must be locked during + * the startup process. + */ + status = pthread_cond_signal(&sc->cond); +diff --git a/include/hash.h b/include/hash.h +index 2447f29..6f0dee6 100644 +--- a/include/hash.h ++++ b/include/hash.h +@@ -5,6 +5,11 @@ + + #include <sys/types.h> + #include <stdint.h> ++#include <linux/stddef.h> ++ ++#ifndef __GLIBC__ ++#include <sys/reg.h> ++#endif + + /* + * The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and +diff --git a/lib/log.c b/lib/log.c +index 0cb47d7..39b1e3b 100644 +--- a/lib/log.c ++++ b/lib/log.c +@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(const char *msg) + char buffer[ATTEMPT_ID_SIZE + 1]; + char *prefixed_msg = NULL; + +- attempt_id = pthread_getspecific(key_thread_attempt_id); ++ if (key_thread_attempt_id) { ++ attempt_id = pthread_getspecific(key_thread_attempt_id); ++ } else { ++ attempt_id = 0; ++ } + if (attempt_id) { + int len = sizeof(buffer) + 1 + strlen(msg) + 1; + +-- +2.32.0 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch index b991acad3..d5ea417fb 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch @@ -15,12 +15,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index 493b9f1..268d06b 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl - AC_INIT(.autofs-5.1.6) + AC_INIT(.autofs-5.1.7) # for pkg-config macros -m4_include([/usr/share/aclocal/pkg.m4]) @@ -28,6 +26,3 @@ index 493b9f1..268d06b 100644 # # autofs installs by default in /usr --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch index e7fdd10aa..1a2eb4fc2 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch @@ -16,29 +16,27 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> modules/lookup_multi.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/daemon/lookup.c b/daemon/lookup.c -index 18df935..d35d484 100644 --- a/daemon/lookup.c +++ b/daemon/lookup.c -@@ -382,7 +382,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source - if (!S_ISREG(st.st_mode)) +@@ -397,7 +397,7 @@ static int read_file_source_instance(str return NSS_STATUS_NOTFOUND; + } - if (st.st_mode & __S_IEXEC) + if (st.st_mode & S_IEXEC) type = src_prog; else type = src_file; -@@ -942,7 +942,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ - if (!S_ISREG(st.st_mode)) +@@ -930,7 +930,7 @@ static int lookup_name_file_source_insta return NSS_STATUS_NOTFOUND; + } - if (st.st_mode & __S_IEXEC) + if (st.st_mode & S_IEXEC) type = src_prog; else type = src_file; -@@ -1118,7 +1118,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry) +@@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map if (!S_ISREG(st.st_mode)) return NULL; @@ -47,11 +45,9 @@ index 18df935..d35d484 100644 type = "program"; else type = "file"; -diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c -index bb9f88c..cf109de 100644 --- a/modules/lookup_multi.c +++ b/modules/lookup_multi.c -@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch +@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_looku continue; } @@ -60,6 +56,3 @@ index bb9f88c..cf109de 100644 type = src_prog; else type = src_file; --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch deleted file mode 100644 index 9b0942ebf..000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2256b8aa98cff15ddf2a8d36496e6c9125927901 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Wed, 13 Mar 2013 16:17:08 +0100 -Subject: [PATCH] autofs-5.0.7: include linux/nfs.h directly in rpc_subs.h - -Upstream-Status: Pending - -Fixes compile error with uclibc. Glibc's nfs/nfs.h contains -nothing but "#include linux/nfs.h". rpc_subs.h already includes -other linux/nfs*.h files directly. - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> - ---- - include/rpc_subs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/rpc_subs.h b/include/rpc_subs.h -index e744e89..83db47e 100644 ---- a/include/rpc_subs.h -+++ b/include/rpc_subs.h -@@ -18,7 +18,7 @@ - - #include <rpc/rpc.h> - #include <rpc/pmap_prot.h> --#include <nfs/nfs.h> -+#include <linux/nfs.h> - #include <linux/nfs2.h> - #include <linux/nfs3.h> - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch index 21a97c8f5..8ad3b22de 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch @@ -23,21 +23,9 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> modules/Makefile | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) -diff --git a/lib/Makefile b/lib/Makefile -index 4798a4b..c40cf86 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -57,7 +57,8 @@ mount_xdr.o: mount_xdr.c - master_tok.c: master_tok.l - $(LEX) -o$@ -Pmaster_ $? - --master_parse.tab.c master_parse.tab.h: master_parse.y -+master_parse.tab.h: master_parse.tab.c -+master_parse.tab.c: master_parse.y - $(YACC) -v -d -p master_ -b master_parse $? - - master_tok.o: master_tok.c master_parse.tab.h -@@ -67,7 +68,8 @@ master_parse.tab.o: master_parse.tab.c master_parse.tab.h +@@ -53,7 +53,8 @@ mount_xdr.o: mount_xdr.c nss_tok.c: nss_tok.l $(LEX) -o$@ -Pnss_ $? @@ -47,8 +35,6 @@ index 4798a4b..c40cf86 100644 $(YACC) -v -d -p nss_ -b nss_parse $? nss_tok.o: nss_tok.c nss_parse.tab.h -diff --git a/modules/Makefile b/modules/Makefile -index d9ab06c..abc7698 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -103,7 +103,8 @@ amd_tok.c: amd_tok.l @@ -61,3 +47,30 @@ index d9ab06c..abc7698 100644 $(YACC) -v -d -p amd_ -b amd_parse $? amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h +--- a/daemon/Makefile ++++ b/daemon/Makefile +@@ -16,7 +16,7 @@ YACCSRC = master_tok.c master_parse.tab. + version := $(shell cat ../.version) + + CFLAGS += -rdynamic $(DAEMON_CFLAGS) -D_GNU_SOURCE -I../include +-CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" ++CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" + CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\" + CFLAGS += -DAUTOFS_CONF_DIR=\"$(autofsconfdir)\" + CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfifodir)\" +@@ -44,7 +44,8 @@ automount: $(OBJS) $(AUTOFS_LIB) + master_tok.c: master_tok.l + $(LEX) -o$@ -Pmaster_ $? + +-master_parse.tab.c master_parse.tab.h: master_parse.y ++master_parse.tab.h: master_parse.tab.c ++master_parse.tab.c: master_parse.y + $(YACC) -v -d -p master_ -b master_parse $? + + master_tok.o: master_tok.c master_parse.tab.h +@@ -57,5 +58,3 @@ clean: + install: all + install -d -m 755 $(INSTALLROOT)$(sbindir) + install -c automount -m 755 $(INSTALLROOT)$(sbindir) +- +- diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch index d1f9f3493..41de373fd 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch @@ -16,33 +16,21 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> configure.in | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) -diff --git a/configure.in b/configure.in -index f5fbb35..76ecb40 100644 --- a/configure.in +++ b/configure.in -@@ -211,8 +211,20 @@ fi - AC_SUBST(ENABLE_FEDFS) - - # LDAP SASL auth needs libxml and Kerberos --AF_CHECK_LIBXML() +@@ -215,7 +215,14 @@ PKG_CHECK_MODULES([XML], [libxml-2.0], [ + AC_DEFINE(LIBXML2_WORKAROUND, 1, [Use libxml2 tsd usage workaround]) + ], [HAVE_LIBXML=0]) + -AF_CHECK_KRB5() -+PKG_CHECK_MODULES(XML, [libxml-2.0],HAVE_LIBXML=1,HAVE_LIBXML=0) -+AC_SUBST([HAVE_LIBXML]) -+XML_FLAGS=$XML_CFLAGS -+ -+PKG_CHECK_MODULES(KRB5, [krb5],HAVE_KRB5=1,HAVE_KRB5=0) -+AC_SUBST([HAVE_KRB5]) -+if test "x$HAVE_KRB5" = "x1"; then ++PKG_CHECK_MODULES(KRB5, [krb5], [ ++ HAVE_KRB5=1 + SAVE_CFLAGS=$CFLAGS + SAVE_LIBS=$LIBS + CFLAGS="$CFLAGS $KRB5_FLAGS" + LIBS="$LIBS $KRB5_LIBS" -+ + AC_CHECK_FUNCS([krb5_principal_get_realm]) -+fi - ++], [HAVE_KRB5=0]) + AC_SEARCH_LIBS([versionsort],[]) if test "$ac_cv_search_versionsort" = "no"; then --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.7.bb index 54f0b9991..019b453c2 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.6.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.7.bb @@ -1,7 +1,7 @@ SUMMARY = "Kernel based automounter for linux" SECTION = "utils" LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" +LIC_FILES_CHKSUM = "file://COPYING;md5=ee9324a6f564bb2376b63878ac396798" DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl libxml2 util-linux cyrus-sasl libnsl2" @@ -10,7 +10,6 @@ CFLAGS += "-I${STAGING_INCDIR}/tirpc" inherit autotools-brokensep systemd update-rc.d pkgconfig SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ - file://autofs-5.0.7-include-linux-nfs.h-directly-in-rpc_sub.patch \ file://no-bash.patch \ file://cross.patch \ file://fix_disable_ldap.patch \ @@ -26,11 +25,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \ file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \ + file://0001-Define-__SWORD_TYPE-if-undefined.patch \ " - - -SRC_URI[md5sum] = "e6800e0afd6009ecdff148088c564050" -SRC_URI[sha256sum] = "82094cad44f4e5c4f93eff2789cd66b57d7ab3fa646b7722d97608571001e694" +SRC_URI[sha256sum] = "a18619e5ad18960fe382354eef33f070e57e4e5711d484b010acde080a003312" UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/" @@ -87,10 +84,14 @@ do_install_append () { } SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" +# all the libraries are unversioned, so don't pack it on PN-dev +SOLIBS = ".so" +FILES_SOLIBSDEV = "" +# Some symlinks are created in plugins dir e.g. +# mount_nfs4.so -> mount_nfs.so INSANE_SKIP_${PN} = "dev-so" RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "autofs.service" - diff --git a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb index 33de8ca7e..c4b41ace8 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.27.bb @@ -96,3 +96,6 @@ FILES_${PN}-dbg += "${libdir}/sasl2/.debug" FILES_${PN}-staticdev += "${libdir}/sasl2/*.a" INSANE_SKIP_${PN} += "dev-so" + +# CVE-2020-8032 affects only openSUSE +CVE_CHECK_WHITELIST += "CVE-2020-8032" diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch new file mode 100644 index 000000000..f9cadbc26 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived/0001-layer4-Change-order-of-include-files.patch @@ -0,0 +1,58 @@ +From a85ca79143a87286f793957e803ee3daf03c2b57 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 6 Jul 2021 14:06:44 -0700 +Subject: [PATCH] layer4: Change order of include files + +curent order to include standard headers first is causing an isue with +glibc 2.34 + kernel-headers 5.13+ where order of including netinet/in.h +and linux/in.h matters and it does not define __UAPI_DEF_IN_IPPROTO +before including linux/in.h and then later includes netinet/in.h which +then means lot of definitions will be defined twice and compile would +fail. Re-ordering the local headers to appear first solves the issue +amicably, and I think this is right order too + +Upsteam-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + keepalived/core/layer4.c | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c +index 90cdc84..c122c29 100644 +--- a/keepalived/core/layer4.c ++++ b/keepalived/core/layer4.c +@@ -23,6 +23,16 @@ + + #include "config.h" + ++#include "layer4.h" ++#include "logger.h" ++#include "scheduler.h" ++#ifdef _WITH_LVS_ ++#include "check_api.h" ++#endif ++#include "bitops.h" ++#include "utils.h" ++#include "align.h" ++ + #include <stdio.h> + #include <errno.h> + #include <unistd.h> +@@ -33,17 +43,6 @@ + #include <sys/time.h> + #endif + #include <linux/errqueue.h> +-#include <netinet/in.h> +- +-#include "layer4.h" +-#include "logger.h" +-#include "scheduler.h" +-#ifdef _WITH_LVS_ +-#include "check_api.h" +-#endif +-#include "bitops.h" +-#include "utils.h" +-#include "align.h" + + // #define ICMP_DEBUG 1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.1.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb index a778d2609..f0cbca1be 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.1.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.2.bb @@ -10,8 +10,10 @@ HOMEPAGE = "http://www.keepalived.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz" -SRC_URI[sha256sum] = "91186f20c83ffc48d7a15a9a6e2329ed4feeb2dcb51f4aa9672c8840190ea741" +SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ + file://0001-layer4-Change-order-of-include-files.patch \ + " +SRC_URI[sha256sum] = "103692bd5345a4ed9f4581632ea636214fdf53e45682e200aab122c4fa674ece" UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" DEPENDS = "libnfnetlink openssl" diff --git a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.03.bb b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.06.bb index 118c5fea3..a97167720 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.03.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.21.06.bb @@ -29,8 +29,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-Fix-build-with-fno-common.patch \ file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ " -SRC_URI[md5sum] = "0433650ba9c25f2cf36145e11bf96a2a" -SRC_URI[sha256sum] = "ed40386852e34bbec0ca7e9534ce315b93a17b587614c8118aea1ecd082e1723" +SRC_URI[md5sum] = "a60775787ba520a0b1031fcd42e0d65b" +SRC_URI[sha256sum] = "d29d124506e4b084285d27c8742c7bca66de80be6a0ba9de8e37835ccaa8ee57" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/opensaf/files/releases" diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0007-correct-signature-of-closefrom-API.patch b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0007-correct-signature-of-closefrom-API.patch new file mode 100644 index 000000000..e583354cc --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/files/0007-correct-signature-of-closefrom-API.patch @@ -0,0 +1,101 @@ +From 1e451ddc15af1a4e19318c8b1ced46c5c41610d3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 14 Jul 2021 18:08:30 -0700 +Subject: [PATCH] correct signature of closefrom() API + +glibc 2.34 introduced this function and finds this error which has been +all along. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/util/sys_compat.c | 6 +++--- + src/util/sys_defs.h | 12 ++++++------ + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/util/sys_compat.c b/src/util/sys_compat.c +index 8bf8e58..c87f043 100644 +--- a/src/util/sys_compat.c ++++ b/src/util/sys_compat.c +@@ -286,7 +286,7 @@ int dup2_pass_on_exec(int oldd, int newd) + + /* closefrom() - closes all file descriptors from the given one up */ + +-int closefrom(int lowfd) ++void closefrom(int lowfd) + { + int fd_limit = open_limit(0); + int fd; +@@ -298,14 +298,14 @@ int closefrom(int lowfd) + */ + if (lowfd < 0) { + errno = EBADF; +- return (-1); ++ return; + } + if (fd_limit > 500) + fd_limit = 500; + for (fd = lowfd; fd < fd_limit; fd++) + (void) close(fd); + +- return (0); ++ return; + } + + #endif +diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h +index 2e1c953..515de6c 100644 +--- a/src/util/sys_defs.h ++++ b/src/util/sys_defs.h +@@ -1509,7 +1509,7 @@ extern int setsid(void); + #endif + + #ifndef HAS_CLOSEFROM +-extern int closefrom(int); ++extern void closefrom(int); + + #endif + +@@ -1563,7 +1563,7 @@ typedef int pid_t; + + /* + * Clang-style attribute tests. +- * ++ * + * XXX Without the unconditional test below, gcc 4.6 will barf on ``elif + * defined(__clang__) && __has_attribute(__whatever__)'' with error message + * ``missing binary operator before token "("''. +@@ -1577,7 +1577,7 @@ typedef int pid_t; + * warn for missing initializations and other trouble. However, OPENSTEP4 + * gcc 2.7.x cannot handle this so we define this only if NORETURN isn't + * already defined above. +- * ++ * + * Data point: gcc 2.7.2 has __attribute__ (Wietse Venema) but gcc 2.6.3 does + * not (Clive Jones). So we'll set the threshold at 2.7. + */ +@@ -1653,12 +1653,12 @@ typedef int pid_t; + * write to output parameters (for example, stat- or scanf-like functions) + * or from functions that have other useful side effects (for example, + * fseek- or rename-like functions). +- * ++ * + * DO NOT use this for functions that write to a stream; it is entirely + * legitimate to detect write errors with fflush() or fclose() only. On the + * other hand most (but not all) functions that read from a stream must + * never ignore result values. +- * ++ * + * XXX Prepending "(void)" won't shut up GCC. Clang behaves as expected. + */ + #if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ > 3) +@@ -1739,7 +1739,7 @@ typedef const char *CONST_CHAR_STAR; + * Safety. On some systems, ctype.h misbehaves with non-ASCII or negative + * characters. More importantly, Postfix uses the ISXXX() macros to ensure + * protocol compliance, so we have to rule out non-ASCII characters. +- * ++ * + * XXX The (unsigned char) casts in isalnum() etc arguments are unnecessary + * because the ISASCII() guard already ensures that the values are + * non-negative; the casts are done anyway to shut up chatty compilers. diff --git a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.4.12.bb b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.1.bb index db5b41bfb..c139f0661 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.4.12.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.6.1.bb @@ -13,6 +13,7 @@ SRC_URI += "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${P file://postfix-install.patch \ file://icu-config.patch \ file://0001-makedefs-add-lnsl-and-lresolv-to-SYSLIBS-by-default.patch \ + file://0007-correct-signature-of-closefrom-API.patch \ " -SRC_URI[sha256sum] = "18555183ae8b52a9e76067799279c86f9f2770cdef3836deb8462ee0a0855dec" +SRC_URI[sha256sum] = "20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c" UPSTREAM_CHECK_REGEX = "postfix\-(?P<pver>3\.3(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch index f49ef2a78..62328203d 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch @@ -1,6 +1,6 @@ -From e03b003610a176d608da9a02e433e7ded7e4b75f Mon Sep 17 00:00:00 2001 -From: Todd Cunningham <tcunningham07@gmail.com> -Date: Wed, 11 Dec 2019 10:18:56 +1000 +From c29959e045dd09d0b5727682d4e9dbc10923ac4f Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <trevor.gamblin@windriver.com> +Date: Wed, 2 Jun 2021 11:08:51 -0400 Subject: [PATCH] avoid naming local function as one of printf family Fixes build issues with clang @@ -11,6 +11,10 @@ Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com> Signed-off-by: Todd Cunningham <tcunningham07@gmail.com> + +Use wiggle to get the patch to apply for version 1.2.0. + +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> --- include/expr_ops.h | 2 +- include/obj.h | 2 +- @@ -62,56 +66,56 @@ Signed-off-by: Todd Cunningham <tcunningham07@gmail.com> src/obj/synproxy.c | 2 +- src/obj/tunnel.c | 2 +- src/object.c | 2 +- - 49 files changed, 50 insertions(+), 50 deletions(-) + 50 files changed, 51 insertions(+), 51 deletions(-) diff --git a/include/expr_ops.h b/include/expr_ops.h -index a7f1b9a..d2946de 100644 +index 7a6aa23..d3a2855 100644 --- a/include/expr_ops.h +++ b/include/expr_ops.h -@@ -17,7 +17,7 @@ struct expr_ops { +@@ -18,7 +18,7 @@ struct expr_ops { const void *(*get)(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len); int (*parse)(struct nftnl_expr *e, struct nlattr *attr); void (*build)(struct nlmsghdr *nlh, const struct nftnl_expr *e); -- int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e); -+ int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e); +- int (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_expr *e); ++ int (*snprintf_)(char *buf, size_t len, uint32_t flags, const struct nftnl_expr *e); }; struct expr_ops *nftnl_expr_ops_lookup(const char *name); diff --git a/include/obj.h b/include/obj.h -index 9394d79..08610d7 100644 +index 60dc853..1c1c3c1 100644 --- a/include/obj.h +++ b/include/obj.h -@@ -99,7 +99,7 @@ struct obj_ops { +@@ -109,7 +109,7 @@ struct obj_ops { const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len); int (*parse)(struct nftnl_obj *e, struct nlattr *attr); void (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e); -- int (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e); -+ int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e); +- int (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e); ++ int (*snprintf_)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e); }; extern struct obj_ops obj_ops_counter; diff --git a/src/expr.c b/src/expr.c -index 80c4c36..b698a60 100644 +index 277bbde..2231b21 100644 --- a/src/expr.c +++ b/src/expr.c -@@ -275,10 +275,10 @@ int nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr, - if (size) +@@ -279,10 +279,10 @@ int nftnl_expr_snprintf(char *buf, size_t remain, const struct nftnl_expr *expr, + if (remain) buf[0] = '\0'; -- if (!expr->ops->snprintf) -+ if (!expr->ops->snprintf_) +- if (!expr->ops->snprintf || type != NFTNL_OUTPUT_DEFAULT) ++ if (!expr->ops->snprintf_ || type != NFTNL_OUTPUT_DEFAULT) return 0; -- ret = expr->ops->snprintf(buf + offset, remain, type, flags, expr); -+ ret = expr->ops->snprintf_(buf + offset, remain, type, flags, expr); +- ret = expr->ops->snprintf(buf + offset, remain, flags, expr); ++ ret = expr->ops->snprintf_(buf + offset, remain, flags, expr); SNPRINTF_BUFFER_SIZE(ret, remain, offset); return offset; diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c -index c9d40df..27d644b 100644 +index d0c7827..eded505 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c -@@ -219,5 +219,5 @@ struct expr_ops expr_ops_bitwise = { +@@ -282,5 +282,5 @@ struct expr_ops expr_ops_bitwise = { .get = nftnl_expr_bitwise_get, .parse = nftnl_expr_bitwise_parse, .build = nftnl_expr_bitwise_build, @@ -119,10 +123,10 @@ index c9d40df..27d644b 100644 + .snprintf_ = nftnl_expr_bitwise_snprintf, }; diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c -index efdfa2b..7ae9dfb 100644 +index d299745..0068ab2 100644 --- a/src/expr/byteorder.c +++ b/src/expr/byteorder.c -@@ -234,5 +234,5 @@ struct expr_ops expr_ops_byteorder = { +@@ -220,5 +220,5 @@ struct expr_ops expr_ops_byteorder = { .get = nftnl_expr_byteorder_get, .parse = nftnl_expr_byteorder_parse, .build = nftnl_expr_byteorder_build, @@ -130,10 +134,10 @@ index efdfa2b..7ae9dfb 100644 + .snprintf_ = nftnl_expr_byteorder_snprintf, }; diff --git a/src/expr/cmp.c b/src/expr/cmp.c -index 86d7842..e3be442 100644 +index 6030693..7e548e6 100644 --- a/src/expr/cmp.c +++ b/src/expr/cmp.c -@@ -216,5 +216,5 @@ struct expr_ops expr_ops_cmp = { +@@ -202,5 +202,5 @@ struct expr_ops expr_ops_cmp = { .get = nftnl_expr_cmp_get, .parse = nftnl_expr_cmp_parse, .build = nftnl_expr_cmp_build, @@ -141,10 +145,10 @@ index 86d7842..e3be442 100644 + .snprintf_ = nftnl_expr_cmp_snprintf, }; diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c -index 53af93b..6c8bc40 100644 +index 3b37587..39b7092 100644 --- a/src/expr/connlimit.c +++ b/src/expr/connlimit.c -@@ -149,5 +149,5 @@ struct expr_ops expr_ops_connlimit = { +@@ -135,5 +135,5 @@ struct expr_ops expr_ops_connlimit = { .get = nftnl_expr_connlimit_get, .parse = nftnl_expr_connlimit_parse, .build = nftnl_expr_connlimit_build, @@ -152,10 +156,10 @@ index 53af93b..6c8bc40 100644 + .snprintf_ = nftnl_expr_connlimit_snprintf, }; diff --git a/src/expr/counter.c b/src/expr/counter.c -index 89a602e..a32a69e 100644 +index 1676d70..42c96d9 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c -@@ -147,5 +147,5 @@ struct expr_ops expr_ops_counter = { +@@ -133,5 +133,5 @@ struct expr_ops expr_ops_counter = { .get = nftnl_expr_counter_get, .parse = nftnl_expr_counter_parse, .build = nftnl_expr_counter_build, @@ -163,10 +167,10 @@ index 89a602e..a32a69e 100644 + .snprintf_ = nftnl_expr_counter_snprintf, }; diff --git a/src/expr/ct.c b/src/expr/ct.c -index 124de9d..7bde179 100644 +index d5dfc81..8c15db1 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c -@@ -273,5 +273,5 @@ struct expr_ops expr_ops_ct = { +@@ -258,5 +258,5 @@ struct expr_ops expr_ops_ct = { .get = nftnl_expr_ct_get, .parse = nftnl_expr_ct_parse, .build = nftnl_expr_ct_build, @@ -174,10 +178,10 @@ index 124de9d..7bde179 100644 + .snprintf_ = nftnl_expr_ct_snprintf, }; diff --git a/src/expr/dup.c b/src/expr/dup.c -index 2bb35e5..d9bd4b1 100644 +index f041b55..6238a43 100644 --- a/src/expr/dup.c +++ b/src/expr/dup.c -@@ -154,5 +154,5 @@ struct expr_ops expr_ops_dup = { +@@ -138,5 +138,5 @@ struct expr_ops expr_ops_dup = { .get = nftnl_expr_dup_get, .parse = nftnl_expr_dup_parse, .build = nftnl_expr_dup_build, @@ -185,10 +189,10 @@ index 2bb35e5..d9bd4b1 100644 + .snprintf_ = nftnl_expr_dup_snprintf, }; diff --git a/src/expr/dynset.c b/src/expr/dynset.c -index 68115ba..6e43bb4 100644 +index 85d64bb..9afbb94 100644 --- a/src/expr/dynset.c +++ b/src/expr/dynset.c -@@ -288,5 +288,5 @@ struct expr_ops expr_ops_dynset = { +@@ -373,5 +373,5 @@ struct expr_ops expr_ops_dynset = { .get = nftnl_expr_dynset_get, .parse = nftnl_expr_dynset_parse, .build = nftnl_expr_dynset_build, @@ -196,10 +200,10 @@ index 68115ba..6e43bb4 100644 + .snprintf_ = nftnl_expr_dynset_snprintf, }; diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c -index e5f714b..e68792b 100644 +index 1b813b1..25f1491 100644 --- a/src/expr/exthdr.c +++ b/src/expr/exthdr.c -@@ -276,5 +276,5 @@ struct expr_ops expr_ops_exthdr = { +@@ -262,5 +262,5 @@ struct expr_ops expr_ops_exthdr = { .get = nftnl_expr_exthdr_get, .parse = nftnl_expr_exthdr_parse, .build = nftnl_expr_exthdr_build, @@ -207,10 +211,10 @@ index e5f714b..e68792b 100644 + .snprintf_ = nftnl_expr_exthdr_snprintf, }; diff --git a/src/expr/fib.c b/src/expr/fib.c -index 9475af4..8e7090d 100644 +index aaff52a..3916e18 100644 --- a/src/expr/fib.c +++ b/src/expr/fib.c -@@ -213,5 +213,5 @@ struct expr_ops expr_ops_fib = { +@@ -198,5 +198,5 @@ struct expr_ops expr_ops_fib = { .get = nftnl_expr_fib_get, .parse = nftnl_expr_fib_parse, .build = nftnl_expr_fib_build, @@ -218,10 +222,10 @@ index 9475af4..8e7090d 100644 + .snprintf_ = nftnl_expr_fib_snprintf, }; diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c -index 6ccec9a..c2f2478 100644 +index a826202..c1ca678 100644 --- a/src/expr/flow_offload.c +++ b/src/expr/flow_offload.c -@@ -134,5 +134,5 @@ struct expr_ops expr_ops_flow = { +@@ -120,5 +120,5 @@ struct expr_ops expr_ops_flow = { .get = nftnl_expr_flow_get, .parse = nftnl_expr_flow_parse, .build = nftnl_expr_flow_build, @@ -229,10 +233,10 @@ index 6ccec9a..c2f2478 100644 + .snprintf_ = nftnl_expr_flow_snprintf, }; diff --git a/src/expr/fwd.c b/src/expr/fwd.c -index cff8235..bcd7d3f 100644 +index 82e5a41..4e80687 100644 --- a/src/expr/fwd.c +++ b/src/expr/fwd.c -@@ -174,5 +174,5 @@ struct expr_ops expr_ops_fwd = { +@@ -158,5 +158,5 @@ struct expr_ops expr_ops_fwd = { .get = nftnl_expr_fwd_get, .parse = nftnl_expr_fwd_parse, .build = nftnl_expr_fwd_build, @@ -240,10 +244,10 @@ index cff8235..bcd7d3f 100644 + .snprintf_ = nftnl_expr_fwd_snprintf, }; diff --git a/src/expr/hash.c b/src/expr/hash.c -index 2c801d2..a9f6e7e 100644 +index 10b4a72..84ace31 100644 --- a/src/expr/hash.c +++ b/src/expr/hash.c -@@ -241,5 +241,5 @@ struct expr_ops expr_ops_hash = { +@@ -226,5 +226,5 @@ struct expr_ops expr_ops_hash = { .get = nftnl_expr_hash_get, .parse = nftnl_expr_hash_parse, .build = nftnl_expr_hash_build, @@ -251,10 +255,10 @@ index 2c801d2..a9f6e7e 100644 + .snprintf_ = nftnl_expr_hash_snprintf, }; diff --git a/src/expr/immediate.c b/src/expr/immediate.c -index 47106ae..ea86c88 100644 +index 94b043c..a8a3c1f 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c -@@ -235,5 +235,5 @@ struct expr_ops expr_ops_immediate = { +@@ -229,5 +229,5 @@ struct expr_ops expr_ops_immediate = { .get = nftnl_expr_immediate_get, .parse = nftnl_expr_immediate_parse, .build = nftnl_expr_immediate_build, @@ -262,10 +266,10 @@ index 47106ae..ea86c88 100644 + .snprintf_ = nftnl_expr_immediate_snprintf, }; diff --git a/src/expr/limit.c b/src/expr/limit.c -index 5872e27..0ce482f 100644 +index 3dfd54a..f652df0 100644 --- a/src/expr/limit.c +++ b/src/expr/limit.c -@@ -216,5 +216,5 @@ struct expr_ops expr_ops_limit = { +@@ -202,5 +202,5 @@ struct expr_ops expr_ops_limit = { .get = nftnl_expr_limit_get, .parse = nftnl_expr_limit_parse, .build = nftnl_expr_limit_build, @@ -273,10 +277,10 @@ index 5872e27..0ce482f 100644 + .snprintf_ = nftnl_expr_limit_snprintf, }; diff --git a/src/expr/log.c b/src/expr/log.c -index bbe43d2..5506bc2 100644 +index 86db548..d96b7ce 100644 --- a/src/expr/log.c +++ b/src/expr/log.c -@@ -267,5 +267,5 @@ struct expr_ops expr_ops_log = { +@@ -253,5 +253,5 @@ struct expr_ops expr_ops_log = { .get = nftnl_expr_log_get, .parse = nftnl_expr_log_parse, .build = nftnl_expr_log_build, @@ -284,10 +288,10 @@ index bbe43d2..5506bc2 100644 + .snprintf_ = nftnl_expr_log_snprintf, }; diff --git a/src/expr/lookup.c b/src/expr/lookup.c -index a495ac0..678868c 100644 +index 83adce9..1fbace4 100644 --- a/src/expr/lookup.c +++ b/src/expr/lookup.c -@@ -221,5 +221,5 @@ struct expr_ops expr_ops_lookup = { +@@ -206,5 +206,5 @@ struct expr_ops expr_ops_lookup = { .get = nftnl_expr_lookup_get, .parse = nftnl_expr_lookup_parse, .build = nftnl_expr_lookup_build, @@ -295,10 +299,10 @@ index a495ac0..678868c 100644 + .snprintf_ = nftnl_expr_lookup_snprintf, }; diff --git a/src/expr/masq.c b/src/expr/masq.c -index f6f3ceb..88292a6 100644 +index 684708c..1ce099c 100644 --- a/src/expr/masq.c +++ b/src/expr/masq.c -@@ -169,5 +169,5 @@ struct expr_ops expr_ops_masq = { +@@ -163,5 +163,5 @@ struct expr_ops expr_ops_masq = { .get = nftnl_expr_masq_get, .parse = nftnl_expr_masq_parse, .build = nftnl_expr_masq_build, @@ -306,10 +310,10 @@ index f6f3ceb..88292a6 100644 + .snprintf_ = nftnl_expr_masq_snprintf, }; diff --git a/src/expr/match.c b/src/expr/match.c -index 4fa74b2..249c6b5 100644 +index 533fdf5..8561986 100644 --- a/src/expr/match.c +++ b/src/expr/match.c -@@ -198,5 +198,5 @@ struct expr_ops expr_ops_match = { +@@ -189,5 +189,5 @@ struct expr_ops expr_ops_match = { .get = nftnl_expr_match_get, .parse = nftnl_expr_match_parse, .build = nftnl_expr_match_build, @@ -317,10 +321,10 @@ index 4fa74b2..249c6b5 100644 + .snprintf_ = nftnl_expr_match_snprintf, }; diff --git a/src/expr/meta.c b/src/expr/meta.c -index 73f6efa..35d5ec5 100644 +index 34fbb9b..1ef79a4 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c -@@ -226,5 +226,5 @@ struct expr_ops expr_ops_meta = { +@@ -216,5 +216,5 @@ struct expr_ops expr_ops_meta = { .get = nftnl_expr_meta_get, .parse = nftnl_expr_meta_parse, .build = nftnl_expr_meta_build, @@ -328,10 +332,10 @@ index 73f6efa..35d5ec5 100644 + .snprintf_ = nftnl_expr_meta_snprintf, }; diff --git a/src/expr/nat.c b/src/expr/nat.c -index 6b7d50e..be4a579 100644 +index 0a9cdd7..bc4a3fa 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c -@@ -279,5 +279,5 @@ struct expr_ops expr_ops_nat = { +@@ -274,5 +274,5 @@ struct expr_ops expr_ops_nat = { .get = nftnl_expr_nat_get, .parse = nftnl_expr_nat_parse, .build = nftnl_expr_nat_build, @@ -339,10 +343,10 @@ index 6b7d50e..be4a579 100644 + .snprintf_ = nftnl_expr_nat_snprintf, }; diff --git a/src/expr/numgen.c b/src/expr/numgen.c -index 4e0d541..5995ee3 100644 +index 159dfec..99bb442 100644 --- a/src/expr/numgen.c +++ b/src/expr/numgen.c -@@ -195,5 +195,5 @@ struct expr_ops expr_ops_ng = { +@@ -180,5 +180,5 @@ struct expr_ops expr_ops_ng = { .get = nftnl_expr_ng_get, .parse = nftnl_expr_ng_parse, .build = nftnl_expr_ng_build, @@ -350,10 +354,10 @@ index 4e0d541..5995ee3 100644 + .snprintf_ = nftnl_expr_ng_snprintf, }; diff --git a/src/expr/objref.c b/src/expr/objref.c -index 7388b18..e673ffd 100644 +index a4b6470..1b2d387 100644 --- a/src/expr/objref.c +++ b/src/expr/objref.c -@@ -210,5 +210,5 @@ struct expr_ops expr_ops_objref = { +@@ -205,5 +205,5 @@ struct expr_ops expr_ops_objref = { .get = nftnl_expr_objref_get, .parse = nftnl_expr_objref_parse, .build = nftnl_expr_objref_build, @@ -361,10 +365,10 @@ index 7388b18..e673ffd 100644 + .snprintf_ = nftnl_expr_objref_snprintf, }; diff --git a/src/expr/osf.c b/src/expr/osf.c -index 98d0df9..618b46e 100644 +index 215a681..75a6b3c 100644 --- a/src/expr/osf.c +++ b/src/expr/osf.c -@@ -161,5 +161,5 @@ struct expr_ops expr_ops_osf = { +@@ -147,5 +147,5 @@ struct expr_ops expr_ops_osf = { .get = nftnl_expr_osf_get, .parse = nftnl_expr_osf_parse, .build = nftnl_expr_osf_build, @@ -372,10 +376,10 @@ index 98d0df9..618b46e 100644 + .snprintf_ = nftnl_expr_osf_snprintf, }; diff --git a/src/expr/payload.c b/src/expr/payload.c -index 2192dad..37aacc4 100644 +index 9ccb78e..aa17025 100644 --- a/src/expr/payload.c +++ b/src/expr/payload.c -@@ -266,5 +266,5 @@ struct expr_ops expr_ops_payload = { +@@ -258,5 +258,5 @@ struct expr_ops expr_ops_payload = { .get = nftnl_expr_payload_get, .parse = nftnl_expr_payload_parse, .build = nftnl_expr_payload_build, @@ -383,10 +387,10 @@ index 2192dad..37aacc4 100644 + .snprintf_ = nftnl_expr_payload_snprintf, }; diff --git a/src/expr/queue.c b/src/expr/queue.c -index 051ef71..b06feff 100644 +index 8f70977..6bc76ef 100644 --- a/src/expr/queue.c +++ b/src/expr/queue.c -@@ -207,5 +207,5 @@ struct expr_ops expr_ops_queue = { +@@ -193,5 +193,5 @@ struct expr_ops expr_ops_queue = { .get = nftnl_expr_queue_get, .parse = nftnl_expr_queue_parse, .build = nftnl_expr_queue_build, @@ -394,10 +398,10 @@ index 051ef71..b06feff 100644 + .snprintf_ = nftnl_expr_queue_snprintf, }; diff --git a/src/expr/quota.c b/src/expr/quota.c -index 39a92e6..41797be 100644 +index 8c841d8..1a5f2fa 100644 --- a/src/expr/quota.c +++ b/src/expr/quota.c -@@ -161,5 +161,5 @@ struct expr_ops expr_ops_quota = { +@@ -147,5 +147,5 @@ struct expr_ops expr_ops_quota = { .get = nftnl_expr_quota_get, .parse = nftnl_expr_quota_parse, .build = nftnl_expr_quota_build, @@ -405,10 +409,10 @@ index 39a92e6..41797be 100644 + .snprintf_ = nftnl_expr_quota_snprintf, }; diff --git a/src/expr/range.c b/src/expr/range.c -index d1d5083..b619cdf 100644 +index f76843a..73a1930 100644 --- a/src/expr/range.c +++ b/src/expr/range.c -@@ -227,5 +227,5 @@ struct expr_ops expr_ops_range = { +@@ -213,5 +213,5 @@ struct expr_ops expr_ops_range = { .get = nftnl_expr_range_get, .parse = nftnl_expr_range_parse, .build = nftnl_expr_range_build, @@ -416,10 +420,10 @@ index d1d5083..b619cdf 100644 + .snprintf_ = nftnl_expr_range_snprintf, }; diff --git a/src/expr/redir.c b/src/expr/redir.c -index 477659a..5c4ebeb 100644 +index 4f56cb4..51ec71c 100644 --- a/src/expr/redir.c +++ b/src/expr/redir.c -@@ -181,5 +181,5 @@ struct expr_ops expr_ops_redir = { +@@ -167,5 +167,5 @@ struct expr_ops expr_ops_redir = { .get = nftnl_expr_redir_get, .parse = nftnl_expr_redir_parse, .build = nftnl_expr_redir_build, @@ -427,10 +431,10 @@ index 477659a..5c4ebeb 100644 + .snprintf_ = nftnl_expr_redir_snprintf, }; diff --git a/src/expr/reject.c b/src/expr/reject.c -index 141942e..a98990d 100644 +index 716d25c..acf32c2 100644 --- a/src/expr/reject.c +++ b/src/expr/reject.c -@@ -148,5 +148,5 @@ struct expr_ops expr_ops_reject = { +@@ -134,5 +134,5 @@ struct expr_ops expr_ops_reject = { .get = nftnl_expr_reject_get, .parse = nftnl_expr_reject_parse, .build = nftnl_expr_reject_build, @@ -438,10 +442,10 @@ index 141942e..a98990d 100644 + .snprintf_ = nftnl_expr_reject_snprintf, }; diff --git a/src/expr/rt.c b/src/expr/rt.c -index 0fce72d..32ace19 100644 +index 1ad9b2a..9f2fdf3 100644 --- a/src/expr/rt.c +++ b/src/expr/rt.c -@@ -177,5 +177,5 @@ struct expr_ops expr_ops_rt = { +@@ -162,5 +162,5 @@ struct expr_ops expr_ops_rt = { .get = nftnl_expr_rt_get, .parse = nftnl_expr_rt_parse, .build = nftnl_expr_rt_build, @@ -449,10 +453,10 @@ index 0fce72d..32ace19 100644 + .snprintf_ = nftnl_expr_rt_snprintf, }; diff --git a/src/expr/socket.c b/src/expr/socket.c -index 96550d5..2394dbf 100644 +index 02d86f8..49a126b 100644 --- a/src/expr/socket.c +++ b/src/expr/socket.c -@@ -174,5 +174,5 @@ struct expr_ops expr_ops_socket = { +@@ -165,5 +165,5 @@ struct expr_ops expr_ops_socket = { .get = nftnl_expr_socket_get, .parse = nftnl_expr_socket_parse, .build = nftnl_expr_socket_build, @@ -460,10 +464,10 @@ index 96550d5..2394dbf 100644 + .snprintf_ = nftnl_expr_socket_snprintf, }; diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c -index 245f4fb..9721029 100644 +index 630f3f4..b22ad2f 100644 --- a/src/expr/synproxy.c +++ b/src/expr/synproxy.c -@@ -166,5 +166,5 @@ struct expr_ops expr_ops_synproxy = { +@@ -152,5 +152,5 @@ struct expr_ops expr_ops_synproxy = { .get = nftnl_expr_synproxy_get, .parse = nftnl_expr_synproxy_parse, .build = nftnl_expr_synproxy_build, @@ -471,10 +475,10 @@ index 245f4fb..9721029 100644 + .snprintf_ = nftnl_expr_synproxy_snprintf, }; diff --git a/src/expr/target.c b/src/expr/target.c -index 9100038..7180085 100644 +index b7c595a..31a039c 100644 --- a/src/expr/target.c +++ b/src/expr/target.c -@@ -198,5 +198,5 @@ struct expr_ops expr_ops_target = { +@@ -189,5 +189,5 @@ struct expr_ops expr_ops_target = { .get = nftnl_expr_target_get, .parse = nftnl_expr_target_parse, .build = nftnl_expr_target_build, @@ -482,10 +486,10 @@ index 9100038..7180085 100644 + .snprintf_ = nftnl_expr_target_snprintf, }; diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c -index 3827b75..feabbbe 100644 +index d3ee8f8..1b01591 100644 --- a/src/expr/tproxy.c +++ b/src/expr/tproxy.c -@@ -183,5 +183,5 @@ struct expr_ops expr_ops_tproxy = { +@@ -170,5 +170,5 @@ struct expr_ops expr_ops_tproxy = { .get = nftnl_expr_tproxy_get, .parse = nftnl_expr_tproxy_parse, .build = nftnl_expr_tproxy_build, @@ -493,10 +497,10 @@ index 3827b75..feabbbe 100644 + .snprintf_ = nftnl_expr_tproxy_snprintf, }; diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c -index b2b8d72..1ed46d3 100644 +index 1460fd2..6c2f653 100644 --- a/src/expr/tunnel.c +++ b/src/expr/tunnel.c -@@ -173,5 +173,5 @@ struct expr_ops expr_ops_tunnel = { +@@ -145,5 +145,5 @@ struct expr_ops expr_ops_tunnel = { .get = nftnl_expr_tunnel_get, .parse = nftnl_expr_tunnel_parse, .build = nftnl_expr_tunnel_build, @@ -504,10 +508,10 @@ index b2b8d72..1ed46d3 100644 + .snprintf_ = nftnl_expr_tunnel_snprintf, }; diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c -index 8fe5438..b6b2772 100644 +index c81d14d..e648ee5 100644 --- a/src/expr/xfrm.c +++ b/src/expr/xfrm.c -@@ -239,5 +239,5 @@ struct expr_ops expr_ops_xfrm = { +@@ -196,5 +196,5 @@ struct expr_ops expr_ops_xfrm = { .get = nftnl_expr_xfrm_get, .parse = nftnl_expr_xfrm_parse, .build = nftnl_expr_xfrm_build, @@ -515,10 +519,10 @@ index 8fe5438..b6b2772 100644 + .snprintf_ = nftnl_expr_xfrm_snprintf, }; diff --git a/src/obj/counter.c b/src/obj/counter.c -index 1baba4e..3710bce 100644 +index ef0cd20..0c199f7 100644 --- a/src/obj/counter.c +++ b/src/obj/counter.c -@@ -145,5 +145,5 @@ struct obj_ops obj_ops_counter = { +@@ -127,5 +127,5 @@ struct obj_ops obj_ops_counter = { .get = nftnl_obj_counter_get, .parse = nftnl_obj_counter_parse, .build = nftnl_obj_counter_build, @@ -526,10 +530,10 @@ index 1baba4e..3710bce 100644 + .snprintf_ = nftnl_obj_counter_snprintf, }; diff --git a/src/obj/ct_expect.c b/src/obj/ct_expect.c -index c0bb5ba..953c08c 100644 +index 8136ad9..b3e1d70 100644 --- a/src/obj/ct_expect.c +++ b/src/obj/ct_expect.c -@@ -209,5 +209,5 @@ struct obj_ops obj_ops_ct_expect = { +@@ -196,5 +196,5 @@ struct obj_ops obj_ops_ct_expect = { .get = nftnl_obj_ct_expect_get, .parse = nftnl_obj_ct_expect_parse, .build = nftnl_obj_ct_expect_build, @@ -537,10 +541,10 @@ index c0bb5ba..953c08c 100644 + .snprintf_ = nftnl_obj_ct_expect_snprintf, }; diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c -index d91f636..2037461 100644 +index c52032a..12b783c 100644 --- a/src/obj/ct_helper.c +++ b/src/obj/ct_helper.c -@@ -166,5 +166,5 @@ struct obj_ops obj_ops_ct_helper = { +@@ -150,5 +150,5 @@ struct obj_ops obj_ops_ct_helper = { .get = nftnl_obj_ct_helper_get, .parse = nftnl_obj_ct_helper_parse, .build = nftnl_obj_ct_helper_build, @@ -548,10 +552,10 @@ index d91f636..2037461 100644 + .snprintf_ = nftnl_obj_ct_helper_snprintf, }; diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c -index e2e9991..a4f2dd2 100644 +index 1d4f8fb..0a12883 100644 --- a/src/obj/ct_timeout.c +++ b/src/obj/ct_timeout.c -@@ -330,5 +330,5 @@ struct obj_ops obj_ops_ct_timeout = { +@@ -316,5 +316,5 @@ struct obj_ops obj_ops_ct_timeout = { .get = nftnl_obj_ct_timeout_get, .parse = nftnl_obj_ct_timeout_parse, .build = nftnl_obj_ct_timeout_build, @@ -559,10 +563,10 @@ index e2e9991..a4f2dd2 100644 + .snprintf_ = nftnl_obj_ct_timeout_snprintf, }; diff --git a/src/obj/limit.c b/src/obj/limit.c -index 60b0159..538f37a 100644 +index 8b40f9d..2f049b8 100644 --- a/src/obj/limit.c +++ b/src/obj/limit.c -@@ -185,5 +185,5 @@ struct obj_ops obj_ops_limit = { +@@ -168,5 +168,5 @@ struct obj_ops obj_ops_limit = { .get = nftnl_obj_limit_get, .parse = nftnl_obj_limit_parse, .build = nftnl_obj_limit_build, @@ -570,10 +574,10 @@ index 60b0159..538f37a 100644 + .snprintf_ = nftnl_obj_limit_snprintf, }; diff --git a/src/obj/quota.c b/src/obj/quota.c -index 1914037..585a088 100644 +index 8ab3300..8666334 100644 --- a/src/obj/quota.c +++ b/src/obj/quota.c -@@ -161,5 +161,5 @@ struct obj_ops obj_ops_quota = { +@@ -144,5 +144,5 @@ struct obj_ops obj_ops_quota = { .get = nftnl_obj_quota_get, .parse = nftnl_obj_quota_parse, .build = nftnl_obj_quota_build, @@ -581,21 +585,32 @@ index 1914037..585a088 100644 + .snprintf_ = nftnl_obj_quota_snprintf, }; diff --git a/src/obj/secmark.c b/src/obj/secmark.c -index e27b5fa..6241bee 100644 +index 2ccc803..e96e06f 100644 --- a/src/obj/secmark.c +++ b/src/obj/secmark.c -@@ -133,5 +133,5 @@ struct obj_ops obj_ops_secmark = { +@@ -116,5 +116,5 @@ struct obj_ops obj_ops_secmark = { .get = nftnl_obj_secmark_get, .parse = nftnl_obj_secmark_parse, .build = nftnl_obj_secmark_build, - .snprintf = nftnl_obj_secmark_snprintf, + .snprintf_ = nftnl_obj_secmark_snprintf, }; +diff --git a/src/obj/synproxy.c b/src/obj/synproxy.c +index d689fee..d06cb6d 100644 +--- a/src/obj/synproxy.c ++++ b/src/obj/synproxy.c +@@ -143,5 +143,5 @@ struct obj_ops obj_ops_synproxy = { + .get = nftnl_obj_synproxy_get, + .parse = nftnl_obj_synproxy_parse, + .build = nftnl_obj_synproxy_build, +- .snprintf = nftnl_obj_synproxy_snprintf, ++ .snprintf_ = nftnl_obj_synproxy_snprintf, + }; diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c -index 7ffade8..800eb3e 100644 +index 5ede6bd..d3743ff 100644 --- a/src/obj/tunnel.c +++ b/src/obj/tunnel.c -@@ -564,5 +564,5 @@ struct obj_ops obj_ops_tunnel = { +@@ -547,5 +547,5 @@ struct obj_ops obj_ops_tunnel = { .get = nftnl_obj_tunnel_get, .parse = nftnl_obj_tunnel_parse, .build = nftnl_obj_tunnel_build, @@ -603,29 +618,18 @@ index 7ffade8..800eb3e 100644 + .snprintf_ = nftnl_obj_tunnel_snprintf, }; diff --git a/src/object.c b/src/object.c -index d8c87ee..5307d7e 100644 +index 46e208b..d321c50 100644 --- a/src/object.c +++ b/src/object.c -@@ -370,7 +370,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size, +@@ -396,7 +396,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t remain, SNPRINTF_BUFFER_SIZE(ret, remain, offset); if (obj->ops) { -- ret = obj->ops->snprintf(buf + offset, offset, type, flags, -+ ret = obj->ops->snprintf_(buf + offset, offset, type, flags, - obj); +- ret = obj->ops->snprintf(buf + offset, remain, flags, obj); ++ ret = obj->ops->snprintf_(buf + offset, remain, flags, obj); SNPRINTF_BUFFER_SIZE(ret, remain, offset); } -diff --git a/src/obj/synproxy.c b/src/obj/synproxy.c -index 56ebc85..6b5380f 100644 ---- a/src/obj/synproxy.c -+++ b/src/obj/synproxy.c -@@ -157,5 +157,5 @@ struct obj_ops obj_ops_synproxy = { - .get = nftnl_obj_synproxy_get, - .parse = nftnl_obj_synproxy_parse, - .build = nftnl_obj_synproxy_build, -- .snprintf = nftnl_obj_synproxy_snprintf, -+ .snprintf_ = nftnl_obj_synproxy_snprintf, - }; + ret = snprintf(buf + offset, remain, "]"); -- -2.17.1 +2.31.1 diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.9.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.0.bb index 5532af8d9..2b90fdd1b 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.1.9.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=79808397c3355f163c012616125c9e26" SECTION = "libs" DEPENDS = "libmnl" -SRCREV = "c3fdda6ac8675aea9b35772458544f03157be415" +SRCREV = "d45be40eef72f0d42a1ba82efddbb0970d4c760a" SRC_URI = "git://git.netfilter.org/libnftnl \ file://0001-avoid-naming-local-function-as-one-of-printf-family.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.8.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.9.bb index 6990ae3ae..cbe2bb399 100644 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.8.bb +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.9.9.bb @@ -10,7 +10,7 @@ DEPENDS = "libmnl libnftnl bison-native \ UPSTREAM_CHECK_REGEX = "nftables-(?P<pver>\d+(\.\d+){2,}).tar.bz2" SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2" -SRC_URI[sha256sum] = "60fc004656dae4fefc4901c939c9d64120b4dedb49738e420a9a34989f108fe4" +SRC_URI[sha256sum] = "76ef2dc7fd0d79031a8369487739a217ca83996b3a746cec5bda79da11e3f1b4" inherit autotools manpages pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb index 0525b4135..01e3b74c6 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20210219.bb @@ -17,15 +17,11 @@ EXTRA_OEMAKE_append = " \ " MAKE_TARGETS = "module" +MODULES_INSTALL_TARGET = "module-install" RRECOMMENDS_${PN} = "kernel-module-xt-hashlimit" MODULE_NAME = "wireguard" -module_do_install() { - install -d ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME} - install -m 0644 ${MODULE_NAME}.ko \ - ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/${MODULE_NAME}/${MODULE_NAME}.ko -} # WireGuard has been merged into Linux kernel >= 5.6 and therefore this compatibility module is no longer required. # OE-core post dunfell has moved to use kernel 5.8 which now means we cant build this module in world builds diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch index da6d80ef4..022eb958f 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-5.7.2-fix-engineBoots-value-on-SIGHUP.patch @@ -1,6 +1,6 @@ -From b6a3d6c8af35f1ef27b80b0516742fce89f4eb29 Mon Sep 17 00:00:00 2001 -From: Marian Florea <marian.florea@windriver.com> -Date: Thu, 20 Jul 2017 16:55:24 +0800 +From 1e3178835217ba89aa355e2b6b88e490f17be16d Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> +Date: Wed, 9 Jun 2021 15:47:30 +0900 Subject: [PATCH] net snmp: fix engineBoots value on SIGHUP Upstream-Status: Pending @@ -14,17 +14,17 @@ Signed-off-by: Li Zhou <li.zhou@windriver.com> 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/agent/snmpd.c b/agent/snmpd.c -index ae73eda..66b4560 100644 +index 1af439f..355b510 100644 --- a/agent/snmpd.c +++ b/agent/snmpd.c -@@ -1207,6 +1207,7 @@ receive(void) +@@ -1208,6 +1208,7 @@ receive(void) snmp_log(LOG_INFO, "NET-SNMP version %s restarted\n", netsnmp_get_version()); update_config(); -+ snmp_store(app_name); ++ snmp_store(app_name); send_easy_trap(SNMP_TRAP_ENTERPRISESPECIFIC, 3); - #if HAVE_SIGHOLD - sigrelse(SIGHUP); + #if HAVE_SIGPROCMASK + ret = sigprocmask(SIG_UNBLOCK, &set, NULL); diff --git a/snmplib/snmpv3.c b/snmplib/snmpv3.c index 29c2a0f..ada961c 100644 --- a/snmplib/snmpv3.c @@ -41,3 +41,6 @@ index 29c2a0f..ada961c 100644 engineBoots = 1; } +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb index de0aeeec7..ed7f8428b 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.1.bb @@ -5,7 +5,8 @@ LICENSE = "BSD & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=9d100a395a38584f2ec18a8275261687" -DEPENDS = "openssl libnl pciutils" +DEPENDS = "openssl" +DEPENDS_append_class-target = " pciutils" SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://init \ @@ -27,7 +28,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \ file://reproducibility-have-printcap.patch \ file://0001-ac_add_search_path.m4-keep-consistent-between-32bit.patch \ " -SRC_URI[sha256sum] = "04303a66f85d6d8b16d3cc53bde50428877c82ab524e17591dfceaeb94df6071" +SRC_URI[sha256sum] = "eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/net-snmp/files/net-snmp/" UPSTREAM_CHECK_REGEX = "/net-snmp/(?P<pver>\d+(\.\d+)+)/" @@ -41,24 +42,23 @@ CCACHE = "" TARGET_CC_ARCH += "${LDFLAGS}" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} des smux" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} des smux" +PACKAGECONFIG[des] = "--enable-des, --disable-des" PACKAGECONFIG[elfutils] = "--with-elf, --without-elf, elfutils" +PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6" PACKAGECONFIG[libnl] = "--with-nl, --without-nl, libnl" - -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," - -PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no,\ - perl," -PACKAGECONFIG[des] = "--enable-des,--disable-des" +PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no, perl" PACKAGECONFIG[smux] = "" - -EXTRA_OECONF = "--enable-shared \ - --disable-manuals \ - --with-defaults \ - --with-install-prefix=${D} \ - --with-persistent-directory=${localstatedir}/lib/net-snmp \ - ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '--with-endianness=little', '--with-endianness=big', d)} \ - --with-mib-modules='${MIB_MODULES}' \ +PACKAGECONFIG[systemd] = "--with-systemd, --without-systemd" + +EXTRA_OECONF = " \ + --enable-shared \ + --disable-manuals \ + --with-defaults \ + --with-install-prefix=${D} \ + --with-persistent-directory=${localstatedir}/lib/net-snmp \ + --with-endianness=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ + --with-mib-modules='${MIB_MODULES}' \ " MIB_MODULES = "" @@ -73,8 +73,10 @@ CACHED_CONFIGUREVARS = " \ ac_cv_file__etc_printcap=no \ NETSNMP_CONFIGURE_OPTIONS= \ " -export PERLPROG="${bindir}/env perl" +PERLPROG = "${bindir}/env perl" +PERLPROG_class-native = "${bindir_native}/env perl" PERLPROG_append = "${@bb.utils.contains('PACKAGECONFIG', 'perl', ' -I${WORKDIR}', '', d)}" +export PERLPROG HAS_PERL = "${@bb.utils.contains('PACKAGECONFIG', 'perl', '1', '0', d)}" @@ -117,7 +119,7 @@ do_install_append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system - sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ + sed -e "s@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g" \ -i ${D}${bindir}/net-snmp-create-v3-user sed -e 's@^NSC_SRCDIR=.*@NSC_SRCDIR=.@g' \ -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ @@ -128,11 +130,14 @@ do_install_append() { -e 's@[^ ]*--with-install-prefix=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_PATH=[^ "]*@@g' \ -e 's@[^ ]*PKG_CONFIG_LIBDIR=[^ "]*@@g' \ - -e 's@${STAGING_DIR_HOST}@@g' \ -i ${D}${bindir}/net-snmp-config - sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${libdir}/pkgconfig/netsnmp*.pc + # ${STAGING_DIR_HOST} is empty for native builds, and the sed command below + # will result in errors if run for native. + if [ "${STAGING_DIR_HOST}" ]; then + sed -e 's@${STAGING_DIR_HOST}@@g' \ + -i ${D}${bindir}/net-snmp-config ${D}${libdir}/pkgconfig/netsnmp*.pc + fi sed -e "s@^NSC_INCLUDEDIR=.*@NSC_INCLUDEDIR=\$\{includedir\}@g" \ -e "s@^NSC_LIBDIR=-L.*@NSC_LIBDIR=-L\$\{libdir\}@g" \ @@ -234,8 +239,6 @@ INITSCRIPT_PACKAGES = "${PN}-server-snmpd" INITSCRIPT_NAME_${PN}-server-snmpd = "snmpd" INITSCRIPT_PARAMS_${PN}-server-snmpd = "start 90 2 3 4 5 . stop 60 0 1 6 ." -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" - SYSTEMD_PACKAGES = "${PN}-server-snmpd \ ${PN}-server-snmptrapd" @@ -275,3 +278,5 @@ RCONFLICTS_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd" LEAD_SONAME = "libnetsnmp.so" MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/net-snmp-config" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb index 41a9b8e76..bf8b18043 100644 --- a/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb +++ b/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_6.13.bb @@ -22,10 +22,21 @@ PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disab inherit autotools pkgconfig +do_configure_prepend() { + # want installed to /usr/sbin rather than /sbin to be DISTRO_FEATURES usrmerge compliant + # must override ROOTSBINDIR (default '/sbin'), + # setting --exec-prefix or --prefix in EXTRA_OECONF does not work + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','fakse',d)}; then + export ROOTSBINDIR=${sbindir} + fi +} + do_install_append() { - # Remove empty /usr/bin and /usr/sbin directories since the mount helper - # is installed to /sbin - rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} + if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','false','true',d)}; then + # Remove empty /usr/bin and /usr/sbin directories since the mount helper + # is installed to /sbin + rmdir --ignore-fail-on-non-empty ${D}${bindir} ${D}${sbindir} + fi } FILES_${PN} += "${base_libdir}/security" diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb index 19ba2b1fc..26b4f5ee8 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.14.bb @@ -72,3 +72,6 @@ FILES_${PN} += "${libdir}/dovecot/*plugin.so \ FILES_${PN}-staticdev += "${libdir}/dovecot/*/*.a" FILES_${PN}-dev += "${libdir}/dovecot/libdovecot*.so" FILES_${PN}-dbg += "${libdir}/dovecot/*/.debug" + +# CVE-2016-4983 affects only postinstall script on specific distribution +CVE_CHECK_WHITELIST += "CVE-2016-4983" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch index 3f2921ed3..74f8d8ad0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba/20-do-not-import-target-module-while-cross-compile.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-do-not-import-target-module-while-cross-compile.patch @@ -1,4 +1,4 @@ -From cc0576405803bcae45ee353c4333c449cead9207 Mon Sep 17 00:00:00 2001 +From 00500909ebb0f51dd3b4e90c665f07158e7fe255 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Tue, 25 Jun 2019 14:25:08 +0800 Subject: [PATCH] do not import target module while cross compile @@ -10,12 +10,16 @@ Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com> update to version 4.10.5, and switch to python3 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- buildtools/wafsamba/samba_bundled.py | 27 +++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) + 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py -index 60ce7da..5468a36 100644 +index 5f080dd..cdc115e 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -4,6 +4,7 @@ import sys @@ -63,5 +67,5 @@ index 60ce7da..5468a36 100644 Logs.error('ERROR: Python module %s of version %s not found, and bundling disabled' % (libname, minversion)) sys.exit(1) -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-waf-add-support-of-cross_compile.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-waf-add-support-of-cross_compile.patch deleted file mode 100644 index 45c5acabb..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0001-waf-add-support-of-cross_compile.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 4b8463ff43f8983a706b181c5292491f9f954be1 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Fri, 25 Jan 2019 15:00:59 +0800 -Subject: [PATCH] waf: add support of cross_compile - -After upgrade, waf build system also upgraded. - -on 1.5.19, for cross_compile, subprocess.Popen is set to be -samba_cross.cross_Popen, which will not execute testprog on -host, but only read result from cross-answers.txt which is -passed by option --cross-answer - -part of old code: - args = Utils.to_list(kw.get('exec_args', [])) - proc = Utils.pproc.Popen([lastprog] + args, stdout=Utils.pproc.PIPE, stderr=Utils.pproc.PIPE) - -but on new version, exec_args is not used and cause do_configure -failed with Exec format error - -fixed by append cross anser related args to cmd - -Upstream-Status: Submitted [https://gitlab.com/samba-team/samba/merge_requests/211] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - third_party/waf/waflib/Tools/c_config.py | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/third_party/waf/waflib/Tools/c_config.py b/third_party/waf/waflib/Tools/c_config.py -index 7608215..767cf33 100644 ---- a/third_party/waf/waflib/Tools/c_config.py -+++ b/third_party/waf/waflib/Tools/c_config.py -@@ -660,20 +660,21 @@ class test_exec(Task.Task): - """ - color = 'PINK' - def run(self): -+ args = self.generator.bld.kw.get('exec_args', []) - if getattr(self.generator, 'rpath', None): - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()]) -- else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()]) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args) -+ else: -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args) - else: - env = self.env.env or {} - env.update(dict(os.environ)) - for var in ('LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH', 'PATH'): - env[var] = self.inputs[0].parent.abspath() + os.path.pathsep + env.get(var, '') - if getattr(self.generator, 'define_ret', False): -- self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.cmd_and_log([self.inputs[0].abspath()] + args, env=env) - else: -- self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()], env=env) -+ self.generator.bld.retval = self.generator.bld.exec_command([self.inputs[0].abspath()] + args, env=env) - - @feature('test_exec') - @after_method('apply_link') --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.5.4.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch index bffd0653b..a55d46bf7 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/options-1.5.4.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0002-ldb-Add-configure-options-for-packages.patch @@ -1,4 +1,4 @@ -From 0841c3ed69c388251c1aeae63f2c3813555a54f6 Mon Sep 17 00:00:00 2001 +From 100d16aaa6fe9a28a5ba77b2de2bde81a3fa3dac Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 1 Jul 2019 16:14:16 +0800 Subject: [PATCH] ldb: Add configure options for packages @@ -17,20 +17,22 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> upgrade to version 1.5.4 Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Rebase to 2.3.0 +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- - lib/replace/wscript | 92 +++++++++++++++++++++++++++++++++++++++++------------ - wscript | 8 +++++ - 2 files changed, 79 insertions(+), 21 deletions(-) + lib/replace/wscript | 90 +++++++++++++++++++++++++++++++++++---------- + wscript | 8 ++++ + 2 files changed, 78 insertions(+), 20 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript -index a7fd25d..ad26041 100644 +index 2c856b6..36b696d 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -24,6 +24,41 @@ def options(opt): - opt.BUILTIN_DEFAULT('NONE') +@@ -25,6 +25,41 @@ def options(opt): opt.PRIVATE_EXTENSION_DEFAULT('') opt.RECURSE('buildtools/wafsamba') -+ + + opt.add_option('--with-acl', + help=("Enable use of acl"), + action="store_true", dest='enable_acl') @@ -65,10 +67,11 @@ index a7fd25d..ad26041 100644 + opt.add_option('--without-libcap', + help=("Disable use of libcap"), + action="store_false", dest='enable_libcap', default=False) - ++ @Utils.run_once def configure(conf): -@@ -34,12 +69,25 @@ def configure(conf): + conf.RECURSE('buildtools/wafsamba') +@@ -35,12 +70,25 @@ def configure(conf): conf.DEFINE('HAVE_LIBREPLACE', 1) conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) @@ -77,10 +80,9 @@ index a7fd25d..ad26041 100644 + conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') + conf.CHECK_HEADERS('compat.h ctype.h dustat.h') conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') -- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('locale.h ndir.h pwd.h') - conf.CHECK_HEADERS('shadow.h sys/acl.h') - conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') -+ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') + conf.CHECK_HEADERS('shadow.h') + conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') + @@ -97,9 +99,9 @@ index a7fd25d..ad26041 100644 + conf.CHECK_HEADERS('sys/capability.h') + conf.CHECK_HEADERS('port.h') - conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h') conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') -@@ -110,8 +158,9 @@ def configure(conf): +@@ -121,8 +169,9 @@ def configure(conf): conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h') conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h') @@ -111,7 +113,7 @@ index a7fd25d..ad26041 100644 conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') -@@ -380,20 +429,21 @@ def configure(conf): +@@ -418,20 +467,21 @@ def configure(conf): strlcpy_in_bsd = False @@ -148,10 +150,10 @@ index a7fd25d..ad26041 100644 conf.CHECK_CODE(''' struct ucred cred; diff --git a/wscript b/wscript -index d3402a7..d4e0ce1 100644 +index bf6129b..722fdf6 100644 --- a/wscript +++ b/wscript -@@ -38,6 +38,14 @@ def options(opt): +@@ -39,6 +39,14 @@ def options(opt): help='disable new LMDB backend for LDB', action='store_true', dest='without_ldb_lmdb', default=False) @@ -167,5 +169,5 @@ index d3402a7..d4e0ce1 100644 def configure(conf): conf.RECURSE('lib/tdb') -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-avoid-openldap-unless-wanted.patch index b30afeee2..dd1246538 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/0003-avoid-openldap-unless-wanted.patch @@ -1,16 +1,20 @@ -From 63570b98ef63c91d8508478fcbe6b89c90c8398f Mon Sep 17 00:00:00 2001 +From 1f24231095a59debcf25d0e3309dc5d1056a7fad Mon Sep 17 00:00:00 2001 From: Jens Rehsack <rehsack@gmail.com> Date: Thu, 19 Nov 2015 20:45:56 +0100 +Subject: [PATCH] avoid openldap unless wanted +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- wscript | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wscript b/wscript -index e7c05d2..1633593 100644 +index 722fdf6..22700d5 100644 --- a/wscript +++ b/wscript -@@ -161,9 +161,7 @@ def configure(conf): +@@ -153,9 +153,7 @@ def configure(conf): if conf.env.standalone_ldb: conf.CHECK_XSLTPROC_MANPAGES() @@ -21,3 +25,6 @@ index e7c05d2..1633593 100644 # we don't want any libraries or modules to rely on runtime # resolution of symbols +-- +2.17.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/libldb-fix-musl-libc-unkown-type-error.patch b/meta-openembedded/meta-networking/recipes-support/libldb/libldb/libldb-fix-musl-libc-unkown-type-error.patch deleted file mode 100644 index c0e7e8907..000000000 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb/libldb-fix-musl-libc-unkown-type-error.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d90534469c5c43bf2a97e5698a5ddb4b7471f92a Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 24 Jul 2018 10:53:16 +0800 -Subject: [PATCH] libldb: fix musl libc unkoown type error - -tevent.h:1440:8: error: unknown type name 'pid_t'; did you mean 'div_t'? - pid_t *pid, - ^~~~~ - div_t - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - lib/tevent/tevent.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h -index aa6fe0d..2572696 100644 ---- a/lib/tevent/tevent.h -+++ b/lib/tevent/tevent.h -@@ -32,6 +32,8 @@ - #include <talloc.h> - #include <sys/time.h> - #include <stdbool.h> -+#include <sys/stat.h> -+#include <sys/types.h> - - struct tevent_context; - struct tevent_ops; --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.8.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb index 199db797a..3731c260b 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.5.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.3.0.bb @@ -7,11 +7,9 @@ DEPENDS += "libtdb libtalloc libtevent popt" RDEPENDS_pyldb += "python3" SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ - file://do-not-import-target-module-while-cross-compile.patch \ - file://libldb-fix-musl-libc-unkown-type-error.patch \ + file://0001-do-not-import-target-module-while-cross-compile.patch \ + file://0002-ldb-Add-configure-options-for-packages.patch \ file://libldb-fix-musl-libc-conflict-type-error.patch \ - file://0001-waf-add-support-of-cross_compile.patch \ - file://options-1.5.4.patch \ " PACKAGECONFIG ??= "\ @@ -27,14 +25,14 @@ PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" PACKAGECONFIG[lmdb] = ",--without-ldb-lmdb,lmdb," -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://0003-avoid-openldap-unless-wanted.patch', d)}" LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9adade \ file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[md5sum] = "d9b4bea8b48cd4c4d0c492e65881164b" -SRC_URI[sha256sum] = "ddf7f770643e0a0dda60f2818913f883caeed37fa1e8d6eda0dfe9588c1e3a83" +SRC_URI[md5sum] = "fe4b1f17f77e2ea52b4e1320d927844c" +SRC_URI[sha256sum] = "a4d308b3d0922ef01f3661a69ebc373e772374defa76cf0979ad21b21f91922d" inherit waf-samba diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch deleted file mode 100644 index e4aa8fda3..000000000 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0001-Replace-sigignore-with-signal-API.patch +++ /dev/null @@ -1,74 +0,0 @@ -From b9040acdba1245f8cdf5e94384830e3d04fde98a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 22 Jul 2020 21:32:14 -0700 -Subject: [PATCH] Replace sigignore with signal API - -sigignore has been deprecated in glibc 2.32+ [1] and eventually it will be -removed, therefore substitute it - -[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=02802fafcf6e11ea3f998f685035ffe568dfddeb - -Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/702] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 1 - - memcached.c | 16 ++-------------- - 2 files changed, 2 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ffc98b2..4567b30 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -630,7 +630,6 @@ AC_CHECK_FUNCS(mlockall) - AC_CHECK_FUNCS(getpagesizes) - AC_CHECK_FUNCS(sysconf) - AC_CHECK_FUNCS(memcntl) --AC_CHECK_FUNCS(sigignore) - AC_CHECK_FUNCS(clock_gettime) - AC_CHECK_FUNCS(preadv) - AC_CHECK_FUNCS(pread) -diff --git a/memcached.c b/memcached.c -index 9cb778d..91ced9e 100644 ---- a/memcached.c -+++ b/memcached.c -@@ -8292,18 +8292,6 @@ static void sig_usrhandler(const int sig) { - stop_main_loop = GRACE_STOP; - } - --#ifndef HAVE_SIGIGNORE --static int sigignore(int sig) { -- struct sigaction sa = { .sa_handler = SIG_IGN, .sa_flags = 0 }; -- -- if (sigemptyset(&sa.sa_mask) == -1 || sigaction(sig, &sa, 0) == -1) { -- return -1; -- } -- return 0; --} --#endif -- -- - /* - * On systems that supports multiple page sizes we may reduce the - * number of TLB-misses by using the biggest available page size -@@ -9996,7 +9984,7 @@ int main (int argc, char **argv) { - /* daemonize if requested */ - /* if we want to ensure our ability to dump core, don't chdir to / */ - if (do_daemonize) { -- if (sigignore(SIGHUP) == -1) { -+ if (signal(SIGHUP, SIG_IGN) == SIG_ERR) { - perror("Failed to ignore SIGHUP"); - } - if (daemonize(maxcore, settings.verbose) == -1) { -@@ -10146,7 +10134,7 @@ int main (int argc, char **argv) { - * ignore SIGPIPE signals; we can use errno == EPIPE if we - * need that information - */ -- if (sigignore(SIGPIPE) == -1) { -+ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) { - perror("failed to ignore SIGPIPE; sigaction"); - exit(EX_OSERR); - } --- -2.27.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch new file mode 100644 index 000000000..2979552a3 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached/0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch @@ -0,0 +1,48 @@ +From d6294e9166e4875a0572349aabcc5e51acbd2e3c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 4 Jun 2021 11:33:12 -0700 +Subject: [PATCH] stats_prefix.c: Check for NDEBUG before using total_written + variable + +When using NDEBUG assert macro is ineffective which is caught by latest +clang and reports that total_written is set but unused. Therefore check +for NDEBUG to make sure assert is used only when its effective + +Fixes +error: variable 'total_written' set but not used [-Werror,-Wunused-but-set-variable] + size_t size = 0, written = 0, total_written = 0; + ^ +Upstream-Status: Submitted [https://github.com/memcached/memcached/pull/792] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + stats_prefix.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/stats_prefix.c b/stats_prefix.c +index 62f0d04..d72e514 100644 +--- a/stats_prefix.c ++++ b/stats_prefix.c +@@ -127,8 +127,10 @@ char *stats_prefix_dump(int *length) { + PREFIX_STATS *pfs; + char *buf; + int i, pos; +- size_t size = 0, written = 0, total_written = 0; +- ++ size_t size = 0, written = 0; ++#ifndef NDEBUG ++ size_t total_written = 0; ++#endif + /* + * Figure out how big the buffer needs to be. This is the sum of the + * lengths of the prefixes themselves, plus the size of one copy of +@@ -154,8 +156,10 @@ char *stats_prefix_dump(int *length) { + pfs->prefix, pfs->num_gets, pfs->num_hits, + pfs->num_sets, pfs->num_deletes); + pos += written; ++#ifndef NDEBUG + total_written += written; + assert(total_written < size); ++#endif + } + } + diff --git a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb index 2eb24db9a..73e18a403 100644 --- a/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.6.bb +++ b/meta-openembedded/meta-networking/recipes-support/memcached/memcached_1.6.9.bb @@ -21,9 +21,9 @@ RDEPENDS_${PN} += "perl perl-module-posix perl-module-autoloader \ SRC_URI = "http://www.memcached.org/files/${BP}.tar.gz \ file://memcached-add-hugetlbfs-check.patch \ - file://0001-Replace-sigignore-with-signal-API.patch \ + file://0002-stats_prefix.c-Check-for-NDEBUG-before-using-total_w.patch \ " -SRC_URI[sha256sum] = "908f0eecfa559129c9e44edc46f02e73afe8faca355b4efc5c86d902fc3e32f7" +SRC_URI[sha256sum] = "d5a62ce377314dbffdb37c4467e7763e3abae376a16171e613cbe69956f092d1" # set the same COMPATIBLE_HOST as libhugetlbfs COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" diff --git a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb index 959cccf35..08b855262 100644 --- a/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/nghttp2/nghttp2_1.43.0.bb @@ -18,11 +18,7 @@ PACKAGECONFIG[manpages] = "" # examples are never installed, and don't need to be built in the # first place -EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON" - -do_install_append() { - rm ${D}${bindir}/deflatehd ${D}${bindir}/inflatehd -} +EXTRA_OECMAKE = "-DENABLE_EXAMPLES=OFF -DENABLE_APP=ON -DENABLE_HPACK_TOOLS=OFF" PACKAGES =+ "lib${PN} ${PN}-client ${PN}-proxy ${PN}-server" diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate index 17b64d133..be3bacfcd 100755 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpdate @@ -52,3 +52,8 @@ if [ -x /usr/bin/lockfile-create ] ; then fi ) & + +# wait for all subprocesses to finish +# this is required when using systemd service as ntpd will start before ntpdate finishes +# and results in a bind error (port 123) +wait diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb index 7e168825e..e668113c5 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p15.bb @@ -26,6 +26,9 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g SRC_URI[sha256sum] = "f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19" +# CVE-2016-9312 is only for windows. +CVE_CHECK_WHITELIST += "CVE-2016-9312" + inherit autotools update-rc.d useradd systemd pkgconfig # The ac_cv_header_readline_history is to stop ntpdc depending on either diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.2.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.3.bb index f82107dbe..7f4cc189c 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.5.3.bb @@ -2,7 +2,7 @@ SUMMARY = "A full-featured SSL VPN solution via tun device." HOMEPAGE = "https://openvpn.net/" SECTION = "net" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba" +LIC_FILES_CHKSUM = "file://COPYING;md5=377a495e6f12b2a3adcee797e59540b8" DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" inherit autotools systemd update-rc.d @@ -14,8 +14,11 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" -SRC_URI[md5sum] = "7643f135b49aee49df7d83c1f434dc4e" -SRC_URI[sha256sum] = "b9d295988b34e39964ac475b619c3585d667b36c350cf1adec19e5e3c843ba11" +SRC_URI[md5sum] = "08895fd1142f25fdd94a98315632e1bf" +SRC_URI[sha256sum] = "75f0044df449430555ca7b995a2b77ab24f2946fdc3668301b8edc23986a5f7e" + +# CVE-2020-7224 and CVE-2020-27569 are for Aviatrix OpenVPN client, not for openvpn. +CVE_CHECK_WHITELIST += "CVE-2020-7224 CVE-2020-27569" SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" SYSTEMD_AUTO_ENABLE = "disable" diff --git a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.3.bb index c178b4cda..8a704f6dc 100644 --- a/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.9.3.bb @@ -12,8 +12,7 @@ SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \ " -SRC_URI[md5sum] = "8918e6675e1be3784817641f07eadeb8" -SRC_URI[sha256sum] = "61c72f741edb2c1295a7b7ccce0317a104b3f9d39efd04c52cd05b01b55ab063" +SRC_URI[sha256sum] = "9325ab56a0a4e97e379401e1d942ce3e0d8b6372291350ab2caae0755862c6f7" UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.5.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb index 3100e4c2c..3062633bc 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb @@ -19,7 +19,7 @@ SRC_URI += " \ UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333" +SRC_URI[sha256sum] = "12a678208f8cb009e6b9d96026e41a6ef03c7ad086b9e1029f42053b249b4628" PE = "1" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb index de4fa1642..949b45ba8 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit setuptools3 SRC_URI = "git://github.com/sivel/speedtest-cli.git" -SRCREV = "c58ad3367bf27f4b4a4d5b1bca29ebd574731c5d" +SRCREV = "42e96b13dda2afabbcec2622612d13495a415caa" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 95e0cf7a8..9c1e485b3 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -61,6 +61,9 @@ PACKAGECONFIG[system-pcre] = "--use-system-pcre,,libpcre," MONGO_ARCH ?= "${HOST_ARCH}" MONGO_ARCH_powerpc64le = "ppc64le" +WIREDTIGER ?= "off" +WIREDTIGER_x86-64 = "on" +WIREDTIGER_aarch64 = "on" EXTRA_OESCONS = "PREFIX=${prefix} \ DESTDIR=${D} \ @@ -75,7 +78,7 @@ EXTRA_OESCONS = "PREFIX=${prefix} \ --use-system-zlib \ --nostrip \ --endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ - --wiredtiger=${@['off','on'][d.getVar('SITEINFO_BITS') != '32']} \ + --wiredtiger='${WIREDTIGER}' \ --separate-debug \ ${PACKAGECONFIG_CONFARGS}" diff --git a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb index 93e00e6e0..39ed3d107 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.6.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/mchehab/rasdaemon.git;branch=master \ file://rasdaemon.service \ file://init" -SRCREV = "32b978fcf73215c90ce7383580224e4295930ae7" +SRCREV = "aa96737648d867a3d73e4151d05b54bbab494605" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/licenses/MINPACK b/meta-openembedded/meta-oe/licenses/MINPACK new file mode 100644 index 000000000..132cc3f33 --- /dev/null +++ b/meta-openembedded/meta-oe/licenses/MINPACK @@ -0,0 +1,51 @@ +Minpack Copyright Notice (1999) University of Chicago. All rights reserved + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the +following conditions are met: + +1. Redistributions of source code must retain the above +copyright notice, this list of conditions and the following +disclaimer. + +2. Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following +disclaimer in the documentation and/or other materials +provided with the distribution. + +3. The end-user documentation included with the +redistribution, if any, must include the following +acknowledgment: + + "This product includes software developed by the + University of Chicago, as Operator of Argonne National + Laboratory. + +Alternately, this acknowledgment may appear in the software +itself, if and wherever such third-party acknowledgments +normally appear. + +4. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" +WITHOUT WARRANTY OF ANY KIND. THE COPYRIGHT HOLDER, THE +UNITED STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND +THEIR EMPLOYEES: (1) DISCLAIM ANY WARRANTIES, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE +OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY +OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR +USEFULNESS OF THE SOFTWARE, (3) DO NOT REPRESENT THAT USE OF +THE SOFTWARE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS, (4) +DO NOT WARRANT THAT THE SOFTWARE WILL FUNCTION +UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL +BE CORRECTED. + +5. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT +HOLDER, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF +ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, +INCIDENTAL, CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF +ANY KIND OR NATURE, INCLUDING BUT NOT LIMITED TO LOSS OF +PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER +SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT +(INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, +EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE +POSSIBILITY OF SUCH LOSS OR DAMAGES. diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.26.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.27.bb index 6f2464e5e..d18649db0 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.26.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.27.bb @@ -22,7 +22,7 @@ PACKAGECONFIG_NUMA_armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "267b164c372d57145880f365bab8d8a52bf8baa7" +SRCREV = "0313e938c9c8bb37d71dade239f1f5326677b079" SRC_URI = "git://git.kernel.dk/fio.git \ " diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch index d5622ed2c..48069ff14 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch @@ -10,20 +10,24 @@ Only fixed linux targets for now Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending +--- + current/makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) - ---- current/makefile.org 2016-12-06 02:19:10.367911020 +0000 -+++ current/makefile 2016-12-06 02:21:38.767911020 +0000 -@@ -167,7 +167,7 @@ +diff --git current/makefile current/makefile +index 3a54701..7071427 100644 +--- current/makefile ++++ current/makefile +@@ -171,7 +171,7 @@ hpux_no_ansi: iozone_hpux_no.o libbif.o # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # -linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o +linux: iozone_linux.o fileop_linux.o pit_server.o - $(CC) -O3 $(LDFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \ + $(CC) -O3 $(CFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \ -lrt -o iozone - $(CC) -O3 -Dlinux fileop_linux.o -o fileop -@@ -176,7 +176,7 @@ + $(CC) -O3 $(CFLAGS) -Dlinux fileop_linux.o -o fileop +@@ -180,7 +180,7 @@ linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o # # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O # @@ -32,7 +36,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-powerpc.o libasync.o \ libbif.o -lpthread -lrt -o iozone $(CC) -O3 -Dlinux fileop_linux-ppc.o -o fileop -@@ -184,7 +184,7 @@ +@@ -188,7 +188,7 @@ linux-powerpc: iozone_linux-powerpc.o libbif.o libasync.o fileop_linux-ppc.o pi # # GNU 'C' compiler Linux build for sparc chip with threads, largefiles, async I/O # @@ -41,7 +45,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-sparc.o libasync.o libbif.o \ -lpthread -lrt -o iozone $(CC) -O3 -Dlinux fileop_linux.o -o fileop -@@ -193,7 +193,7 @@ +@@ -197,7 +197,7 @@ linux-sparc: iozone_linux-sparc.o libbif.o libasync.o fileop_linux.o pit_server # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # @@ -50,7 +54,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-ia64.o libbif.o libasync.o \ -lrt -lpthread -o iozone $(CC) -O3 -Dlinux fileop_linux-ia64.o -o fileop -@@ -202,7 +202,7 @@ +@@ -206,7 +206,7 @@ linux-ia64: iozone_linux-ia64.o libbif.o libasync.o fileop_linux-ia64.o pit_ser # # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O # @@ -59,7 +63,7 @@ Upstream-Status: Pending $(CC) -O3 -Dunix -DHAVE_ANSIC_C -DSHARED_MEM -DASYNC_IO \ -D_LARGEFILE64_SOURCE -Dlinux \ iozone_linux-powerpc64.o libasync.o libbif.o -lpthread \ -@@ -213,7 +213,7 @@ +@@ -217,7 +217,7 @@ linux-powerpc64: iozone_linux-powerpc64.o libbif.o libasync.o fileop_linux-ppc6 # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # @@ -68,7 +72,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-arm.o libbif.o libasync.o \ -lrt -lpthread -o iozone $(CC) -O3 -Dlinux fileop_linux-arm.o -o fileop -@@ -222,7 +222,7 @@ +@@ -249,7 +249,7 @@ endif # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # @@ -77,7 +81,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-AMD64.o libbif.o libasync.o \ -lrt -lpthread -o iozone $(CC) -O3 -Dlinux fileop_linux-AMD64.o -o fileop -@@ -231,7 +231,7 @@ +@@ -258,7 +258,7 @@ linux-AMD64: iozone_linux-AMD64.o libbif.o libasync.o fileop_linux-AMD64.o pit_ # # GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O # @@ -86,7 +90,7 @@ Upstream-Status: Pending $(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390.o \ libbif.o libasync.o -o iozone $(CC) -O3 -Dlinux fileop_linux-s390.o -o fileop -@@ -240,7 +240,7 @@ +@@ -267,7 +267,7 @@ linux-S390: iozone_linux-s390.o libbif.o libasync.o fileop_linux-s390.o pit_serv # # GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O # @@ -95,3 +99,6 @@ Upstream-Status: Pending $(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390x.o \ libbif.o libasync.o -o iozone $(CC) -O3 -Dlinux fileop_linux-s390x.o -o fileop +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_492.bb index 1d2e53a31..a68a27c97 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_492.bb @@ -11,8 +11,8 @@ SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://0001-let-system-headers-provide-pread64.patch \ file://copyright.txt \ " -SRC_URI[md5sum] = "95cb73dfdd58a0dfa42804f016dbb83c" -SRC_URI[sha256sum] = "5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145ad4fed" +SRC_URI[md5sum] = "228f54482c01d1c04c571a9414cd20e5" +SRC_URI[sha256sum] = "322981e168f32bd39f54772b82b2906d598d958c37e954e75742e71baf58bb9b" UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench/0001-build-Do-not-override-ldflags-from-environment.patch b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench/0001-build-Do-not-override-ldflags-from-environment.patch new file mode 100644 index 000000000..060b418fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench/0001-build-Do-not-override-ldflags-from-environment.patch @@ -0,0 +1,30 @@ +From 419dac71dd524a39ad2333e91334b4650e277a78 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 25 Jun 2021 09:43:00 -0700 +Subject: [PATCH] build: Do not override ldflags from environment + +bitbake passed LDFLAGS contain important information e.g. which compiler +runtime to link etc. Therefore append -static to LDFLAGS instead + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index efda5c0..a867876 100644 +--- a/Makefile ++++ b/Makefile +@@ -3,7 +3,7 @@ SRCS = $(sort $(wildcard *.c)) + OBJS = $(SRCS:.c=.o) + + CFLAGS = -Os -D_XOPEN_SOURCE=700 +-LDFLAGS = -static ++LDFLAGS += -static + LIBS = -lpthread -lrt -lpthread + + +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb index e81389431..f16bd99d5 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb @@ -10,6 +10,7 @@ SRCREV = "b6b2ce5f9f87a09b14499cb00c600c601f022634" PV = "20110206+git${SRCPV}" SRC_URI = "git://git.musl-libc.org/libc-bench \ + file://0001-build-Do-not-override-ldflags-from-environment.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.1.bb index 1a041101b..1628a0519 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.1.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \ file://Makefile.patch \ " -SRC_URI[md5sum] = "674a8a88ff54bdb229ca4148218a41f1" -SRC_URI[sha256sum] = "8ed52b0d06d4aeb61954994146e2a5b2d20448a8f3ce3ee995120e6dbde2ae37" +SRC_URI[md5sum] = "1bc22c01e987d6a67fac39dc5656a4d3" +SRC_URI[sha256sum] = "1c5fc2382576c084b314cfd334d127a66c20bd63892cac9f445bc1d8b4ca5a47" do_compile () { echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc diff --git a/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch new file mode 100644 index 000000000..d628e81b5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch @@ -0,0 +1,40 @@ +From c1ebf893e32a0a77e820484d48a903523fef7c1b Mon Sep 17 00:00:00 2001 +From: Vasily Tarasov <tarasov@vasily.name> +Date: Fri, 10 Jun 2016 14:33:48 -0400 +Subject: [PATCH] Adding volatile modifier to tmp variable in memory test + +Issue explanation: + +./sysbench/sysbench --test=memory --num-threads=16 \ + --memory-block-size=268435456 \ + --memory-total-size=137438953472 \ + --memory-oper=read \ + --memory-access-mode=seq \ + --memory-scope=local run + +Without this commit the time to run the above command is 0.0004 seconds. +With this commit the time is greater than 3 seconds. Essentially, +without the volatile modifier, the compiler optimizes read access so +that no real access happens. + +Upstream-Status: Backport [part of v1.0.0 https://github.com/akopytov/sysbench/commit/8753cb93be4c0b81a20b704ced91e7a422da52b1] + +(cherry picked from commit 8753cb93be4c0b81a20b704ced91e7a422da52b1) +Signed-off-by: massimo toscanelli <massimo.toscanelli@leica-geosystems.com> +--- + sysbench/tests/memory/sb_memory.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysbench/tests/memory/sb_memory.c b/sysbench/tests/memory/sb_memory.c +index 2e8998f..7d22bb9 100644 +--- a/sysbench/tests/memory/sb_memory.c ++++ b/sysbench/tests/memory/sb_memory.c +@@ -244,7 +244,7 @@ sb_request_t memory_get_request(int tid) + int memory_execute_request(sb_request_t *sb_req, int thread_id) + { + sb_mem_request_t *mem_req = &sb_req->u.mem_request; +- int tmp = 0; ++ volatile int tmp = 0; + int idx; + int *buf, *end; + log_msg_t msg; diff --git a/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb index 708c71f4f..d1725dddd 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb @@ -8,7 +8,9 @@ inherit autotools # The project has moved from Sourceforge to Launchpad, to Github. Use the source tarball from # Launchpad until the next release is available from Github. -SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/${BPN}_${PV}.orig.tar.gz" +SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/${BPN}_${PV}.orig.tar.gz \ + file://0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch \ + " SRC_URI[md5sum] = "3a6d54fdd3fe002328e4458206392b9d" SRC_URI[sha256sum] = "83fa7464193e012c91254e595a89894d8e35b4a38324b52a5974777e3823ea9e" diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch new file mode 100644 index 000000000..f3316aa26 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom/0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch @@ -0,0 +1,52 @@ +From 3334dd4e9fc34c79c3925c3c24869939d8955f21 Mon Sep 17 00:00:00 2001 +From: Rosen Penev <rosenp@gmail.com> +Date: Sat, 18 Jul 2020 12:16:00 -0700 +Subject: [PATCH] hwaccess: use __asm__ as is done elsewhere + +Fixes compilation under powerpc platform. Made the change for the SPARC +platform as well. + +../hwaccess.c: In function 'sync_primitive': +../hwaccess.c:74:2: warning: implicit declaration of function 'asm' + [-Wimplicit-function-declaration] + 74 | asm("eieio" : : : "memory"); + | ^~~ +../hwaccess.c:74:13: error: expected ')' before ':' token + 74 | asm("eieio" : : : "memory"); + +Upstream-Status: Submitted [https://github.com/flashrom/flashrom/pull/155] +Signed-off-by: Rosen Penev <rosenp@gmail.com> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + hwaccess.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/hwaccess.c b/hwaccess.c +index 48ccb34..2a39989 100644 +--- a/hwaccess.c ++++ b/hwaccess.c +@@ -71,18 +71,18 @@ static inline void sync_primitive(void) + * See also https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/memory-barriers.txt + */ + #if IS_PPC // cf. http://lxr.free-electrons.com/source/arch/powerpc/include/asm/barrier.h +- asm("eieio" : : : "memory"); ++ __asm__ ("eieio" : : : "memory"); + #elif IS_SPARC + #if defined(__sparc_v9__) || defined(__sparcv9) + /* Sparc V9 CPUs support three different memory orderings that range from x86-like TSO to PowerPC-like + * RMO. The modes can be switched at runtime thus to make sure we maintain the right order of access we + * use the strongest hardware memory barriers that exist on Sparc V9. */ +- asm volatile ("membar #Sync" ::: "memory"); ++ __asm__ volatile ("membar #Sync" ::: "memory"); + #elif defined(__sparc_v8__) || defined(__sparcv8) + /* On SPARC V8 there is no RMO just PSO and that does not apply to I/O accesses... but if V8 code is run + * on V9 CPUs it might apply... or not... we issue a write barrier anyway. That's the most suitable + * operation in the V8 instruction set anyway. If you know better then please tell us. */ +- asm volatile ("stbar"); ++ __asm__ volatile ("stbar"); + #else + #error Unknown and/or unsupported SPARC instruction set version detected. + #endif +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb index 145a3cad0..1d0613214 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb @@ -7,6 +7,7 @@ SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ file://0001-typecast-enum-conversions-explicitly.patch \ file://meson-fixes.patch \ file://0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch \ + file://0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch \ " SRC_URI[md5sum] = "7f8e4b87087eb12ecee0fcc5445b4956" SRC_URI[sha256sum] = "e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.7.bb index 271a66875..f2a2a5fc8 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.2.7.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a0fd36908af843bcee10cb6dfc47fa67 \ file://COPYING;md5=bae3019b4c6dc4138c217864bd04331f \ " -SRCREV = "ed307629e067a9ef55d79beec9c9f67b86efbaaf" +SRCREV = "35c82812f2d6bb41686d49987e052b75e1836afd" SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=2.2.x" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.14.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.15.bb index dbcc319dc..9a5256f94 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_1.15.bb @@ -8,7 +8,7 @@ DEPENDS = "ell" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ " -SRC_URI[sha256sum] = "21be6ad59ba666ba1e50e01889d647472b9b2f96f4941123db036fd33c257f0b" +SRC_URI[sha256sum] = "a7ab8e80592da5cb1a8b651b6d41e87e4507a3f07e04246e05bca89c547af659" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.8.bb index 6fe6a2e4f..6a8d2405e 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.24.8.bb @@ -12,6 +12,4 @@ DEPENDS = "glib-2.0 glib-2.0-native libgudev" inherit autotools pkgconfig bash-completion gobject-introspection SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" - -SRC_URI[md5sum] = "38d228548eae3ee144e19a42b028eab0" -SRC_URI[sha256sum] = "760465caaa1ccd699c14290e9791da456d5300dd11ebf4c1486151033e875dfd" +SRC_URI[sha256sum] = "02590736163fff10e5732191fccc1b9920969616ddc59613a003052a116a3c25" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.6.bb index c6422c392..f062d8631 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.28.6.bb @@ -14,7 +14,7 @@ inherit autotools pkgconfig bash-completion gobject-introspection SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "3b14cd2ab5221a7adbb39fed16ef697538ea1c79308821ad2d19b505e1daaea0" +SRC_URI[sha256sum] = "cbb890893de1dee06ea5ebdac2d22f0469314a6f93f15f61f2f1206a1c9ae5fd" PACKAGECONFIG ??= "udev mbim" PACKAGECONFIG[udev] = ",--without-udev,libgudev" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb index 89c98fec0..685aebee5 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libwebsockets/libwebsockets_4.2.1.bb @@ -1,12 +1,12 @@ SUMMARY = "Canonical libwebsockets.org websocket library" HOMEPAGE = "https://libwebsockets.org/" -LICENSE = "MIT & Zlib & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c47b078124308a4e1354e8d59f606b7" +LICENSE = "MIT & Zlib & BSD-3-Clause & Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c8bea43a2eb5d713c338819a0be07797" DEPENDS = "zlib" S = "${WORKDIR}/git" -SRCREV = "1367c11e1ee44d9e19daa50e1d015365bae17354" +SRCREV = "8a580b59b23d204ca72028370e97a8f6aa0c9202" SRC_URI = "git://github.com/warmcat/libwebsockets.git;protocol=https;branch=v4.2-stable" UPSTREAM_CHECK_URI = "https://github.com/warmcat/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb index c8527260b..a0f894a4d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_3.1.bb @@ -1,4 +1,5 @@ DESCRIPTION = "Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux" +HOMEPAGE = "http://linuxptp.sourceforge.net/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" @@ -7,17 +8,25 @@ SRC_URI = "http://sourceforge.net/projects/linuxptp/files/v${PV}/linuxptp-${PV}. file://Use-cross-cpp-in-incdefs.patch \ " +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/linuxptp/files/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/" + SRC_URI[md5sum] = "2264cb69c9af947028835c12c89a7572" SRC_URI[sha256sum] = "f58f5b11cf14dc7c4f7c9efdfb27190e43d02cf20c3525f6639edac10528ce7d" -EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}'" +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} EXTRA_CFLAGS='${CFLAGS}' mandir=${mandir}" export KBUILD_OUTPUT="${RECIPE_SYSROOT}" -do_install () { - install -d ${D}/${bindir} - install -p ${S}/ptp4l ${D}/${bindir} - install -p ${S}/pmc ${D}/${bindir} - install -p ${S}/phc2sys ${D}/${bindir} - install -p ${S}/hwstamp_ctl ${D}/${bindir} +do_install() { + oe_runmake install DESTDIR=${D} prefix=${prefix} + + # Install example configs from source tree + install -d ${D}${docdir}/${PN} + cp -R --no-dereference --preserve=mode,links ${S}/configs ${D}${docdir}/${PN} } + +PACKAGES =+ "${PN}-configs" + +FILES_${PN}-configs = "${docdir}" +FILES_${PN}-doc = "${mandir}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb index f8e8aa1d4..acfa113ed 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.16.8.bb @@ -12,7 +12,7 @@ inherit gnomebase gettext systemd vala gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" -SRC_URI[sha256sum] = "167e60b26fa05887f87a0b3fb54143d7845e6e4d8c2f2dd93afac059f41e7edf" +SRC_URI[sha256sum] = "21fdfaf94171261ad9d99771894f5ade4bc39ef3d1ff1d421054d14713e97880" S = "${WORKDIR}/ModemManager-${PV}" PACKAGECONFIG ??= "mbim qmi \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb index e6a4bc4c4..75584498a 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377da UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases" -inherit cmake +inherit cmake pkgconfig PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" @@ -23,10 +23,12 @@ FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" RDEPENDS_lib${BPN}-dev = "zeromq-dev" PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4" -PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux" -PACKAGECONFIG[curl] = ",-DCMAKE_DISABLE_FIND_PACKAGE_libcurl=TRUE,curl" -PACKAGECONFIG[systemd] = ",-DCMAKE_DISABLE_FIND_PACKAGE_systemd=TRUE,systemd" +PACKAGECONFIG[curl] = "-DCZMQ_WITH_LIBCURL=ON,-DCZMQ_WITH_LIBCURL=OFF,curl" +PACKAGECONFIG[httpd] = "-DCZMQ_WITH_LIBMICROHTTPD=ON,-DCZMQ_WITH_LIBMICROHTTPD=OFF,libmicrohttpd" +PACKAGECONFIG[lz4] = "-DCZMQ_WITH_LZ4=ON,-DCZMQ_WITH_LZ4=OFF,lz4" +PACKAGECONFIG[nss] = "-DCZMQ_WITH_NSS=ON,-DCZMQ_WITH_NSS=OFF,nss" +PACKAGECONFIG[systemd] = "-DCZMQ_WITH_SYSTEMD=ON,-DCZMQ_WITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[uuid] = "-DCZMQ_WITH_UUID=ON,-DCZMQ_WITH_UUID=OFF,util-linux" BBCLASSEXTEND = "nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_28.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_29.bb index a35f5c64c..8fcdb8c66 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_28.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_29.bb @@ -7,15 +7,15 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" -SRC_URI[sha256sum] = "abb8b54434faeeb6bf59a70ebf0732e851a50bd922995ba5928e8c28c18b05ea" +SRC_URI[sha256sum] = "4eca425db52b7ab1027153e93fea9b3f11759db9e93ffbf88759b73ddfb8026a" UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" inherit meson pkgconfig systemd features_check DEPENDS = "expat systemd" -DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" -DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit', '', d)}" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux (>= 3.2)', '', d)}" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit (>= 3.0)', '', d)}" RDEPENDS_${PN} += "dbus-common" @@ -29,5 +29,4 @@ FILES_${PN} += "${nonarch_libdir}/systemd/catalog" EXTRA_OEMESON += " -Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" EXTRA_OEMESON += " -Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" -EXTRA_OEMESON += " -Dlinux-4-17=true" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb index 75eea4e58..a40561138 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.62.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.1.bb @@ -6,23 +6,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "mm-common glib-2.0 libsigc++-2.0 glib-2.0-native" + +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI += " \ - file://remove-examples.patch \ -" -SRC_URI[archive.md5sum] = "7da228e3f0c6a10024b9a7708c53691e" -SRC_URI[archive.sha256sum] = "36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe" +SRC_URI[archive.sha256sum] = "69bd6b5327716ca2f511ab580a969fd7bf0cd2c24ce15e1d0e530592d3ff209c" do_install_append() { - install -d ${D}${datadir}/glibmm-2.4 - install -d ${D}${datadir}/aclocal - - install -m 0644 glib/glibmmconfig.h ${D}${datadir}/glibmm-2.4/ - install -m 0644 scripts/glibmm_check_perl.m4 ${D}${datadir}/aclocal/ || true - for i in generate_wrap_init.pl gmmproc; do sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.4/proc/$i done @@ -32,4 +25,3 @@ FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" RDEPENDS_${PN}-dev = "perl" -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.6.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.7.bb index f4c5aa396..de1aa4ea3 100644 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.6.bb +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.10.7.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" DEPENDS = "mm-common" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-${PV}.tar.xz" -SRC_URI[sha256sum] = "dda176dc4681bda9d5a2ac1bc55273bdd381662b7a6d49e918267d13e8774e1b" +SRC_URI[sha256sum] = "d082a2ce72c750f66b1a415abe3e852df2eae1e8af53010f4ac2ea261a478832" S = "${WORKDIR}/libsigc++-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb index 0148c0c2e..4ecfb3d44 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb @@ -6,8 +6,8 @@ SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -PV = "2.0.13+git${SRCPV}" -SRCREV = "b230a96b61e9e35b8da1565893d74380646e03c8" +PV = "2.0.15+git${SRCPV}" +SRCREV = "f7237f3799009d856935e1eecfd7c9301fe522b4" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index d0665f258..6db7f1e38 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -245,6 +245,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ lemon \ flatbuffers \ heaptrack \ + libparse-yapp-perl \ libubox \ ltrace \ lua \ @@ -355,6 +356,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ libleak \ libuio \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libwmf", "", d)} \ + libyang \ lprng \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "icewm", "", d)} \ md5deep \ @@ -425,6 +427,7 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ wxwidgets \ zlog \ zstd \ + zsync-curl \ redis-plus-plus \ " RDEPENDS_packagegroup-meta-oe-extended_append_libc-musl = " libexecinfo" @@ -437,8 +440,8 @@ RDEPENDS_packagegroup-meta-oe-extended_remove_mips = "sysdig" RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc = "upm mraa minifi-cpp" RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc64 = "upm mraa minifi-cpp" RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc64le = "upm mraa" -RDEPENDS_packagegroup-meta-oe-extended_remove_riscv64 = "upm libleak mraa sysdig tiptop" -RDEPENDS_packagegroup-meta-oe-extended_remove_riscv32 = "upm libleak mraa sysdig tiptop" +RDEPENDS_packagegroup-meta-oe-extended_remove_riscv64 = "upm libleak libyang mraa sysdig tiptop" +RDEPENDS_packagegroup-meta-oe-extended_remove_riscv32 = "upm libleak libyang mraa sysdig tiptop" RDEPENDS_packagegroup-meta-oe-extended-python2 ="\ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'openlmi-tools', '', d), "", d)} \ @@ -933,6 +936,7 @@ RDEPENDS_packagegroup-meta-oe-test ="\ bats \ cmocka \ cppunit \ + cpputest \ cukinia \ cunit \ cxxtest \ diff --git a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.4.bb b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.5.bb index cc98b9ec0..90a0ad6c7 100644 --- a/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.8.5.bb @@ -9,7 +9,7 @@ inherit cml1 update-alternatives SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ " -SRC_URI[sha256sum] = "cb2a565a8d30015d08d73628795dca51a85b99b149aeabbbecd9e8dbdbd8fddc" +SRC_URI[sha256sum] = "bfd230c187726347f7e31a1fc5841705871dfe4f3cbc6628f512b54e57360949" SECTION = "base" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.5.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb index 0da9a26e8..9e83b90ea 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.3.6.bb @@ -16,13 +16,9 @@ DEPENDS = " \ util-linux-libuuid \ " -RDEPENDS_${PN} = " \ - libdevmapper \ -" - SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[md5sum] = "408620e0df577ec04108ec0bc2b91dee" -SRC_URI[sha256sum] = "ced9946f444d132536daf92fc8aca4277638a3c2d96e20540b2bae4d36fd70c1" +SRC_URI[md5sum] = "504d1ab22cbc4d1a59a8d8c7ee5ed3bf" +SRC_URI[sha256sum] = "b296b7a21ea576c2b180611ccb19d06aec8dddaedf7c704b0c6a81210c25635f" inherit autotools gettext pkgconfig @@ -71,14 +67,6 @@ PACKAGECONFIG[kernel] = "--with-crypto_backend=kernel" PACKAGECONFIG[nettle] = "--with-crypto_backend=nettle,,nettle" PACKAGECONFIG[luks2] = "--with-default-luks-format=LUKS2,--with-default-luks-format=LUKS1" -RRECOMMENDS_${PN} = "kernel-module-aes-generic \ - kernel-module-dm-crypt \ - kernel-module-md5 \ - kernel-module-cbc \ - kernel-module-sha256-generic \ - kernel-module-xts \ -" - EXTRA_OECONF = "--enable-static" # Building without largefile is not supported by upstream EXTRA_OECONF += "--enable-largefile" @@ -89,4 +77,17 @@ EXTRA_OECONF += "--disable-libargon2" FILES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES','systemd','${exec_prefix}/lib/tmpfiles.d/cryptsetup.conf', '', d)}" +RDEPENDS_${PN} = " \ + libdevmapper \ +" + +RRECOMMENDS_${PN}_class-target = " \ + kernel-module-aes-generic \ + kernel-module-dm-crypt \ + kernel-module-md5 \ + kernel-module-cbc \ + kernel-module-sha256-generic \ + kernel-module-xts \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb index 9b1ba4f2e..a39aeb617 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/fsverity-utils/fsverity-utils_1.4.bb @@ -9,7 +9,7 @@ SECTION = "console" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=bc974d217b525ea216a336adb73e1220" -SRCREV = "a92b1a54b003879322c044adf0ae3ea3e95e7348" +SRCREV = "9e082897d61a2449657651aa5a0931aca31428fd" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/fsverity-utils.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb index 73b2a0980..73b2a0980 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.10.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.5.11.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 25e630a16..5787ae4bd 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -12,7 +12,6 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://mysql-systemd-start \ file://configure.cmake-fix-valgrind.patch \ file://support-files-CMakeLists.txt-fix-do_populate_sysroot.patch \ - file://sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://0001-disable-ucontext-on-musl.patch \ file://c11_atomics.patch \ file://clang_version_header_conflict.patch \ @@ -21,12 +20,12 @@ SRC_URI = "https://downloads.mariadb.org/interstitial/${BP}/source/${BP}.tar.gz file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \ file://sys_futex.patch \ - file://cross-compiling.patch \ file://ssize_t.patch \ + file://mm_malloc.patch \ " SRC_URI_append_libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb" +SRC_URI[sha256sum] = "761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -37,15 +36,15 @@ BINCONFIG_GLOB = "mysql_config" inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ - ${PN}-server:${bindir}/mariadb-install-db" + ${PN}-setupdb:${bindir}/mariadb-install-db" INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_NAME_${PN}-server = "mysqld" INITSCRIPT_PARAMS_${PN}-server ?= "start 45 5 . stop 45 0 6 1 ." -USERADD_PACKAGES = "${PN}-server" -USERADD_PARAM_${PN}-server = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql" -GROUPADD_PARAM_${PN}-server = "--system mysql" +USERADD_PACKAGES = "${PN}-setupdb" +USERADD_PARAM_${PN}-setupdb = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql" +GROUPADD_PARAM_${PN}-setupdb = "--system mysql" INITSCRIPT_NAME_${PN}-setupdb = "install_db" INITSCRIPT_PARAMS_${PN}-setupdb ?= "defaults 44 44" @@ -57,16 +56,18 @@ SYSTEMD_AUTO_ENABLE_${PN}-server ?= "disable" SYSTEMD_SERVICE_${PN}-setupdb = "install_db.service" SYSTEMD_AUTO_ENABLE_${PN}-setupdb ?= "enable" ALLOW_EMPTY_${PN}-setupdb ?= "1" -FILES_${PN}-setupdb = "${sysconfdir}/init.d/install_db" - -EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR_NATIVE}/gen_lex_hash'" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} setupdb" +FILES_${PN}-setupdb = "${sysconfdir}/init.d/install_db \ + ${bindir}/mariadb-install-db \ + ${bindir}/my_print_defaults \ + ${bindir}/mysql_install_db \ + ${bindir}/mysql-systemd-start \ + " + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" PACKAGECONFIG_class-native = "" PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" PACKAGECONFIG[krb5] = ", ,krb5" -PACKAGECONFIG[setupdb] = ", ,,${PN}-setupdb" PACKAGECONFIG[zstd] = "-DWITH_ROCKSDB_ZSTD=ON,-DWITH_ROCKSDB_ZSTD=OFF,zstd" # MariaDB doesn't link properly with gold @@ -94,6 +95,8 @@ EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ -DCAT_EXECUTABLE=`which cat` \ -DCMAKE_AR:FILEPATH=${AR}" +EXTRA_OECMAKE_prepend_class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper " + # With Ninja it fails with: # make: *** No rule to make target `install'. Stop. OECMAKE_GENERATOR = "Unix Makefiles" @@ -116,12 +119,18 @@ do_generate_toolchain_file_append_class-native () { sed -i "/set( CMAKE_SYSTEM_PROCESSOR/d" ${WORKDIR}/toolchain.cmake } -do_compile_prepend_class-target () { - # These need to be in-tree or make will think they need to be built, - # and since we're cross-compiling that is disabled - cp ${STAGING_BINDIR_NATIVE}/comp_err ${S}/extra - cp ${STAGING_BINDIR_NATIVE}/comp_sql ${S}/scripts +do_configure_prepend_class-target () { + # Write out a qemu wrapper that will be used by cmake + # so that it can run target helper binaries through that. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} +do_compile_prepend_class-target () { if [ "${@bb.utils.contains('PACKAGECONFIG', 'krb5', 'yes', 'no', d)}" = "no" ]; then if ! [ -e ${B}/include/openssl/kssl.h ] ; then mkdir -p ${B}/include/openssl @@ -131,11 +140,6 @@ do_compile_prepend_class-target () { echo "#endif" >>${B}/include/openssl/kssl.h fi fi - # workaround to handle out-of-source build from source package - yacc_files="sql_yacc.hh sql_yacc.cc sql_yacc_ora.hh sql_yacc_ora.cc" - for yacc_file in ${yacc_files}; do - cp ${S}/sql/${yacc_file} ${B}/sql/${yacc_file} - done } SYSROOT_PREPROCESS_FUNCS += "mariadb_sysroot_preprocess" @@ -185,10 +189,10 @@ do_install() { fi } -PACKAGES = "${PN}-dbg ${PN} \ +PACKAGES = "${PN}-dbg ${PN}-setupdb ${PN} \ libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev \ libmysqlclient libmysqlclient-dev libmysqlclient-staticdev \ - libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-setupdb ${PN}-leftovers" + libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-leftovers" CONFFILES_${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf" CONFFILES_${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf" CONFFILES_libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf" @@ -291,7 +295,6 @@ FILES_${PN}-server = "\ ${bindir}/mysql_convert_table_format \ ${bindir}/mariadb-convert-table-format \ ${bindir}/mysql_install_db \ - ${bindir}/mariadb-install-db \ ${bindir}/mysql_secure_installation \ ${bindir}/mariadb-secure-installation \ ${bindir}/mysql_setpermission \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch deleted file mode 100644 index 0f4815b18..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/cross-compiling.patch +++ /dev/null @@ -1,25 +0,0 @@ -This is not needed for OE builds - -building failed since native does not generate import_executables.cmake -In fact, our building system will export the needed commands - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -392,11 +392,6 @@ CHECK_PCRE() - - CHECK_SYSTEMD() - --IF(CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR) -- SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") -- INCLUDE(${IMPORT_EXECUTABLES}) --ENDIF() -- - # - # Setup maintainer mode options. Platform checks are - # not run with the warning options as to not perturb fragile checks diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch new file mode 100644 index 000000000..347fcd851 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch @@ -0,0 +1,11 @@ +--- a/storage/rocksdb/rocksdb/port/jemalloc_helper.h ++++ b/storage/rocksdb/rocksdb/port/jemalloc_helper.h +@@ -5,7 +5,7 @@ + + #pragma once + +-#if defined(__clang__) ++#if defined(__clang__) && defined(__GLIBC__) + // glibc's `posix_memalign()` declaration specifies `throw()` while clang's + // declaration does not. There is a hack in clang to make its re-declaration + // compatible with glibc's if they are declared consecutively. That hack breaks diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch index d082d424b..d6e53c29e 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch @@ -36,7 +36,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + __builtin_ppc_get_timebase(); #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) /* Mainly, prevent the compiler from optimizing away delay loops */ - __asm__ __volatile__ ("isb":::"memory"); + #ifdef _aarch64_ --- a/storage/tokudb/PerconaFT/portability/toku_time.h +++ b/storage/tokudb/PerconaFT/portability/toku_time.h @@ -124,7 +124,7 @@ static inline tokutime_t toku_time_now(v diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch deleted file mode 100644 index 4cb044339..000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch +++ /dev/null @@ -1,67 +0,0 @@ -From cfce1491827e5a581878b5e166bf4d30e6d90e07 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Thu, 23 Jul 2020 00:08:16 -0700 -Subject: [PATCH] sql/CMakeLists.txt: fix gen_lex_hash not found - -Fix the below do_compile issue in cross-compiling env. -| make[2]: *** No rule to make target '/build/tmp/work/aarch64-poky-linux/mariadb/10.3.13-r0/mariadb-10.3.13/sql/gen_lex_hash', needed by 'sql/lex_hash.h'. Stop. -| make[2]: *** No rule to make target '/build/tmp/work/aarch64-poky-linux/mariadb/10.3.13-r0/mariadb-10.3.13/sql/gen_lex_token', needed by 'sql/lex_token.h'. Stop. - -Upstream-Status: Inappropriate [oe build specific] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - sql/CMakeLists.txt | 30 ++++++++++++++++++++---------- - 1 file changed, 20 insertions(+), 10 deletions(-) - -diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt -index 0dc3caa..616017b 100644 ---- a/sql/CMakeLists.txt -+++ b/sql/CMakeLists.txt -@@ -52,11 +52,16 @@ ${CMAKE_BINARY_DIR}/sql - ${CMAKE_SOURCE_DIR}/tpool - ) - --ADD_CUSTOM_COMMAND( -- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h -- COMMAND gen_lex_token > lex_token.h -- DEPENDS gen_lex_token --) -+IF(NOT CMAKE_CROSSCOMPILING) -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h -+ COMMAND gen_lex_token > lex_token.h -+ DEPENDS gen_lex_token) -+ELSE() -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_token.h -+ COMMAND gen_lex_token > lex_token.h) -+ENDIF() - - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sql_yacc_ora.yy -@@ -345,11 +350,16 @@ IF(NOT CMAKE_CROSSCOMPILING) - ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) - ENDIF() - --ADD_CUSTOM_COMMAND( -- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h -- COMMAND gen_lex_hash > lex_hash.h -- DEPENDS gen_lex_hash --) -+IF(NOT CMAKE_CROSSCOMPILING) -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h -+ COMMAND gen_lex_hash > lex_hash.h -+ DEPENDS gen_lex_hash) -+ELSE() -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h -+ COMMAND gen_lex_hash > lex_hash.h) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mariadb-tzinfo-to-sql tztime.cc COMPONENT Server) - SET_TARGET_PROPERTIES(mariadb-tzinfo-to-sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL") --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb index 8ae8241b0..57d7736ea 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.10.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.5.11.bb @@ -1,8 +1,8 @@ require mariadb.inc -EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" +inherit qemu -DEPENDS += "mariadb-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" +DEPENDS += "qemu-native bison-native boost libpcre2 curl openssl ncurses zlib libaio libedit libevent libxml2" PROVIDES += "mysql5 libmysqlclient" diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch index eb9928a0c..8bdd27ff2 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch @@ -25,11 +25,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 74 insertions(+) create mode 100644 cmake/modules/CheckAtomic.cmake -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f9c8f3346..4d604004b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -852,7 +852,12 @@ endif() +@@ -935,7 +935,12 @@ endif() if(WIN32) set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib) else() @@ -41,10 +39,7 @@ index f9c8f3346..4d604004b 100644 + endif() endif() - add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES}) -diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake -new file mode 100644 -index 000000000..8b7dc8a37 + add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC}) --- /dev/null +++ b/cmake/modules/CheckAtomic.cmake @@ -0,0 +1,69 @@ @@ -117,6 +112,3 @@ index 000000000..8b7dc8a37 + endif() +endif() + --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch index 57433b057..d3054759a 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch @@ -11,8 +11,6 @@ Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7541] CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 676192913..801586c30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ @@ -24,7 +22,7 @@ index 676192913..801586c30 100644 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/") include(ReadVersion) -@@ -148,12 +148,7 @@ else() +@@ -152,12 +152,7 @@ else() if(WITH_BZ2) find_package(BZip2 REQUIRED) add_definitions(-DBZIP2) @@ -38,6 +36,3 @@ index 676192913..801586c30 100644 endif() if(WITH_LZ4) --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch index aa291daa3..9c70d4f6a 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-folly-Use-SYS_futex-for-syscall.patch @@ -12,8 +12,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> third-party/folly/folly/detail/Futex.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -diff --git a/third-party/folly/folly/detail/Futex.cpp b/third-party/folly/folly/detail/Futex.cpp -index 62d6ea2b2..a914a8c73 100644 --- a/third-party/folly/folly/detail/Futex.cpp +++ b/third-party/folly/folly/detail/Futex.cpp @@ -48,9 +48,15 @@ namespace { @@ -42,6 +40,3 @@ index 62d6ea2b2..a914a8c73 100644 addr, /* addr1 */ op, /* op */ expected, /* val */ --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch new file mode 100644 index 000000000..dbb0dda22 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch @@ -0,0 +1,23 @@ +From 1a69d4cc3f97e348dba9714c7ec60da1a8650664 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Jun 2021 22:05:36 -0700 +Subject: [PATCH] jemalloc_helper: Limit the mm_malloc.h hack to glibc on linux + +Musl does not need this hack + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + port/jemalloc_helper.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/port/jemalloc_helper.h ++++ b/port/jemalloc_helper.h +@@ -5,7 +5,7 @@ + + #pragma once + +-#if defined(__clang__) ++#if defined(__clang__) && defined(__GLIBC__) + // glibc's `posix_memalign()` declaration specifies `throw()` while clang's + // declaration does not. There is a hack in clang to make its re-declaration + // compatible with glibc's if they are declared consecutively. That hack breaks diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch new file mode 100644 index 000000000..86c1bffea --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch @@ -0,0 +1,44 @@ +From 89c032a9b4011385c0b504ea61e5df0db71f0ff5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 16 Jun 2021 19:06:02 -0700 +Subject: [PATCH] range_tree: Implement toku_time_now for rv32/rv64 in asm + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../range_tree/lib/portability/toku_time.h | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +index 4425a4a2e..4ac964f85 100644 +--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h ++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +@@ -133,6 +133,25 @@ static inline tokutime_t toku_time_now(void) { + return result; + #elif defined(__powerpc__) + return __ppc_get_timebase(); ++#elif defined(__riscv) // RISC-V ++#if __riscv_xlen == 32 ++ uint32_t lo, hi0, hi1; ++ __asm __volatile__( ++ "rdcycleh %0\n" ++ "rdcycle %1\n" ++ "rdcycleh %2\n" ++ "sub %0, %0, %2\n" ++ "seqz %0, %0\n" ++ "sub %0, zero, %0\n" ++ "and %1, %1, %0\n" ++ : "=r"(hi0), "=r"(lo), "=r"(hi1)); ++ return ((uint64_t)hi1 << 32) | lo; ++#else ++ uint64_t result; ++ __asm __volatile__("rdcycle %0" : "=r"(result)); ++ return result; ++#endif ++ + #else + #error No timer implementation for this platform + #endif +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch new file mode 100644 index 000000000..4aa91d9b2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch @@ -0,0 +1,59 @@ +From 114c42fba3fc86119710e8dd1bb2b7a9e39e3064 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 17 Jun 2021 19:35:01 -0700 +Subject: [PATCH] replace old sync with new atomic builtin equivalents + +Helps compiling with gcc on newer arches e.g. riscv32 where these +__sync* builtins are not implemented atleast for 64bit values + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../range/range_tree/lib/portability/toku_atomic.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_atomic.h ++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_atomic.h +@@ -77,37 +77,37 @@ template <typename T, typename U> + __attribute__((always_inline)) static inline T toku_sync_fetch_and_add(T *addr, + U diff) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_fetch_and_add(addr, diff); ++ return __atomic_fetch_add(addr, diff, 5); + } + template <typename T, typename U> + __attribute__((always_inline)) static inline T toku_sync_add_and_fetch(T *addr, + U diff) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_add_and_fetch(addr, diff); ++ return __atomic_add_fetch(addr, diff, 5); + } + template <typename T, typename U> + __attribute__((always_inline)) static inline T toku_sync_fetch_and_sub(T *addr, + U diff) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_fetch_and_sub(addr, diff); ++ return __atomic_fetch_sub(addr, diff, 5); + } + template <typename T, typename U> + __attribute__((always_inline)) static inline T toku_sync_sub_and_fetch(T *addr, + U diff) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_sub_and_fetch(addr, diff); ++ return __atomic_sub_fetch(addr, diff, 5); + } + template <typename T, typename U, typename V> + __attribute__((always_inline)) static inline T toku_sync_val_compare_and_swap( + T *addr, U oldval, V newval) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_val_compare_and_swap(addr, oldval, newval); ++ return __atomic_compare_exchange(addr, oldval, newval); + } + template <typename T, typename U, typename V> + __attribute__((always_inline)) static inline bool + toku_sync_bool_compare_and_swap(T *addr, U oldval, V newval) { + paranoid_invariant(!crosses_boundary(addr, sizeof *addr)); +- return __sync_bool_compare_and_swap(addr, oldval, newval); ++ return static_cast<bool>(__atomic_compare_exchange(addr, oldval, newval)); + } + + // in case you include this but not toku_portability.h diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/arm.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/arm.patch new file mode 100644 index 000000000..d428a6624 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/arm.patch @@ -0,0 +1,26 @@ +implement timer for arm >= v6 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h ++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +@@ -161,6 +161,20 @@ static inline tokutime_t toku_time_now(v + struct timeval tv; + gettimeofday(&tv, nullptr); + return (uint64_t)tv.tv_sec * 1000000 + tv.tv_usec; ++#elif (__ARM_ARCH >= 6) ++ uint32_t pmccntr; ++ uint32_t pmuseren; ++ uint32_t pmcntenset; ++ // Read the user mode perf monitor counter access permissions. ++ asm volatile("mrc p15, 0, %0, c9, c14, 0" : "=r"(pmuseren)); ++ if (pmuseren & 1) { // Allows reading perfmon counters for user mode code. ++ asm volatile("mrc p15, 0, %0, c9, c12, 1" : "=r"(pmcntenset)); ++ if (pmcntenset & 0x80000000ul) { // Is it counting? ++ asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr)); ++ // The counter is set up to count every 64th cycle ++ return (uint64_t)pmccntr * 64; // Should optimize to << 6 ++ } ++ } + #else + #error No timer implementation for this platform + #endif diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/mips.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/mips.patch new file mode 100644 index 000000000..db2305d29 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/mips.patch @@ -0,0 +1,19 @@ +implement timer implementation for mips platform + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h ++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +@@ -155,7 +155,12 @@ static inline tokutime_t toku_time_now(v + __asm __volatile__("rdcycle %0" : "=r"(result)); + return result; + #endif +- ++#elif defined(__mips__) ++ // mips apparently only allows rdtsc for superusers, so we fall ++ // back to gettimeofday. It's possible clock_gettime would be better. ++ struct timeval tv; ++ gettimeofday(&tv, nullptr); ++ return (uint64_t)tv.tv_sec * 1000000 + tv.tv_usec; + #else + #error No timer implementation for this platform + #endif diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch new file mode 100644 index 000000000..bc40f1b1e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/ppc64.patch @@ -0,0 +1,28 @@ +implement support for musl/ppc64 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h ++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +@@ -58,7 +58,7 @@ Copyright (c) 2006, 2015, Percona and/or + #include <stdint.h> + #include <sys/time.h> + #include <time.h> +-#if defined(__powerpc__) ++#if defined(__powerpc__) && defined(__GLIBC__) + #include <sys/platform/ppc.h> + #endif + +@@ -131,8 +131,12 @@ static inline tokutime_t toku_time_now(v + uint64_t result; + __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result)); + return result; +-#elif defined(__powerpc__) ++#elif defined(__powerpc__) && defined(__GLIBC__) + return __ppc_get_timebase(); ++#elif defined(__powerpc64__) || defined(__ppc64__) ++ uint64_t result; ++ asm volatile("mfspr %0, 268" : "=r"(result)); ++ return result; + #elif defined(__riscv) // RISC-V + #if __riscv_xlen == 32 + uint32_t lo, hi0, hi1; diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.15.5.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb index acef05b01..c89d5d431 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.15.5.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_6.20.3.bb @@ -6,15 +6,24 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "abd4b1ff1504ae2a7ed6e60bc9c9797b880c33a5" -SRCBRANCH = "6.15.fb" +SRCREV = "8608d75d85f8e1b3b64b73a4fb6d19baec61ba5c" +SRCBRANCH = "6.20.fb" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ file://0001-cmake-Add-check-for-atomic-support.patch \ file://0001-cmake-Use-exported-target-for-bz2.patch \ file://0001-folly-Use-SYS_futex-for-syscall.patch \ + file://0001-jemalloc_helper-Limit-the-mm_malloc.h-hack-to-glibc-.patch \ + file://0001-range_tree-Implement-toku_time_now-for-rv32-rv64-in-.patch \ + file://ppc64.patch \ + file://mips.patch \ + file://arm.patch \ " +SRC_URI_append_riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" +SRC_URI_append_mips = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" +SRC_URI_remove_toolchain-clang_riscv32 = "file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" + S = "${WORKDIR}/git" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch index 52d4f42d5..126b79261 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-Export-of-internal-Abseil-changes.patch @@ -1,6 +1,6 @@ -From a9831f1cbf93fb18dd951453635f488037454ce9 Mon Sep 17 00:00:00 2001 -From: Abseil Team <absl-team@google.com> -Date: Mon, 3 May 2021 07:37:39 -0700 +From c9250af98f48e4aa734cab0e2f5ae1f780c05ad0 Mon Sep 17 00:00:00 2001 +From: Zang Ruochen <zangrc.fnst@fujitsu.com> +Date: Fri, 11 Jun 2021 10:53:37 +0900 Subject: [PATCH] Export of internal Abseil changes -- @@ -27,15 +27,16 @@ Cmake builds should only install pkg-config when explicitly requested. PiperOrigin-RevId: 371403419 GitOrigin-RevId: cf88f9cf40eab54c06bca7f20795352ec23bb583 Change-Id: I4360a18c638a4d901ff44ab1e0a9d8f321c302ea + +Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com> --- CMake/AbseilHelpers.cmake | 3 ++- - absl/debugging/failure_signal_handler.cc | 3 ++- absl/strings/internal/str_format/arg.h | 8 ++++++++ absl/strings/internal/str_format/convert_test.cc | 3 +++ - 4 files changed, 15 insertions(+), 2 deletions(-) + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake -index 1f754392..1a80b5b4 100644 +index 54fb8df3..a32b94d5 100644 --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake @@ -141,7 +141,8 @@ function(absl_cc_library) @@ -48,20 +49,6 @@ index 1f754392..1a80b5b4 100644 if(NOT ABSL_CC_LIB_TESTONLY) if(absl_VERSION) set(PC_VERSION "${absl_VERSION}") -diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc -index e458a795..689e5979 100644 ---- a/absl/debugging/failure_signal_handler.cc -+++ b/absl/debugging/failure_signal_handler.cc -@@ -136,7 +136,8 @@ static bool SetupAlternateStackOnce() { - #else - const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; - #endif -- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; -+ size_t stack_size = -+ (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask; - #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ - defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) - // Account for sanitizer instrumentation requiring additional stack space. diff --git a/absl/strings/internal/str_format/arg.h b/absl/strings/internal/str_format/arg.h index 7040c866..3c91be70 100644 --- a/absl/strings/internal/str_format/arg.h @@ -96,5 +83,5 @@ index 926283cf..91e03609 100644 TEST_F(FormatConvertTest, NullString) { -- -2.31.1 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb index 01dd9f550..3f89df558 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb @@ -7,8 +7,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" -PV = "20210324+git${SRCPV}" -SRCREV = "e1d388e7e74803050423d035e4374131b9b57919" +PV = "20210324.2+git${SRCPV}" +SRCREV = "278e0a071885a22dcd2fd1b5576cc44757299343" BRANCH = "lts_2021_03_24" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH} \ file://0001-absl-always-use-asm-sgidefs.h.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb index 616d56daa..e42b891d4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_10.0.bb @@ -5,9 +5,9 @@ LICENSE = "MIT & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" -SRCREV = "03e4e9d2cab4f1a61d3f589785641a73dff027c5" -SRC_URI = "git://github.com/${BPN}/${BPN}.git \ - file://0001-libbacktrace-include-config.h.patch \ +SRCREV = "9d42f667e2a36a6624d92b9bd697de097cc4e619" +PV .= "+10.0.1+git${SRCPV}" +SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210502.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210711.0.bb index 273d6e573..4be634b38 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210502.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20210711.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "6df08b82d4845d1b9420d9268f24d5db16ee4480" +SRCREV = "c81079788bfe650190db8ac9df80d63d2bc160aa" SRC_URI = "git://github.com/universal-ctags/ctags" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch new file mode 100644 index 000000000..2a5f23316 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch @@ -0,0 +1,33 @@ +From e735fb23f46f0c3c7a1144ba6b4050bfc0015a05 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 2 Jun 2021 13:34:35 +0800 +Subject: [PATCH] do not hardcode the full path of dpkg + +While calling debootstrap in sdk, if host does not install dpkg package, +the full path calling will fail + +Do not hardcode the full path of dpkg, then then sdk's dpkg will be used. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + debootstrap | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debootstrap b/debootstrap +index a3cf3af..5e96c3e 100755 +--- a/debootstrap ++++ b/debootstrap +@@ -538,7 +538,7 @@ fi + + if in_path dpkg && \ + dpkg --print-architecture >/dev/null 2>&1; then +- HOST_ARCH=$(/usr/bin/dpkg --print-architecture) ++ HOST_ARCH=$(dpkg --print-architecture) + elif in_path udpkg && \ + udpkg --print-architecture >/dev/null 2>&1; then + HOST_ARCH=$(/usr/bin/udpkg --print-architecture) +-- +2.27.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb index 300c98f91..4fc59adfb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.124.bb @@ -8,6 +8,7 @@ SRC_URI = "\ http://http.debian.net/debian/pool/main/d/debootstrap/debootstrap_${PV}.tar.gz \ file://0001-support-to-override-usr-sbin-and-usr-share.patch \ file://0002-support-to-override-usr-bin-arch-test.patch \ + file://0001-do-not-hardcode-the-full-path-of-dpkg.patch \ " SRC_URI[md5sum] = "8a5e97f60236c3a63f715c056a5f0e29" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.38.0.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.38.1.bb index 2095d81d4..10004b236 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.38.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.38.1.bb @@ -16,7 +16,7 @@ RDEPENDS_${PN}-compiler = "${PN}" RDEPENDS_${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -SRCREV_grpc = "54dc182082db941aa67c7c3f93ad858c99a16d7d" +SRCREV_grpc = "96b73272eadc01afb5fb45b92b408c47e4387274" BRANCH = "v1.38.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch new file mode 100644 index 000000000..f83e0a273 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch @@ -0,0 +1,50 @@ +From ed8dbe1c793f2f770fef61adc4390277f903cceb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 9 Jul 2021 01:32:42 -0700 +Subject: [PATCH] mips: Use hardcodes values for ABI syscall bases + +mips kernels 5.13+ have stopped exposing the UAPIs which provided these +defines, the values are more or less static so just use the hardcoded +values for now. Use __NR_syscalls to get number of syscalls supported +and include asm-generic/unistd.h to get this definition + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sysdeps/linux-gnu/mips/trace.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/sysdeps/linux-gnu/mips/trace.c b/sysdeps/linux-gnu/mips/trace.c +index d54818e..e72184d 100644 +--- a/sysdeps/linux-gnu/mips/trace.c ++++ b/sysdeps/linux-gnu/mips/trace.c +@@ -33,6 +33,7 @@ + #include <asm/unistd.h> + #include <assert.h> + #include <asm/unistd.h> ++#include <asm-generic/unistd.h> + + #include "backend.h" + #include "common.h" +@@ -135,12 +136,12 @@ syscall_p(struct process *proc, int status, int *sysnum) + int min_syscall, max_syscall, sigreturn, rt_sigreturn; + struct callstack_element *top = NULL; + int depth = proc->callstack_depth; +- const int syscallbase[] = {__NR_O32_Linux, __NR_N32_Linux, +- __NR_64_Linux, __NR_O32_Linux}; +- const int syscallnum[] = {__NR_O32_Linux_syscalls, +- __NR_N32_Linux_syscalls, +- __NR_64_Linux_syscalls, +- __NR_O32_Linux_syscalls}; ++ const int syscallbase[] = {4000, 6000, ++ 5000, 4000}; ++ const int syscallnum[] = {__NR_syscalls, ++ __NR_syscalls, ++ __NR_syscalls, ++ __NR_syscalls}; + const int rt_sigreturn_list[] = {193, 211, 211, 193}; + const int sigreturn_list[] = {119, -1, -1, 119}; + +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-Remove-unused-host_powerpc64-function.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-Remove-unused-host_powerpc64-function.patch new file mode 100644 index 000000000..39e1f77a0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-Remove-unused-host_powerpc64-function.patch @@ -0,0 +1,37 @@ +From 4517bf59838f40eb6e3f46e39adb5e5090c59df8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Jun 2021 18:14:36 -0700 +Subject: [PATCH] ppc: Remove unused host_powerpc64 function + +This function is dead code, remove it which avoids compiler warnings +with clang + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sysdeps/linux-gnu/ppc/plt.c | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/sysdeps/linux-gnu/ppc/plt.c b/sysdeps/linux-gnu/ppc/plt.c +index 5f81889..9d1838b 100644 +--- a/sysdeps/linux-gnu/ppc/plt.c ++++ b/sysdeps/linux-gnu/ppc/plt.c +@@ -142,16 +142,6 @@ + #define PPC64_PLT_STUB_SIZE 4 + #endif + +-static inline int +-host_powerpc64() +-{ +-#ifdef __powerpc64__ +- return 1; +-#else +- return 0; +-#endif +-} +- + static void + mark_as_resolved(struct library_symbol *libsym, GElf_Addr value) + { +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch deleted file mode 100644 index e4490bbb9..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/include_unistd_nr.patch +++ /dev/null @@ -1,30 +0,0 @@ -kernel headers have restructured mips syscall generation in kernel -in recent versions, however, ltrace still has logic to define the -syscall numbers based on old logic, this patch includes the legacy -UAPI headers to get these defines - -Fixes errors e.g. -../../../../git/sysdeps/linux-gnu/mips/trace.c:138:29: error: '__NR_O32_Linux' undeclared (first use in this function) - const int syscallbase[] = {__NR_O32_Linux, __NR_N32_Linux, - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/sysdeps/linux-gnu/mips/trace.c -+++ b/sysdeps/linux-gnu/mips/trace.c -@@ -34,6 +34,16 @@ - #include <assert.h> - #include <asm/unistd.h> - -+#ifndef __NR_O32_Linux -+#include <asm/unistd_nr_o32.h> -+#endif -+#ifndef __NR_N32_Linux -+#include <asm/unistd_nr_n64.h> -+#endif -+#ifndef __NR_N64_Linux -+#include <asm/unistd_nr_n32.h> -+#endif -+ - #include "backend.h" - #include "common.h" - #include "debug.h" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 17264cef5..69dce851f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -26,9 +26,10 @@ SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http file://0001-mips-plt.c-Delete-include-error.h.patch \ file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \ file://0001-hook-Do-not-append-int-to-std-string.patch \ - file://include_unistd_nr.patch \ file://0001-Bug-fix-for-data-type-length-judgment.patch \ file://0001-ensure-the-struct-pointers-are-null-initilized.patch \ + file://0001-ppc-Remove-unused-host_powerpc64-function.patch \ + file://0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch \ " SRC_URI_append_libc-musl = " file://add_ppc64le.patch" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb index 0ee02d685..20df3620d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_3.4.2.bb @@ -31,7 +31,8 @@ PACKAGECONFIG += " \ " PACKAGECONFIG[x11] = "--with-x --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--without-x,virtual/libx11" -LDFLAGS_append_x86-64 = " -lgcc" +LDFLAGS_append_libc-glibc_x86-64 = " -lgcc" +LDFLAGS_append_libc-glibc_x86 = " -lgcc" inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch new file mode 100644 index 000000000..00b2e9baa --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch @@ -0,0 +1,28 @@ +From 0976af0f3b328436ea44a74a406f311adb2ab211 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Jun 2021 19:01:31 -0700 +Subject: [PATCH] ppc64: Do not use -mminimal-toc with clang + +clang does not support this option + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + common.gypi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common.gypi b/common.gypi +index ee91fb1d..049c8f8c 100644 +--- a/common.gypi ++++ b/common.gypi +@@ -413,7 +413,7 @@ + 'ldflags': [ '-m32' ], + }], + [ 'target_arch=="ppc64" and OS!="aix"', { +- 'cflags': [ '-m64', '-mminimal-toc' ], ++ 'cflags': [ '-m64' ], + 'ldflags': [ '-m64' ], + }], + [ 'target_arch=="s390x"', { +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch deleted file mode 100644 index 806360084..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/v8-call-new-ListFormatter-createInstance.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001 -From: Frank Tang <ftang@chromium.org> -Date: Thu, 15 Oct 2020 22:44:27 -0700 -Subject: [PATCH] [Intl] call new ListFormatter::createInstance - -The one we currently using is now marked as internal and to be removed -for 68. Migrating to the style which already avaiable in ICU 67-1. - -Upstream-Status: Backport -Bug: v8:11031 -Change-Id: I668382a2e1b8602ddca02bf231c5008a6c92bf2d -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477751 -Reviewed-by: Jakob Kummerow <jkummerow@chromium.org> -Commit-Queue: Frank Tang <ftang@chromium.org> -Cr-Commit-Position: refs/heads/master@{#70638} ---- - deps/v8/src/objects/js-list-format.cc | 55 ++++++++++++----------------------- - 1 file changed, 18 insertions(+), 37 deletions(-) - ---- a/deps/v8/src/objects/js-list-format.cc -+++ b/deps/v8/src/objects/js-list-format.cc -@@ -29,46 +29,27 @@ namespace v8 { - namespace internal { - - namespace { --const char* kStandard = "standard"; --const char* kOr = "or"; --const char* kUnit = "unit"; --const char* kStandardShort = "standard-short"; --const char* kOrShort = "or-short"; --const char* kUnitShort = "unit-short"; --const char* kStandardNarrow = "standard-narrow"; --const char* kOrNarrow = "or-narrow"; --const char* kUnitNarrow = "unit-narrow"; - --const char* GetIcuStyleString(JSListFormat::Style style, -- JSListFormat::Type type) { -+UListFormatterWidth GetIcuWidth(JSListFormat::Style style) { -+ switch (style) { -+ case JSListFormat::Style::LONG: -+ return ULISTFMT_WIDTH_WIDE; -+ case JSListFormat::Style::SHORT: -+ return ULISTFMT_WIDTH_SHORT; -+ case JSListFormat::Style::NARROW: -+ return ULISTFMT_WIDTH_NARROW; -+ } -+ UNREACHABLE(); -+} -+ -+UListFormatterType GetIcuType(JSListFormat::Type type) { - switch (type) { - case JSListFormat::Type::CONJUNCTION: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kStandard; -- case JSListFormat::Style::SHORT: -- return kStandardShort; -- case JSListFormat::Style::NARROW: -- return kStandardNarrow; -- } -+ return ULISTFMT_TYPE_AND; - case JSListFormat::Type::DISJUNCTION: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kOr; -- case JSListFormat::Style::SHORT: -- return kOrShort; -- case JSListFormat::Style::NARROW: -- return kOrNarrow; -- } -+ return ULISTFMT_TYPE_OR; - case JSListFormat::Type::UNIT: -- switch (style) { -- case JSListFormat::Style::LONG: -- return kUnit; -- case JSListFormat::Style::SHORT: -- return kUnitShort; -- case JSListFormat::Style::NARROW: -- return kUnitNarrow; -- } -+ return ULISTFMT_TYPE_UNITS; - } - UNREACHABLE(); - } -@@ -143,7 +124,7 @@ MaybeHandle<JSListFormat> JSListFormat:: - icu::Locale icu_locale = r.icu_locale; - UErrorCode status = U_ZERO_ERROR; - icu::ListFormatter* formatter = icu::ListFormatter::createInstance( -- icu_locale, GetIcuStyleString(style_enum, type_enum), status); -+ icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status); - if (U_FAILURE(status) || formatter == nullptr) { - delete formatter; - THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError), diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_14.16.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb index 48bf2f4a8..5ac4f9dc7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_14.16.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_14.17.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & BSD & Artistic-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=85bf260d8b6de1588f57abc5dc66587c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a1016f9b7979cfe6fc3466a9bba60b1e" DEPENDS = "openssl" DEPENDS_append_class-target = " qemu-native" @@ -21,7 +21,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0004-v8-don-t-override-ARM-CFLAGS.patch \ file://big-endian.patch \ file://mips-warnings.patch \ - file://v8-call-new-ListFormatter-createInstance.patch \ file://mips-less-memory.patch \ " SRC_URI_append_class-target = " \ @@ -30,7 +29,10 @@ SRC_URI_append_class-target = " \ SRC_URI_append_toolchain-clang_x86 = " \ file://libatomic.patch \ " -SRC_URI[sha256sum] = "e44adbbed6756c2c1a01258383e9f00df30c147b36e438f6369b5ef1069abac3" +SRC_URI_append_toolchain-clang_powerpc64le = " \ + file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ + " +SRC_URI[sha256sum] = "ddf1d2d56ddf35ecd98c5ea5ddcd690b245899f289559b4330c921255f5a247f" S = "${WORKDIR}/node-v${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb new file mode 100644 index 000000000..27a7f9da7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libparse-yapp-perl_1.21.bb @@ -0,0 +1,21 @@ +SUMMARY = "Perl extension for generating and using LALR parsers" +DESCRIPTION = "Parse::Yapp (Yet Another Perl Parser compiler) is a collection \ +of modules that let you generate and use yacc like thread safe (reentrant) parsers \ +with perl object oriented interface." + +HOMEPAGE = "http://search.cpan.org/dist/Parse-Yapp/" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" + +LIC_FILES_CHKSUM = "file://lib/Parse/Yapp.pm;beginline=508;endline=521;md5=41a4542fcde97a600c9de0d782a90256" + +SRC_URI = "https://www.cpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-${PV}.tar.gz" + +SRC_URI[md5sum] = "69584d5b0f0304bb2a23cffcd982c5de" +SRC_URI[sha256sum] = "3810e998308fba2e0f4f26043035032b027ce51ce5c8a52a8b8e340ca65f13e5" + +S = "${WORKDIR}/Parse-Yapp-${PV}" + +inherit cpan + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb index 81af2d50f..6ad3bdb3b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_3.17.3.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib" DEPENDS_append_class-target = " protobuf-native" -SRCREV = "652d99a8ee8aa6b801e11977951fbf444cfccc8f" +SRCREV = "909a0f36a10075c4b4bc70fdee2c7e32dd612a72" SRC_URI = "git://github.com/protocolbuffers/protobuf.git \ file://run-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index 5b5c8b257..ac803294e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/git" inherit cmake -EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DLIB_INSTALL_DIR:STRING=${libdir}" +EXTRA_OECMAKE += "-DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF" # RapidJSON is a header-only C++ library, so the main package will be empty. diff --git a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb index 9ccf2d0bf..b92f63b26 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/suitesparse/suitesparse_5.10.1.bb @@ -1,15 +1,11 @@ LICENSE = "GPLv2 & GPLv3 & BSD-3-Clause & LGPL-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f9f2b9d61cb769a67c4cd079e1166de7" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5fa987762101f748a6cdd951b64ffc6b" SRC_URI = "git://github.com/DrTimothyAldenDavis/SuiteSparse;protocol=https \ file://0001-Preserve-CXXFLAGS-from-environment-in-Mongoose.patch \ file://0002-Preserve-links-when-installing-libmetis.patch \ file://0003-Add-version-information-to-libmetis.patch \ " - -SRC_URI[md5sum] = "c414679bbc9432a3def01b31ad921140" -SRC_URI[sha256sum] = "06726e471fbaa55f792578f9b4ab282ea9d008cf39ddcc3b42b73400acddef40" - -SRCREV = "v${PV}" +SRCREV = "538273cfd53720a10e34a3d80d3779b607e1ac26" S = "${WORKDIR}/git" @@ -77,4 +73,3 @@ FILES_${PN}-staticdev += "${libdir}/libmongoose.a" FILES_${PN}-dev += "${includedir} ${libdir}/*.so" EXCLUDE_FROM_WORLD = "1" - diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch new file mode 100644 index 000000000..fe40334b6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/317.patch @@ -0,0 +1,43 @@ +Origin: https://github.com/GENIVI/dlt-daemon/pull/317 +From 55d31216823841a1547fe261cdf8e3b1002d5f94 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Thu, 1 Jul 2021 12:58:20 +0200 +Subject: [PATCH] dlt-control-common.c: Fix build failure due to out-of-bound + write -Werror=stringop-truncation + +cd /build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/src/console/logstorage && /usr/bin/cc -DCONFIGURATION_FILES_DIR=\"/etc\" -DDLT_DAEMON_USE_FIFO_IPC -DDLT_LIB_USE_FIFO_IPC -DDLT_NETWORK_TRACE_ENABLE -DDLT_SYSTEMD_ENABLE -DDLT_SYSTEMD_JOURNAL_ENABLE -DDLT_UNIT_TESTS -DDLT_USER_IPC_PATH=\"/tmp\" -DDLT_USE_IPv6 -DEXTENDED_FILTERING -D_GNU_SOURCE -I/build/dlt-daemon-2.18.7 -I/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu/include/dlt -I/build/dlt-daemon-2.18.7/include/dlt -I/build/dlt-daemon-2.18.7/src/shared -I/build/dlt-daemon-2.18.7/src/core_dump_handler -I/build/dlt-daemon-2.18.7/src/offlinelogstorage -I/build/dlt-daemon-2.18.7/src/lib -I/build/dlt-daemon-2.18.7/src/daemon -I/build/dlt-daemon-2.18.7/src/console -I/build/dlt-daemon-2.18.7/src/gateway -I/build/dlt-daemon-2.18.7/systemd/3rdparty -g -O2 -ffile-prefix-map=/build/dlt-daemon-2.18.7=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Werror -std=gnu99 -Wall -Wextra -Wno-variadic-macros -Wno-strict-aliasing -o CMakeFiles/dlt-logstorage-ctrl.dir/__/dlt-control-common.c.o -c /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c +make[3]: Leaving directory '/build/dlt-daemon-2.18.7/obj-x86_64-linux-gnu' +In file included from /usr/include/string.h:495, + from /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:56: +In function 'strncpy', + inlined from 'dlt_json_filter_load' at /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:716:13: +/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: '__builtin_strncpy' specified bound 4 equals destination size [-Werror=stringop-truncation] + 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +In function 'strncpy', + inlined from 'dlt_json_filter_load' at /build/dlt-daemon-2.18.7/src/console/dlt-control-common.c:721:13: +/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: '__builtin_strncpy' specified bound 4 equals destination size [-Werror=stringop-truncation] + 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org> +--- + src/console/dlt-control-common.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/console/dlt-control-common.c b/src/console/dlt-control-common.c +index 8a9d29f0..f58d8268 100644 +--- a/src/console/dlt-control-common.c ++++ b/src/console/dlt-control-common.c +@@ -671,8 +671,8 @@ DltReturnValue dlt_json_filter_load(DltFilter *filter, const char *filename, int + struct json_object *j_payload_max; + enum json_tokener_error jerr; + +- char app_id[DLT_ID_SIZE] = ""; +- char context_id[DLT_ID_SIZE] = ""; ++ char app_id[DLT_ID_SIZE + 1] = ""; ++ char context_id[DLT_ID_SIZE + 1] = ""; + int32_t log_level = 0; + int32_t payload_max = INT32_MAX; + int32_t payload_min = 0; diff --git a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb index b3cfb4709..a16e810be 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.7.bb @@ -12,13 +12,14 @@ SECTION = "console/utils" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" -DEPENDS = "zlib gzip-native" +DEPENDS = "zlib gzip-native json-c" SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=https \ file://0002-Don-t-execute-processes-as-a-specific-user.patch \ file://0004-Modify-systemd-config-directory.patch \ + file://317.patch \ " -SRCREV = "22715aeceaa81ace2c832312529bde3a42d0814f" +SRCREV = "24d197214bfdcec7430d31b42e5c87df27287aaf" S = "${WORKDIR}/git" @@ -44,7 +45,7 @@ PACKAGECONFIG[dlt-console] = "-DWITH_DLT_CONSOLE=ON,-DWITH_DLT_CONSOLE=OFF,,dlt- inherit autotools gettext cmake systemd -EXTRA_OECMAKE += "-DSYSTEMD_UNITDIR=${systemd_system_unitdir}" +EXTRA_OECMAKE += "-DWITH_EXTENDED_FILTERING=ON -DSYSTEMD_UNITDIR=${systemd_system_unitdir}" PACKAGES += "${PN}-systemd" SYSTEMD_PACKAGES = "${PN} ${PN}-systemd" diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch b/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch new file mode 100644 index 000000000..139d13f4c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/hiredis/files/0001-CMake-configuration-for-hiredis.patch @@ -0,0 +1,117 @@ +From 2dc0c7e4a3fa7ecc92ee5e22f1d8ee48c2b333a8 Mon Sep 17 00:00:00 2001 +From: Thomas Lee <debian@tomlee.co> +Date: Sun, 4 Nov 2018 22:59:09 +0000 +Subject: [PATCH] CMake configuration for hiredis + +Last-Update: 2018-09-26 + +Upstream-Status: Backport [Ubuntu 20.04] +--- + HiredisConfig.cmake.in | 5 +++++ + HiredisConfigVersion.cmake.in | 22 ++++++++++++++++++++++ + Makefile | 17 ++++++++++++++++- + 3 files changed, 43 insertions(+), 1 deletion(-) + create mode 100644 HiredisConfig.cmake.in + create mode 100644 HiredisConfigVersion.cmake.in + +diff --git a/HiredisConfig.cmake.in b/HiredisConfig.cmake.in +new file mode 100644 +index 0000000..2cce290 +--- /dev/null ++++ b/HiredisConfig.cmake.in +@@ -0,0 +1,5 @@ ++find_path(HIREDIS_INCLUDE_DIRS hiredis/hiredis.h HINTS "/usr/include") ++find_library(HIREDIS_LIB_HIREDIS NAMES hiredis HINTS "/usr/lib") ++ ++set(HIREDIS_LIBRARIES ${HIREDIS_LIB_HIREDIS}) ++ +diff --git a/HiredisConfigVersion.cmake.in b/HiredisConfigVersion.cmake.in +new file mode 100644 +index 0000000..584144a +--- /dev/null ++++ b/HiredisConfigVersion.cmake.in +@@ -0,0 +1,22 @@ ++set(PACKAGE_VERSION "@HIREDIS_VERSION@") ++ ++string(REPLACE "." ";" HIREDIS_VERSION_COMPONENTS ${PACKAGE_VERSION}) ++string(REPLACE "." ";" REQUESTED_VERSION_COMPONENTS ${PACKAGE_FIND_VERSION}) ++ ++list(GET HIREDIS_VERSION_COMPONENTS 0 HIREDIS_VERSION_MAJOR) ++list(GET HIREDIS_VERSION_COMPONENTS 1 HIREDIS_VERSION_MINOR) ++ ++list(GET REQUESTED_VERSION_COMPONENTS 0 REQUESTED_VERSION_MAJOR) ++list(GET REQUESTED_VERSION_COMPONENTS 1 REQUESTED_VERSION_MINOR) ++ ++if(("${HIREDIS_VERSION_MAJOR}" EQUAL "${REQUESTED_VERSION_MAJOR}") AND ++ (("${HIREDIS_VERSION_MINOR}" EQUAL "${REQUESTED_VERSION_MINOR}") OR ++ ("${HIREDIS_VERSION_MINOR}" GREATER "${REQUESTED_VERSION_MINOR}"))) ++ set(PACKAGE_VERSION_COMPATIBLE TRUE) ++ if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") ++ set(PACKAGE_VERSION_EXACT TRUE) ++ endif() ++else() ++ set(PACKAGE_VERSION_COMPATIBLE FALSE) ++endif() ++ +diff --git a/Makefile b/Makefile +index 339727f..43704cd 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,6 +8,8 @@ EXAMPLES=hiredis-example hiredis-example-libevent hiredis-example-libev hiredis- + TESTS=hiredis-test + LIBNAME=libhiredis + PKGCONFNAME=hiredis.pc ++CMAKECONFNAME=HiredisConfig.cmake ++CMAKEVERSNAME=HiredisConfigVersion.cmake + + HIREDIS_MAJOR=$(shell grep HIREDIS_MAJOR hiredis.h | awk '{print $$3}') + HIREDIS_MINOR=$(shell grep HIREDIS_MINOR hiredis.h | awk '{print $$3}') +@@ -19,9 +21,11 @@ PREFIX?=/usr/local + INCLUDE_PATH?=include/hiredis + LIBRARY_PATH?=lib + PKGCONF_PATH?=pkgconfig ++CMAKE_PATH?=cmake/Hiredis + INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH) + INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH) + INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH) ++INSTALL_CMAKE_PATH= $(INSTALL_LIBRARY_PATH)/$(CMAKE_PATH) + + # redis-server configuration used for testing + REDIS_PORT=56379 +@@ -150,6 +154,7 @@ check: hiredis-test + + clean: + rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov ++ rm -f $(CMAKECONFNAME) $(CMAKEVERSNAME) + + dep: + $(CC) -MM *.c +@@ -169,7 +174,14 @@ $(PKGCONFNAME): hiredis.h + @echo Libs: -L\$${libdir} -lhiredis >> $@ + @echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@ + +-install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) ++$(CMAKECONFNAME): $(CMAKECONFNAME).in ++ cp $(CMAKECONFNAME).in $(CMAKECONFNAME) ++ ++$(CMAKEVERSNAME): $(CMAKEVERSNAME).in ++ sed -e "s,@HIREDIS_VERSION@,$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH),g" \ ++ $(CMAKEVERSNAME).in >$(CMAKEVERSNAME) ++ ++install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) $(CMAKECONFNAME) $(CMAKEVERSNAME) + mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL_LIBRARY_PATH) + $(INSTALL) hiredis.h async.h read.h sds.h $(INSTALL_INCLUDE_PATH) + $(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters +@@ -178,6 +190,9 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) + $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH) + mkdir -p $(INSTALL_PKGCONF_PATH) + $(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH) ++ mkdir -p $(INSTALL_CMAKE_PATH) ++ $(INSTALL) $(CMAKECONFNAME) $(INSTALL_CMAKE_PATH) ++ $(INSTALL) $(CMAKEVERSNAME) $(INSTALL_CMAKE_PATH) + + 32bit: + @echo "" +-- +2.27.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb index 29f8de8d2..a41888802 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb @@ -7,7 +7,8 @@ DEPENDS = "redis" LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51" SRCREV = "685030652cd98c5414ce554ff5b356dfe8437870" SRC_URI = "git://github.com/redis/hiredis;protocol=git \ - file://0001-Makefile-remove-hardcoding-of-CC.patch" + file://0001-Makefile-remove-hardcoding-of-CC.patch \ + file://0001-CMake-configuration-for-hiredis.patch" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.3.3.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.6.0.bb index abc3e098c..90c0d244f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_2.6.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b" SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \ file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ " -SRC_URI[sha256sum] = "4162565cf7566d78d786e4ecf4b0639451b8464bcb24e761b1f08ef43e95e513" +SRC_URI[sha256sum] = "33cc69ba1fb762d85cc2755a930d6cf1a7c23e33f736ef2ec01c59d612f9b2eb" UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" diff --git a/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Remove-dead-paren_level-code.patch b/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Remove-dead-paren_level-code.patch new file mode 100644 index 000000000..5a474cf0f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/indent/indent/0001-Remove-dead-paren_level-code.patch @@ -0,0 +1,79 @@ +From 5af65ce9674a69054c9a8405e51794c6f3ca41df Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 4 Jun 2021 12:34:18 -0700 +Subject: [PATCH] Remove dead paren_level code + +Local variable `paren_level' in src/output.c:dump_line_code() is +initialized to 0, then incremented with count_parens() return +value, and then the variable is never used. Also count_parens() +has no side effect. Thus this patch removes this useless code. + +Upstream-Status: Submitted [https://mail.gnu.org/archive/html/bug-indent/2011-04/msg00000.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/output.c | 35 ----------------------------------- + 1 file changed, 35 deletions(-) + +diff --git a/src/output.c b/src/output.c +index ee01bcc..5b92167 100644 +--- a/src/output.c ++++ b/src/output.c +@@ -798,37 +798,6 @@ static int dump_line_label(void) + return cur_col; + } + +-/** +- * +- */ +- +-static int count_parens( +- const char * string) +-{ +- int paren_level = 0; +- +- while (*string) +- { +- switch (*string) +- { +- case '(': +- case '[': +- paren_level++; +- break; +- case ')': +- case ']': +- paren_level--; +- break; +- default: +- break; +- } +- +- string++; +- } +- +- return paren_level; +-} +- + /** + * + */ +@@ -840,8 +809,6 @@ static void dump_line_code( + BOOLEAN * pbreak_line, + int target_col_break) + { +- int paren_level = 0; +- + if (s_code != e_code) + { /* print code section, if any */ + int i; +@@ -928,8 +895,6 @@ static void dump_line_code( + + *pcur_col = count_columns (*pcur_col, s_code, NULL_CHAR); + +- paren_level += count_parens(s_code); +- + s_code[buf_break->offset] = c; + + *pnot_truncated = 0; +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb b/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb index 90ba8a2e6..829bf0fc1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/indent/indent_2.2.12.bb @@ -16,6 +16,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-src-indent.c-correct-the-check-for-locale.h.patch \ file://0001-Makefile.am-remove-regression-dir.patch \ file://0001-Fix-builds-with-recent-gettext.patch \ + file://0001-Remove-dead-paren_level-code.patch \ " SRC_URI[md5sum] = "4764b6ac98f6654a35da117b8e5e8e14" SRC_URI[sha256sum] = "e77d68c0211515459b8812118d606812e300097cfac0b4e9fb3472664263bb8b" diff --git a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb index a4a258145..3d87e4481 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb @@ -14,8 +14,8 @@ UPSTREAM_CHECK_REGEX = "Version (?P<pver>\d+(\.\d+)+)" inherit autotools-brokensep pkgconfig -SRC_URI[md5sum] = "6bd98ee3a6e6b9126c82c916d7a9e690" -SRC_URI[sha256sum] = "7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a16fad9" +SRC_URI[md5sum] = "15ec701205f91f21b1187f8b61e0d64f" +SRC_URI[sha256sum] = "545166d6cac037744381d1e9cc5a5405094e7bfad16a411699bcff40bbb31ee7" PACKAGE_BEFORE_PN = "${PN}++" FILES_${PN}++ = "${libdir}/${BPN}++*${SOLIBS}" diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/libyang-skip-pcre2-config-add-stdint-h.patch b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/libyang-skip-pcre2-config-add-stdint-h.patch new file mode 100644 index 000000000..e3b2d0e02 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/libyang-skip-pcre2-config-add-stdint-h.patch @@ -0,0 +1,55 @@ +From c7f3e2a8fe530beec6103cb9071ccc41458879aa Mon Sep 17 00:00:00 2001 +From: Tony Tascioglu <tony.tascioglu@windriver.com> +Date: Mon, 21 Jun 2021 12:34:22 -0400 +Subject: [PATCH] libyang: fix initial build errors + +This patch addresses build errors seen when integrating libyang as a +recipe. + +The call to pcre2-config has been commented out. *-config calls are +being replaced by pkgconfig, and we want to avoid the binary config +calls. This call can safely be discarded since it is used to check +the version of libpcre2 on the system, and all recent YP builds meet +the minimum required version (v10.21). + +There is a missing include statement for stdint.h in utests.h which +causes build problems. stdint.h is required to be imported by cmocka.h +prior to the cmocka file. Adding the stdint allows it to build the +tests correctly + +Upstream-Status: Pending + +Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> +--- + CMakeModules/FindPCRE2.cmake | 2 +- + tests/utests/utests.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeModules/FindPCRE2.cmake b/CMakeModules/FindPCRE2.cmake +index 8f60daa2..ad014f14 100644 +--- a/CMakeModules/FindPCRE2.cmake ++++ b/CMakeModules/FindPCRE2.cmake +@@ -12,7 +12,7 @@ FIND_PATH(PCRE2_INCLUDE_DIR pcre2.h) + FIND_LIBRARY(PCRE2_LIBRARY NAMES libpcre2.a pcre2-8) + + # Check required version +-execute_process(COMMAND pcre2-config --version OUTPUT_VARIABLE PCRE2_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) ++# execute_process(COMMAND pcre2-config --version OUTPUT_VARIABLE PCRE2_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) + + # Handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if all listed variables are TRUE. + INCLUDE(FindPackageHandleStandardArgs) +diff --git a/tests/utests/utests.h b/tests/utests/utests.h +index 5bea0459..a256120c 100644 +--- a/tests/utests/utests.h ++++ b/tests/utests/utests.h +@@ -23,6 +23,7 @@ + #include <stddef.h> + #include <stdlib.h> + ++#include <stdint.h> + #include <cmocka.h> + + #include <string.h> +-- +2.32.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/run-ptest b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/run-ptest new file mode 100644 index 000000000..1c9f8f47f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang/run-ptest @@ -0,0 +1,46 @@ +#!/bin/sh +# Valid tests to run +tests="utest_binary \ + utest_bits \ + utest_common \ + utest_hash_table \ + utest_inet_types \ + utest_int8 \ + utest_json \ + utest_list \ + utest_merge \ + utest_metadata \ + utest_parser_yang \ + utest_parser_yin \ + utest_pattern \ + utest_printer_yang \ + utest_printer_yin \ + utest_range \ + utest_schema \ + utest_set \ + utest_string \ + utest_tree_data \ + utest_tree_schema_compile \ + utest_types \ + utest_xml \ + utest_xpath \ + utest_yang_types \ + utest_yanglib" + +# cd into right directory +ptestdir=$(dirname "$(readlink -f "$0")") +cd "$ptestdir"/tests || exit + +# Run specified tests +for f in $tests +do + if test -e ./"$f"; then + if ./"$f" > ./"$f".out 2> ./"$f".err; then + echo "PASS: $f" + else + echo "FAIL: $f" + fi + else + echo "SKIP: $f" + fi +done diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb new file mode 100644 index 000000000..8e9e8cc02 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.7.bb @@ -0,0 +1,37 @@ +SUMMARY = "YANG data modeling language library" +DESCRIPTION = "libyang is a YANG data modelling language parser and toolkit written (and providing API) in C." +HOMEPAGE = "https://github.com/CESNET/libyang" +SECTION = "libs" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" + +SRCREV = "69d9fff65abb58beb0bb6aa9ecacd572ca1dfc56" + +SRC_URI = "git://github.com/CESNET/libyang.git \ + file://libyang-skip-pcre2-config-add-stdint-h.patch \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +COMPATIBLE_HOST_riscv32 = "null" +COMPATIBLE_HOST_armv5 = "null" +COMPATIBLE_HOST_riscv64 = "null" + +# Main dependencies +inherit cmake pkgconfig lib_package binconfig-disabled ptest +DEPENDS = "libpcre2" +DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" +BINCONFIG = "${bindir}/pcre2-config" + +# Ptest dependencies +RDEPENDS_${PN}-ptest += "valgrind" + +EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" +EXTRA_OECMAKE += " ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_BUILD_TESTS=ON', '', d)}" + +do_install_ptest () { + cp -fR ${B}/tests/ ${D}${PTEST_PATH}/ +} + diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb deleted file mode 100644 index e903de3da..000000000 --- a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.7.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." -HOMEPAGE = "https://libzip.org/" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=067e9870bba57e1ce20695c4d5672f30" - -DEPENDS = "zlib bzip2" - -PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" -PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" - -PACKAGECONFIG ?= "ssl lzma" - -inherit cmake - -SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" - -SRC_URI[sha256sum] = "a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132" diff --git a/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb new file mode 100644 index 000000000..23ac76a2d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libzip/libzip_1.8.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." +HOMEPAGE = "https://libzip.org/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=067e9870bba57e1ce20695c4d5672f30" + +DEPENDS = "zlib bzip2" + +PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" +PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" +PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF,gnutls nettle" +PACKAGECONFIG[zstd] = "-DENABLE_ZSTD=ON,-DENABLE_ZSTD=OFF,zstd" +PACKAGECONFIG[mbedtls] = "-DENABLE_MBEDTLS=ON,-DENABLE_MBEDTLS=OFF,mbedtls" +PACKAGECONFIG[examples] = "-DENABLE_EXAMPLES=ON,-DENABLE_EXAMPLES=OFF," +PACKAGECONFIG[tools] = "-DENABLE_TOOLS=ON,-DENABLE_TOOLS=OFF," +PACKAGECONFIG[tests] = "-DBUILD_REGRESS=ON,-DBUILD_REGRESS=OFF," + +PACKAGECONFIG ?= "ssl lzma tools examples" + +inherit cmake + +SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" + +SRC_URI[sha256sum] = "f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e" diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 86c149ba5..ef82a8fb0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -89,6 +89,7 @@ do_install() { install -d ${D}${MINIFI_BIN} install -d ${D}${MINIFI_HOME}/conf install -m 755 -d ${D}${localstatedir}/lib/minifi + install -m 755 -d ${D}${libexecdir}/minifi-python cp -a ${WORKDIR}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ cp -a ${WORKDIR}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ @@ -102,6 +103,8 @@ do_install() { ${D}${MINIFI_HOME}/conf/minifi.properties sed -i 's|nifi.flow.configuration.file=.*|nifi.flow.configuration.file='${MINIFI_HOME}'/conf/config.yml|g' \ ${D}${MINIFI_HOME}/conf/minifi.properties + sed -i 's|nifi.python.processor.dir=.*|nifi.python.processor.dir=${libexecdir}/minifi-python|g' \ + ${D}${MINIFI_HOME}/conf/minifi.properties sed -i 's|export MINIFI_HOME=.*|export MINIFI_HOME='${MINIFI_HOME}'|g' ${D}${MINIFI_BIN}/minifi.sh sed -i 's|bin_dir=${MINIFI_HOME}/bin|bin_dir='${MINIFI_BIN}'|g' ${D}${MINIFI_BIN}/minifi.sh @@ -136,3 +139,5 @@ pkg_postinst_${PN}() { fi fi } + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.2.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.3.bb index c3505ab06..c735f6d8b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2021.3.bb @@ -25,7 +25,7 @@ SRC_URI = " \ gitsm://github.com/ostreedev/ostree;branch=main \ file://run-ptest \ " -SRCREV = "6a72674ec621a2282043c3a083fe1e45cd6a8761" +SRCREV = "38c14b374567f736533f7f515595208fe359819f" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.3.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb index 67ac974de..35f34a27d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_6.2.4.bb @@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://GNU_SOURCE.patch \ file://0006-Define-correct-gregs-for-RISCV32.patch \ " -SRC_URI[sha256sum] = "98ed7d532b5e9671f5df0825bb71f0f37483a16546364049384c63db8764512b" +SRC_URI[sha256sum] = "ba32c406a10fc2c09426e2be2787d74ff204eb3a2e496d87cff76a476b6ae16e" inherit autotools-brokensep update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2104.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb index 3f1ec91ab..37f391356 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2104.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2106.0.bb @@ -31,8 +31,8 @@ SRC_URI_append_libc-musl = " \ file://0001-Include-sys-time-h.patch \ " -SRC_URI[md5sum] = "a0213c989bce297944901e1a85286b8b" -SRC_URI[sha256sum] = "710981c3c34f88d5d1fb55ecfc042aecad8af69414b2b1602b304f4dedbf9f43" +SRC_URI[md5sum] = "b90659d85dce1df0f6c69a79c4ef053a" +SRC_URI[sha256sum] = "faf45c25a2265c001739e8888b3652cf685eb3f35cd65d17d5c38fd44b9ddd81" UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index eca8dfc7b..0278b5338 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -1,14 +1,19 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931" -SRCREV = "b31bce98d65f894aad6427bcf6f3f7822e261a59" +SRCREV = "beb4650660179963a8ed5b5cbf2085cc1b34f608" PV = "1.0+git${SRCPV}" SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https" + S = "${WORKDIR}/git" inherit module EXTRA_OEMAKE += "KERNELDIR=${STAGING_KERNEL_DIR}" -PNBLACKLIST[can-isotp] ?= "Kernel module Needs forward porting to kernel 5.2+" +do_install_append() { + install -Dm 644 ${S}/include/uapi/linux/can/isotp.h ${D}${includedir}/linux/can/isotp.h +} + +EXCLUDE_FROM_WORLD = "1" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 3b2b6a9da..36e7d1ef5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -6,9 +6,9 @@ DEPENDS = "libsocketcan" SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git" -SRCREV = "eb66451df280f95a9a12e78b151b8d867e1b78ed" +SRCREV = "e9dd86fa5c4e6ecdfc34e487634a32f19e5c4d63" -PV = "2020.12.0" +PV = "2021.06.0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb index f1b77070c..a626e3b20 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sysdig/sysdig_git.bb @@ -15,6 +15,8 @@ JIT_mipsarchn64 = "" JIT_riscv64 = "" JIT_riscv32 = "" JIT_powerpc = "" +JIT_powerpc64le = "" +JIT_powerpc64 = "" DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp tbb jq openssl elfutils protobuf protobuf-native jq-native" RDEPENDS_${PN} = "bash" diff --git a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/fixes.patch b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/fixes.patch new file mode 100644 index 000000000..1ec4993a1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/fixes.patch @@ -0,0 +1,115 @@ +Upstream-Status: Submitted [https://github.com/probonopd/zsync-curl/pull/41] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/src/configure.ac b/src/configure.ac +index 10de8c4..6488140 100644 +--- a/src/configure.ac ++++ b/src/configure.ac +@@ -9,7 +9,6 @@ AC_CONFIG_MACRO_DIR([autotools]) + AC_CANONICAL_HOST + + AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign check-news -Woverride -Wobsolete -Wportability -Wsyntax -Wunsupported]) +-AM_MAINTAINER_MODE + + dnl --- Check for programs + AC_PROG_CC +@@ -23,6 +22,7 @@ AS_IF([test "x$enable_profile" = "xyes"], [ + ZS_CFLAGS="${ZS_CFLAGS} -pg" ]) + + dnl --- Header files, typedefs, structures, libraries ++AC_USE_SYSTEM_EXTENSIONS + AC_C_CONST + AC_HEADER_STDC + # string.h, memory.h, stdlib.h both included in the default header checks +@@ -55,10 +55,6 @@ case $host_os in + host_os_mingw32=yes + LIBS="${LIBS} -lwsock32" + ;; +- *) +- AC_DEFINE([_XOPEN_SOURCE], 600, [Enable POSIX extensions if present]) +- AC_DEFINE([_BSD_SOURCE],1, [Enable BSD extensions if present]) +- ;; + esac + AM_CONDITIONAL([MINGW32], test "x$host_os_mingw32" = "xyes") + +diff --git a/src/librcksum/Makefile.am b/src/librcksum/Makefile.am +index f4fce72..47754eb 100644 +--- a/src/librcksum/Makefile.am ++++ b/src/librcksum/Makefile.am +@@ -1,4 +1,4 @@ +- ++AM_CPPFLAGS = "-I$(top_srcdir)" + + noinst_LIBRARIES = librcksum.a + +diff --git a/src/librcksum/md4.h b/src/librcksum/md4.h +index e90603a..0ed7485 100644 +--- a/src/librcksum/md4.h ++++ b/src/librcksum/md4.h +@@ -18,11 +18,8 @@ + + #include "zsglobal.h" + +-#ifdef HAVE_INTTYPES_H +-#include <inttypes.h> +-#else ++#include <stdint.h> + #include <sys/types.h> +-#endif + + #define MD4_BLOCK_LENGTH 64 + #define MD4_DIGEST_LENGTH 16 +diff --git a/src/libzsync/Makefile.am b/src/libzsync/Makefile.am +index 0a6ae85..33a5951 100644 +--- a/src/libzsync/Makefile.am ++++ b/src/libzsync/Makefile.am +@@ -1,3 +1,4 @@ ++AM_CPPFLAGS = "-I$(top_srcdir)" + + noinst_LIBRARIES = libzsync.a + +diff --git a/src/libzsync/sha1.h b/src/libzsync/sha1.h +index 3946505..87f3794 100644 +--- a/src/libzsync/sha1.h ++++ b/src/libzsync/sha1.h +@@ -11,11 +11,8 @@ + + #include "config.h" + +-#ifdef HAVE_INTTYPES_H +-#include <inttypes.h> +-#else ++#include <stdint.h> + #include <sys/types.h> +-#endif + + #define SHA1_BLOCK_LENGTH 64 + #define SHA1_DIGEST_LENGTH 20 +diff --git a/src/libzsync/zmap.c b/src/libzsync/zmap.c +index f052dba..030b2a5 100644 +--- a/src/libzsync/zmap.c ++++ b/src/libzsync/zmap.c +@@ -28,9 +28,6 @@ + #include <string.h> + #include <sys/types.h> + #include <arpa/inet.h> +-#ifdef HAVE_INTTYPES_H +-#include <inttypes.h> +-#endif + + #ifdef WITH_DMALLOC + # include <dmalloc.h> +diff --git a/src/make.c b/src/make.c +index 191b527..ba7f3a9 100644 +--- a/src/make.c ++++ b/src/make.c +@@ -28,9 +28,6 @@ + #include <time.h> + + #include <arpa/inet.h> +-#ifdef HAVE_INTTYPES_H +-#include <inttypes.h> +-#endif + + #include <sys/types.h> + #include <sys/stat.h> diff --git a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/make.patch b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/make.patch new file mode 100644 index 000000000..ef19b5e85 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl/make.patch @@ -0,0 +1,50 @@ +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From 3b9d64cf3c33ad235ed444f8715732e509ab023f Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Wed, 9 Jun 2021 16:11:25 +0100 +Subject: [PATCH] Build zsyncmake + +No point having the zsync client without the server-side tool. + +Closes #42 +--- + .gitignore | 1 + + src/Makefile.am | 5 ++++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/.gitignore b/.gitignore +index 36f7bd8..728658e 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -22,3 +22,4 @@ src/librcksum/md4test + src/libzsync/sha1test + stamp-h1 + zsync_curl ++zsyncmake_curl +diff --git a/src/Makefile.am b/src/Makefile.am +index 5f8ff73..ffa2280 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -4,13 +4,16 @@ ACLOCAL_AMFLAGS = -I autotools + + SUBDIRS = librcksum zlib libzsync doc + +-bin_PROGRAMS = zsync_curl ++bin_PROGRAMS = zsync_curl zsyncmake_curl + + zsync_curl_SOURCES = client.c http.c http.h url.c url.h progress.c progress.h base64.c format_string.h zsglobal.h + zsync_curl_LDADD = libzsync/libzsync.a librcksum/librcksum.a zlib/libinflate.a $(LIBOBJS) + + EXTRA_zsync_curl_SOURCES = getaddrinfo.h + ++zsyncmake_curl_SOURCES = make.c makegz.c makegz.h format_string.h ++zsyncmake_curl_LDADD = libzsync/libzsync.a librcksum/librcksum.a zlib/libinflate.a zlib/libdeflate.a -lm ++ + # From "GNU autoconf, automake and libtool" Vaughan, Elliston, + # # Tromey and Taylor, publisher New Riders, p.134 + # # They made me do it! :-) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb new file mode 100644 index 000000000..adb72d5de --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "File transfer tool optimised for large files (curl port)" +HOMEPAGE = "http://zsync.moria.org.uk/" +DEPENDS = "curl" + +LICENSE = "Artistic-2.0" +LIC_FILES_CHKSUM = "file://src/COPYING;md5=71c0ac4d86266533509aa0825b8d323c" + +SRC_URI = "git://github.com/probonopd/zsync-curl;protocol=https \ + file://fixes.patch \ + file://make.patch" +SRCREV = "00141c2806ccc4ddf2ff6263ee1612d19c0b713f" + +PV = "0.6.2+git${SRCPV}" + +inherit autotools + +S = "${WORKDIR}/git" +AUTOTOOLS_SCRIPT_PATH = "${S}/src" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb b/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb index 0e09c3a64..a3e8bbf49 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.2.bb @@ -7,13 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ DEPENDS = "atk glibmm" -inherit features_check gnomebase autotools pkgconfig +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "6194ac577f15567adfa3c923944c6651" -SRC_URI[archive.sha256sum] = "4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc0bc2d9afcedd3a" +SRC_URI[archive.sha256sum] = "a0bb49765ceccc293ab2c6735ba100431807d384ffa14c2ebd30e07993fd2fa4" -EXTRA_OECONF = " --disable-documentation " +EXTRA_OEMESON = "-Dbuild-documentation=false" FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h index 714cb5aa9..a899ce0ad 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h +++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime/iconv-detect.h @@ -3,3 +3,4 @@ #define ICONV_ISO_INT_FORMAT "iso-%u-%u" #define ICONV_ISO_STR_FORMAT "iso-%u-%s" #define ICONV_10646 "iso-10646" +#define ICONV_SHIFT_JIS "shift-jis" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb index 4ae13e7ef..e70b74789 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.6.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.7.bb @@ -2,15 +2,14 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DESCRIPTION = "Runtime libraries for parsing and creating MIME mail" SECTION = "libs" + DEPENDS = "glib-2.0 zlib" inherit gnomebase gobject-introspection SRC_URI += "file://iconv-detect.h \ file://nodolt.patch" - -SRC_URI[archive.md5sum] = "656548dc431004d1ebf95e5d0bb4b9c8" -SRC_URI[archive.sha256sum] = "abff194c7c4802fba2e233890d09dde8bf7170c3ad5e13000601c8d5b3c44717" +SRC_URI[archive.sha256sum] = "2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44" export ac_cv_have_iconv_detect_h="yes" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch deleted file mode 100644 index 46a691643..000000000 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm/0001-meson.build-use-relative-path.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 152d295a28567ac87b0e6db2e62c0d914b1d7ef9 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Tue, 23 Feb 2021 08:47:54 +0000 -Subject: [PATCH] meson.build: use relative path - -Fixes: -Fatal error: can't create -gdk/gdkmm/libgdkmm-3.0.so.1.1.0.p/_buildarea1_master-wr_build_Userspace_auto-usrmerge_standalone_usrmerge_next_210222_lxbuilds_Har12345_platform_up_intel-x86-64-standard-glibc-std_wrlinux_build_tmp-glibc_work_corei7-64-wrs-linux_gtkmm3_3.24.3-r0_gtkmm-3.24.3_untracked_gdk_gdkmm_timecoord.cc.o: File name too long - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtkmm/-/merge_requests/61] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - gdk/gdkmm/meson.build | 4 ++-- - gtk/gtkmm/meson.build | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/gdk/gdkmm/meson.build b/gdk/gdkmm/meson.build -index afccaea..240ce4d 100644 ---- a/gdk/gdkmm/meson.build -+++ b/gdk/gdkmm/meson.build -@@ -200,9 +200,9 @@ else # not maintainer_mode - gdkmm_hg_ccg_basenames, - ) - -- built_cc_files = [ src_untracked_gdkmm / 'wrap_init.cc' ] -+ built_cc_files = [ '../..' / untracked_gdkmm / 'wrap_init.cc' ] - foreach file : gdkmm_used_hg_ccg_basenames -- built_cc_files += src_untracked_gdkmm / file + '.cc' -+ built_cc_files += '../..' / untracked_gdkmm / file + '.cc' - endforeach - - gdk_gen_sources = built_cc_files -diff --git a/gtk/gtkmm/meson.build b/gtk/gtkmm/meson.build -index ab96a22..cc0c050 100644 ---- a/gtk/gtkmm/meson.build -+++ b/gtk/gtkmm/meson.build -@@ -464,9 +464,9 @@ else # not maintainer_mode - gtkmm_hg_ccg_basenames, - ) - -- built_cc_files = [ src_untracked_gtkmm / 'wrap_init.cc' ] -+ built_cc_files = [ '../..' / untracked_gtkmm / 'wrap_init.cc' ] - foreach file : gtkmm_used_hg_ccg_basenames -- built_cc_files += src_untracked_gtkmm / file + '.cc' -+ built_cc_files += '../..' / untracked_gtkmm / file + '.cc' - endforeach - - gtk_gen_sources = built_cc_files --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb index 1648e37fa..2c5012cb2 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.3.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.5.bb @@ -16,10 +16,7 @@ inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += "file://0001-meson.build-use-relative-path.patch \ -" - -SRC_URI[archive.sha256sum] = "60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435" +SRC_URI[archive.sha256sum] = "856333de86689f6a81c123f2db15d85db9addc438bc3574c36f15736aeae22e6" EXTRA_OEMESON = "-Dbuild-demos=false" diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch index 25e851883..3a62fffe3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch @@ -1,6 +1,6 @@ -From 5b83983b246cff440de4421696b6b5dd9072ed2d Mon Sep 17 00:00:00 2001 +From bd9b5060bc3b9581090d44f15b4e236566ea86a6 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 6 Feb 2021 11:36:23 -0800 +Date: Fri, 4 Jun 2021 12:57:57 -0700 Subject: [PATCH] Silence clang warnings Fixes @@ -12,15 +12,22 @@ glm/gtc/../ext/quaternion_common.inl:76:87: error: unused parameter 'k' [-Werror GLM_FUNC_QUALIFIER qua<T, Q> slerp(qua<T, Q> const& x, qua<T, Q> const& y, T a, S k) ^ +and + +test/gtx/gtx_fast_trigonometry.cpp:135:9: error: variable 'result' set but not used [-Werror,-Wunused-but-set-variable] +| float result = 0.f; +| ^ + Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/1055] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - glm/ext/quaternion_common.inl | 2 +- - glm/gtc/random.inl | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + glm/ext/quaternion_common.inl | 2 +- + glm/gtc/random.inl | 2 +- + test/gtx/gtx_fast_trigonometry.cpp | 30 ++++++++++++------------------ + 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/glm/ext/quaternion_common.inl b/glm/ext/quaternion_common.inl -index 0e4a3bb2..8f9dccef 100644 +index 0e4a3bb2..6f99f52d 100644 --- a/glm/ext/quaternion_common.inl +++ b/glm/ext/quaternion_common.inl @@ -104,7 +104,7 @@ namespace glm @@ -28,7 +35,7 @@ index 0e4a3bb2..8f9dccef 100644 // Graphics Gems III, page 96 T angle = acos(cosTheta); - T phi = angle + k * glm::pi<T>(); -+ T phi = angle + static_cast<float>(k) * glm::pi<T>(); ++ T phi = angle + static_cast<T>(k) * glm::pi<T>(); return (sin(angle - a * phi)* x + sin(a * phi) * z) / sin(angle); } } @@ -45,6 +52,114 @@ index 70485098..a4af2a06 100644 } }; +diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp +index 8bf86ba0..ddaa708b 100644 +--- a/test/gtx/gtx_fast_trigonometry.cpp ++++ b/test/gtx/gtx_fast_trigonometry.cpp +@@ -19,15 +19,14 @@ namespace fastCos + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastCos(i); ++ glm::fastCos(i); + + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::cos(i); ++ glm::cos(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -53,15 +52,14 @@ namespace fastSin + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastSin(i); ++ glm::fastSin(i); + + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::sin(i); ++ glm::sin(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -79,15 +77,14 @@ namespace fastTan + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastTan(i); ++ glm::fastTan(i); + + const std::clock_t timestamp2 = std::clock(); + for (float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::tan(i); ++ glm::tan(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -105,15 +102,14 @@ namespace fastAcos + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastAcos(i); ++ glm::fastAcos(i); + + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::acos(i); ++ glm::acos(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -132,13 +128,12 @@ namespace fastAsin + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastAsin(i); ++ glm::fastAsin(i); + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::asin(i); ++ glm::asin(i); + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; + const std::clock_t time_default = timestamp3 - timestamp2; +@@ -155,13 +150,12 @@ namespace fastAtan + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastAtan(i); ++ glm::fastAtan(i); + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::atan(i); ++ glm::atan(i); + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; + const std::clock_t time_default = timestamp3 - timestamp2; -- -2.30.0 +2.31.1 diff --git a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb index b44b03ce8..085aaae12 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" DEPENDS = "freetype " PROVIDES = "virtual/imlib2" PV = "1.7.1" -SRCREV = "v1.7.1" +SRCREV = "01424487e360383a039dc123bc2a345fe7ea2535" inherit autotools pkgconfig lib_package diff --git a/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.1.bb b/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.46.1.bb index 57d9ff982..f7e126e95 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.46.1.bb @@ -6,18 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ DEPENDS = "mm-common cairomm glibmm pango" -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" +GNOMEBASEBUILDCLASS = "meson" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.xz" -SRC_URI[md5sum] = "339c48dd92ebd3a9911b231708f7a819" -SRC_URI[sha256sum] = "14bf04939930870d5cfa96860ed953ad2ce07c3fd8713add4a1bfe585589f40f" +inherit gnomebase features_check -inherit features_check autotools pkgconfig +SRC_URI[archive.sha256sum] = "c885013fe61a4c5117fda395770d507563411c63e49f4a3aced4c9efe34d9975" REQUIRED_DISTRO_FEATURES = "x11" -EXTRA_OECONF = " --disable-documentation " - FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${libdir}/*/include/ ${libdir}/pangomm-*/" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb index e74f7a7f6..6dc39b17b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20190815.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-noto-emoji_20200916.bb @@ -5,8 +5,8 @@ HOMEPAGE = "https://github.com/googlefonts/noto-emoji" LICENSE = "OFL-1.1" LIC_FILES_CHKSUM = "file://fonts/LICENSE;md5=55719faa0112708e946b820b24b14097" -SRC_URI = "git://github.com/googlefonts/noto-emoji;protocol=https" -SRCREV = "833a43d03246a9325e748a2d783006454d76ff66" +SRC_URI = "git://github.com/googlefonts/noto-emoji;branch=main;protocol=https" +SRCREV = "aac7ccaa4d1dea4543453b96f7d6fc47066a57ff" PACKAGES = "${PN}-color ${PN}-regular" FONT_PACKAGES = "${PN}-color ${PN}-regular" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch new file mode 100644 index 000000000..7703a4320 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch @@ -0,0 +1,44 @@ +From 19bd0a979677a81d7399d5b567998398ec81f38b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 8 Jul 2021 15:40:10 -0700 +Subject: [PATCH] build: Do not build po files + +Fixes +| make[1]: Entering directory '/mnt/b/yoe/master/build/tmp/work/cortexa57-yoe-linux/xscreensaver/6.01-r0/xscreensaver-6.01/po' +| make[1]: *** No rule to make target 'default'. Stop. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -6,8 +6,8 @@ srcdir = @srcdir@ + VPATH = @srcdir@ + + SHELL = /bin/sh +-SUBDIRS = utils jwxyz hacks/images hacks hacks/glx hacks/fonts \ +- driver po ++SUBDIRS = utils jwxyz hacks/images hacks hacks/fonts \ ++ driver + SUBDIRS2 = $(SUBDIRS) OSX android + TARFILES = README README.hacking INSTALL \ + configure configure.ac Makefile.in config.h.in \ +@@ -451,4 +451,3 @@ cerebrum:: + --include 'configure*' \ + --include '*/' \ + --exclude '*' +- +--- a/driver/Makefile.in ++++ b/driver/Makefile.in +@@ -212,7 +212,7 @@ TEST_EXES = test-passwd test-uid + xdpyinfo test-screens test-yarandom test-xinput \ + test-xkb + +-EXES = xscreensaver xscreensaver-command xscreensaver-settings ++EXES = xscreensaver xscreensaver-command + UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@ + SETUID_EXES = xscreensaver-auth + DEMO_EXES = @ALL_DEMO_PROGRAMS@ diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch deleted file mode 100644 index afc8bc8e7..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- xscreensaver-5.44.orig/configure.in 2020-06-16 12:49:55.384675395 +0000 -+++ xscreensaver-5.44/configure.in 2020-06-16 12:51:49.451826729 +0000 -@@ -14,6 +14,9 @@ - # - ############################################################################### - -+includedir='' -+libdir='' -+ - AH_TOP([ - /* config.h.in --- xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski. - * -diff -Naur xscreensaver-5.44.orig/driver/Makefile.in xscreensaver-5.44/driver/Makefile.in ---- xscreensaver-5.44.orig/driver/Makefile.in 2020-06-16 12:49:55.388675365 +0000 -+++ xscreensaver-5.44/driver/Makefile.in 2020-06-16 12:53:36.331038333 +0000 -@@ -10,7 +10,7 @@ - top_srcdir = @top_srcdir@ - top_builddir = .. - --install_prefix = -+install_prefix = ${DESTDIR} - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ -@@ -228,7 +228,7 @@ - SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \ - xscreensaver-text - SCRIPTS_OSX = xscreensaver-getimage-desktop --SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ -+#SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ - - HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ - xscreensaver.h prefs.h remote.h exec.h \ -diff -Naur xscreensaver-5.44.orig/hacks/Makefile.in xscreensaver-5.44/hacks/Makefile.in ---- xscreensaver-5.44.orig/hacks/Makefile.in 2020-06-16 12:49:55.532674285 +0000 -+++ xscreensaver-5.44/hacks/Makefile.in 2020-06-16 12:58:54.364719996 +0000 -@@ -10,7 +10,7 @@ - top_srcdir = @top_srcdir@ - top_builddir = .. - --install_prefix = -+install_prefix = ${DESTDIR} - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ -@@ -124,7 +124,7 @@ - tessellimage.c delaunay.c recanim.c binaryring.c \ - glitchpeg.c vfeedback.c scooter.c webcollage-cocoa.m \ - webcollage-helper-cocoa.m testx11.c --SCRIPTS = vidwhacker webcollage ljlatest -+#SCRIPTS = vidwhacker webcollage ljlatest - - # Programs that are mentioned in XScreenSaver.ad, and that have XML files, - # but that are not shipped with xscreensaver itself. -@@ -166,7 +166,13 @@ - tessellimage.o delaunay.o recanim.o binaryring.o \ - glitchpeg.o vfeedback.o scooter.o testx11.o - --EXES = attraction blitspin bouboule braid decayscreen deco \ -+EXES = fontglide -+JPEG_EXES = webcollage-helper -+ -+RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ -+ lightning lisa lissie lmorph rotor sphere spiral t3d vines \ -+ whirlygig worm xsublim juggle testx11 \ -+ attraction blitspin bouboule braid decayscreen deco \ - drift flame galaxy grav greynetic halo \ - helix hopalong ifs imsmap julia kaleidescope \ - maze moire noseguy pedal \ -@@ -182,17 +188,12 @@ - speedmine vermiculate twang apollonian euler2d \ - polyominoes thornbird fluidballs anemone halftone \ - metaballs eruption popsquares barcode piecewise cloudlife \ -- fontglide apple2 xanalogtv pong filmleader wormhole \ -+ apple2 xanalogtv pong filmleader wormhole \ - pacman fuzzyflakes anemotaxis memscroller substrate \ - intermomentary fireworkx fiberlamp boxfit interaggregate \ - celtic cwaves m6502 abstractile lcdscrub hexadrop \ - tessellimage binaryring glitchpeg vfeedback scooter \ - @JPEG_EXES@ --JPEG_EXES = webcollage-helper -- --RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ -- lightning lisa lissie lmorph rotor sphere spiral t3d vines \ -- whirlygig worm xsublim juggle testx11 - - HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ - $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \ -diff -Naur xscreensaver-5.44.orig/Makefile.in xscreensaver-5.44/Makefile.in ---- xscreensaver-5.44.orig/Makefile.in 2020-06-16 12:49:55.384675395 +0000 -+++ xscreensaver-5.44/Makefile.in 2020-06-16 12:52:49.395383836 +0000 -@@ -6,7 +6,7 @@ - VPATH = @srcdir@ - - SHELL = /bin/sh --SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po -+SUBDIRS = utils jwxyz hacks/images hacks driver - SUBDIRS2 = $(SUBDIRS) OSX android - TARFILES = README README.hacking README.VMS INSTALL \ - configure configure.in Makefile.in config.h.in \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch index 0f2e09aec..4ce2faed5 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch @@ -1,5 +1,5 @@ ---- xscreensaver-5.44.orig/driver/XScreenSaver.ad.in 2020-06-16 13:13:14.950970569 +0000 -+++ xscreensaver-5.44/driver/XScreenSaver.ad.in 2020-06-16 13:19:35.777000937 +0000 +--- a/driver/XScreenSaver.ad.in ++++ b/driver/XScreenSaver.ad.in @@ -29,7 +29,7 @@ ! /* (xrdb prevention kludge: whole file) @@ -18,13 +18,13 @@ *grabVideoFrames: False *chooseRandomImages: @DEFAULT_IMAGES_P@ ! This can be a local directory name, or the URL of an RSS or Atom feed. -@@ -48,11 +48,11 @@ +@@ -47,11 +47,11 @@ + *memoryLimit: 0 *lock: False *verbose: False - *timestamp: True -*fade: True +*fade: False - *unfade: False + *unfade: True *fadeSeconds: 0:00:03 *fadeTicks: 20 -*splash: True @@ -32,7 +32,7 @@ *splashDuration: 0:00:05 *visualID: default *installColormap: True -@@ -343,246 +343,8 @@ +@@ -324,250 +324,8 @@ XScreenSaver.bourneShell: /bin/sh !============================================================================= *programs: \ @@ -272,8 +272,12 @@ - vfeedback -root \n\ -@GL_KLUDGE@ GL: deepstars -root \n\ -@GL_KLUDGE@ GL: gravitywell -root \n\ +-@GL_KLUDGE@ GL: beats -root \n\ +-@GL_KLUDGE@ GL: covid19 -root \n\ -@GL_KLUDGE@ GL: etruscanvenus -root \n\ --@GL_KLUDGE@ GL: gibson -root \n +-@GL_KLUDGE@ GL: gibson -root \n\ +-@GL_KLUDGE@ GL: headroom -root \n\ +-@GL_KLUDGE@ GL: sphereeversion -root \n - - +- fontglide -root -program "date +'%F %H:%M %z'" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb deleted file mode 100644 index 9131c754d..000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "X screen saver and locker" -HOMEPAGE = "https://www.jwz.org/xscreensaver/" -LICENSE = "BSD-0-Clause" -LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=2b97002f72fbfc9329b4336e798f2463" - -SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "9f764e561f9939f8684a66ec98b27cba" -SRC_URI[sha256sum] = "73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95" - -SRC_URI += " \ - file://xscreensaver.service \ - file://fix-buildscripts.patch \ - file://tweak-app-defaults.patch \ -" - -DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native" -# These are only needed as part of the stopgap screensaver implementation: -RDEPENDS_${PN} = " \ - liberation-fonts \ - xuser-account \ -" - -inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check - -EXTRA_OECONF += "--with-x-app-defaults=${datadir}/X11/app-defaults" - -REQUIRED_DISTRO_FEATURES = "x11" - -do_install_append() { - install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service -} - -FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver" -SYSTEMD_SERVICE_${PN} = "xscreensaver.service" - -CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb new file mode 100644 index 000000000..d67e05844 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb @@ -0,0 +1,53 @@ +SUMMARY = "X screen saver and locker" +HOMEPAGE = "https://www.jwz.org/xscreensaver/" +LICENSE = "BSD-0-Clause" +LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=c3ce41cdff745eb1dc9d4fcfbffb4d51" + +SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz" +SRC_URI[sha256sum] = "085484665d91f60b4a1dedacd94bcf9b74b0fb096bcedc89ff1c245168e5473b" + +SRC_URI += " \ + file://xscreensaver.service \ + file://0001-build-Do-not-build-po-files.patch \ + file://tweak-app-defaults.patch \ +" + +DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam" +# These are only needed as part of the stopgap screensaver implementation: +RDEPENDS_${PN} = " \ + liberation-fonts \ + xuser-account \ +" + +inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check + + +EXTRA_OECONF += "--with-app-defaults=${datadir}/X11/app-defaults --libdir=${STAGING_LIBDIR} \ + --includedir=${STAGING_INCDIR} --with-pam --with-login-manager" + +EXTRA_OEMAKE += "install_prefix=${D}" +REQUIRED_DISTRO_FEATURES = "x11 pam" + +do_install_append() { + install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service + for f in xscreensaver-getimage-file xscreensaver-getimage-video webcollage xscreensaver-text vidwhacker + do + sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" ${D}/${libexecdir}/${PN}/$f + done +} + +PACKAGES =+ "${PN}-perl" + +FILES_${PN}-perl = "\ + ${libexecdir}/${PN}/xscreensaver-getimage-file \ + ${libexecdir}/${PN}/xscreensaver-getimage-video \ + ${libexecdir}/${PN}/webcollage \ + ${libexecdir}/${PN}/xscreensaver-text \ + ${libexecdir}/${PN}/vidwhacker \ + " +FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver ${datadir}/fonts" +SYSTEMD_SERVICE_${PN} = "xscreensaver.service" + +RDEPENDS_${PN}-perl = "perl" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4/0002-perf_examples-Remove-unused-sum-variable.patch b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4/0002-perf_examples-Remove-unused-sum-variable.patch new file mode 100644 index 000000000..e85ca96fc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4/0002-perf_examples-Remove-unused-sum-variable.patch @@ -0,0 +1,44 @@ +From 0b2f611a95f3c93454453892bbe021ad2815925d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Jun 2021 17:35:26 -0700 +Subject: [PATCH] perf_examples: Remove unused 'sum' variable + +Fixes +self_smpl_multi.c:144:19: error: variable 'sum' set but not used [-Werror,-Wunused-but-set-variable] + unsigned long x, sum; + ^ +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + perf_examples/self_smpl_multi.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/perf_examples/self_smpl_multi.c b/perf_examples/self_smpl_multi.c +index 391fa61..75b45e0 100644 +--- a/perf_examples/self_smpl_multi.c ++++ b/perf_examples/self_smpl_multi.c +@@ -141,7 +141,7 @@ void + do_cycles(void) + { + struct timeval start, last, now; +- unsigned long x, sum; ++ unsigned long x; + + gettimeofday(&start, NULL); + last = start; +@@ -150,15 +150,12 @@ do_cycles(void) + iter[myid] = 0; + + do { +- +- sum = 1; + for (x = 1; x < 250000; x++) { + /* signal pending to private queue because of + * pthread_kill(), i.e., tkill() + */ + if ((x % 5000) == 0) + pthread_kill(pthread_self(), SIGUSR1); +- sum += x; + } + iter[myid]++; + diff --git a/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.10.1.bb b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb index ff56d4804..8ffc99f91 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libpfm/libpfm4_4.11.0.bb @@ -10,13 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0de488f3bd4424e308e2e399cb99c788" SECTION = "devel" -COMPATIBLE_HOST = "powerpc64" +COMPATIBLE_HOST = "powerpc64|aarch64" SRC_URI = "${SOURCEFORGE_MIRROR}/perfmon2/${BPN}/libpfm-${PV}.tar.gz \ file://0001-Include-poll.h-instead-of-sys-poll.h.patch \ - " -SRC_URI[md5sum] = "d8f66cb9bfa7e1434434e0de6409db5b" -SRC_URI[sha256sum] = "c61c575378b5c17ccfc5806761e4038828610de76e2e34fac9f7fa73ba844b49" + file://0002-perf_examples-Remove-unused-sum-variable.patch \ + " +SRC_URI[sha256sum] = "5da5f8872bde14b3634c9688d980f68bda28b510268723cc12973eedbab9fecc" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/perfmon2/files/libpfm4/" @@ -24,6 +24,7 @@ EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LIBDIR=\"${libdir}\" LDCON EXTRA_OEMAKE_append_powerpc = " ARCH=\"powerpc\"" EXTRA_OEMAKE_append_powerpc64 = " ARCH=\"powerpc\" BITMODE=\"64\"" EXTRA_OEMAKE_append_powerpc64le = " ARCH=\"powerpc\" BITMODE=\"64\"" +EXTRA_OEMAKE_append_aarch64 = " ARCH=\"arm64\"" S = "${WORKDIR}/libpfm-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-kernel/spidev-test/spidev-test.bb b/meta-openembedded/meta-oe/recipes-kernel/spidev-test/spidev-test.bb index 662630291..974cb1e93 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/spidev-test/spidev-test.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/spidev-test/spidev-test.bb @@ -1,7 +1,7 @@ SUMMARY = "Test SPI devices" DESCRIPTION = "SPI testing utility using the spidev driver" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" PROVIDES = "virtual/spidev-test" inherit bash-completion kernelsrc kernel-arch diff --git a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210406.bb b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210710.bb index cc138adb6..9d89e1c5a 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210406.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/live555/live555_20210710.bb @@ -16,7 +16,7 @@ SRC_URI = "https://download.videolan.org/pub/contrib/live555/live.${URLV}.tar.gz # only latest live version stays on http://www.live555.com/liveMedia/public/, add mirror for older MIRRORS += "http://www.live555.com/liveMedia/public/ http://download.videolan.org/contrib/live555/ \n" -SRC_URI[sha256sum] = "0bd182fac7d6297d924af4405ce840515a38fa5438cb1a4b90fcb6bc737b36d6" +SRC_URI[sha256sum] = "c157e848fecb335a7af2917fe787dacc5ada07e74f02026c206b092bc4cecb01" S = "${WORKDIR}/live" diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.1.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.2.bb index ba24d360e..7d2cec18b 100644 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.0.2.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master \ " S = "${WORKDIR}/git" -SRCREV = "46cb7d92443c9ec7b3af15fb0baa65f65f6415d3" +SRCREV = "40312ddee3035d13e287355544cd7bd7e49b5499" inherit autotools python3native update-rc.d systemd diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch index 0eb7e4bbb..c6f9c6de6 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch @@ -1,4 +1,4 @@ -From 12414304245cce6ef0e8b9547949be5109845353 Mon Sep 17 00:00:00 2001 +From 2cc41bee63223cb398ea932aad6ecc94ff5b61dd Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Tue, 24 Jul 2018 13:33:33 +0800 Subject: [PATCH] cmake: Install libcares.pc @@ -11,12 +11,13 @@ Signed-off-by: Alexey Firago <alexey_firago@mentor.com> update to 1.14.0, fix patch warning Signed-off-by: Changqing Li <changqing.li@windriver.com> + --- - CMakeLists.txt | 28 +++++++++++++++++++++++----- - 1 file changed, 23 insertions(+), 5 deletions(-) + CMakeLists.txt | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd123e1..3a5878d 100644 +index 08c0247..0020d6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,22 +214,25 @@ ADD_DEFINITIONS(${SYSFLAGS}) @@ -50,9 +51,9 @@ index fd123e1..3a5878d 100644 # When checking for symbols, we need to make sure we set the proper # headers, libraries, and definitions for the detection to work properly -@@ -554,6 +557,15 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h) - # Write ares_config.h configuration file. This is used only for the build. - CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h) +@@ -551,6 +554,15 @@ ENDIF() + # Record toplevel CMakeLists.txt path + set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}") +# Pass required CFLAGS to pkg-config in case of static library +IF (CARES_STATIC) @@ -66,19 +67,11 @@ index fd123e1..3a5878d 100644 # TRANSFORM_MAKEFILE_INC # -@@ -728,6 +740,12 @@ IF (CARES_INSTALL) +@@ -624,7 +636,6 @@ IF (CARES_INSTALL) INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ENDIF () -+# pkg-config file -+IF (CARES_INSTALL) -+ SET (PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -+ INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION ${PKGCONFIG_INSTALL_DIR}) -+ENDIF () -+ +- # Legacy chain-building variables (provided for compatibility with old code). # Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares). SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND") --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb index 67dd70180..92eb9dae5 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb @@ -5,14 +5,14 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" -PV = "1.16.0+gitr${SRCPV}" +PV = "1.17.1" SRC_URI = "\ git://github.com/c-ares/c-ares.git \ file://cmake-install-libcares.pc.patch \ file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ " -SRCREV = "74a1426ba60e2cd7977e53a22ef839c87415066e" +SRCREV = "39c73b503d9ef70a58ad1f4a4643f15b01407c66" UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P<pver>\d+_(\d_?)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.0.bb index f74a39b50..c52a04064 100644 --- a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.0.bb @@ -4,11 +4,9 @@ LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" SRC_URI = "git://github.com/commonmark/cmark.git" -SRCREV = "8daa6b1495124f0b67e6034130e12d7be83e38bd" +SRCREV = "8800e66010214384e75f933830ca5585e1ae3060" S = "${WORKDIR}/git" -PV = "0.29.0" - inherit cmake lib_package EXTRA_OECMAKE += " \ diff --git a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.8.bb b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb index de175d629..9979c21b8 100644 --- a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb @@ -9,8 +9,7 @@ SRC_URI = " \ file://install-bench.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "8aac833c943d8e90d51b697b27d4384d" -SRC_URI[sha256sum] = "6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303" +SRC_URI[sha256sum] = "bf2c7ce40b04ae811af714deb512510cc2c17b9ab9d6ddcf49fe4487eea7af3d" inherit autotools pkgconfig ptest diff --git a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb index 56dc30acd..14b988337 100644 --- a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Provides improved implementations of std::function." HOMEPAGE = "https://naios.github.io/function2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRCREV = "3a0746bf5f601dfed05330aefcb6854354fce07d" +SRCREV = "02ca99831de59c7c3a4b834789260253cace0ced" PV .= "+git${SRCPV}" SRC_URI += "gitsm://github.com/Naios/function2" diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch b/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch deleted file mode 100644 index 4c0861cca..000000000 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- /dev/null -+++ b/cmake/FindLibunwind.cmake -@@ -0,0 +1,54 @@ -+# - Try to find libunwind -+# Once done this will define -+# -+# Libunwind_FOUND - system has libunwind -+# unwind - cmake target for libunwind -+ -+find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") -+include (CheckIncludeFile) -+check_include_file (libunwind.h HAVE_LIBUNWIND_H) -+check_include_file (unwind.h HAVE_UNWIND_H) -+ -+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") -+ set(LIBUNWIND_ARCH "arm") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") -+ set(LIBUNWIND_ARCH "aarch64") -+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR -+ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR -+ CMAKE_SYSTEM_PROCESSOR STREQUAL "corei7-64") -+ set(LIBUNWIND_ARCH "x86_64") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") -+ set(LIBUNWIND_ARCH "x86") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64") -+ set(LIBUNWIND_ARCH "ppc64") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc") -+ set(LIBUNWIND_ARCH "ppc32") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") -+ set(LIBUNWIND_ARCH "mips") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^hppa") -+ set(LIBUNWIND_ARCH "hppa") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ia64") -+ set(LIBUNWIND_ARCH "ia64") -+endif() -+ -+find_library (UNWIND_LIBRARY_PLATFORM NAMES "unwind-${LIBUNWIND_ARCH}" DOC "unwind library platform") -+if (UNWIND_LIBRARY_PLATFORM) -+ set(HAVE_LIB_UNWIND "1") -+endif() -+ -+include(FindPackageHandleStandardArgs) -+# handle the QUIETLY and REQUIRED arguments and set Libunwind_FOUND to TRUE -+# if all listed variables are TRUE -+find_package_handle_standard_args(Libunwind DEFAULT_MSG -+ UNWIND_LIBRARY HAVE_LIBUNWIND_H HAVE_UNWIND_H HAVE_LIB_UNWIND) -+ -+mark_as_advanced (UNWIND_LIBRARY UNWIND_LIBRARY_PLATFORM) -+ -+if (Libunwind_FOUND) -+ add_library(unwind INTERFACE IMPORTED) -+ set_target_properties(unwind PROPERTIES -+ INTERFACE_LINK_LIBRARIES "${UNWIND_LIBRARY};${UNWIND_LIBRARY_PLATFORM}" -+ ) -+else() -+ message("Can't find libunwind library") -+endif() ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -64,7 +64,6 @@ check_include_file (dlfcn.h HAVE_DLFCN_H - check_include_file (execinfo.h HAVE_EXECINFO_H) - check_include_file (glob.h HAVE_GLOB_H) - check_include_file (inttypes.h HAVE_INTTYPES_H) --check_include_file (libunwind.h HAVE_LIBUNWIND_H) - check_include_file (memory.h HAVE_MEMORY_H) - check_include_file (pwd.h HAVE_PWD_H) - check_include_file (stdint.h HAVE_STDINT_H) -@@ -80,7 +79,6 @@ check_include_file (syscall.h HAVE_SYSCA - check_include_file (syslog.h HAVE_SYSLOG_H) - check_include_file (ucontext.h HAVE_UCONTEXT_H) - check_include_file (unistd.h HAVE_UNISTD_H) --check_include_file (unwind.h HAVE_UNWIND_H) - check_include_file (pwd.h HAVE_PWD_H) - - check_include_file_cxx ("ext/hash_map" HAVE_EXT_HASH_MAP) -@@ -116,11 +114,9 @@ check_cxx_compiler_flag (-Wunnamed-type- - # snprintf as an inline function - check_symbol_exists (snprintf stdio.h HAVE_SNPRINTF) - --check_library_exists (unwind get_static_proc_name "" HAVE_LIB_UNWIND) - check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) - --find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") --mark_as_advanced (UNWIND_LIBRARY) -+find_package(Libunwind) - - check_c_source_compiles (" - #include <stdlib.h> -@@ -471,9 +467,9 @@ add_library(glog::glog ALIAS glog) - - set_target_properties (glog PROPERTIES POSITION_INDEPENDENT_CODE ON) - --if (UNWIND_LIBRARY) -- target_link_libraries (glog PUBLIC ${UNWIND_LIBRARY}) --endif (UNWIND_LIBRARY) -+if (Libunwind_FOUND) -+ target_link_libraries (glog PUBLIC unwind) -+endif (Libunwind_FOUND) - - if (HAVE_DBGHELP) - target_link_libraries (glog PUBLIC dbghelp) -@@ -678,6 +674,7 @@ export (PACKAGE glog) - install (FILES - ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibunwind.cmake - DESTINATION ${_glog_CMake_INSTALLDIR}) - - install (EXPORT glog-targets NAMESPACE glog:: DESTINATION ---- a/glog-config.cmake.in -+++ b/glog-config.cmake.in -@@ -8,4 +8,7 @@ include (CMakeFindDependencyMacro) - - @gflags_DEPENDENCY@ - -+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") -+find_dependency (Libunwind) -+ - include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch index ae46d3274..927c269a6 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch @@ -8,17 +8,17 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -115,6 +115,7 @@ check_cxx_compiler_flag (-Wunnamed-type- - check_symbol_exists (snprintf stdio.h HAVE_SNPRINTF) +@@ -144,6 +144,7 @@ check_cxx_compiler_flag (-Wunnamed-type- + check_symbol_exists (snprintf cstdio HAVE_SNPRINTF) check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) +check_library_exists (execinfo backtrace "" HAVE_EXECINFO) - find_package(Libunwind) - -@@ -471,6 +472,10 @@ if (Libunwind_FOUND) - target_link_libraries (glog PUBLIC unwind) - endif (Libunwind_FOUND) + check_cxx_source_compiles (" + #include <cstdlib> +@@ -584,6 +585,10 @@ if (Unwind_FOUND) + set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})") + endif (Unwind_FOUND) +if (HAVE_EXECINFO) + target_link_libraries (glog PUBLIC execinfo) diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.4.0.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb index 6b101ef67..c4ba9f244 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" SRC_URI = " \ git://github.com/google/glog.git;nobranch=1 \ - file://0001-Find-Libunwind-during-configure.patch \ file://libexecinfo.patch \ " -SRCREV = "96a2f23dca4cc7180821ca5f32e526314395d26a" +SRCREV = "8f9ccfe770add9e4c64e9b25c102658e3c763b73" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb index d6ef98f94..a54d8f8f7 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb @@ -1,8 +1,13 @@ DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." AUTHOR = "Benoît Jacob and Gaël Guennebaud and others" HOMEPAGE = "http://eigen.tuxfamily.org/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" +LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPLv3 & LGPLv2.1 & MINPACK" +LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ + file://COPYING.BSD;md5=543367b8e11f07d353ef894f71b574a0 \ + file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MINPACK;md5=5fe4603e80ef7390306f51ef74449bbd \ +" SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest index 4cda05d44..60c661fc1 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest @@ -1,12 +1,19 @@ #!/bin/sh -testbin="gpiod-test" +testbins="gpiod-test gpio-tools-test gpiod-cxx-test gpiod_py_test.py" + ptestdir=$(dirname "$(readlink -f "$0")") cd $ptestdir/tests -./$testbin -if [ $? -ne 0 ]; then - echo "FAIL: $testbin" -else - echo "PASS: $testbin" -fi +for testbin in $testbins; do + if test -e ./$testbin; then + ./$testbin > ./$testbin.out + if [ $? -ne 0 ]; then + echo "FAIL: $testbin" + else + echo "PASS: $testbin" + fi + else + echo "SKIP: $testbin" + fi +done diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb index d9c251705..be5be2f8d 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb @@ -1,11 +1,12 @@ SUMMARY = "C library and tools for interacting with the linux GPIO character device" -AUTHOR = "Bartosz Golaszewski <bgolaszewski@baylibre.com>" +AUTHOR = "Bartosz Golaszewski <brgl@bgdev.pl>" LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" -SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ - file://run-ptest \ +SRC_URI = " \ + https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ + file://run-ptest \ " SRC_URI[md5sum] = "28e79f6f70fee1da9079558d8b7b3736" @@ -13,7 +14,7 @@ SRC_URI[sha256sum] = "841be9d788f00bab08ef22c4be5c39866f0e46cb100a3ae49ed816ac9c inherit autotools pkgconfig python3native ptest -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2,bats python3-packaging" PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" @@ -26,19 +27,51 @@ EXTRA_OECONF = "--enable-tools" DEPENDS += "autoconf-archive-native" -PACKAGES =+ "${PN}-tools libgpiodcxx" -FILES_${PN}-tools = "${bindir}/*" +PACKAGES =+ "${PN}-tools libgpiodcxx ${PN}-python" +FILES_${PN}-tools = " \ + ${bindir}/gpiodetect \ + ${bindir}/gpioinfo \ + ${bindir}/gpioget \ + ${bindir}/gpioset \ + ${bindir}/gpiofind \ + ${bindir}/gpiomon \ +" +FILES_${PN}-ptest += " \ + ${bindir}/gpiod-test \ + ${bindir}/gpio-tools-test \ + ${bindir}/gpio-tools-test.bats \ + ${bindir}/gpiod-cxx-test \ + ${bindir}/gpiod_py_test.py \ + ${libdir}/libgpiomockup.so.* \ +" FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" - -PACKAGES =+ "${PN}-python" FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so" FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" -RRECOMMENDS_PYTHON = "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '',d)}" -RRECOMMENDS_${PN}-python += "${RRECOMMENDS_PYTHON}" + +RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '', d)}" +RRECOMMENDS_${PN}-ptest += "kernel-module-gpio-mockup" PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)}" do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests + + # These are the core C library tests + install -m 0755 ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ + + # Tools are always built so let's always install them for ptest even if + # we're not selecting libgpiod-tools. + install -m 0755 ${S}/tools/gpio-tools-test ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/tools/gpio-tools-test.bats ${D}${PTEST_PATH}/tests/ + for tool in ${FILES_${PN}-tools}; do + install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ + done + + if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then + install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/ + fi + + if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then + install -m 0755 ${S}/bindings/python/tests/gpiod_py_test.py ${D}${PTEST_PATH}/tests/ + fi } diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.6.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.7.bb index 2f74013ca..2b8728179 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.7.bb @@ -7,5 +7,5 @@ DEPENDS = "glib-2.0 libusb" inherit meson gobject-introspection gtk-doc gettext vala SRC_URI = "git://github.com/hughsie/libgusb.git" -SRCREV = "b0464454048cac6779d4d51f12fe7f37ae4bbd57" +SRCREV = "ff9c606d9d72c7dd369ad220d92729556faaaf0c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch b/meta-openembedded/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch new file mode 100644 index 000000000..4d3dcd5ce --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch @@ -0,0 +1,34 @@ +From 717b0f46b23ddc042da481d1d446bdd1c6c49142 Mon Sep 17 00:00:00 2001 +From: Julien Malik <julien.malik@unseenlabs.fr> +Date: Mon, 27 Jul 2020 14:34:44 +0200 +Subject: [PATCH] python: Do not verify whether libiio is installed when + cross-compiling + +This should fix #561 + +Signed-off-by: Julien Malik <julien.malik@paraiso.me> +--- + bindings/python/setup.py.cmakein | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/bindings/python/setup.py.cmakein b/bindings/python/setup.py.cmakein +index cd14e2e..96d58a8 100644 +--- a/bindings/python/setup.py.cmakein ++++ b/bindings/python/setup.py.cmakein +@@ -54,6 +54,13 @@ class InstallWrapper(install): + install.run(self) + + def _check_libiio_installed(self): ++ cross_compiling = ("${CMAKE_CROSSCOMPILING}" == "TRUE") ++ if cross_compiling: ++ # When cross-compiling, we generally cannot dlopen ++ # the libiio shared lib from the build platform. ++ # Simply skip this check in that case. ++ return ++ + from platform import system as _system + from ctypes import CDLL as _cdll + from ctypes.util import find_library +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index 6f37d1e89..d2d6fd475 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" SRCREV = "565bf68eccfdbbf22cf5cb6d792e23de564665c7" PV = "0.21+git${SRCPV}" -SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" +SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https \ + file://0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch \ +" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb index 5245059a8..215f32a78 100644 --- a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" SRC_URI = "git://github.com/leethomason/tinyxml2.git" -SRCREV = "3291390336141573e51dfa991b4179c8bcd8f306" +SRCREV = "1dee28e51f9175a31955b9791c74c430fe13dc82" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg_20210314.bb b/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb index 9275dd233..eb7de1279 100644 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg_20210314.bb +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" DEPENDS = "ncurses libbsd" SECTION = "console/editors" -SRCREV = "598f7a028f01f85f0dee0e798753bccf93233add" +SRCREV = "688f49cd67ab30dfa6482c74815e117cbf7af63a" SRC_URI = "git://github.com/hboetes/mg \ file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.0.bb index b5e16d0f9..069d9f81c 100644 --- a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.0.bb @@ -15,8 +15,7 @@ SRC_URI = " \ file://monitrc \ " -SRC_URI[md5sum] = "13a0804dae18ef08198c3ace72f9dd60" -SRC_URI[sha256sum] = "d8809c78d5dc1ed7a7ba32a5a55c5114855132cc4da4805f8d3aaf8cf46eaa4c" +SRC_URI[sha256sum] = "9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c" DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.7.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb index 6a293c763..8ba4ca13f 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb @@ -13,7 +13,7 @@ RDEPENDS_${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "d4b181cc2ec11def3711b4649e34f2be7a668e70ab506860514031d069cccafa" +SRC_URI[sha256sum] = "e43b63db2f78336e2aa123e8d015dbabc1720a15361714bfd4b1bb4e5e87768c" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb index fce5a856e..98be21d40 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb @@ -45,6 +45,8 @@ TDS = "${S}/tentative-dist-staging" TARGET_CC_ARCH += "${LDFLAGS}" +CFLAGS_append_class-native = " -D_XOPEN_SOURCE " + do_configure_prepend_libc-musl () { sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk } @@ -277,3 +279,6 @@ FILES_${PN}-dev = "\ RDEPENDS_${PN}-smime = "perl" BBCLASSEXTEND = "native nativesdk" + +# CVE-2006-5201 affects only Sun Solaris +CVE_CHECK_WHITELIST += "CVE-2006-5201" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.05.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.07.0.bb index 4cfc5bd86..975ab1d70 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.05.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.07.0.bb @@ -7,7 +7,7 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ " -SRC_URI[sha256sum] = "dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c" +SRC_URI[sha256sum] = "e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4" DEPENDS = "fontconfig zlib cairo lcms glib-2.0" diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch new file mode 100644 index 000000000..892399de7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch @@ -0,0 +1,49 @@ +From ced7af0420c1df0ac02f0c25e7c3534431ebd7fd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 4 Jul 2021 17:09:49 -0700 +Subject: [PATCH] cmake: Use GNUInstallDirs + +Helps install cmakefiles in right libdir + +Upstream-Status: Submitted [https://github.com/PortAudio/portaudio/pull/610] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ + + CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + ++include(GNUInstallDirs) ++ + # Check if the user is building PortAudio stand-alone or as part of a larger + # project. If this is part of a larger project (i.e. the CMakeLists.txt has + # been imported by some other CMakeLists.txt), we don't want to trump over +@@ -452,18 +454,18 @@ IF(NOT PA_OUTPUT_OSX_FRAMEWORK AND NOT P + CONFIGURE_FILE(cmake_support/portaudio-2.0.pc.in ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc @ONLY) + INSTALL(FILES README.md DESTINATION share/doc/portaudio) + INSTALL(FILES LICENSE.txt DESTINATION share/doc/portaudio) +- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION lib/pkgconfig) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + INSTALL(FILES ${PA_PUBLIC_INCLUDES} DESTINATION include) + INSTALL(TARGETS ${PA_TARGETS} + EXPORT portaudio-targets +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) +- INSTALL(EXPORT portaudio-targets FILE "portaudioTargets.cmake" DESTINATION "lib/cmake/portaudio") ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ INSTALL(EXPORT portaudio-targets FILE "portaudioTargets.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/portaudio") + EXPORT(TARGETS ${PA_TARGETS} FILE "${PROJECT_BINARY_DIR}/cmake/portaudio/portaudioTargets.cmake") + INSTALL(FILES "${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfig.cmake" + "${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfigVersion.cmake" +- DESTINATION "lib/cmake/portaudio") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/portaudio") + + IF (NOT TARGET uninstall) + CONFIGURE_FILE( diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb index 3a0f7894f..aec482b9b 100644 --- a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -8,6 +8,7 @@ PV = "v190700" SRC_URI = " \ git://github.com/PortAudio/portaudio.git \ file://0001-Find-jack.patch \ + file://0001-cmake-Use-GNUInstallDirs.patch \ " SRCREV = "147dd722548358763a8b649b3e4b41dfffbcfbb6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.17.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb index ef7876786..954da272e 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.17.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb @@ -25,7 +25,7 @@ DEPENDS = " \ DEPENDS_append_libc-musl = " libexecinfo" LDFLAGS_append_libc-musl = " -lexecinfo" -SRCREV = "0ef1621b3e16b3168213147a2bfca39da2c2668f" +SRCREV = "045862cc7d7dd986b349c68131df2f86b9b1cd9c" SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index 33f5dccca..a81d8d6ca 100644 --- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -22,8 +22,8 @@ RDEPENDS_${PN} = "rsync \ perl-module-ipc-open3 \ " -SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" -PV = "1.4.3+git${SRCPV}" +SRCREV = "4dc82bfe6be3f83fcfa94946dcf6accfd6a18031" +PV = "1.4.4+git${SRCPV}" SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ file://configure-fix-cmd_rsync.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.37.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb index 4630eb021..d01ea42bd 100644 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.37.bb +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb @@ -10,7 +10,7 @@ inherit autotools-brokensep python3native pkgconfig SRC_URI = "git://github.com/abrt/satyr.git \ file://0002-fix-compile-failure-against-musl-C-library.patch \ " -SRCREV = "4a7d0a31cdeee23bb13739f57926188a795bdf25" +SRCREV = "ad0030f071b7ce7eb748eca3c31cb381038e2b21" S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.9.2.bb b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.0.bb index 16b7c3e54..4cf0dee11 100644 --- a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.9.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.0.bb @@ -4,7 +4,7 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI += "git://github.com/martinmoene/span-lite" -SRCREV = "126453198fe2236b31ddfa7353e95d3a06c478ab" +SRCREV = "2987dd8d3b8fe7c861e3c3f879234cc1c412f03f" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb index cde26df49..bb41a33c1 100644 --- a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb @@ -4,9 +4,9 @@ AUTHOR = "Christophe BLAESS" LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" -BPV = "0.8.7" +BPV = "1.0.0" PV = "${BPV}" -SRCREV = "67937230d70ad87c23c7116a72df83577e309f6f" +SRCREV = "f5d87954bd9e13689481700105efe2f42199d364" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch new file mode 100644 index 000000000..8a603ffe3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch @@ -0,0 +1,40 @@ +From b94a1e3d6b5c733ba24cfa0d35450d8659d48289 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 4 Jun 2021 13:07:28 -0700 +Subject: [PATCH] arena: Remove dead code + +Fixes clang warning +arena.cpp:226:19: error: variable 'drained' set b +ut not used [-Werror,-Wunused-but-set-variable] +| std::intptr_t drained = 0; +| ^ + +Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/429] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/tbb/arena.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/tbb/arena.cpp b/src/tbb/arena.cpp +index 4a9c0f8a..c8ed4999 100644 +--- a/src/tbb/arena.cpp ++++ b/src/tbb/arena.cpp +@@ -232,14 +232,13 @@ void arena::free_arena () { + __TBB_ASSERT( !my_global_concurrency_mode, NULL ); + #endif + poison_value( my_guard ); +- std::intptr_t drained = 0; + for ( unsigned i = 0; i < my_num_slots; ++i ) { + // __TBB_ASSERT( !my_slots[i].my_scheduler, "arena slot is not empty" ); + // TODO: understand the assertion and modify + // __TBB_ASSERT( my_slots[i].task_pool == EmptyTaskPool, NULL ); + __TBB_ASSERT( my_slots[i].head == my_slots[i].tail, NULL ); // TODO: replace by is_quiescent_local_task_pool_empty + my_slots[i].free_task_pool(); +- drained += mailbox(i).drain(); ++ mailbox(i).drain(); + my_slots[i].my_default_task_dispatcher->~task_dispatcher(); + } + __TBB_ASSERT(my_fifo_task_stream.empty(), "Not all enqueued tasks were executed"); +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb index f4c52daf4..0b039a181 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb @@ -19,6 +19,7 @@ SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH file://0001-CMakeLists.txt-exclude-riscv64-riscv32.patch \ file://0001-Disable-use-of-_tpause-instruction.patch \ file://0001-set_my_tls_end_of_input-Use-an-arbitrary-but-valid-p.patch \ + file://0001-arena-Remove-dead-code.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch new file mode 100644 index 000000000..e95e24049 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch @@ -0,0 +1,276 @@ +Subject: Fix build errors with linux 5.13 +Origin: upstream, https://www.virtualbox.org/browser/vbox/trunk +Bug: https://bugs.launchpad.net/bugs/1929193 + +diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h +--- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h 2021-04-28 16:24:47.000000000 +0000 ++++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h 2021-06-23 10:08:44.431714404 +0000 +@@ -46,20 +41,20 @@ + * Evaluates to true if the linux kernel version is equal or higher to the + * one specfied. */ + #define RTLNX_VER_MIN(a_Major, a_Minor, a_Patch) \ +- (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch)) ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch)) + + /** @def RTLNX_VER_MAX + * Evaluates to true if the linux kernel version is less to the one specfied + * (exclusive). */ + #define RTLNX_VER_MAX(a_Major, a_Minor, a_Patch) \ +- (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch)) ++ (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch)) + + /** @def RTLNX_VER_RANGE + * Evaluates to true if the linux kernel version is equal or higher to the given + * minimum version and less (but not equal) to the maximum version (exclusive). */ + #define RTLNX_VER_RANGE(a_MajorMin, a_MinorMin, a_PatchMin, a_MajorMax, a_MinorMax, a_PatchMax) \ +- ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \ +- && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) ) ++ ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \ ++ && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) ) + + + /** @def RTLNX_RHEL_MIN +@@ -70,7 +65,7 @@ + */ + #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) + # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) \ +- ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))) ++ ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))) + #else + # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) (0) + #endif +@@ -83,7 +78,7 @@ + */ + #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) + # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) \ +- ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor))) ++ ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor))) + #else + # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) + #endif +@@ -95,7 +90,7 @@ + */ + #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) + # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax, a_iMinorMax) \ +- (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax)) ++ (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax)) + #else + # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax, a_iMinorMax) (0) + #endif +@@ -173,7 +168,9 @@ + #include <drm/ttm/ttm_bo_api.h> + #include <drm/ttm/ttm_bo_driver.h> + #include <drm/ttm/ttm_placement.h> ++#if RTLNX_VER_MAX(5,13,0) + #include <drm/ttm/ttm_memory.h> ++#endif + #if RTLNX_VER_MAX(5,12,0) + # include <drm/ttm/ttm_module.h> + #endif +@@ -222,7 +219,7 @@ static inline void drm_gem_object_put(st + VBVA_ADAPTER_INFORMATION_SIZE) + #define GUEST_HEAP_SIZE VBVA_ADAPTER_INFORMATION_SIZE + #define GUEST_HEAP_USABLE_SIZE (VBVA_ADAPTER_INFORMATION_SIZE - \ +- sizeof(HGSMIHOSTFLAGS)) ++ sizeof(struct hgsmi_host_flags)) + #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE + + /** How frequently we refresh if the guest is not providing dirty rectangles. */ +@@ -232,7 +229,7 @@ static inline void drm_gem_object_put(st + static inline void *devm_kcalloc(struct device *dev, size_t n, size_t size, + gfp_t flags) + { +- return devm_kzalloc(dev, n * size, flags); ++ return devm_kzalloc(dev, n * size, flags); + } + #endif + +@@ -244,7 +241,7 @@ struct vbox_private { + u8 __iomem *guest_heap; + u8 __iomem *vbva_buffers; + struct gen_pool *guest_pool; +- struct VBVABUFFERCONTEXT *vbva_info; ++ struct vbva_buf_context *vbva_info; + bool any_pitch; + u32 num_crtcs; + /** Amount of available VRAM, including space used for buffers. */ +@@ -252,7 +249,7 @@ struct vbox_private { + /** Amount of available VRAM, not including space used for buffers. */ + u32 available_vram_size; + /** Array of structures for receiving mode hints. */ +- VBVAMODEHINT *last_mode_hints; ++ struct vbva_modehint *last_mode_hints; + + struct vbox_fbdev *fbdev; + +@@ -263,7 +260,11 @@ struct vbox_private { + struct drm_global_reference mem_global_ref; + struct ttm_bo_global_ref bo_global_ref; + #endif ++#if RTLNX_VER_MIN(5,13,0) ++ struct ttm_device bdev; ++#else + struct ttm_bo_device bdev; ++#endif + bool mm_initialised; + } ttm; + +diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c +--- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-04-28 16:24:47.000000000 +0000 ++++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-06-23 10:08:07.164057918 +0000 +@@ -48,7 +43,11 @@ + #endif + + ++#if RTLNX_VER_MIN(5,13,0) ++static inline struct vbox_private *vbox_bdev(struct ttm_device *bd) ++#else + static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd) ++#endif + { + return container_of(bd, struct vbox_private, ttm.bdev); + } +@@ -188,7 +187,7 @@ static int vbox_ttm_io_mem_reserve(struc + mem->bus.size = mem->num_pages << PAGE_SHIFT; + mem->bus.base = 0; + mem->bus.is_iomem = false; +- if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) ++ if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) + return -EINVAL; + switch (mem->mem_type) { + case TTM_PL_SYSTEM: +@@ -205,8 +204,13 @@ static int vbox_ttm_io_mem_reserve(struc + return 0; + } + #else ++# if RTLNX_VER_MAX(5,13,0) + static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, + struct ttm_resource *mem) ++# else /* > 5.13.0 */ ++static int vbox_ttm_io_mem_reserve(struct ttm_device *bdev, ++ struct ttm_resource *mem) ++# endif /* > 5.13.0 */ + { + struct vbox_private *vbox = vbox_bdev(bdev); + mem->bus.addr = NULL; +@@ -241,7 +245,12 @@ static int vbox_ttm_io_mem_reserve(struc + + + +-#if RTLNX_VER_MIN(5,10,0) ++#if RTLNX_VER_MIN(5,13,0) ++static void vbox_ttm_io_mem_free(struct ttm_device *bdev, ++ struct ttm_resource *mem) ++{ ++} ++#elif RTLNX_VER_MIN(5,10,0) + static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, + struct ttm_resource *mem) + { +@@ -253,7 +262,13 @@ static void vbox_ttm_io_mem_free(struct + } + #endif + +-#if RTLNX_VER_MIN(5,10,0) ++#if RTLNX_VER_MIN(5,13,0) ++static void vbox_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *tt) ++{ ++ ttm_tt_fini(tt); ++ kfree(tt); ++} ++#elif RTLNX_VER_MIN(5,10,0) + static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt) + { + ttm_tt_fini(tt); +@@ -333,7 +348,11 @@ static int vbox_bo_move(struct ttm_buffe + } + #endif + ++#if RTLNX_VER_MIN(5,13,0) ++static struct ttm_device_funcs vbox_bo_driver = { ++#else /* < 5.13.0 */ + static struct ttm_bo_driver vbox_bo_driver = { ++#endif /* < 5.13.0 */ + .ttm_tt_create = vbox_ttm_tt_create, + #if RTLNX_VER_MIN(5,10,0) + .ttm_tt_destroy = vbox_ttm_tt_destroy, +@@ -370,14 +389,22 @@ int vbox_mm_init(struct vbox_private *vb + { + int ret; + struct drm_device *dev = vbox->dev; ++#if RTLNX_VER_MIN(5,13,0) ++ struct ttm_device *bdev = &vbox->ttm.bdev; ++#else + struct ttm_bo_device *bdev = &vbox->ttm.bdev; ++#endif + + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + ret = vbox_ttm_global_init(vbox); + if (ret) + return ret; + #endif ++#if RTLNX_VER_MIN(5,13,0) ++ ret = ttm_device_init(&vbox->ttm.bdev, ++#else + ret = ttm_bo_device_init(&vbox->ttm.bdev, ++#endif + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + vbox->ttm.bo_global_ref.ref.object, + #endif +@@ -429,7 +456,11 @@ int vbox_mm_init(struct vbox_private *vb + return 0; + + err_device_release: ++#if RTLNX_VER_MIN(5,13,0) ++ ttm_device_fini(&vbox->ttm.bdev); ++#else + ttm_bo_device_release(&vbox->ttm.bdev); ++#endif + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + err_ttm_global_release: + vbox_ttm_global_release(vbox); +@@ -446,7 +477,11 @@ void vbox_mm_fini(struct vbox_private *v + #else + arch_phys_wc_del(vbox->fb_mtrr); + #endif ++#if RTLNX_VER_MIN(5,13,0) ++ ttm_device_fini(&vbox->ttm.bdev); ++#else + ttm_bo_device_release(&vbox->ttm.bdev); ++#endif + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + vbox_ttm_global_release(vbox); + #endif +@@ -528,7 +563,9 @@ int vbox_bo_create(struct drm_device *de + { + struct vbox_private *vbox = dev->dev_private; + struct vbox_bo *vboxbo; ++#if RTLNX_VER_MAX(5,13,0) + size_t acc_size; ++#endif + int ret; + + vboxbo = kzalloc(sizeof(*vboxbo), GFP_KERNEL); +@@ -551,16 +588,20 @@ int vbox_bo_create(struct drm_device *de + + vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM); + ++#if RTLNX_VER_MAX(5,13,0) + acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size, + sizeof(struct vbox_bo)); ++#endif + + ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size, + ttm_bo_type_device, &vboxbo->placement, + #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) + align >> PAGE_SHIFT, false, NULL, acc_size, +-#else ++#elif RTLNX_VER_MAX(5,13,0) /* < 5.13.0 */ + align >> PAGE_SHIFT, false, acc_size, +-#endif ++#else /* > 5.13.0 */ ++ align >> PAGE_SHIFT, false, ++#endif /* > 5.13.0 */ + #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2) + NULL, NULL, vbox_bo_ttm_destroy); + #else diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb index a074d0a55..19b8f8f46 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb @@ -13,6 +13,7 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ + file://40-linux-5.13-support.patch \ file://add__divmoddi4.patch \ " SRC_URI[md5sum] = "abb1a20021e5915fe38c666e8c11cf80" diff --git a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.3.0.bb b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.3.0.bb index 8190a5e3a..39a02733f 100644 --- a/meta-openembedded/meta-oe/recipes-test/bats/bats_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-test/bats/bats_1.3.0.bb @@ -7,6 +7,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2970203aedf9e829edb96a137a4fe81b" SRC_URI = "git://github.com/bats-core/bats-core.git \ + file://0001-install.sh-consider-multilib.patch \ " # v1.3.0 SRCREV = "9086c47854652f2731861b40385689c85f12103f" @@ -15,7 +16,7 @@ S = "${WORKDIR}/git" do_install() { # Just a bunch of bash scripts to install - ${S}/install.sh ${D}${prefix} + ${S}/install.sh ${D}${prefix} ${baselib} } RDEPENDS_${PN} = "bash" diff --git a/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch b/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch new file mode 100644 index 000000000..c7393ca2e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch @@ -0,0 +1,43 @@ +From 6e3d01f1ff199383b78a7504858c374fbce05f4e Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Thu, 10 Jun 2021 11:11:07 +0800 +Subject: [PATCH] install.sh: consider multilib + +It may install files to /usr/lib64 when multilib is enabled. Add an +optional parameter for install.sh to support it. + +Upstream-Status: Submitted [https://github.com/bats-core/bats-core/pull/452] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + install.sh | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/install.sh b/install.sh +index e660866..d91159e 100755 +--- a/install.sh ++++ b/install.sh +@@ -4,6 +4,7 @@ set -e + + BATS_ROOT="${0%/*}" + PREFIX="$1" ++BASELIB="${2:-lib}" + + if [[ -z "$PREFIX" ]]; then + printf '%s\n' \ +@@ -12,10 +13,10 @@ if [[ -z "$PREFIX" ]]; then + exit 1 + fi + +-install -d -m 755 "$PREFIX"/{bin,libexec/bats-core,lib/bats-core,share/man/man{1,7}} ++install -d -m 755 "$PREFIX"/{bin,libexec/bats-core,${BASELIB}/bats-core,share/man/man{1,7}} + install -m 755 "$BATS_ROOT/bin"/* "$PREFIX/bin" + install -m 755 "$BATS_ROOT/libexec/bats-core"/* "$PREFIX/libexec/bats-core" +-install -m 755 "$BATS_ROOT/lib/bats-core"/* "$PREFIX/lib/bats-core" ++install -m 755 "$BATS_ROOT/lib/bats-core"/* "$PREFIX/${BASELIB}/bats-core" + install -m 644 "$BATS_ROOT/man/bats.1" "$PREFIX/share/man/man1" + install -m 644 "$BATS_ROOT/man/bats.7" "$PREFIX/share/man/man7" + +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb b/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb new file mode 100644 index 000000000..a17c0658c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/cpputest/cpputest_4.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "CppUTest unit testing and mocking framework for C/C++" +HOMEPAGE = "http://cpputest.github.io/" +SECTION = "devel" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177" + +SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https" +SRCREV = "67d2dfd41e13f09ff218aa08e2d35f1c32f032a1" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DLONGLONG=ON \ + -DC++11=ON \ + -DTESTS=OFF \ + -DEXTENSIONS=OFF \ + " + +FILES_${PN}-dev += "${libdir}/CppUTest/cmake/*" diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch index 906ec99a9..5ccd461d9 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts/0003-Remove-Werror-from-build.patch @@ -11,12 +11,12 @@ Upstream-Status: Pending 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index a26a197b..70a28174 100644 +index f8066af..6b979f8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -14,7 +14,7 @@ AM_CPPFLAGS = \ - `pkg-config --silence-errors --cflags json` \ - `pkg-config --silence-errors --cflags json-c` \ +@@ -12,7 +12,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src/acpica/source/compiler \ + -I$(top_srcdir)/efi_runtime \ -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ - -Wall -Werror -Wextra \ + -Wall -Wextra \ @@ -24,7 +24,7 @@ index a26a197b..70a28174 100644 -Wfloat-equal -Wmissing-declarations \ -Wno-long-long -Wredundant-decls -Wshadow \ diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am -index 55c52b41..b85d0101 100644 +index 55c52b4..50efa97 100644 --- a/src/lib/src/Makefile.am +++ b/src/lib/src/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = \ @@ -32,23 +32,23 @@ index 55c52b41..b85d0101 100644 `pkg-config --cflags glib-2.0 gio-2.0` \ -DDATAROOTDIR=\"$(datarootdir)\" \ - -Wall -Werror -Wextra \ -+ -Wall -Wextra \ ++ -Wall -Wextra \ -Wno-address-of-packed-member pkglib_LTLIBRARIES = libfwts.la diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am -index ecc25f0a..129c1036 100644 +index a7d9b9c..e1bf141 100644 --- a/src/utilities/Makefile.am +++ b/src/utilities/Makefile.am @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # --AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ -+AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ - `pkg-config --silence-errors --cflags json` \ - `pkg-config --silence-errors --cflags json-c` \ - -I../lib/include +-AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ ++AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ + -I$(srcdir)/../lib/include + + bin_PROGRAMS = kernelscan -- 2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.03.00.bb b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb index aa7d422f7..21d256351 100644 --- a/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.03.00.bb +++ b/meta-openembedded/meta-oe/recipes-test/fwts/fwts_21.06.00.bb @@ -13,7 +13,7 @@ SRC_URI = "http://fwts.ubuntu.com/release/fwts-V${PV}.tar.gz;subdir=${BP} \ file://0005-Undefine-PAGE_SIZE.patch \ file://0006-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \ " -SRC_URI[sha256sum] = "c22dcba2572e4237bf2fe9ab579e195cf051d3a99b2c07ab58f757cae02d24fb" +SRC_URI[sha256sum] = "ca43439707976f6664fe3f6eb7f356a51ac7d7f8a4e246ef4d1b16305e066909" COMPATIBLE_HOST = "(i.86|x86_64|aarch64|powerpc64).*-linux" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb index 2e0fecf7a..3e1fc4ff8 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -4,12 +4,12 @@ SECTION = "libs" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" -PV = "1.10.0+git${SRCPV}" +PV = "1.11.0+git${SRCPV}" PROVIDES += "gmock gtest" S = "${WORKDIR}/git" -SRCREV = "662fe38e44900c007eccb65a5d2ea19df7bd520e" +SRCREV = "e2239ee6043f73722e7aa812a459f54a28552929" SRC_URI = "git://github.com/google/googletest.git" inherit cmake diff --git a/meta-openembedded/meta-perl/README b/meta-openembedded/meta-perl/README index 67f291079..2419ae228 100644 --- a/meta-openembedded/meta-perl/README +++ b/meta-openembedded/meta-perl/README @@ -78,7 +78,7 @@ Send patches / pull requests to openembedded-devel@lists.openembedded.org with '[meta-perl]' in the subject. When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-perl][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-perl][PATCH' Layer maintainers: Hongxu Jia <hongxu.jia@windriver.com> @@ -90,4 +90,3 @@ License All metadata is MIT licensed unless otherwise stated. Source code included in tree for individual recipes is under the LICENSE stated in each recipe (.bb file) unless otherwise stated. - diff --git a/meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.20.bb b/meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.23.bb index 10b281a66..bb9faa2c0 100644 --- a/meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.20.bb +++ b/meta-openembedded/meta-perl/recipes-extended/logcheck/logcheck_1.3.23.bb @@ -14,8 +14,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c93c0550bd3173f4504b2cbd8991e50b" SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.xz \ file://99_logcheck \ " -SRC_URI[md5sum] = "1c6e9a97f9cc485353c25147cb99fb25" -SRC_URI[sha256sum] = "9fb6d02b933470d0b1d1efb54ea186e0d0d27336f9d146be592f65ce60dfb3e6" +SRC_URI[sha256sum] = "a2188ba549fff4412c82074b271884ff66d25f3fdb2a41916e817ce676855b29" S = "${WORKDIR}/${BPN}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.51.bb b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.53.bb index e3a83679e..2f1a86031 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.51.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.53.bb @@ -10,8 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=415fc49abed2728f9480cd32c8d67beb" SRC_URI = "http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" -SRC_URI[md5sum] = "87b6cf5bc68739c9310ca501adad998e" -SRC_URI[sha256sum] = "0bd215e7012f9f52e6a7d3fe695ee30ef959d796e8e53472fa0ed8c53fba600a" +SRC_URI[sha256sum] = "c67e732f3c96bcb505405fd944f131fe5c57b46e5d02885c00714c452bf14e60" S = "${WORKDIR}/CGI-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.12.bb b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.13.bb index 6f35e39bf..b0a193757 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.12.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-guess-perl_0.13.bb @@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ea914cc2718e8d53bd7744d96e66c03c" SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-Guess-${PV}.tar.gz " -SRC_URI[md5sum] = "9e86baf96828a38c967003a5e66f0c39" -SRC_URI[sha256sum] = "0a18d18768cf42b49b15c9dea626199dc74346bbbc76acd3d817b9c1d2bd471d" +SRC_URI[sha256sum] = "87c1dd7f0f80fcd3d1396bce9fd9962e7791e748dc0584802f8d10cc9585e743" DEPENDS += "openssl" diff --git a/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.21.bb b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.23.bb index a11b4d2db..876b75c8f 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.21.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-cppguess-perl_0.23.bb @@ -12,8 +12,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=81;endline=84;md5=84c0390b90ea8c6702ce659b67bed699" SRC_URI = "${CPAN_MIRROR}/authors/id/E/ET/ETJ/ExtUtils-CppGuess-${PV}.tar.gz" -SRC_URI[md5sum] = "62bdf731bcbe988d07486836e11585f7" -SRC_URI[sha256sum] = "ff629178321a1e591b83f809712593eae4408a413aa448654bce59b156f24153" +SRC_URI[sha256sum] = "f96c48984eb6d8efb7d933b34f361d0c8b38335e3e5382e9aeccc0aa519a002c" S = "${WORKDIR}/ExtUtils-CppGuess-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.068.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.071.bb index fc9786bec..4a98ac374 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.068.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.071.bb @@ -22,8 +22,7 @@ RDEPENDS_${PN} += "\ SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "4230c829c8875889848093b2b46a7284" -SRC_URI[sha256sum] = "4420fc0056f1827b4dd1245eacca0da56e2182b4ef6fc078f107dc43c3fb8ff9" +SRC_URI[sha256sum] = "40da40948ecc9c787ed39c95715872679eebfd54243721174993a2003e32ab0a" S = "${WORKDIR}/IO-Socket-SSL-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.004000.bb b/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.005004.bb index dbad74d22..ecc4d87c8 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.004000.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libmoo/libmoo-perl_2.005004.bb @@ -10,8 +10,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=742;endline=787;md5=0e7ee44f5ce5e9b84619cd198caad1d6" SRC_URI = "${CPAN_MIRROR}/authors/id/H/HA/HAARG/Moo-${PV}.tar.gz" -SRC_URI[md5sum] = "e542104553d616b15631b5c66ccee904" -SRC_URI[sha256sum] = "323240d000394cf38ec42e865b05cb8928f625c82c9391cd2cdc72b33c51b834" +SRC_URI[sha256sum] = "e3030b80bd554a66f6b3c27fd53b1b5909d12af05c4c11ece9a58f8d1e478928" S = "${WORKDIR}/Moo-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.26.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.31.bb index 3b960778c..c80645619 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.26.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.31.bb @@ -9,8 +9,7 @@ DEPENDS += "perl" SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" -SRC_URI[md5sum] = "6db2562b6c42619e9c7d7e62422af8c4" -SRC_URI[sha256sum] = "eabaecd0fdb3e6adef8c9e016e8509319f19caa8c76836253f7db72bafe56498" +SRC_URI[sha256sum] = "00024a8e371605c6d8422a27a0a87af8b7cf66f26502102e68ddd4baf7cfc615" UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.04.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.05.bb index 652e8c941..c5d8271ff 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.04.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-telnet-perl_3.05.bb @@ -12,11 +12,11 @@ HOMEPAGE = "http://search.cpan.org/dist/Net-Telnet/" SECTION = "Development/Libraries" LICENSE = "Artistic-1.0|GPLv1+" -LIC_FILES_CHKSUM = "file://README;beginline=4;endline=7;md5=3fd238bfb6ee1810cb15d5d95e07b0f5" +LIC_FILES_CHKSUM = "file://README;beginline=4;endline=7;md5=e94ab3b72335e3cdadd6c1ff736dd714" SRC_URI = "http://search.cpan.org/CPAN/authors/id/J/JR/JROGERS/Net-Telnet-${PV}.tar.gz" -SRC_URI[md5sum] = "d2514080116c1b0fa5f96295c84538e3" -SRC_URI[sha256sum] = "e64d567a4e16295ecba949368e7a6b8b5ae2a16b3ad682121d9b007dc5d2a37a" +SRC_URI[md5sum] = "c8573c57a2d9469f038c40ac284b1e5f" +SRC_URI[sha256sum] = "677f68ba2cd2a824fae323fa82e183bf7e3d03c3c499c91d923bd6283796a743" S = "${WORKDIR}/Net-Telnet-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb b/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.030.bb index 7cd07b2c0..78110ca47 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.028.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-warnings-perl_0.030.bb @@ -19,8 +19,7 @@ file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf SRC_URI = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Warnings-${PV}.tar.gz" -SRC_URI[md5sum] = "cd007342017fedfb02d6fde75602e473" -SRC_URI[sha256sum] = "26fda9f8d279e943d27e43a4a3a5cea8a6592cd36e7308695f8dc6602262c0e0" +SRC_URI[sha256sum] = "89a4947ddf1564ae01122275584433d7f6c4370370bcf3768922d796956ae24f" S = "${WORKDIR}/Test-Warnings-${PV}" diff --git a/meta-openembedded/meta-python/README b/meta-openembedded/meta-python/README index ca0a290d9..df6abe0e2 100644 --- a/meta-openembedded/meta-python/README +++ b/meta-openembedded/meta-python/README @@ -37,8 +37,8 @@ before posting. Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-python]' in the subject. -When sending single patches, please use something like: -'git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix=meta-python][PATCH' +When sending single patches, please use something like: +git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix='meta-python][PATCH' Maintenance ------------------------- @@ -47,4 +47,3 @@ Layer Maintainers: Tim "moto-timo" Orling <TicoTimo@gmail.com> Derek Straka <derek@asterius.io> Trevor Gamblin <trevor.gamblin@windriver.com> - diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-priority/python3-priority_1.3.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python3-priority_2.0.0.bb index 5d84571f9..93b694c8b 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-priority/python3-priority_1.3.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-priority/python3-priority_2.0.0.bb @@ -4,7 +4,6 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae57d8a09fc8b6b164d7357339619045" -SRC_URI[md5sum] = "4f1ff52f7fa448e9d9cb46337ae86d1e" -SRC_URI[sha256sum] = "6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe" +SRC_URI[sha256sum] = "c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.13.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.13.0.bb index 80f1a5017..c17a602be 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.13.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-thrift/python3-thrift_0.13.0.bb @@ -16,3 +16,5 @@ RDEPENDS_${PN} += "\ ${PYTHON_PN}-stringold \ ${PYTHON_PN}-threading \ " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python3-pytun/python3-pytun_2.3.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python3-pytun/python3-pytun_2.4.1.bb index bc11d705f..08ec2cf67 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python3-pytun/python3-pytun_2.3.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python3-pytun/python3-pytun_2.4.1.bb @@ -2,8 +2,7 @@ SUMMARY = "Python TUN/TAP tunnel module" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=13f7629e8e4989b66b4a913ab05a91de" -SRC_URI[md5sum] = "adcaeea56d0ed06814487cdbde32d198" -SRC_URI[sha256sum] = "5ead86b3391acef239535ebcabeb04d2cdc6b40ab14580d28c6da193c2d1fe53" +SRC_URI[sha256sum] = "20b53ea7a09dfe173c00ec0a00eea508b05e959f5dc4b4bb698aa52252192f8f" PYPI_PACKAGE = "python-pytun" diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 9f3d48253..063b6e4f2 100644 --- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -34,6 +34,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-arpeggio \ python3-asciitree \ python3-asn1crypto \ + python3-aspectlib \ python3-astor \ python3-astroid \ python3-asttokens \ @@ -114,10 +115,13 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-engineio \ python3-et-xmlfile \ python3-evdev \ + python3-execnet \ python3-fann2 \ python3-fasteners \ + python3-fastjsonschema \ python3-fastnumbers \ python3-feedformatter \ + python3-fields \ python3-flask \ python3-flask-babel \ python3-flask-bootstrap \ @@ -141,6 +145,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-future \ python3-gast \ python3-geojson \ + python3-geomet \ python3-gevent \ python3-gmpy2 \ python3-gmqtt \ @@ -192,6 +197,7 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-jdcal \ python3-jedi \ python3-jmespath \ + python3-joblib \ python3-jsmin \ python3-jsonpatch \ python3-jsonpath-rw \ @@ -274,12 +280,14 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-pretend \ python3-prettytable \ python3-priority \ + python3-process-tests \ python3-progress \ python3-prompt-toolkit \ python3-protobuf \ python3-psutil \ python3-ptyprocess \ python3-pulsectl \ + python3-py-cpuinfo \ python3-py-ubjson \ python3-pyalsaaudio \ python3-pyasn1 \ @@ -332,6 +340,8 @@ RDEPENDS_packagegroup-meta-python3 = "\ python3-pystache \ python3-pystemd \ python3-pytest-asyncio \ + python3-pytest-benchmark \ + python3-pytest-cache \ python3-pytest-helpers-namespace \ python3-pytest-html \ python3-pytest-metadata \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_0.13.0.bb index 2ecf10caa..2ebd358e5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_0.12.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_0.13.0.bb @@ -4,8 +4,8 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[md5sum] = "cfc383e2c647698666a7c5d8ef83a675" -SRC_URI[sha256sum] = "b44f68984a5ceb2607d135a615999b93924c771238a63920d17d3387b0d229d5" +SRC_URI[md5sum] = "afb3ffb4b59d53575e8eb073c3a52803" +SRC_URI[sha256sum] = "6953272383486044699fd0e9f00aad167a27e08ce19aae66c6c4b10e7e767793" PYPI_PACKAGE = "absl-py" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_2.5.1.bb index a29625acc..4a203ccc6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_2.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_2.5.1.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" -SRC_URI[sha256sum] = "e2ae49be45261283a899cc1b95786f07fe5076be9a311d250dbe2de1b8c38f0f" +SRC_URI[sha256sum] = "3ee8e857b07364516f8b9f0e5c52d4cd775036f3ace37c2769de1e8579f4dc07" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib/0001-Remove-tornado-6-test-constraint.-Ref-15.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib/0001-Remove-tornado-6-test-constraint.-Ref-15.patch new file mode 100644 index 000000000..174f088e9 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib/0001-Remove-tornado-6-test-constraint.-Ref-15.patch @@ -0,0 +1,45 @@ +From d3ae6ac951cc5bbce29b9c987741e0a557c9b777 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro> +Date: Sun, 2 May 2021 09:50:43 +0300 +Subject: [PATCH] Remove tornado<6 test constraint. Ref #15. + +Upstream-Status: Backport [https://github.com/ionelmc/python-aspectlib/commit/7dccb198dfb426f529b81a28a755f3c02f8b50cb] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/test_integrations_py3.py | 5 ++++- + tox.ini | 3 ++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/tests/test_integrations_py3.py b/tests/test_integrations_py3.py +index e025eac..596589d 100644 +--- a/tests/test_integrations_py3.py ++++ b/tests/test_integrations_py3.py +@@ -36,7 +36,10 @@ def test_decorate_tornado_coroutine(): + @gen.coroutine + @debug.log(print_to=buf, module=False, stacktrace=2, result_repr=repr) + def coro(): +- yield gen.Task(loop.add_timeout, timedelta(microseconds=10)) ++ if hasattr(gen, 'Task'): ++ yield gen.Task(loop.add_timeout, timedelta(microseconds=10)) ++ else: ++ yield gen.sleep(0.01) + return "result" + + loop = ioloop.IOLoop.current() +diff --git a/tox.ini b/tox.ini +index 8c607de..08c31b3 100644 +--- a/tox.ini ++++ b/tox.ini +@@ -55,7 +55,8 @@ deps = + pytest-clarity + pytest-cov + pytest-travis-fold +- tornado<6.0 ++ six ++ tornado + commands = + {posargs:pytest --cov --cov-report=term-missing -vv --ignore=src} + +-- +2.32.0 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb new file mode 100644 index 000000000..2dc57a6bb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aspectlib_1.5.2.bb @@ -0,0 +1,29 @@ +# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "``aspectlib`` is an aspect-oriented programming, monkey-patch and decorators library. It is useful when changing" +HOMEPAGE = "https://github.com/ionelmc/python-aspectlib" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d58b3f20fd10347a9458b8a03793b62e" + +SRC_URI[sha256sum] = "d275ec82c4c2712e564bb760e4accff8f061f648e38774feabeb8b241cf3a4aa" + +inherit ptest pypi setuptools3 + +SRC_URI += "file://run-ptest \ + file://0001-Remove-tornado-6-test-constraint.-Ref-15.patch \ + " + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS_${PN}-ptest += "\ + python3-tornado \ + python3-process-tests \ +" + +RDEPENDS_${PN} += "python3-core python3-fields" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.5.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.6.5.bb index c805dc4dc..513235bd8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.5.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_2.6.5.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" -SRC_URI[sha256sum] = "d66a600e1602736a0f24f725a511b0e50d12eb18f54b31ec276d2c26a0a62c6a" +SRC_URI[sha256sum] = "83e494b02d75d07d4e347b27c066fd791c0c74fc96c613d1ea3de0c82c48168f" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.2.2.bb index 12de2c97a..01f474d0b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitarray_2.2.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/ilanschnell/bitarray" LICENSE = "PSF" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=2ad702cdcd49e8d2ac01d7e7d0810d2d" -SRC_URI[sha256sum] = "97224a19325ecee49a3bf4df3ee0531d3af9cf288b67d089a7ef44a3c4ea3839" +SRC_URI[sha256sum] = "5ed37f0482199de5a3e096405a646ab3f45dd020d234c42539b3c11ea0e2278d" inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.25.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.25.0.bb index a1941bf3c..ad446d6ef 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.25.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.25.0.bb @@ -10,17 +10,11 @@ SRCNAME = "cassandra-driver" SRC_URI[sha256sum] = "8ad7d7c090eb1cac6110b3bfc1fd2d334ac62f415aac09350ebb8d241b7aa7ee" -DISTUTILS_BUILD_ARGS += " \ - --no-libev \ -" -DISTUTILS_INSTALL_ARGS += " \ - --no-libev \ -" - inherit pypi setuptools3 RDEPENDS_${PN} += "\ ${PYTHON_PN}-cython \ + ${PYTHON_PN}-geomet \ ${PYTHON_PN}-json \ ${PYTHON_PN}-misc \ ${PYTHON_PN}-multiprocessing \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.4.0.bb index 32d2016e5..b791588b4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.4.0.bb @@ -4,7 +4,7 @@ DEPENDS +="${PYTHON_PN}-setuptools-scm-native" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "462b3604d9579458a79e6ca350943c49aabbc98c794c111a79b98720b9164336" +SRC_URI[sha256sum] = "a7926f7244b08c413f1a4fa71a81aa256771c75bdf1a4fd77308547a2d63dd48" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.6.bb index 16928f0db..bcd185d89 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cffi_1.14.6.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5677e2fdbf7cdda61d6dd2b57df547bf" DEPENDS += "libffi ${PYTHON_PN}-pycparser" -SRC_URI[sha256sum] = "fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c" +SRC_URI[sha256sum] = "c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.1.2.bb index 18c7a6699..38f050a04 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_1.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.1.2.bb @@ -1,11 +1,11 @@ SUMMARY = "Extra features for standard library's cmd module" HOMEPAGE = "https://github.com/python-cmd2/cmd2" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9791cd24ca7d1807388ccd55cd066def" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4c527bcb481233ebcb803de975f42701" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -SRC_URI[sha256sum] = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62" +SRC_URI[sha256sum] = "25dbb2e9847aaa686a8a21e84e3d101db8b79f5cb992e044fc54210ab8c0ad41" inherit pypi setuptools3 @@ -14,6 +14,9 @@ RDEPENDS_${PN} += "\ ${PYTHON_PN}-colorama \ ${PYTHON_PN}-pyperclip \ ${PYTHON_PN}-wcwidth \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-pydoc \ + ${PYTHON_PN}-json \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.1.bb index daeda6b2e..5de59d5b4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.1.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=764e737b117a38d773609885e8d04f0b" -SRC_URI[sha256sum] = "5e78691e2673a8e294499e1832bb13efcfb44a86b92e18109fa18951093218ab" +SRC_URI[sha256sum] = "7c991aa71a4577af2f82600d8f8f3a89f936baeaf9b50a9c197da014e5bf16b0" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.5.1.bb index 0c851fef3..596d16fa4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.5.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/bw2/ConfigArgParse" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=da746463714cc35999ed9a42339f2943" -SRC_URI[sha256sum] = "6df537158f28c5ef2e8a8146781833abbc6cb7fca81b1b55d18808ce3439235e" +SRC_URI[sha256sum] = "371f46577e76ec71a183b88378f36dd09f4b946f60fe60712f411b020f26b812" PYPI_PACKAGE = "ConfigArgParse" @@ -15,6 +15,7 @@ PACKAGECONFIG[yaml] = ",,,${PYTHON_PN}-pyyaml" RDEPENDS_${PN} += "\ ${PYTHON_PN}-core \ ${PYTHON_PN}-shell \ + ${PYTHON_PN}-json \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.15.bb index c520fa715..1782391a6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.13.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_1.0.15.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=b8ee59850b882cbf623188489ea748e2" PYPI_PACKAGE = "croniter" -SRC_URI[sha256sum] = "57f36df4f5a1c31bbf50bbffa3551612c19f6156ab1e88e2e42342ccbb9f9b9a" +SRC_URI[sha256sum] = "a70dfc9d52de9fc1a886128b9148c89dd9e76b67d55f46516ca94d2d73d58219" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.7.bb index b5f34daef..565e223bf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cryptography-vectors_3.4.7.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0 | BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" -SRC_URI[sha256sum] = "e5f88a5fb03d60b4f20eed4920638b6a3ed32a363523a77086528d557a2c2da8" +SRC_URI[sha256sum] = "a7ac3aaa57514687696ad65f833e5e39b6fa3c5d41de2b8c938346ee119204c2" PYPI_PACKAGE = "cryptography_vectors" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.2.bb index 5326924e6..a68a736a8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.2.bb @@ -4,8 +4,7 @@ HOMEPAGE = "https://dateutil.readthedocs.org" LICENSE = "BSD-3-Clause & Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3155c7bdc71f66e02678411d2abf996" -SRC_URI[md5sum] = "f2a1d4b680b297b367a974664ca3a4f6" -SRC_URI[sha256sum] = "73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c" +SRC_URI[sha256sum] = "0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86" PYPI_PACKAGE = "python-dateutil" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.3.bb deleted file mode 100644 index bf26ba30b..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Serialize all of python" -HOMEPAGE = "https://pypi.org/project/dill/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=90fee9f98d11d59df3f8aa813ff9a3de" - -SRC_URI[md5sum] = "99c878e2e4e924f3234c0efcbcff6abf" -SRC_URI[sha256sum] = "efb7f6cb65dba7087c1e111bb5390291ba3616741f96840bfc75792a1a9b5ded" - -inherit pypi setuptools3 - -PYPI_PACKAGE_EXT = "zip" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.4.bb new file mode 100644 index 000000000..0634e17f5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.4.bb @@ -0,0 +1,14 @@ +SUMMARY = "Serialize all of python" +HOMEPAGE = "https://pypi.org/project/dill/" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=41adceb584fdde8323ddf9ad23c07fe5" + +SRC_URI[sha256sum] = "9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675" + +inherit pypi setuptools3 + +PYPI_PACKAGE_EXT = "zip" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-multiprocessing \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.23.bb deleted file mode 100644 index ab4b68fc8..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.23.bb +++ /dev/null @@ -1,9 +0,0 @@ -require python-django.inc -inherit setuptools3 - -SRC_URI[md5sum] = "d72405637143e201b745714e300bb546" -SRC_URI[sha256sum] = "12cfc045a4ccb2348719aaaa77b17e66a26bff9fc238b4c765a3e825ef92e414" - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-sqlparse \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.24.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.24.bb new file mode 100644 index 000000000..964ca6ba0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_2.2.24.bb @@ -0,0 +1,9 @@ +require python-django.inc +inherit setuptools3 + +SRC_URI[md5sum] = "ebf3bbb7716a7b11029e860475b9a122" +SRC_URI[sha256sum] = "3339ff0e03dee13045aef6ae7b523edff75b6d726adf7a7a48f53d5a501f7db7" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-sqlparse \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_3.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_3.2.5.bb index 7a9611ca1..5890c8541 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_3.2.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_3.2.5.bb @@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "13ac78dbfd189532cad8f383a27e58e18b3d33f80009ceb476d7fcbfc5dcebd8" +SRC_URI[sha256sum] = "3da05fea54fdec2315b54a563d5b59f3b4e2b1e69c3a5841dda35019c01855cd" RDEPENDS_${PN} += "\ ${PYTHON_PN}-sqlparse \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.2.3.bb index c793592be..2d9c53172 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_2.2.3.bb @@ -3,9 +3,13 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" -SRC_URI[sha256sum] = "68de07c1aec3b1d33126111252cc699600dd1e45802625344aa6eb9e680ef157" +SRC_URI[sha256sum] = "60139b91ef9646e27381fd62b8c38f1fc8ebc78dc4bc231c08c51240062e58e6" PYPI_PACKAGE = "elementpath" inherit pypi setuptools3 +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-xml \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet_1.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet_1.9.0.bb new file mode 100644 index 000000000..a7b156535 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet_1.9.0.bb @@ -0,0 +1,28 @@ +# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "execnet: rapid multi-Python deployment" +HOMEPAGE = "https://execnet.readthedocs.io/en/latest/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=772fcdaca14b378878d05c7d857e6c3e" + +DEPENDS += "python3-pip-native" + +SRC_URI += "file://run-ptest \ + " +SRC_URI[sha256sum] = "8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5" + +inherit ptest pypi setuptools3 + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/testing/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS_${PN}-ptest += "\ + python3-pytest \ +" + +RDEPENDS_${PN} += "python3-core python3-crypt python3-ctypes python3-fcntl python3-io python3-shell python3-threading" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.16.3.bb index eed8d2c95..6f283a392 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.16.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.16.3.bb @@ -3,6 +3,11 @@ HOMEPAGE = "https://github.com/harlowja/fasteners" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=4476c4be31402271e101d9a4a3430d52" -SRC_URI[sha256sum] = "c995d8c26b017c5d6a6de9ad29a0f9cdd57de61ae1113d28fac26622b06a0933" +SRC_URI[sha256sum] = "b1ab4e5adfbc28681ce44b3024421c4f567e705cc3963c732bf1cba3348307de" inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-fcntl \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema_2.15.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema_2.15.1.bb new file mode 100644 index 000000000..d901fcb2e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema_2.15.1.bb @@ -0,0 +1,38 @@ +# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Fastest Python implementation of JSON schema" +HOMEPAGE = "https://github.com/seznam/python-fastjsonschema" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=18950e8362b69c0c617b42b8bd8e7532" + +SRCREV = "1e214911fe83dbaeea3d50dfb3a539118de8a442" +PYPI_SRC_URI = "git://github.com/horejsek/python-fastjsonschema;protocol=https;branch=master" + +SRC_URI += "file://run-ptest" + +inherit ptest pypi setuptools3 + +S = "${WORKDIR}/git" + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS_${PN}-ptest += "\ + python3-colorama \ + python3-jsonschema \ + python3-pylint \ + python3-pytest \ + python3-pytest-benchmark \ + python3-pytest-cache \ +" +RDEPENDS_${PN} += "\ + python3-core \ + python3-urllib3 \ + python3-numbers \ + python3-pickle \ + " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fields_5.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fields_5.0.0.bb new file mode 100644 index 000000000..9c22b920d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fields_5.0.0.bb @@ -0,0 +1,15 @@ +# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Container class boilerplate killer." +HOMEPAGE = "https://github.com/ionelmc/python-fields" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e32c6705498713d9c904a9f565953a2c" + +SRC_URI[sha256sum] = "31d4aa03d8d44e35df13c431de35136997f047a924a597d84f7bc209e1be5727" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-core" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_3.0.1.bb index 8f84e0597..77fd172bc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_3.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_3.0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "SQLAlchemy database migrations for Flask applications using Alemb LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b69377f79f3f48c661701236d5a6a85" -SRC_URI[sha256sum] = "a6607e66bf1d68489b2281ead5caa6fdf7a21b71984fae922ef5f915ac45bbcb" +SRC_URI[sha256sum] = "4d42e8f861d78cb6e9319afcba5bf76062e5efd7784184dd2a1cccd9de34a702" PYPI_PACKAGE = "Flask-Migrate" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.1.0.bb index 5def7621e..5a6b83bfe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.1.0.bb @@ -9,7 +9,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "Flask-SocketIO" -SRC_URI[sha256sum] = "4fb968c43bc384f184cd1a25c1842297c2e3d6efc2f755a61be6d4406858220f" +SRC_URI[sha256sum] = "b41b9f6fb0d7f3fcadd54c44653307a9b96e985c7da73f92779480248b5b6874" RDEPENDS_${PN} += "\ ${PYTHON_PN}-flask \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.5.0.bb index 7ef2eb468..9908950dc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.5.0.bb @@ -4,8 +4,7 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3ad9b6802e713fc5e307e1230f1ea90" -SRC_URI[md5sum] = "d1f258eb70bb916f8fe5535351d5ff05" -SRC_URI[sha256sum] = "40feb7b8b8434785585ab224d1568b857edb18297e5a3047f1ba012bc83b42c1" +SRC_URI[sha256sum] = "8109cbe7aa0f7bf7e4348379da05b8137ea1f059f073332c3c1cedd57db8541f" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-geomet_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-geomet_0.3.0.bb new file mode 100644 index 000000000..de05534b1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-geomet_0.3.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Convert GeoJSON to WKT/WKB (Well-Known Text/Binary), and vice versa." +DESCRIPTION = "Convert GeoJSON to WKT/WKB (Well-Known Text/Binary), and vice versa." +HOMEPAGE = "https://github.com/geomet/geomet" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" +SRCNAME = "geomet" + +SRC_URI[sha256sum] = "cb52411978ee01ff104ab48f108d7333b14423ae7a15a65fee25b7d29bda2e1b" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/geomet/geomet.git;protocol=https;branch=release-${PV} \ + " +SRCREV = "73ec5ec96cca32f2e2461d3964fc3d4ab80248f9" + +inherit setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-click \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.7.bb index ff0a91c6f..cc441af0b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gnupg_0.4.7.bb @@ -4,8 +4,11 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b0b7ac63b60085b23fa9f7e1951daa1d" PYPI_PACKAGE = "python-gnupg" -SRC_URI[sha256sum] = "3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a" +SRC_URI[sha256sum] = "2061f56b1942c29b92727bf9aecbd3cea3893acc9cccbdc7eb4604285efe4ac7" inherit pypi setuptools3 -RDEPENDS_${PN} += "gnupg-gpg" +RDEPENDS_${PN} += " \ + gnupg-gpg \ + python3-logging \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_1.30.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_1.30.0.bb new file mode 100644 index 000000000..08cc35d06 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_1.30.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Google API client core library" +HOMEPAGE = "https://github.com/googleapis/python-api-core" +AUTHOR = "Google LLC" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "0724d354d394b3d763bc10dfee05807813c5210f0bd9b8e2ddf6b6925603411c" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-asyncio \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-math \ +" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-googleapis-common-protos \ + ${PYTHON_PN}-google-auth \ + ${PYTHON_PN}-grpcio \ + ${PYTHON_PN}-protobuf \ + ${PYTHON_PN}-pytz \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.12.0.bb new file mode 100644 index 000000000..67d05b5dd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.12.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, \ +Moderator, and many other Google APIs." +HOMEPAGE = "https://github.com/googleapis/google-api-python-client" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" + +SRC_URI[sha256sum] = "a5d203241a93201a770c966f8eca39de7f88b28194f9d252065b18e83bd99c4b" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-core \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-httplib2 \ + ${PYTHON_PN}-uritemplate \ + ${PYTHON_PN}-google-api-core \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.6.0.bb deleted file mode 100644 index c6ae6e847..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.6.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "The Google API Client for Python is a client library for accessing the Plus, \ -Moderator, and many other Google APIs." -HOMEPAGE = "https://github.com/googleapis/google-api-python-client" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=94023d14f6b58272fd885e4e3f2f08b3" - -SRC_URI[sha256sum] = "6a87f324334247bf7ba24406da586424b09e715d04336fb7cf45a402b80d38e8" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_1.32.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_1.32.0.bb new file mode 100644 index 000000000..d492bbbcb --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_1.32.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Google Authentication Library" +HOMEPAGE = "https://github.com/googleapis/google-auth-library-python" +AUTHOR = "Google Cloud Platform" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "e34e5f5de5610b202f9b40ebd9f8b27571d5c5537db9afed3a72b2db5a345039" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-asyncio \ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-numbers \ +" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-aiohttp \ + ${PYTHON_PN}-cachetools \ + ${PYTHON_PN}-pyasn1-modules \ + ${PYTHON_PN}-rsa \ + ${PYTHON_PN}-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.53.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.53.0.bb new file mode 100644 index 000000000..2c59ae86d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.53.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Common protobufs used in Google APIs" +HOMEPAGE = "https://github.com/googleapis/python-api-common-protos" +AUTHOR = "Google LLC" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "a88ee8903aa0a81f6c3cec2d5cf62d3c8aa67c06439b0496b49048fb1854ebf4" + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-grpcio \ + ${PYTHON_PN}-protobuf \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.37.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.38.1.bb index d1b934bd0..e6680e84b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.37.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.38.1.bb @@ -11,7 +11,7 @@ DEPENDS += "${PYTHON_PN}-grpcio" SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" -SRC_URI[sha256sum] = "3ec510c1b6bfc32effc639acf9a055e72dab7a7b6757bf72f2132790d6a7cf1c" +SRC_URI[sha256sum] = "cd85f58038b92e1961f8127d79691e84e151390d35cae73c4c0cbe2042f76b77" RDEPENDS_${PN} = "${PYTHON_PN}-grpcio" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.38.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.38.1.bb index d9e00422b..3af033d96 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.38.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.38.1.bb @@ -12,7 +12,7 @@ SRC_URI_append_class-target = " file://ppc-boringssl-support.patch \ file://mips_bigendian.patch \ file://0001-absl-always-use-asm-sgidefs.h.patch \ " -SRC_URI[sha256sum] = "abbf9c8c3df4d5233d5888c6cfa85c1bb68a6923749bd4dd1abc6e1e93986f17" +SRC_URI[sha256sum] = "1f79d8a24261e3c12ec3a6c25945ff799ae09874fd24815bc17c2dc37715ef6c" RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.3.0.bb index 5faa0b808..58498f89a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-h5py_3.3.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=113251d71fb0384712c719b567261c5c" -SRC_URI[sha256sum] = "89474be911bfcdb34cbf0d98b8ec48b578c27a89fdb1ae4ee7513f1ef8d9249e" +SRC_URI[sha256sum] = "e0dac887d779929778b3cfd13309a939359cc9e74756fc09af7c527a82797186" SRC_URI_append = " \ file://0001-setup_build.py-avoid-absolute-path.patch \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine/0001-setup.py-Correct-the-license-assignment.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine/0001-setup.py-Correct-the-license-assignment.patch deleted file mode 100644 index bb5955a44..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine/0001-setup.py-Correct-the-license-assignment.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 56b421a18ef8acb41ab9e4bde7e1f5452ec67da9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 17 May 2021 22:17:07 -0700 -Subject: [PATCH] setup.py: Correct the license assignment - -latest python/2.9 + setuptools bail out otherwise - -lines = header.split('\n') -| AttributeError: 'list' object has no attribute 'split' - -Upstream-Status: Submitted [https://github.com/mapado/haversine/pull/38] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 549436d..9e7fb00 100755 ---- a/setup.py -+++ b/setup.py -@@ -15,7 +15,7 @@ setup( - maintainer_email='julien.deniau@mapado.com', - url='https://github.com/mapado/haversine', - packages=['haversine'], -- license=['MIT'], -+ license='MIT', - classifiers=[ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Developers', --- -2.31.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.3.1.bb index 624d30ca0..c3251624f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.3.1.bb @@ -2,10 +2,7 @@ SUMMARY = "Calculate the distance between 2 points on Earth" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI += "file://0001-setup.py-Correct-the-license-assignment.patch" - -SRC_URI[md5sum] = "ff2d43a74195ec00c42ccd5da2a3f3de" -SRC_URI[sha256sum] = "72c76855ac25e6ad054c7ed380e95c1a96803185f005dd11f40ccaa9620b551f" +SRC_URI[sha256sum] = "75a7f859b3fb6df746564ca66ad1fd5b4052cdbab3d74ff16e8f1a7c3d4a26a5" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.19.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.19.1.bb index a16f8d9d2..122b4bd8b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.19.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.19.1.bb @@ -7,3 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=56e5e931172b6164b62dc7c4aba6c8cf" SRC_URI[sha256sum] = "0b12617eeca7433d4c396a100eaecfa4b08ee99aa881e6df6e257a7aad5d533d" inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-pyparsing \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.2.bb index fb6a7e3b6..6be27f760 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_9.2.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Human friendly output for text interfaces using Python" HOMEPAGE = "https://humanfriendly.readthedocs.io/" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=764e737b117a38d773609885e8d04f0b" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5d178009f806c2bdd498a19be0013a7a" PYPI_PACKAGE = "humanfriendly" -SRC_URI[sha256sum] = "066562956639ab21ff2676d1fda0b5987e985c534fc76700a19bd54bcb81121d" +SRC_URI[sha256sum] = "f7dba53ac7935fd0b4a2fc9a29e316ddd9ea135fb3052d3d0279d10c18ff9c48" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.10.0.bb index 1c269bac9..eba13dbc7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_3.10.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" -SRC_URI[sha256sum] = "a31704cf41f023e268032c4813c6482573320150a0d986f76b245e0451bb89e1" +SRC_URI[sha256sum] = "b2413730ce6684f85e0439a5b80b8f402e09f03e16ab8023d1da758c6ff41148" inherit pypi setuptools3 @@ -15,6 +15,7 @@ DEPENDS += "\ RDEPENDS_${PN} += "\ ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-setuptools \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_3.2.bb index fbdbab6df..4ca7f625a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-idna_3.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/kjd/idna" LICENSE = "BSD-3-Clause & Python-2.0 & Unicode" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=239668a7c6066d9e0c5382e9c8c6c0e1" -SRC_URI[sha256sum] = "c5b02147e01ea9920e6b0a3f1f7bb833612d507592c837a6c49552768f4054e1" +SRC_URI[sha256sum] = "467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.1.7.bb index 4fff7d1e5..6d4fab3c9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.1.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.1.7.bb @@ -8,3 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8debe8d42320ec0ff24665319b625a5e" SRC_URI[sha256sum] = "1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94" inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-ctypes \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.24.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.25.0.bb index 1c11eeca0..b8a6db2b1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.24.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_7.25.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[sha256sum] = "a171caa3d3d4c819a1c0742e3abecfd5a2b8ab525ca1c9f114b40b76b0679ab1" +SRC_URI[sha256sum] = "54bbd1fe3882457aaf28ae060a5ccdef97f212a741754e420028d4ec5c2291dc" RDEPENDS_${PN} = "\ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.9.2.bb index 36de825d2..5832136df 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-isort_5.9.2.bb @@ -4,13 +4,17 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=8227180126797a0148f94f483f3e1489" -SRC_URI[sha256sum] = "0a943902919f65c5684ac4e0154b1ad4fac6dcaa5d9f3426b732f1c8b5419be6" +SRC_URI[sha256sum] = "f65ce5bd4cbc6abdfbe29afc2f0245538ab358c14590912df638033f157d555e" inherit pypi setuptools3 RDEPENDS_${PN} += "\ ${PYTHON_PN}-datetime \ ${PYTHON_PN}-shell \ + ${PYTHON_PN}-profile \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-difflib \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-joblib_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-joblib_1.0.1.bb new file mode 100644 index 000000000..4e63b056c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-joblib_1.0.1.bb @@ -0,0 +1,17 @@ +SUMMARY = "Joblib is a set of tools to provide lightweight pipelining in Python." +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=32b289008fb813a27c9025f02b59d03d" + +inherit setuptools3 pypi + +SRC_URI[md5sum] = "9914b330916395c0a1feca54949867a3" +SRC_URI[sha256sum] = "9c17567692206d2f3fb9ecf5e991084254fe631665c450b443761c4186a613f7" + +RDEPENDS_${PN} += " \ + python3-asyncio \ + python3-distutils \ + python3-json \ + python3-multiprocessing \ + python3-pprint \ + python3-pydoc \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_21.6.14.bb index c033bd352..0513d091f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-license-expression_21.6.14.bb @@ -2,16 +2,20 @@ SUMMARY = "Utility library to parse, compare, simplify and normalize license exp HOMEPAGE = "https://github.com/nexB/license-expression" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://apache-2.0.LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa" +LIC_FILES_CHKSUM = "file://apache-2.0.LICENSE;md5=9429839cdc4b292ff46e88b524c6e0c9" -SRC_URI[md5sum] = "fd4cb295cc345be1071274cdbd81c969" -SRC_URI[sha256sum] = "7960e1dfdf20d127e75ead931476f2b5c7556df05b117a73880b22ade17d1abc" +SRC_URI[sha256sum] = "9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2" inherit pypi ptest setuptools3 +DEPENDS += "\ + ${PYTHON_PN}-setuptools-scm-native \ + ${PYTHON_PN}-wheel-native \ +" + RDEPENDS_${PN} += "\ ${PYTHON_PN}-booleanpy \ - " +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch deleted file mode 100644 index 3c836635a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Allow-verify_cb_-to-be-called-with-ok-True.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 73fbd1e646f6bbf202d4418bae80eb9941fbf552 Mon Sep 17 00:00:00 2001 -From: Casey Deccio <casey@deccio.net> -Date: Fri, 8 Jan 2021 12:43:09 -0700 -Subject: [PATCH] Allow verify_cb_* to be called with ok=True - -With https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58 -OpenSSL allowed verificaton to continue on UNABLE_TO_VERIFY_LEAF_SIGNATURE ---- - tests/test_ssl.py | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/tests/test_ssl.py b/tests/test_ssl.py -index 92b6942..7a3271a 100644 ---- a/tests/test_ssl.py -+++ b/tests/test_ssl.py -@@ -59,8 +59,13 @@ def allocate_srv_port(): - - - def verify_cb_new_function(ok, store): -- assert not ok - err = store.get_error() -+ # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of -+ # aborting, this callback is called to retrieve additional error -+ # information. In this case, ok might not be False. -+ # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58 -+ if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE: -+ assert not ok - assert err in [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT, - m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, - m2.X509_V_ERR_CERT_UNTRUSTED, -@@ -618,7 +623,12 @@ class MiscSSLClientTestCase(BaseSSLClientTestCase): - - def verify_cb_old(self, ctx_ptr, x509_ptr, err, depth, ok): - try: -- self.assertFalse(ok) -+ # If err is X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, then instead of -+ # aborting, this callback is called to retrieve additional error -+ # information. In this case, ok might not be False. -+ # See https://github.com/openssl/openssl/commit/2e06150e3928daa06d5ff70c32bffad8088ebe58 -+ if err != m2.X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE: -+ self.assertFalse(ok) - self.assertIn(err, - [m2.X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT, - m2.X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, --- -2.29.2 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch deleted file mode 100644 index 2313a324a..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d06eaa88a5f491827733f32027c46de3557fbd05 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu> -Date: Fri, 19 Feb 2021 15:53:02 +0100 -Subject: [PATCH] Use of RSA_SSLV23_PADDING has been deprecated. - -Fixes #293. ---- - tests/test_rsa.py | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/tests/test_rsa.py b/tests/test_rsa.py -index 3de5016..7299785 100644 ---- a/tests/test_rsa.py -+++ b/tests/test_rsa.py -@@ -124,11 +124,6 @@ class RSATestCase(unittest.TestCase): - ptxt = priv.private_decrypt(ctxt, p) - self.assertEqual(ptxt, self.data) - -- # sslv23_padding -- ctxt = priv.public_encrypt(self.data, RSA.sslv23_padding) -- res = priv.private_decrypt(ctxt, RSA.sslv23_padding) -- self.assertEqual(res, self.data) -- - # no_padding - with six.assertRaisesRegex(self, RSA.RSAError, 'data too small'): - priv.public_encrypt(self.data, RSA.no_padding) --- -2.29.2 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/avoid-host-contamination.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/avoid-host-contamination.patch new file mode 100644 index 000000000..9d9b8449b --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/avoid-host-contamination.patch @@ -0,0 +1,23 @@ +Filter out '/usr/include' for swig to avoid host contamination issue. + +Upstream-Status: Upstream-Status: Inappropriate [cross compile specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 5a12981..389d49f 100644 +--- a/setup.py ++++ b/setup.py +@@ -153,7 +153,8 @@ class _M2CryptoBuildExt(build_ext.build_ext): + self.swig_opts.append('-py3') + + # swig seems to need the default header file directories +- self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()]) ++ self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes() ++ if i != '/usr/include']) + + log.debug('self.include_dirs = %s', self.include_dirs) + log.debug('self.library_dirs = %s', self.library_dirs) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch index f039ae866..77ef7e557 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto/cross-compile-platform.patch @@ -6,7 +6,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/setup.py +++ b/setup.py -@@ -169,22 +169,6 @@ class _M2CryptoBuildExt(build_ext.build_ +@@ -169,24 +169,6 @@ class _M2CryptoBuildExt(build_ext.build_ log.debug('self.include_dirs = %s', self.include_dirs) log.debug('self.library_dirs = %s', self.library_dirs) @@ -25,6 +25,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> - self.swig_opts.append('-D%s' % arch) - if mach in ('ppc64le', 'ppc64el'): - self.swig_opts.append('-D_CALL_ELF=2') +- if mach in ('arm64_be'): +- self.swig_opts.append('-D__AARCH64EB__') - self.swig_opts.extend(['-I%s' % i for i in self.include_dirs]) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.38.0.bb index e1f92928c..950de564f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.37.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.38.0.bb @@ -8,10 +8,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/python-m2crypto:" SRC_URI += "file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ file://cross-compile-platform.patch \ - file://0001-Allow-verify_cb_-to-be-called-with-ok-True.patch \ - file://0001-Use-of-RSA_SSLV23_PADDING-has-been-deprecated.patch \ + file://avoid-host-contamination.patch \ " -SRC_URI[sha256sum] = "e4e42f068b78ccbf113e5d0a72ae5f480f6c3ace4940b91e4fff5598cfff6fb3" +SRC_URI[sha256sum] = "99f2260a30901c949a8dc6d5f82cd5312ffb8abc92e76633baf231bbbcb2decb" PYPI_PACKAGE = "M2Crypto" inherit pypi siteinfo setuptools3 @@ -39,6 +38,9 @@ SWIG_FEATURES ?= "-D__${HOST_ARCH}__ ${@['-D__ILP32__','-D__LP64__'][d.getVar('S SWIG_FEATURES_append_riscv64 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" SWIG_FEATURES_append_riscv32 = " -D__SIZEOF_POINTER__=${SITEINFO_BITS}/8 -D__riscv_xlen=${SITEINFO_BITS}" SWIG_FEATURES_append_mipsarch = " -D_MIPS_SZPTR=${SITEINFO_BITS}" +SWIG_FEATURES_append_powerpc64le = " -D__powerpc64__" export SWIG_FEATURES +export STAGING_DIR + BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.812.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.910.bb index 8faab60b9..8e675e6a9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.812.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mypy_0.910.bb @@ -1,18 +1,23 @@ SUMMARY = "Optional static typing for Python 3 and 2 (PEP 484)" HOMEPAGE = "https://github.com/python/mypy" LICENSE = "MIT & Python-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6afb7c151c4dedb5c3dc292cc120fadc" - -RDEPENDS_${PN} = " \ - ${PYTHON_PN}-mypy-extensions \ - ${PYTHON_PN}-typed-ast \ - ${PYTHON_PN}-typing-extensions \ -" +LIC_FILES_CHKSUM = "file://LICENSE;md5=17b7180fcfc43c4e70c07c71588604c4" PYPI_PACKAGE = "mypy" inherit pypi setuptools3 -SRC_URI[sha256sum] = "cd07039aa5df222037005b08fbbfd69b3ab0b0bd7a07d7906de75ae52c4e3119" +SRC_URI[sha256sum] = "704098302473cb31a218f1775a873b376b30b4c18229421e9e9dc8916fd16150" BBCLASSEXTEND = "native" + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-mypy-extensions \ + ${PYTHON_PN}-typed-ast \ + ${PYTHON_PN}-typing-extensions \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-pprint \ + ${PYTHON_PN}-difflib \ + ${PYTHON_PN}-toml \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.5.1.bb deleted file mode 100644 index 0b52cfd7e..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.5.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Python package for creating and manipulating graphs and networks" -HOMEPAGE = "http://networkx.github.io/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a24ea029adac8935699bf69b2e38c728" - -SRC_URI[sha256sum] = "109cd585cac41297f71103c3c42ac6ef7379f29788eb54cb751be5a663bb235a" - -inherit pypi setuptools3 - -RDEPENDS_${PN} += "\ - ${PYTHON_PN}-decorator \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.6.1.bb new file mode 100644 index 000000000..676e1dbdc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_2.6.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Python package for creating and manipulating graphs and networks" +HOMEPAGE = "http://networkx.github.io/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5cfa4d8f5881e0d053bb497130b9c73a" + +SRC_URI[sha256sum] = "bf4cb807d1bccf1593c7d0742d9127d9e04e021867299082658b0fc3907924e8" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-decorator \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-numbers \ + ${PYTHON_PN}-pickle \ + ${PYTHON_PN}-html \ + ${PYTHON_PN}-xml \ + ${PYTHON_PN}-json \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_3.1.1.bb index fe27e8e50..e11786349 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_3.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_3.1.1.bb @@ -4,8 +4,7 @@ HOMEPAGE = "https://github.com/idan/oauthlib" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=abd2675e944a2011aed7e505290ba482" -SRC_URI[md5sum] = "43cb2b5bac983712ee55076b61181cc2" -SRC_URI[sha256sum] = "bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889" +SRC_URI[sha256sum] = "8f0215fcc533dd8dd1bee6f4c412d4f0cd7297307d43ac61666389e3bc3198a3" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.3.0.bb index 54fa910a9..b98e2865c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.2.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_1.3.0.bb @@ -4,9 +4,9 @@ high-performance, easy-to-use data structures and data analysis tools for \ the Python programming language." HOMEPAGE = "http://pandas.pydata.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c2a8f987b2ce77c368c6b3e1b5b10774" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3f23c5c092b74d245d48eeef72bc3fd2" -SRC_URI[sha256sum] = "649ecab692fade3cbfcf967ff936496b0cfba0af00a55dfaacd82bdda5cb2279" +SRC_URI[sha256sum] = "c554e6c9cf2d5ea1aba5979cc837b3649539ced0e18ece186f055450c86622e2" inherit pypi setuptools3 @@ -20,5 +20,7 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-json \ ${PYTHON_PN}-numpy \ ${PYTHON_PN}-dateutil \ + ${PYTHON_PN}-dateutil-zoneinfo \ ${PYTHON_PN}-pytz \ + ${PYTHON_PN}-profile \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_8.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_8.3.1.bb index 3241230d1..045357a6a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_8.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_8.3.1.bb @@ -5,11 +5,11 @@ HOMEPAGE = "https://pillow.readthedocs.io" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=0337b116233da4616ae9fdb130bf6f1a" -SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=8.2.x \ +SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=8.3.x \ file://0001-support-cross-compiling.patch \ file://0001-explicitly-set-compile-options.patch \ " -SRCREV ?= "e0e353c0ef7516979a9aedce3792596649ce4433" +SRCREV ?= "92933b86574b9c80764bf52c357ed29e1ef53382" inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb index 7a98ef288..4c0e799ac 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=faa7f82be8f220bff6156be4790344fc" -SRC_URI[sha256sum] = "38d612488f0633755a2e7a8acab6c01d20d63dbc31af75e2a9ac98a6f638ca94" +SRC_URI[sha256sum] = "deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899" RDEPENDS_${PN} = "pkgconfig \ ${PYTHON_PN}-shell \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb new file mode 100644 index 000000000..dccdeb7a0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-process-tests_2.1.2.bb @@ -0,0 +1,15 @@ +# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Tools for testing processes." +HOMEPAGE = "https://github.com/ionelmc/python-process-tests" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=37031056aff37e4b3310872a9a3d0b1e" + +SRC_URI[sha256sum] = "a3747ad947bdfc93e5c986bdb17a6d718f3f26e8577a0807a00962f29e26deba" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-core" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.18.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.19.bb index 366287583..f384e216e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.18.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.19.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" -SRC_URI[sha256sum] = "e1b4f11b9336a28fa11810bc623c357420f69dfdb6d2dac41ca2c21a55c033bc" +SRC_URI[sha256sum] = "08360ee3a3148bdb5163621709ee322ec34fc4375099afa4bbf751e9b7b7fa4f" inherit pypi setuptools3 @@ -18,6 +18,7 @@ RDEPENDS_${PN} += " \ ${PYTHON_PN}-datetime \ ${PYTHON_PN}-shell \ ${PYTHON_PN}-image \ + ${PYTHON_PN}-asyncio \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.17.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.17.3.bb index be846f799..b3f9f6f21 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.17.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_3.17.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=19e8f490f9526b1de8 inherit pypi setuptools3 -SRC_URI[sha256sum] = "05dfe9319939a8473c21b469f34f6486646e54fb8542637cf7ed8e2fbfe21538" +SRC_URI[sha256sum] = "72804ea5eaa9c22a090d2803813e280fb273b62d5ae497aaf3553d141c4fdd7b" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.5.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.5.18.bb index 3c0a9c0e5..d039b7ee3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.5.17.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_21.5.18.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/mk-fg/python-pulse-control" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f1d10048469ff90123263eb5e214061d" -SRC_URI[sha256sum] = "3f782b3adf6d91b2398504002d248b36aa047bd04d5acd0ae5d4e2d3c8e746a0" +SRC_URI[sha256sum] = "14e34563cdad5f01d193f1ef7cd859a0fbdaa846726d44b0b68f4451a7458458" RDEPENDS_${PN} += " \ libpulse \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest new file mode 100644 index 000000000..b63c4de0d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo_8.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo_8.0.0.bb new file mode 100644 index 000000000..1b62a7611 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo_8.0.0.bb @@ -0,0 +1,27 @@ +# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Get CPU info with pure Python 2 & 3" +HOMEPAGE = "https://github.com/workhorsy/py-cpuinfo" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b0b97c022f12b14d9e02de0b283ee9e9" + +SRC_URI[sha256sum] = "5f269be0e08e33fd959de96b34cd4aeeeacac014dd8305f70eb28d06de2345c5" + +inherit ptest pypi setuptools3 + +SRC_URI += "file://run-ptest \ + " + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS_${PN}-ptest += "\ + python3-pytest \ +" + +RDEPENDS_${PN} += "python3-core python3-ctypes python3-datetime python3-json python3-io python3-mmap python3-multiprocessing python3-netclient python3-pickle python3-pprint python3-shell" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.2.0.bb index c392261ad..ebe11241c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_9.2.0.bb @@ -3,8 +3,16 @@ HOMEPAGE = "https://github.com/balloob/pychromecast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" -SRC_URI[sha256sum] = "907656cea46d39d0e93ec815979578ef4fb6f655fd8bf4e88e6421fcd7824e85" +SRC_URI[sha256sum] = "6d34593575cf77565df47af4c75dd47c6a65831ec18a8c10b5367b2f1c172f0a" PYPI_PACKAGE = "PyChromecast" inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-logging \ + ${PYTHON_PN}-zeroconf \ + ${PYTHON_PN}-json \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-protobuf \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.143.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.144.bb index 1e3ef27a7..1e97b27ae 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.143.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.144.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" SRC_URI = "git://github.com/MISP/PyMISP.git;protocol=https;branch=main" -SRCREV = "c2e9663765e83f1a4aa70099546bec653ed770e7" +SRCREV = "7dbaf665d9288f2a2692bee3d6207bb6abe3c51f" S = "${WORKDIR}/git" inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.17.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.18.0.bb index 72736c891..7b792284e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.17.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyrsistent_0.18.0.bb @@ -1,10 +1,9 @@ SUMMARY = "Persistent/Immutable/Functional data structures for Python" HOMEPAGE = "https://github.com/tobgu/pyrsistent" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE.mit;md5=ca574f2891cf528b3e7a2ee570337e7c" +LIC_FILES_CHKSUM = "file://LICENSE.mit;md5=a4b94c2b800b582a8d3925a9939cbf44" -SRC_URI[md5sum] = "cd38658ea772a7f9b12b6f9485a7018b" -SRC_URI[sha256sum] = "2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e" +SRC_URI[sha256sum] = "773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.50.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.53.bb index cfa0d6ef0..dc7f67665 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.50.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.53.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=07b0e2ca9ac77cd65cd4edf2e13367ea" -SRC_URI[sha256sum] = "15a583b819c1e758cca72d5e148d59dd3bf7c9d59f19b5e79ab38c743c3e0738" +SRC_URI[sha256sum] = "e24ea33f4ab810ff5e698d5e577d382413a2994565439ebc67fb42614f899e93" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-benchmark_3.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-benchmark_3.4.1.bb new file mode 100644 index 000000000..5fb11ddb7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-benchmark_3.4.1.bb @@ -0,0 +1,15 @@ +# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "A ``pytest`` fixture for benchmarking code. It will group the tests into rounds that are calibrated to the chosen timer." +HOMEPAGE = "https://github.com/ionelmc/pytest-benchmark" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9c5c2c74370826468065c5702b8a1fcf" + +SRC_URI[sha256sum] = "40e263f912de5a81d891619032983557d62a3d85843f9a9f30b98baea0cd7b47" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-core python3-py-cpuinfo python3-pytest python3-aspectlib" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-cache_1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-cache_1.0.bb new file mode 100644 index 000000000..4ce91dd98 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-cache_1.0.bb @@ -0,0 +1,15 @@ +# Copyright (C) 2021 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "pytest plugin with mechanisms for caching across test runs" +HOMEPAGE = "http://bitbucket.org/hpk42/pytest-cache/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9" + +SRC_URI[sha256sum] = "be7468edd4d3d83f1e844959fd6e3fd28e77a481440a7118d430130ea31b07a9" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += "python3-core python3-execnet python3-pprint python3-py python3-pytest" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pythonping_1.0.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pythonping_1.1.0.bb index 5affb934c..fd66a6ffd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pythonping_1.0.16.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pythonping_1.1.0.bb @@ -4,8 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://setup.py;beginline=12;endline=12;md5=2d33c00f47720c7e35e1fdb4b9fab027" -SRC_URI[md5sum] = "9b505ad8a5b8a6a8e57ccf75098ea364" -SRC_URI[sha256sum] = "d025c8b25952580dea47bc241421e17a5a97f97f50098e1096dd10d845d0f156" +SRC_URI[sha256sum] = "71199bdeee942ba1258b65f88ca5624278e63b31e7643ee8ca7292d2f5f77e99" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb index a8c7031b6..30b2c6d88 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb @@ -5,8 +5,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e64a29fcd3c3dd356a24e235dfcb3905" DEPENDS += "libusb1 ${PYTHON_PN}-setuptools-scm-native" -SRC_URI[sha256sum] = "7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38" +RDEPENDS_${PN} += " \ + python3-logging \ +" + +SRC_URI[sha256sum] = "a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9" inherit pypi setuptools3 +RDEPENDS_${PN} += "libusb1" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.1.bb index df99d403d..329bf3e4f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.1.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4b802d2a65df4626623c79757f486af9" PYPI_PACKAGE = "qrcode" -SRC_URI[sha256sum] = "505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369" +SRC_URI[sha256sum] = "59ba630fa2adb637b06571e6ceec1bb0ecf372c458c4447ceba763061bd3af72" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2021.4.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2021.7.6.bb index 177b06b97..458236d55 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2021.4.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2021.7.6.bb @@ -5,6 +5,10 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=f0a3e4a2554ebb89c0 inherit pypi setuptools3 -SRC_URI[sha256sum] = "52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb" +SRC_URI[sha256sum] = "8394e266005f2d8c6f0bc6780001f7afa3ef81a7a2111fa35058ded6fce79e4d" + +RDEPENDS_${PN} += " \ + python3-stringold \ +" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests/setup.py-Support-idna-version-3.1.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests/setup.py-Support-idna-version-3.1.patch deleted file mode 100644 index 26332249d..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests/setup.py-Support-idna-version-3.1.patch +++ /dev/null @@ -1,40 +0,0 @@ -From fc45beed40a86c8fc38fc430765c1c5d2c9961c2 Mon Sep 17 00:00:00 2001 -From: Fabio Berton <fabio.berton@ossystems.com.br> -Date: Thu, 4 Mar 2021 09:26:48 -0300 -Subject: [PATCH] setup.py: Support idna version 3.1 -Organization: O.S. Systems Software LTDA. - -Change idna required version to use python3-idna recipe that currently -is on version 3.1. - -Without this change python-request doesn't work as the idna version -doesn't match the required versions. When bump python-request recipe, -verify if the upstream project bumped the idna version and drop this -patch. - -As this recipe was tested with python3-idna_3.1 don't allow higher -versions. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 7ba4b2a2..9d3b973e 100755 ---- a/setup.py -+++ b/setup.py -@@ -43,7 +43,7 @@ packages = ['requests'] - - requires = [ - 'chardet>=3.0.2,<5', -- 'idna>=2.5,<3', -+ 'idna>=2.5,<3.2', - 'urllib3>=1.21.1,<1.27', - 'certifi>=2017.4.17' - --- -2.30.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.25.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.26.0.bb index cea8fd517..95e6e1a6b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.25.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests_2.26.0.bb @@ -3,9 +3,7 @@ HOMEPAGE = "http://python-requests.org" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" -SRC_URI += "file://setup.py-Support-idna-version-3.1.patch" - -SRC_URI[sha256sum] = "27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804" +SRC_URI[sha256sum] = "b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.10.bb index 5da0ac3fc..3414ed097 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ruamel-yaml_0.17.10.bb @@ -8,9 +8,11 @@ PYPI_PACKAGE = "ruamel.yaml" inherit pypi setuptools3 -BBCLASSEXTEND = "native nativesdk" +SRC_URI[sha256sum] = "106bc8d6dc6a0ff7c9196a47570432036f41d556b779c6b4e618085f57e39e67" -SRC_URI[sha256sum] = "5c3fa739bbedd2f23769656784e671c6335d17a5bf163c3c3901d8663c0af287" +RDEPENDS_${PN} += "\ + ${PYTHON_PN}-shell \ +" do_install_prepend() { export RUAMEL_NO_PIP_INSTALL_CHECK=1 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.18.bb index bcd58914a..da3130016 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.17.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.18.bb @@ -5,7 +5,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt" SRC_URI += "file://0001-py-scrypt-remove-the-hard-coded-include-paths.patch" -SRC_URI[sha256sum] = "25b5075f2238be93af1cd574540a5ea01b8547f9b678aa72d22fce22577475ec" +SRC_URI[sha256sum] = "bcf04257af12e6d52974d177a7b08e314b66f350a73f9b6f7b232d69a6a1e041" inherit pypi ptest setuptools3 dos2unix @@ -17,6 +17,10 @@ RDEPENDS_${PN}-ptest += " \ ${PYTHON_PN}-pytest \ " +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-ctypes \ +" + do_install_ptest() { install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/scrypt/tests/* ${D}${PTEST_PATH}/tests/ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.2.0.bb index 89c659dba..e86ff46be 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.2.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0c79f8d3c91fc847350efd28bfe0a341" RDEPENDS_${PN} += "python3-urllib3" -SRC_URI[sha256sum] = "c1227d38dca315ba35182373f129c3e2722e8ed999e52584e6aca7d287870739" +SRC_URI[sha256sum] = "9907adbdd30a55b818914512cc143e6beae0bb3ba78b2649f4b079752eb0e424" PYPI_PACKAGE = "sentry-sdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.20.bb index 2d7273bb2..b96cdd3ed 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.15.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_1.4.20.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3359ed561ac16aaa25b6c6eff84df595" -SRC_URI[sha256sum] = "0ff100c75cd175f35f4d24375a0b3d82461f5b1af5fc8d112ef0e5ceea8049e6" +SRC_URI[sha256sum] = "38ee3a266afef2978e82824650457f70c5d74ec0cadec1b10fe5ed6f038eb5d0" PYPI_PACKAGE = "SQLAlchemy" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-texttable_1.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-texttable_1.6.4.bb index 03ebd010e..6916a72d3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-texttable_1.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-texttable_1.6.4.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7a97cdac2d9679ffdcfef3dc036d24f6" inherit pypi setuptools3 -SRC_URI[md5sum] = "68e6b31d36f5c20221da7d5db3eca772" -SRC_URI[sha256sum] = "ce0faf21aa77d806bbff22b107cc22cce68dc9438f97a2df32c93e9afa4ce436" +SRC_URI[sha256sum] = "42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.61.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.61.2.bb index 0c04b676a..1e127f724 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.61.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.61.2.bb @@ -5,10 +5,15 @@ SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=59e4271a933d33edfe60237db377a14b" -SRC_URI[sha256sum] = "cd5791b5d7c3f2f1819efc81d36eb719a38e0906a7380365c556779f585ea042" +SRC_URI[sha256sum] = "8bb94db0d4468fea27d004a0f1d1c02da3cdedc00fe491c0de986b76a04d6b0a" inherit pypi setuptools3 DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +RDEPENDS_${PN} += " \ + python3-logging \ + python3-numbers \ +" + BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.12.1.bb index 148806e10..803067651 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.12.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_2.12.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/typeguard/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0e423eea5c91e7aa21bdb70184b3e53" -SRC_URI[sha256sum] = "fca77fd4ccba63465b421cdbbab5a1a8e3994e6d6f18b45da2bb475c09f147ef" +SRC_URI[sha256sum] = "c2af8b9bdd7657f4bd27b45336e7930171aead796711bc4cfc99b4731bb9d051" inherit pypi setuptools3 ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.6.bb index f2fb33c6d..f9b49fe69 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-urllib3_1.26.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c" -SRC_URI[sha256sum] = "a7acd0977125325f516bda9735fa7142b909a8d01e8b2e4c8108d0984e6e0098" +SRC_URI[sha256sum] = "f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.3.bb index c2bf68a2d..ba0fdf1eb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_2.1.3.bb @@ -4,7 +4,7 @@ DEPENDS = "${PYTHON_PN}-argh" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "0237db4d9024859bea27d0efb59fe75eef290833fd988b8ead7a879b0308c2db" +SRC_URI[sha256sum] = "e5236a8e8602ab6db4b873664c2d356c365ab3cac96fbdec4970ad616415dd45" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.1.0.bb index da4e05f30..b46392aee 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.1.0.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/websocket-client/websocket-client" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE;md5=c96ca6c1de8adc025adfada81d06fba5" -SRC_URI[sha256sum] = "3e2bf58191d4619b161389a95bdce84ce9e0b24eb8107e7e590db682c2d0ca81" +SRC_URI[sha256sum] = "b68e4959d704768fa20e35c9d508c8dc2bbc041fd8d267c0d7345cffe2824568" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.4.bb index e6b196956..64ab8afa6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_1.4.4.bb @@ -16,6 +16,6 @@ RDEPENDS_${PN} += " \ python3-io \ " -SRC_URI[sha256sum] = "641db6e7b4f4982fd407a3f372f45b878766098250d26963e95e50121168cbe2" +SRC_URI[sha256sum] = "791567acccc485ba76e0b84bccced2651981171de5b47d541520416f2f9f93e3" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.1.0.bb index a2483a6f4..25e7edab2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/Phynix/yamlloader" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6831ef36faa29329bce2420c5356f97e" -SRC_URI[sha256sum] = "e96dc3dc6895d814c330c054c966d993fc81ef1dbf5a30a4bdafeb256359e058" +SRC_URI[sha256sum] = "8a297c7a197683ba02e5e2b882ffd6c6180d01bdefb534b69cd3962df020bfe6" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi/0001-Fix-imports-for-ptests.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi/0001-Fix-imports-for-ptests.patch new file mode 100644 index 000000000..fa58897e6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi/0001-Fix-imports-for-ptests.patch @@ -0,0 +1,3905 @@ +From 0dedc1c573ddc4e87475eb03c64555cd54a72e92 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <trevor.gamblin@windriver.com> +Date: Mon, 7 Jun 2021 09:40:20 -0400 +Subject: [PATCH] Fix imports for tests + +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> +--- + tests/test_asyncio.py | 2 +- + tests/test_asyncio_context_vars.py | 2 +- + tests/test_functionality.py | 2 +- + tests/test_gevent.py | 2 +- + tests/test_hooks.py | 2 +- + tests/test_tags.py | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +--- a/tests/test_asyncio.py ++++ b/tests/test_asyncio.py +@@ -2,7 +2,7 @@ import unittest + import yappi + import asyncio + import threading +-from utils import YappiUnitTestCase, find_stat_by_name, burn_cpu, burn_io ++from .utils import YappiUnitTestCase, find_stat_by_name, burn_cpu, burn_io + + + @asyncio.coroutine +--- a/tests/test_asyncio_context_vars.py ++++ b/tests/test_asyncio_context_vars.py +@@ -5,7 +5,7 @@ import contextvars + import functools + import time + import os +-import utils ++import tests.utils as utils + import yappi + + async_context_id = contextvars.ContextVar('async_context_id') +--- a/tests/test_functionality.py ++++ b/tests/test_functionality.py +@@ -1,1916 +1,1916 @@ +-import os
+-import sys
+-import time
+-import threading
+-import unittest
+-import yappi
+-import _yappi
+-import utils
+-import multiprocessing # added to fix http://bugs.python.org/issue15881 for > Py2.6
+-import subprocess
+-
+-_counter = 0
+-
+-
+-class BasicUsage(utils.YappiUnitTestCase):
+-
+- def test_callback_function_int_return_overflow(self):
+- # this test is just here to check if any errors are generated, as the err
+- # is printed in C side, I did not include it here. THere are ways to test
+- # this deterministically, I did not bother
+- import ctypes
+-
+- def _unsigned_overflow_margin():
+- return 2**(ctypes.sizeof(ctypes.c_void_p) * 8) - 1
+-
+- def foo():
+- pass
+-
+- #with utils.captured_output() as (out, err):
+- yappi.set_context_id_callback(_unsigned_overflow_margin)
+- yappi.set_tag_callback(_unsigned_overflow_margin)
+- yappi.start()
+- foo()
+-
+- def test_issue60(self):
+-
+- def foo():
+- buf = bytearray()
+- buf += b't' * 200
+- view = memoryview(buf)[10:]
+- view = view.tobytes()
+- del buf[:10] # this throws exception
+- return view
+-
+- yappi.start(builtins=True)
+- foo()
+- self.assertTrue(
+- len(
+- yappi.get_func_stats(
+- filter_callback=lambda x: yappi.
+- func_matches(x, [memoryview.tobytes])
+- )
+- ) > 0
+- )
+- yappi.stop()
+-
+- def test_issue54(self):
+-
+- def _tag_cbk():
+- global _counter
+- _counter += 1
+- return _counter
+-
+- def a():
+- pass
+-
+- def b():
+- pass
+-
+- yappi.set_tag_callback(_tag_cbk)
+- yappi.start()
+- a()
+- a()
+- a()
+- yappi.stop()
+- stats = yappi.get_func_stats()
+- self.assertEqual(stats.pop().ncall, 3) # aggregated if no tag is given
+- stats = yappi.get_func_stats(tag=1)
+-
+- for i in range(1, 3):
+- stats = yappi.get_func_stats(tag=i)
+- stats = yappi.get_func_stats(
+- tag=i, filter_callback=lambda x: yappi.func_matches(x, [a])
+- )
+-
+- stat = stats.pop()
+- self.assertEqual(stat.ncall, 1)
+-
+- yappi.set_tag_callback(None)
+- yappi.clear_stats()
+- yappi.start()
+- b()
+- b()
+- stats = yappi.get_func_stats()
+- self.assertEqual(len(stats), 1)
+- stat = stats.pop()
+- self.assertEqual(stat.ncall, 2)
+-
+- def test_filter(self):
+-
+- def a():
+- pass
+-
+- def b():
+- a()
+-
+- def c():
+- b()
+-
+- _TCOUNT = 5
+-
+- ts = []
+- yappi.start()
+- for i in range(_TCOUNT):
+- t = threading.Thread(target=c)
+- t.start()
+- ts.append(t)
+-
+- for t in ts:
+- t.join()
+-
+- yappi.stop()
+-
+- ctx_ids = []
+- for tstat in yappi.get_thread_stats():
+- if tstat.name == '_MainThread':
+- main_ctx_id = tstat.id
+- else:
+- ctx_ids.append(tstat.id)
+-
+- fstats = yappi.get_func_stats(filter={"ctx_id": 9})
+- self.assertTrue(fstats.empty())
+- fstats = yappi.get_func_stats(
+- filter={
+- "ctx_id": main_ctx_id,
+- "name": "c"
+- }
+- ) # main thread
+- self.assertTrue(fstats.empty())
+-
+- for i in ctx_ids:
+- fstats = yappi.get_func_stats(
+- filter={
+- "ctx_id": i,
+- "name": "a",
+- "ncall": 1
+- }
+- )
+- self.assertEqual(fstats.pop().ncall, 1)
+- fstats = yappi.get_func_stats(filter={"ctx_id": i, "name": "b"})
+- self.assertEqual(fstats.pop().ncall, 1)
+- fstats = yappi.get_func_stats(filter={"ctx_id": i, "name": "c"})
+- self.assertEqual(fstats.pop().ncall, 1)
+-
+- yappi.clear_stats()
+- yappi.start(builtins=True)
+- time.sleep(0.1)
+- yappi.stop()
+- fstats = yappi.get_func_stats(filter={"module": "time"})
+- self.assertEqual(len(fstats), 1)
+-
+- # invalid filters`
+- self.assertRaises(
+- Exception, yappi.get_func_stats, filter={'tag': "sss"}
+- )
+- self.assertRaises(
+- Exception, yappi.get_func_stats, filter={'ctx_id': "None"}
+- )
+-
+- def test_filter_callback(self):
+-
+- def a():
+- time.sleep(0.1)
+-
+- def b():
+- a()
+-
+- def c():
+- pass
+-
+- def d():
+- pass
+-
+- yappi.set_clock_type("wall")
+- yappi.start(builtins=True)
+- a()
+- b()
+- c()
+- d()
+- stats = yappi.get_func_stats(
+- filter_callback=lambda x: yappi.func_matches(x, [a, b])
+- )
+- #stats.print_all()
+- r1 = '''
+- tests/test_functionality.py:98 a 2 0.000000 0.200350 0.100175
+- tests/test_functionality.py:101 b 1 0.000000 0.120000 0.100197
+- '''
+- self.assert_traces_almost_equal(r1, stats)
+- self.assertEqual(len(stats), 2)
+- stats = yappi.get_func_stats(
+- filter_callback=lambda x: yappi.
+- module_matches(x, [sys.modules[__name__]])
+- )
+- r1 = '''
+- tests/test_functionality.py:98 a 2 0.000000 0.230130 0.115065
+- tests/test_functionality.py:101 b 1 0.000000 0.120000 0.109011
+- tests/test_functionality.py:104 c 1 0.000000 0.000002 0.000002
+- tests/test_functionality.py:107 d 1 0.000000 0.000001 0.000001
+- '''
+- self.assert_traces_almost_equal(r1, stats)
+- self.assertEqual(len(stats), 4)
+-
+- stats = yappi.get_func_stats(
+- filter_callback=lambda x: yappi.func_matches(x, [time.sleep])
+- )
+- self.assertEqual(len(stats), 1)
+- r1 = '''
+- time.sleep 2 0.206804 0.220000 0.103402
+- '''
+- self.assert_traces_almost_equal(r1, stats)
+-
+- def test_print_formatting(self):
+-
+- def a():
+- pass
+-
+- def b():
+- a()
+-
+- func_cols = {
+- 1: ("name", 48),
+- 0: ("ncall", 5),
+- 2: ("tsub", 8),
+- }
+- thread_cols = {
+- 1: ("name", 48),
+- 0: ("ttot", 8),
+- }
+-
+- yappi.start()
+- a()
+- b()
+- yappi.stop()
+- fs = yappi.get_func_stats()
+- cs = fs[1].children
+- ts = yappi.get_thread_stats()
+- #fs.print_all(out=sys.stderr, columns={1:("name", 70), })
+- #cs.print_all(out=sys.stderr, columns=func_cols)
+- #ts.print_all(out=sys.stderr, columns=thread_cols)
+- #cs.print_all(out=sys.stderr, columns={})
+-
+- self.assertRaises(
+- yappi.YappiError, fs.print_all, columns={1: ("namee", 9)}
+- )
+- self.assertRaises(
+- yappi.YappiError, cs.print_all, columns={1: ("dd", 0)}
+- )
+- self.assertRaises(
+- yappi.YappiError, ts.print_all, columns={1: ("tidd", 0)}
+- )
+-
+- def test_get_clock(self):
+- yappi.set_clock_type('cpu')
+- self.assertEqual('cpu', yappi.get_clock_type())
+- clock_info = yappi.get_clock_info()
+- self.assertTrue('api' in clock_info)
+- self.assertTrue('resolution' in clock_info)
+-
+- yappi.set_clock_type('wall')
+- self.assertEqual('wall', yappi.get_clock_type())
+-
+- t0 = yappi.get_clock_time()
+- time.sleep(0.1)
+- duration = yappi.get_clock_time() - t0
+- self.assertTrue(0.05 < duration < 0.3)
+-
+- def test_profile_decorator(self):
+-
+- def aggregate(func, stats):
+- fname = "tests/%s.profile" % (func.__name__)
+- try:
+- stats.add(fname)
+- except IOError:
+- pass
+- stats.save(fname)
+- raise Exception("messing around")
+-
+- @yappi.profile(return_callback=aggregate)
+- def a(x, y):
+- if x + y == 25:
+- raise Exception("")
+- return x + y
+-
+- def b():
+- pass
+-
+- try:
+- os.remove(
+- "tests/a.profile"
+- ) # remove the one from prev test, if available
+- except:
+- pass
+-
+- # global profile is on to mess things up
+- yappi.start()
+- b()
+-
+- # assert functionality and call function at same time
+- try:
+- self.assertEqual(a(1, 2), 3)
+- except:
+- pass
+- try:
+- self.assertEqual(a(2, 5), 7)
+- except:
+- pass
+- try:
+- a(4, 21)
+- except:
+- pass
+- stats = yappi.get_func_stats().add("tests/a.profile")
+- fsa = utils.find_stat_by_name(stats, 'a')
+- self.assertEqual(fsa.ncall, 3)
+- self.assertEqual(len(stats), 1) # b() should be cleared out.
+-
+- @yappi.profile(return_callback=aggregate)
+- def count_down_rec(n):
+- if n == 0:
+- return
+- count_down_rec(n - 1)
+-
+- try:
+- os.remove(
+- "tests/count_down_rec.profile"
+- ) # remove the one from prev test, if available
+- except:
+- pass
+-
+- try:
+- count_down_rec(4)
+- except:
+- pass
+- try:
+- count_down_rec(3)
+- except:
+- pass
+-
+- stats = yappi.YFuncStats("tests/count_down_rec.profile")
+- fsrec = utils.find_stat_by_name(stats, 'count_down_rec')
+- self.assertEqual(fsrec.ncall, 9)
+- self.assertEqual(fsrec.nactualcall, 2)
+-
+- def test_strip_dirs(self):
+-
+- def a():
+- pass
+-
+- stats = utils.run_and_get_func_stats(a, )
+- stats.strip_dirs()
+- fsa = utils.find_stat_by_name(stats, "a")
+- self.assertEqual(fsa.module, os.path.basename(fsa.module))
+-
+- @unittest.skipIf(os.name == "nt", "do not run on Windows")
+- def test_run_as_script(self):
+- import re
+- p = subprocess.Popen(
+- ['yappi', os.path.join('./tests', 'run_as_script.py')],
+- stdout=subprocess.PIPE
+- )
+- out, err = p.communicate()
+- self.assertEqual(p.returncode, 0)
+- func_stats, thread_stats = re.split(
+- b'name\\s+id\\s+tid\\s+ttot\\s+scnt\\s*\n', out
+- )
+- self.assertTrue(b'FancyThread' in thread_stats)
+-
+- def test_yappi_overhead(self):
+- LOOP_COUNT = 100000
+-
+- def a():
+- pass
+-
+- def b():
+- for i in range(LOOP_COUNT):
+- a()
+-
+- t0 = time.time()
+- yappi.start()
+- b()
+- yappi.stop()
+- time_with_yappi = time.time() - t0
+- t0 = time.time()
+- b()
+- time_without_yappi = time.time() - t0
+- if time_without_yappi == 0:
+- time_without_yappi = 0.000001
+-
+- # in latest v0.82, I calculated this as close to "7.0" in my machine.
+- # however, %83 of this overhead is coming from tickcount(). The other %17
+- # seems to have been evenly distributed to the internal bookkeeping
+- # structures/algorithms which seems acceptable. Note that our test only
+- # tests one function being profiled at-a-time in a short interval.
+- # profiling high number of functions in a small time
+- # is a different beast, (which is pretty unlikely in most applications)
+- # So as a conclusion: I cannot see any optimization window for Yappi that
+- # is worth implementing as we will only optimize %17 of the time.
+- sys.stderr.write("\r\nYappi puts %0.1f times overhead to the profiled application in average.\r\n" % \
+- (time_with_yappi / time_without_yappi))
+-
+- def test_clear_stats_while_running(self):
+-
+- def a():
+- pass
+-
+- yappi.start()
+- a()
+- yappi.clear_stats()
+- a()
+- stats = yappi.get_func_stats()
+- fsa = utils.find_stat_by_name(stats, 'a')
+- self.assertEqual(fsa.ncall, 1)
+-
+- def test_generator(self):
+-
+- def _gen(n):
+- while (n > 0):
+- yield n
+- n -= 1
+-
+- yappi.start()
+- for x in _gen(5):
+- pass
+- self.assertTrue(
+- yappi.convert2pstats(yappi.get_func_stats()) is not None
+- )
+-
+- def test_slice_child_stats_and_strip_dirs(self):
+-
+- def b():
+- for i in range(10000000):
+- pass
+-
+- def a():
+- b()
+-
+- yappi.start(builtins=True)
+- a()
+- stats = yappi.get_func_stats()
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- self.assertTrue(fsa.children[0:1] is not None)
+- prev_afullname = fsa.full_name
+- prev_bchildfullname = fsa.children[fsb].full_name
+- stats.strip_dirs()
+- self.assertTrue(len(prev_afullname) > len(fsa.full_name))
+- self.assertTrue(
+- len(prev_bchildfullname) > len(fsa.children[fsb].full_name)
+- )
+-
+- def test_children_stat_functions(self):
+- _timings = {"a_1": 5, "b_1": 3, "c_1": 1}
+- _yappi._set_test_timings(_timings)
+-
+- def b():
+- pass
+-
+- def c():
+- pass
+-
+- def a():
+- b()
+- c()
+-
+- yappi.start()
+- a()
+- b() # non-child call
+- c() # non-child call
+- stats = yappi.get_func_stats()
+- fsa = utils.find_stat_by_name(stats, 'a')
+- childs_of_a = fsa.children.get().sort("tavg", "desc")
+- prev_item = None
+- for item in childs_of_a:
+- if prev_item:
+- self.assertTrue(prev_item.tavg > item.tavg)
+- prev_item = item
+- childs_of_a.sort("name", "desc")
+- prev_item = None
+- for item in childs_of_a:
+- if prev_item:
+- self.assertTrue(prev_item.name > item.name)
+- prev_item = item
+- childs_of_a.clear()
+- self.assertTrue(childs_of_a.empty())
+-
+- def test_no_stats_different_clock_type_load(self):
+-
+- def a():
+- pass
+-
+- yappi.start()
+- a()
+- yappi.stop()
+- yappi.get_func_stats().save("tests/ystats1.ys")
+- yappi.clear_stats()
+- yappi.set_clock_type("WALL")
+- yappi.start()
+- yappi.stop()
+- stats = yappi.get_func_stats().add("tests/ystats1.ys")
+- fsa = utils.find_stat_by_name(stats, 'a')
+- self.assertTrue(fsa is not None)
+-
+- def test_subsequent_profile(self):
+- _timings = {"a_1": 1, "b_1": 1}
+- _yappi._set_test_timings(_timings)
+-
+- def a():
+- pass
+-
+- def b():
+- pass
+-
+- yappi.start()
+- a()
+- yappi.stop()
+- yappi.start()
+- b()
+- yappi.stop()
+- stats = yappi.get_func_stats()
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- self.assertTrue(fsa is not None)
+- self.assertTrue(fsb is not None)
+- self.assertEqual(fsa.ttot, 1)
+- self.assertEqual(fsb.ttot, 1)
+-
+- def test_lambda(self):
+- f = lambda: time.sleep(0.3)
+- yappi.set_clock_type("wall")
+- yappi.start()
+- f()
+- stats = yappi.get_func_stats()
+- fsa = utils.find_stat_by_name(stats, '<lambda>')
+- self.assertTrue(fsa.ttot > 0.1)
+-
+- def test_module_stress(self):
+- self.assertEqual(yappi.is_running(), False)
+-
+- yappi.start()
+- yappi.clear_stats()
+- self.assertRaises(_yappi.error, yappi.set_clock_type, "wall")
+-
+- yappi.stop()
+- yappi.clear_stats()
+- yappi.set_clock_type("cpu")
+- self.assertRaises(yappi.YappiError, yappi.set_clock_type, "dummy")
+- self.assertEqual(yappi.is_running(), False)
+- yappi.clear_stats()
+- yappi.clear_stats()
+-
+- def test_stat_sorting(self):
+- _timings = {"a_1": 13, "b_1": 10, "a_2": 6, "b_2": 1}
+- _yappi._set_test_timings(_timings)
+-
+- self._ncall = 1
+-
+- def a():
+- b()
+-
+- def b():
+- if self._ncall == 2:
+- return
+- self._ncall += 1
+- a()
+-
+- stats = utils.run_and_get_func_stats(a)
+- stats = stats.sort("totaltime", "desc")
+- prev_stat = None
+- for stat in stats:
+- if prev_stat:
+- self.assertTrue(prev_stat.ttot >= stat.ttot)
+- prev_stat = stat
+- stats = stats.sort("totaltime", "asc")
+- prev_stat = None
+- for stat in stats:
+- if prev_stat:
+- self.assertTrue(prev_stat.ttot <= stat.ttot)
+- prev_stat = stat
+- stats = stats.sort("avgtime", "asc")
+- prev_stat = None
+- for stat in stats:
+- if prev_stat:
+- self.assertTrue(prev_stat.tavg <= stat.tavg)
+- prev_stat = stat
+- stats = stats.sort("name", "asc")
+- prev_stat = None
+- for stat in stats:
+- if prev_stat:
+- self.assertTrue(prev_stat.name <= stat.name)
+- prev_stat = stat
+- stats = stats.sort("subtime", "asc")
+- prev_stat = None
+- for stat in stats:
+- if prev_stat:
+- self.assertTrue(prev_stat.tsub <= stat.tsub)
+- prev_stat = stat
+-
+- self.assertRaises(
+- yappi.YappiError, stats.sort, "invalid_func_sorttype_arg"
+- )
+- self.assertRaises(
+- yappi.YappiError, stats.sort, "totaltime",
+- "invalid_func_sortorder_arg"
+- )
+-
+- def test_start_flags(self):
+- self.assertEqual(_yappi._get_start_flags(), None)
+- yappi.start()
+-
+- def a():
+- pass
+-
+- a()
+- self.assertEqual(_yappi._get_start_flags()["profile_builtins"], 0)
+- self.assertEqual(_yappi._get_start_flags()["profile_multicontext"], 1)
+- self.assertEqual(len(yappi.get_thread_stats()), 1)
+-
+- def test_builtin_profiling(self):
+-
+- def a():
+- time.sleep(0.4) # is a builtin function
+-
+- yappi.set_clock_type('wall')
+-
+- yappi.start(builtins=True)
+- a()
+- stats = yappi.get_func_stats()
+- fsa = utils.find_stat_by_name(stats, 'sleep')
+- self.assertTrue(fsa is not None)
+- self.assertTrue(fsa.ttot > 0.3)
+- yappi.stop()
+- yappi.clear_stats()
+-
+- def a():
+- pass
+-
+- yappi.start()
+- t = threading.Thread(target=a)
+- t.start()
+- t.join()
+- stats = yappi.get_func_stats()
+-
+- def test_singlethread_profiling(self):
+- yappi.set_clock_type('wall')
+-
+- def a():
+- time.sleep(0.2)
+-
+- class Worker1(threading.Thread):
+-
+- def a(self):
+- time.sleep(0.3)
+-
+- def run(self):
+- self.a()
+-
+- yappi.start(profile_threads=False)
+-
+- c = Worker1()
+- c.start()
+- c.join()
+- a()
+- stats = yappi.get_func_stats()
+- fsa1 = utils.find_stat_by_name(stats, 'Worker1.a')
+- fsa2 = utils.find_stat_by_name(stats, 'a')
+- self.assertTrue(fsa1 is None)
+- self.assertTrue(fsa2 is not None)
+- self.assertTrue(fsa2.ttot > 0.1)
+-
+- def test_run(self):
+-
+- def profiled():
+- pass
+-
+- yappi.clear_stats()
+- try:
+- with yappi.run():
+- profiled()
+- stats = yappi.get_func_stats()
+- finally:
+- yappi.clear_stats()
+-
+- self.assertIsNotNone(utils.find_stat_by_name(stats, 'profiled'))
+-
+- def test_run_recursive(self):
+-
+- def profiled():
+- pass
+-
+- def not_profiled():
+- pass
+-
+- yappi.clear_stats()
+- try:
+- with yappi.run():
+- with yappi.run():
+- profiled()
+- # Profiling stopped here
+- not_profiled()
+- stats = yappi.get_func_stats()
+- finally:
+- yappi.clear_stats()
+-
+- self.assertIsNotNone(utils.find_stat_by_name(stats, 'profiled'))
+- self.assertIsNone(utils.find_stat_by_name(stats, 'not_profiled'))
+-
+-
+-class StatSaveScenarios(utils.YappiUnitTestCase):
+-
+- def test_pstats_conversion(self):
+-
+- def pstat_id(fs):
+- return (fs.module, fs.lineno, fs.name)
+-
+- def a():
+- d()
+-
+- def b():
+- d()
+-
+- def c():
+- pass
+-
+- def d():
+- pass
+-
+- _timings = {"a_1": 12, "b_1": 7, "c_1": 5, "d_1": 2}
+- _yappi._set_test_timings(_timings)
+- stats = utils.run_and_get_func_stats(a, )
+- stats.strip_dirs()
+- stats.save("tests/a1.pstats", type="pstat")
+- fsa_pid = pstat_id(utils.find_stat_by_name(stats, "a"))
+- fsd_pid = pstat_id(utils.find_stat_by_name(stats, "d"))
+- yappi.clear_stats()
+- _yappi._set_test_timings(_timings)
+- stats = utils.run_and_get_func_stats(a, )
+- stats.strip_dirs()
+- stats.save("tests/a2.pstats", type="pstat")
+- yappi.clear_stats()
+- _yappi._set_test_timings(_timings)
+- stats = utils.run_and_get_func_stats(b, )
+- stats.strip_dirs()
+- stats.save("tests/b1.pstats", type="pstat")
+- fsb_pid = pstat_id(utils.find_stat_by_name(stats, "b"))
+- yappi.clear_stats()
+- _yappi._set_test_timings(_timings)
+- stats = utils.run_and_get_func_stats(c, )
+- stats.strip_dirs()
+- stats.save("tests/c1.pstats", type="pstat")
+- fsc_pid = pstat_id(utils.find_stat_by_name(stats, "c"))
+-
+- # merge saved stats and check pstats values are correct
+- import pstats
+- p = pstats.Stats(
+- 'tests/a1.pstats', 'tests/a2.pstats', 'tests/b1.pstats',
+- 'tests/c1.pstats'
+- )
+- p.strip_dirs()
+- # ct = ttot, tt = tsub
+- (cc, nc, tt, ct, callers) = p.stats[fsa_pid]
+- self.assertEqual(cc, nc, 2)
+- self.assertEqual(tt, 20)
+- self.assertEqual(ct, 24)
+- (cc, nc, tt, ct, callers) = p.stats[fsd_pid]
+- self.assertEqual(cc, nc, 3)
+- self.assertEqual(tt, 6)
+- self.assertEqual(ct, 6)
+- self.assertEqual(len(callers), 2)
+- (cc, nc, tt, ct) = callers[fsa_pid]
+- self.assertEqual(cc, nc, 2)
+- self.assertEqual(tt, 4)
+- self.assertEqual(ct, 4)
+- (cc, nc, tt, ct) = callers[fsb_pid]
+- self.assertEqual(cc, nc, 1)
+- self.assertEqual(tt, 2)
+- self.assertEqual(ct, 2)
+-
+- def test_merge_stats(self):
+- _timings = {
+- "a_1": 15,
+- "b_1": 14,
+- "c_1": 12,
+- "d_1": 10,
+- "e_1": 9,
+- "f_1": 7,
+- "g_1": 6,
+- "h_1": 5,
+- "i_1": 1
+- }
+- _yappi._set_test_timings(_timings)
+-
+- def a():
+- b()
+-
+- def b():
+- c()
+-
+- def c():
+- d()
+-
+- def d():
+- e()
+-
+- def e():
+- f()
+-
+- def f():
+- g()
+-
+- def g():
+- h()
+-
+- def h():
+- i()
+-
+- def i():
+- pass
+-
+- yappi.start()
+- a()
+- a()
+- yappi.stop()
+- stats = yappi.get_func_stats()
+- self.assertRaises(
+- NotImplementedError, stats.save, "", "INVALID_SAVE_TYPE"
+- )
+- stats.save("tests/ystats2.ys")
+- yappi.clear_stats()
+- _yappi._set_test_timings(_timings)
+- yappi.start()
+- a()
+- stats = yappi.get_func_stats().add("tests/ystats2.ys")
+- fsa = utils.find_stat_by_name(stats, "a")
+- fsb = utils.find_stat_by_name(stats, "b")
+- fsc = utils.find_stat_by_name(stats, "c")
+- fsd = utils.find_stat_by_name(stats, "d")
+- fse = utils.find_stat_by_name(stats, "e")
+- fsf = utils.find_stat_by_name(stats, "f")
+- fsg = utils.find_stat_by_name(stats, "g")
+- fsh = utils.find_stat_by_name(stats, "h")
+- fsi = utils.find_stat_by_name(stats, "i")
+- self.assertEqual(fsa.ttot, 45)
+- self.assertEqual(fsa.ncall, 3)
+- self.assertEqual(fsa.nactualcall, 3)
+- self.assertEqual(fsa.tsub, 3)
+- self.assertEqual(fsa.children[fsb].ttot, fsb.ttot)
+- self.assertEqual(fsa.children[fsb].tsub, fsb.tsub)
+- self.assertEqual(fsb.children[fsc].ttot, fsc.ttot)
+- self.assertEqual(fsb.children[fsc].tsub, fsc.tsub)
+- self.assertEqual(fsc.tsub, 6)
+- self.assertEqual(fsc.children[fsd].ttot, fsd.ttot)
+- self.assertEqual(fsc.children[fsd].tsub, fsd.tsub)
+- self.assertEqual(fsd.children[fse].ttot, fse.ttot)
+- self.assertEqual(fsd.children[fse].tsub, fse.tsub)
+- self.assertEqual(fse.children[fsf].ttot, fsf.ttot)
+- self.assertEqual(fse.children[fsf].tsub, fsf.tsub)
+- self.assertEqual(fsf.children[fsg].ttot, fsg.ttot)
+- self.assertEqual(fsf.children[fsg].tsub, fsg.tsub)
+- self.assertEqual(fsg.ttot, 18)
+- self.assertEqual(fsg.tsub, 3)
+- self.assertEqual(fsg.children[fsh].ttot, fsh.ttot)
+- self.assertEqual(fsg.children[fsh].tsub, fsh.tsub)
+- self.assertEqual(fsh.ttot, 15)
+- self.assertEqual(fsh.tsub, 12)
+- self.assertEqual(fsh.tavg, 5)
+- self.assertEqual(fsh.children[fsi].ttot, fsi.ttot)
+- self.assertEqual(fsh.children[fsi].tsub, fsi.tsub)
+- #stats.debug_print()
+-
+- def test_merge_multithreaded_stats(self):
+- import _yappi
+- timings = {"a_1": 2, "b_1": 1}
+- _yappi._set_test_timings(timings)
+-
+- def a():
+- pass
+-
+- def b():
+- pass
+-
+- yappi.start()
+- t = threading.Thread(target=a)
+- t.start()
+- t.join()
+- t = threading.Thread(target=b)
+- t.start()
+- t.join()
+- yappi.get_func_stats().save("tests/ystats1.ys")
+- yappi.clear_stats()
+- _yappi._set_test_timings(timings)
+- self.assertEqual(len(yappi.get_func_stats()), 0)
+- self.assertEqual(len(yappi.get_thread_stats()), 1)
+- t = threading.Thread(target=a)
+- t.start()
+- t.join()
+-
+- self.assertEqual(_yappi._get_start_flags()["profile_builtins"], 0)
+- self.assertEqual(_yappi._get_start_flags()["profile_multicontext"], 1)
+- yappi.get_func_stats().save("tests/ystats2.ys")
+-
+- stats = yappi.YFuncStats([
+- "tests/ystats1.ys",
+- "tests/ystats2.ys",
+- ])
+- fsa = utils.find_stat_by_name(stats, "a")
+- fsb = utils.find_stat_by_name(stats, "b")
+- self.assertEqual(fsa.ncall, 2)
+- self.assertEqual(fsb.ncall, 1)
+- self.assertEqual(fsa.tsub, fsa.ttot, 4)
+- self.assertEqual(fsb.tsub, fsb.ttot, 1)
+-
+- def test_merge_load_different_clock_types(self):
+- yappi.start(builtins=True)
+-
+- def a():
+- b()
+-
+- def b():
+- c()
+-
+- def c():
+- pass
+-
+- t = threading.Thread(target=a)
+- t.start()
+- t.join()
+- yappi.get_func_stats().sort("name", "asc").save("tests/ystats1.ys")
+- yappi.stop()
+- yappi.clear_stats()
+- yappi.start(builtins=False)
+- t = threading.Thread(target=a)
+- t.start()
+- t.join()
+- yappi.get_func_stats().save("tests/ystats2.ys")
+- yappi.stop()
+- self.assertRaises(_yappi.error, yappi.set_clock_type, "wall")
+- yappi.clear_stats()
+- yappi.set_clock_type("wall")
+- yappi.start()
+- t = threading.Thread(target=a)
+- t.start()
+- t.join()
+- yappi.get_func_stats().save("tests/ystats3.ys")
+- self.assertRaises(
+- yappi.YappiError,
+- yappi.YFuncStats().add("tests/ystats1.ys").add, "tests/ystats3.ys"
+- )
+- stats = yappi.YFuncStats(["tests/ystats1.ys",
+- "tests/ystats2.ys"]).sort("name")
+- fsa = utils.find_stat_by_name(stats, "a")
+- fsb = utils.find_stat_by_name(stats, "b")
+- fsc = utils.find_stat_by_name(stats, "c")
+- self.assertEqual(fsa.ncall, 2)
+- self.assertEqual(fsa.ncall, fsb.ncall, fsc.ncall)
+-
+- def test_merge_aabab_aabbc(self):
+- _timings = {
+- "a_1": 15,
+- "a_2": 14,
+- "b_1": 12,
+- "a_3": 10,
+- "b_2": 9,
+- "c_1": 4
+- }
+- _yappi._set_test_timings(_timings)
+-
+- def a():
+- if self._ncall == 1:
+- self._ncall += 1
+- a()
+- elif self._ncall == 5:
+- self._ncall += 1
+- a()
+- else:
+- b()
+-
+- def b():
+- if self._ncall == 2:
+- self._ncall += 1
+- a()
+- elif self._ncall == 6:
+- self._ncall += 1
+- b()
+- elif self._ncall == 7:
+- c()
+- else:
+- return
+-
+- def c():
+- pass
+-
+- self._ncall = 1
+- stats = utils.run_and_get_func_stats(a, )
+- stats.save("tests/ystats1.ys")
+- yappi.clear_stats()
+- _yappi._set_test_timings(_timings)
+- #stats.print_all()
+-
+- self._ncall = 5
+- stats = utils.run_and_get_func_stats(a, )
+- stats.save("tests/ystats2.ys")
+-
+- #stats.print_all()
+-
+- def a(): # same name but another function(code object)
+- pass
+-
+- yappi.start()
+- a()
+- stats = yappi.get_func_stats().add(
+- ["tests/ystats1.ys", "tests/ystats2.ys"]
+- )
+- #stats.print_all()
+- self.assertEqual(len(stats), 4)
+-
+- fsa = None
+- for stat in stats:
+- if stat.name == "a" and stat.ttot == 45:
+- fsa = stat
+- break
+- self.assertTrue(fsa is not None)
+-
+- self.assertEqual(fsa.ncall, 7)
+- self.assertEqual(fsa.nactualcall, 3)
+- self.assertEqual(fsa.ttot, 45)
+- self.assertEqual(fsa.tsub, 10)
+- fsb = utils.find_stat_by_name(stats, "b")
+- fsc = utils.find_stat_by_name(stats, "c")
+- self.assertEqual(fsb.ncall, 6)
+- self.assertEqual(fsb.nactualcall, 3)
+- self.assertEqual(fsb.ttot, 36)
+- self.assertEqual(fsb.tsub, 27)
+- self.assertEqual(fsb.tavg, 6)
+- self.assertEqual(fsc.ttot, 8)
+- self.assertEqual(fsc.tsub, 8)
+- self.assertEqual(fsc.tavg, 4)
+- self.assertEqual(fsc.nactualcall, fsc.ncall, 2)
+-
+-
+-class MultithreadedScenarios(utils.YappiUnitTestCase):
+-
+- def test_issue_32(self):
+- '''
+- Start yappi from different thread and we get Internal Error(15) as
+- the current_ctx_id() called while enumerating the threads in start()
+- and as it does not swap to the enumerated ThreadState* the THreadState_GetDict()
+- returns wrong object and thus sets an invalid id for the _ctx structure.
+-
+- When this issue happens multiple Threads have same tid as the internal ts_ptr
+- will be same for different contexts. So, let's see if that happens
+- '''
+-
+- def foo():
+- time.sleep(0.2)
+-
+- def bar():
+- time.sleep(0.1)
+-
+- def thread_func():
+- yappi.set_clock_type("wall")
+- yappi.start()
+-
+- bar()
+-
+- t = threading.Thread(target=thread_func)
+- t.start()
+- t.join()
+-
+- foo()
+-
+- yappi.stop()
+-
+- thread_ids = set()
+- for tstat in yappi.get_thread_stats():
+- self.assertTrue(tstat.tid not in thread_ids)
+- thread_ids.add(tstat.tid)
+-
+- def test_subsequent_profile(self):
+- WORKER_COUNT = 5
+-
+- def a():
+- pass
+-
+- def b():
+- pass
+-
+- def c():
+- pass
+-
+- _timings = {
+- "a_1": 3,
+- "b_1": 2,
+- "c_1": 1,
+- }
+-
+- yappi.start()
+-
+- def g():
+- pass
+-
+- g()
+- yappi.stop()
+- yappi.clear_stats()
+- _yappi._set_test_timings(_timings)
+- yappi.start()
+-
+- _dummy = []
+- for i in range(WORKER_COUNT):
+- t = threading.Thread(target=a)
+- t.start()
+- t.join()
+- for i in range(WORKER_COUNT):
+- t = threading.Thread(target=b)
+- t.start()
+- _dummy.append(t)
+- t.join()
+- for i in range(WORKER_COUNT):
+- t = threading.Thread(target=a)
+- t.start()
+- t.join()
+- for i in range(WORKER_COUNT):
+- t = threading.Thread(target=c)
+- t.start()
+- t.join()
+- yappi.stop()
+- yappi.start()
+-
+- def f():
+- pass
+-
+- f()
+- stats = yappi.get_func_stats()
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- fsc = utils.find_stat_by_name(stats, 'c')
+- self.assertEqual(fsa.ncall, 10)
+- self.assertEqual(fsb.ncall, 5)
+- self.assertEqual(fsc.ncall, 5)
+- self.assertEqual(fsa.ttot, fsa.tsub, 30)
+- self.assertEqual(fsb.ttot, fsb.tsub, 10)
+- self.assertEqual(fsc.ttot, fsc.tsub, 5)
+-
+- # MACOSx optimizes by only creating one worker thread
+- self.assertTrue(len(yappi.get_thread_stats()) >= 2)
+-
+- def test_basic(self):
+- yappi.set_clock_type('wall')
+-
+- def dummy():
+- pass
+-
+- def a():
+- time.sleep(0.2)
+-
+- class Worker1(threading.Thread):
+-
+- def a(self):
+- time.sleep(0.3)
+-
+- def run(self):
+- self.a()
+-
+- yappi.start(builtins=False, profile_threads=True)
+-
+- c = Worker1()
+- c.start()
+- c.join()
+- a()
+- stats = yappi.get_func_stats()
+- fsa1 = utils.find_stat_by_name(stats, 'Worker1.a')
+- fsa2 = utils.find_stat_by_name(stats, 'a')
+- self.assertTrue(fsa1 is not None)
+- self.assertTrue(fsa2 is not None)
+- self.assertTrue(fsa1.ttot > 0.2)
+- self.assertTrue(fsa2.ttot > 0.1)
+- tstats = yappi.get_thread_stats()
+- self.assertEqual(len(tstats), 2)
+- tsa = utils.find_stat_by_name(tstats, 'Worker1')
+- tsm = utils.find_stat_by_name(tstats, '_MainThread')
+- dummy() # call dummy to force ctx name to be retrieved again.
+- self.assertTrue(tsa is not None)
+- # TODO: I put dummy() to fix below, remove the comments after a while.
+- self.assertTrue( # FIX: I see this fails sometimes?
+- tsm is not None,
+- 'Could not find "_MainThread". Found: %s' % (', '.join(utils.get_stat_names(tstats))))
+-
+- def test_ctx_stats(self):
+- from threading import Thread
+- DUMMY_WORKER_COUNT = 5
+- yappi.start()
+-
+- class DummyThread(Thread):
+- pass
+-
+- def dummy():
+- pass
+-
+- def dummy_worker():
+- pass
+-
+- for i in range(DUMMY_WORKER_COUNT):
+- t = DummyThread(target=dummy_worker)
+- t.start()
+- t.join()
+- yappi.stop()
+- stats = yappi.get_thread_stats()
+- tsa = utils.find_stat_by_name(stats, "DummyThread")
+- self.assertTrue(tsa is not None)
+- yappi.clear_stats()
+- time.sleep(1.0)
+- _timings = {
+- "a_1": 6,
+- "b_1": 5,
+- "c_1": 3,
+- "d_1": 1,
+- "a_2": 4,
+- "b_2": 3,
+- "c_2": 2,
+- "d_2": 1
+- }
+- _yappi._set_test_timings(_timings)
+-
+- class Thread1(Thread):
+- pass
+-
+- class Thread2(Thread):
+- pass
+-
+- def a():
+- b()
+-
+- def b():
+- c()
+-
+- def c():
+- d()
+-
+- def d():
+- time.sleep(0.6)
+-
+- yappi.set_clock_type("wall")
+- yappi.start()
+- t1 = Thread1(target=a)
+- t1.start()
+- t2 = Thread2(target=a)
+- t2.start()
+- t1.join()
+- t2.join()
+- stats = yappi.get_thread_stats()
+-
+- # the fist clear_stats clears the context table?
+- tsa = utils.find_stat_by_name(stats, "DummyThread")
+- self.assertTrue(tsa is None)
+-
+- tst1 = utils.find_stat_by_name(stats, "Thread1")
+- tst2 = utils.find_stat_by_name(stats, "Thread2")
+- tsmain = utils.find_stat_by_name(stats, "_MainThread")
+- dummy() # call dummy to force ctx name to be retrieved again.
+- self.assertTrue(len(stats) == 3)
+- self.assertTrue(tst1 is not None)
+- self.assertTrue(tst2 is not None)
+- # TODO: I put dummy() to fix below, remove the comments after a while.
+- self.assertTrue( # FIX: I see this fails sometimes
+- tsmain is not None,
+- 'Could not find "_MainThread". Found: %s' % (', '.join(utils.get_stat_names(stats))))
+- self.assertTrue(1.0 > tst2.ttot >= 0.5)
+- self.assertTrue(1.0 > tst1.ttot >= 0.5)
+-
+- # test sorting of the ctx stats
+- stats = stats.sort("totaltime", "desc")
+- prev_stat = None
+- for stat in stats:
+- if prev_stat:
+- self.assertTrue(prev_stat.ttot >= stat.ttot)
+- prev_stat = stat
+- stats = stats.sort("totaltime", "asc")
+- prev_stat = None
+- for stat in stats:
+- if prev_stat:
+- self.assertTrue(prev_stat.ttot <= stat.ttot)
+- prev_stat = stat
+- stats = stats.sort("schedcount", "desc")
+- prev_stat = None
+- for stat in stats:
+- if prev_stat:
+- self.assertTrue(prev_stat.sched_count >= stat.sched_count)
+- prev_stat = stat
+- stats = stats.sort("name", "desc")
+- prev_stat = None
+- for stat in stats:
+- if prev_stat:
+- self.assertTrue(prev_stat.name.lower() >= stat.name.lower())
+- prev_stat = stat
+- self.assertRaises(
+- yappi.YappiError, stats.sort, "invalid_thread_sorttype_arg"
+- )
+- self.assertRaises(
+- yappi.YappiError, stats.sort, "invalid_thread_sortorder_arg"
+- )
+-
+- def test_ctx_stats_cpu(self):
+-
+- def get_thread_name():
+- try:
+- return threading.current_thread().name
+- except AttributeError:
+- return "Anonymous"
+-
+- def burn_cpu(sec):
+- t0 = yappi.get_clock_time()
+- elapsed = 0
+- while (elapsed < sec):
+- for _ in range(1000):
+- pass
+- elapsed = yappi.get_clock_time() - t0
+-
+- def test():
+-
+- ts = []
+- for i in (0.01, 0.05, 0.1):
+- t = threading.Thread(target=burn_cpu, args=(i, ))
+- t.name = "burn_cpu-%s" % str(i)
+- t.start()
+- ts.append(t)
+- for t in ts:
+- t.join()
+-
+- yappi.set_clock_type("cpu")
+- yappi.set_context_name_callback(get_thread_name)
+-
+- yappi.start()
+-
+- test()
+-
+- yappi.stop()
+-
+- tstats = yappi.get_thread_stats()
+- r1 = '''
+- burn_cpu-0.1 3 123145356058624 0.100105 8
+- burn_cpu-0.05 2 123145361313792 0.050149 8
+- burn_cpu-0.01 1 123145356058624 0.010127 2
+- MainThread 0 4321620864 0.001632 6
+- '''
+- self.assert_ctx_stats_almost_equal(r1, tstats)
+-
+- def test_producer_consumer_with_queues(self):
+- # we currently just stress yappi, no functionality test is done here.
+- yappi.start()
+- if utils.is_py3x():
+- from queue import Queue
+- else:
+- from Queue import Queue
+- from threading import Thread
+- WORKER_THREAD_COUNT = 50
+- WORK_ITEM_COUNT = 2000
+-
+- def worker():
+- while True:
+- item = q.get()
+- # do the work with item
+- q.task_done()
+-
+- q = Queue()
+- for i in range(WORKER_THREAD_COUNT):
+- t = Thread(target=worker)
+- t.daemon = True
+- t.start()
+-
+- for item in range(WORK_ITEM_COUNT):
+- q.put(item)
+- q.join() # block until all tasks are done
+- #yappi.get_func_stats().sort("callcount").print_all()
+- yappi.stop()
+-
+- def test_temporary_lock_waiting(self):
+- yappi.start()
+- _lock = threading.Lock()
+-
+- def worker():
+- _lock.acquire()
+- try:
+- time.sleep(1.0)
+- finally:
+- _lock.release()
+-
+- t1 = threading.Thread(target=worker)
+- t2 = threading.Thread(target=worker)
+- t1.start()
+- t2.start()
+- t1.join()
+- t2.join()
+- #yappi.get_func_stats().sort("callcount").print_all()
+- yappi.stop()
+-
+- @unittest.skipIf(os.name != "posix", "requires Posix compliant OS")
+- def test_signals_with_blocking_calls(self):
+- import signal, os, time
+-
+- # just to verify if signal is handled correctly and stats/yappi are not corrupted.
+- def handler(signum, frame):
+- raise Exception("Signal handler executed!")
+-
+- yappi.start()
+- signal.signal(signal.SIGALRM, handler)
+- signal.alarm(1)
+- self.assertRaises(Exception, time.sleep, 2)
+- stats = yappi.get_func_stats()
+- fsh = utils.find_stat_by_name(stats, "handler")
+- self.assertTrue(fsh is not None)
+-
+- @unittest.skipIf(not sys.version_info >= (3, 2), "requires Python 3.2")
+- def test_concurrent_futures(self):
+- yappi.start()
+- from concurrent.futures import ThreadPoolExecutor
+- with ThreadPoolExecutor(max_workers=5) as executor:
+- f = executor.submit(pow, 5, 2)
+- self.assertEqual(f.result(), 25)
+- time.sleep(1.0)
+- yappi.stop()
+-
+- @unittest.skipIf(not sys.version_info >= (3, 2), "requires Python 3.2")
+- def test_barrier(self):
+- yappi.start()
+- b = threading.Barrier(2, timeout=1)
+-
+- def worker():
+- try:
+- b.wait()
+- except threading.BrokenBarrierError:
+- pass
+- except Exception:
+- raise Exception("BrokenBarrierError not raised")
+-
+- t1 = threading.Thread(target=worker)
+- t1.start()
+- #b.wait()
+- t1.join()
+- yappi.stop()
+-
+-
+-class NonRecursiveFunctions(utils.YappiUnitTestCase):
+-
+- def test_abcd(self):
+- _timings = {"a_1": 6, "b_1": 5, "c_1": 3, "d_1": 1}
+- _yappi._set_test_timings(_timings)
+-
+- def a():
+- b()
+-
+- def b():
+- c()
+-
+- def c():
+- d()
+-
+- def d():
+- pass
+-
+- stats = utils.run_and_get_func_stats(a)
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- fsc = utils.find_stat_by_name(stats, 'c')
+- fsd = utils.find_stat_by_name(stats, 'd')
+- cfsab = fsa.children[fsb]
+- cfsbc = fsb.children[fsc]
+- cfscd = fsc.children[fsd]
+-
+- self.assertEqual(fsa.ttot, 6)
+- self.assertEqual(fsa.tsub, 1)
+- self.assertEqual(fsb.ttot, 5)
+- self.assertEqual(fsb.tsub, 2)
+- self.assertEqual(fsc.ttot, 3)
+- self.assertEqual(fsc.tsub, 2)
+- self.assertEqual(fsd.ttot, 1)
+- self.assertEqual(fsd.tsub, 1)
+- self.assertEqual(cfsab.ttot, 5)
+- self.assertEqual(cfsab.tsub, 2)
+- self.assertEqual(cfsbc.ttot, 3)
+- self.assertEqual(cfsbc.tsub, 2)
+- self.assertEqual(cfscd.ttot, 1)
+- self.assertEqual(cfscd.tsub, 1)
+-
+- def test_stop_in_middle(self):
+- _timings = {"a_1": 6, "b_1": 4}
+- _yappi._set_test_timings(_timings)
+-
+- def a():
+- b()
+- yappi.stop()
+-
+- def b():
+- time.sleep(0.2)
+-
+- yappi.start()
+- a()
+- stats = yappi.get_func_stats()
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+-
+- self.assertEqual(fsa.ncall, 1)
+- self.assertEqual(fsa.nactualcall, 0)
+- self.assertEqual(fsa.ttot, 0) # no call_leave called
+- self.assertEqual(fsa.tsub, 0) # no call_leave called
+- self.assertEqual(fsb.ttot, 4)
+-
+-
+-class RecursiveFunctions(utils.YappiUnitTestCase):
+-
+- def test_fibonacci(self):
+-
+- def fib(n):
+- if n > 1:
+- return fib(n - 1) + fib(n - 2)
+- else:
+- return n
+-
+- stats = utils.run_and_get_func_stats(fib, 22)
+- fs = utils.find_stat_by_name(stats, 'fib')
+- self.assertEqual(fs.ncall, 57313)
+- self.assertEqual(fs.ttot, fs.tsub)
+-
+- def test_abcadc(self):
+- _timings = {
+- "a_1": 20,
+- "b_1": 19,
+- "c_1": 17,
+- "a_2": 13,
+- "d_1": 12,
+- "c_2": 10,
+- "a_3": 5
+- }
+- _yappi._set_test_timings(_timings)
+-
+- def a(n):
+- if n == 3:
+- return
+- if n == 1 + 1:
+- d(n)
+- else:
+- b(n)
+-
+- def b(n):
+- c(n)
+-
+- def c(n):
+- a(n + 1)
+-
+- def d(n):
+- c(n)
+-
+- stats = utils.run_and_get_func_stats(a, 1)
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- fsc = utils.find_stat_by_name(stats, 'c')
+- fsd = utils.find_stat_by_name(stats, 'd')
+- self.assertEqual(fsa.ncall, 3)
+- self.assertEqual(fsa.nactualcall, 1)
+- self.assertEqual(fsa.ttot, 20)
+- self.assertEqual(fsa.tsub, 7)
+- self.assertEqual(fsb.ttot, 19)
+- self.assertEqual(fsb.tsub, 2)
+- self.assertEqual(fsc.ttot, 17)
+- self.assertEqual(fsc.tsub, 9)
+- self.assertEqual(fsd.ttot, 12)
+- self.assertEqual(fsd.tsub, 2)
+- cfsca = fsc.children[fsa]
+- self.assertEqual(cfsca.nactualcall, 0)
+- self.assertEqual(cfsca.ncall, 2)
+- self.assertEqual(cfsca.ttot, 13)
+- self.assertEqual(cfsca.tsub, 6)
+-
+- def test_aaaa(self):
+- _timings = {"d_1": 9, "d_2": 7, "d_3": 3, "d_4": 2}
+- _yappi._set_test_timings(_timings)
+-
+- def d(n):
+- if n == 3:
+- return
+- d(n + 1)
+-
+- stats = utils.run_and_get_func_stats(d, 0)
+- fsd = utils.find_stat_by_name(stats, 'd')
+- self.assertEqual(fsd.ncall, 4)
+- self.assertEqual(fsd.nactualcall, 1)
+- self.assertEqual(fsd.ttot, 9)
+- self.assertEqual(fsd.tsub, 9)
+- cfsdd = fsd.children[fsd]
+- self.assertEqual(cfsdd.ttot, 7)
+- self.assertEqual(cfsdd.tsub, 7)
+- self.assertEqual(cfsdd.ncall, 3)
+- self.assertEqual(cfsdd.nactualcall, 0)
+-
+- def test_abcabc(self):
+- _timings = {
+- "a_1": 20,
+- "b_1": 19,
+- "c_1": 17,
+- "a_2": 13,
+- "b_2": 11,
+- "c_2": 9,
+- "a_3": 6
+- }
+- _yappi._set_test_timings(_timings)
+-
+- def a(n):
+- if n == 3:
+- return
+- else:
+- b(n)
+-
+- def b(n):
+- c(n)
+-
+- def c(n):
+- a(n + 1)
+-
+- stats = utils.run_and_get_func_stats(a, 1)
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- fsc = utils.find_stat_by_name(stats, 'c')
+- self.assertEqual(fsa.ncall, 3)
+- self.assertEqual(fsa.nactualcall, 1)
+- self.assertEqual(fsa.ttot, 20)
+- self.assertEqual(fsa.tsub, 9)
+- self.assertEqual(fsb.ttot, 19)
+- self.assertEqual(fsb.tsub, 4)
+- self.assertEqual(fsc.ttot, 17)
+- self.assertEqual(fsc.tsub, 7)
+- cfsab = fsa.children[fsb]
+- cfsbc = fsb.children[fsc]
+- cfsca = fsc.children[fsa]
+- self.assertEqual(cfsab.ttot, 19)
+- self.assertEqual(cfsab.tsub, 4)
+- self.assertEqual(cfsbc.ttot, 17)
+- self.assertEqual(cfsbc.tsub, 7)
+- self.assertEqual(cfsca.ttot, 13)
+- self.assertEqual(cfsca.tsub, 8)
+-
+- def test_abcbca(self):
+- _timings = {"a_1": 10, "b_1": 9, "c_1": 7, "b_2": 4, "c_2": 2, "a_2": 1}
+- _yappi._set_test_timings(_timings)
+- self._ncall = 1
+-
+- def a():
+- if self._ncall == 1:
+- b()
+- else:
+- return
+-
+- def b():
+- c()
+-
+- def c():
+- if self._ncall == 1:
+- self._ncall += 1
+- b()
+- else:
+- a()
+-
+- stats = utils.run_and_get_func_stats(a)
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- fsc = utils.find_stat_by_name(stats, 'c')
+- cfsab = fsa.children[fsb]
+- cfsbc = fsb.children[fsc]
+- cfsca = fsc.children[fsa]
+- self.assertEqual(fsa.ttot, 10)
+- self.assertEqual(fsa.tsub, 2)
+- self.assertEqual(fsb.ttot, 9)
+- self.assertEqual(fsb.tsub, 4)
+- self.assertEqual(fsc.ttot, 7)
+- self.assertEqual(fsc.tsub, 4)
+- self.assertEqual(cfsab.ttot, 9)
+- self.assertEqual(cfsab.tsub, 2)
+- self.assertEqual(cfsbc.ttot, 7)
+- self.assertEqual(cfsbc.tsub, 4)
+- self.assertEqual(cfsca.ttot, 1)
+- self.assertEqual(cfsca.tsub, 1)
+- self.assertEqual(cfsca.ncall, 1)
+- self.assertEqual(cfsca.nactualcall, 0)
+-
+- def test_aabccb(self):
+- _timings = {
+- "a_1": 13,
+- "a_2": 11,
+- "b_1": 9,
+- "c_1": 5,
+- "c_2": 3,
+- "b_2": 1
+- }
+- _yappi._set_test_timings(_timings)
+- self._ncall = 1
+-
+- def a():
+- if self._ncall == 1:
+- self._ncall += 1
+- a()
+- else:
+- b()
+-
+- def b():
+- if self._ncall == 3:
+- return
+- else:
+- c()
+-
+- def c():
+- if self._ncall == 2:
+- self._ncall += 1
+- c()
+- else:
+- b()
+-
+- stats = utils.run_and_get_func_stats(a)
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- fsc = utils.find_stat_by_name(stats, 'c')
+- cfsaa = fsa.children[fsa.index]
+- cfsab = fsa.children[fsb]
+- cfsbc = fsb.children[fsc.full_name]
+- cfscc = fsc.children[fsc]
+- cfscb = fsc.children[fsb]
+- self.assertEqual(fsb.ttot, 9)
+- self.assertEqual(fsb.tsub, 5)
+- self.assertEqual(cfsbc.ttot, 5)
+- self.assertEqual(cfsbc.tsub, 2)
+- self.assertEqual(fsa.ttot, 13)
+- self.assertEqual(fsa.tsub, 4)
+- self.assertEqual(cfsab.ttot, 9)
+- self.assertEqual(cfsab.tsub, 4)
+- self.assertEqual(cfsaa.ttot, 11)
+- self.assertEqual(cfsaa.tsub, 2)
+- self.assertEqual(fsc.ttot, 5)
+- self.assertEqual(fsc.tsub, 4)
+-
+- def test_abaa(self):
+- _timings = {"a_1": 13, "b_1": 10, "a_2": 9, "a_3": 5}
+- _yappi._set_test_timings(_timings)
+-
+- self._ncall = 1
+-
+- def a():
+- if self._ncall == 1:
+- b()
+- elif self._ncall == 2:
+- self._ncall += 1
+- a()
+- else:
+- return
+-
+- def b():
+- self._ncall += 1
+- a()
+-
+- stats = utils.run_and_get_func_stats(a)
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- cfsaa = fsa.children[fsa]
+- cfsba = fsb.children[fsa]
+- self.assertEqual(fsb.ttot, 10)
+- self.assertEqual(fsb.tsub, 1)
+- self.assertEqual(fsa.ttot, 13)
+- self.assertEqual(fsa.tsub, 12)
+- self.assertEqual(cfsaa.ttot, 5)
+- self.assertEqual(cfsaa.tsub, 5)
+- self.assertEqual(cfsba.ttot, 9)
+- self.assertEqual(cfsba.tsub, 4)
+-
+- def test_aabb(self):
+- _timings = {"a_1": 13, "a_2": 10, "b_1": 9, "b_2": 5}
+- _yappi._set_test_timings(_timings)
+-
+- self._ncall = 1
+-
+- def a():
+- if self._ncall == 1:
+- self._ncall += 1
+- a()
+- elif self._ncall == 2:
+- b()
+- else:
+- return
+-
+- def b():
+- if self._ncall == 2:
+- self._ncall += 1
+- b()
+- else:
+- return
+-
+- stats = utils.run_and_get_func_stats(a)
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- cfsaa = fsa.children[fsa]
+- cfsab = fsa.children[fsb]
+- cfsbb = fsb.children[fsb]
+- self.assertEqual(fsa.ttot, 13)
+- self.assertEqual(fsa.tsub, 4)
+- self.assertEqual(fsb.ttot, 9)
+- self.assertEqual(fsb.tsub, 9)
+- self.assertEqual(cfsaa.ttot, 10)
+- self.assertEqual(cfsaa.tsub, 1)
+- self.assertEqual(cfsab.ttot, 9)
+- self.assertEqual(cfsab.tsub, 4)
+- self.assertEqual(cfsbb.ttot, 5)
+- self.assertEqual(cfsbb.tsub, 5)
+-
+- def test_abbb(self):
+- _timings = {"a_1": 13, "b_1": 10, "b_2": 6, "b_3": 1}
+- _yappi._set_test_timings(_timings)
+-
+- self._ncall = 1
+-
+- def a():
+- if self._ncall == 1:
+- b()
+-
+- def b():
+- if self._ncall == 3:
+- return
+- self._ncall += 1
+- b()
+-
+- stats = utils.run_and_get_func_stats(a)
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- cfsab = fsa.children[fsb]
+- cfsbb = fsb.children[fsb]
+- self.assertEqual(fsa.ttot, 13)
+- self.assertEqual(fsa.tsub, 3)
+- self.assertEqual(fsb.ttot, 10)
+- self.assertEqual(fsb.tsub, 10)
+- self.assertEqual(fsb.ncall, 3)
+- self.assertEqual(fsb.nactualcall, 1)
+- self.assertEqual(cfsab.ttot, 10)
+- self.assertEqual(cfsab.tsub, 4)
+- self.assertEqual(cfsbb.ttot, 6)
+- self.assertEqual(cfsbb.tsub, 6)
+- self.assertEqual(cfsbb.nactualcall, 0)
+- self.assertEqual(cfsbb.ncall, 2)
+-
+- def test_aaab(self):
+- _timings = {"a_1": 13, "a_2": 10, "a_3": 6, "b_1": 1}
+- _yappi._set_test_timings(_timings)
+-
+- self._ncall = 1
+-
+- def a():
+- if self._ncall == 3:
+- b()
+- return
+- self._ncall += 1
+- a()
+-
+- def b():
+- return
+-
+- stats = utils.run_and_get_func_stats(a)
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- cfsaa = fsa.children[fsa]
+- cfsab = fsa.children[fsb]
+- self.assertEqual(fsa.ttot, 13)
+- self.assertEqual(fsa.tsub, 12)
+- self.assertEqual(fsb.ttot, 1)
+- self.assertEqual(fsb.tsub, 1)
+- self.assertEqual(cfsaa.ttot, 10)
+- self.assertEqual(cfsaa.tsub, 9)
+- self.assertEqual(cfsab.ttot, 1)
+- self.assertEqual(cfsab.tsub, 1)
+-
+- def test_abab(self):
+- _timings = {"a_1": 13, "b_1": 10, "a_2": 6, "b_2": 1}
+- _yappi._set_test_timings(_timings)
+-
+- self._ncall = 1
+-
+- def a():
+- b()
+-
+- def b():
+- if self._ncall == 2:
+- return
+- self._ncall += 1
+- a()
+-
+- stats = utils.run_and_get_func_stats(a)
+- fsa = utils.find_stat_by_name(stats, 'a')
+- fsb = utils.find_stat_by_name(stats, 'b')
+- cfsab = fsa.children[fsb]
+- cfsba = fsb.children[fsa]
+- self.assertEqual(fsa.ttot, 13)
+- self.assertEqual(fsa.tsub, 8)
+- self.assertEqual(fsb.ttot, 10)
+- self.assertEqual(fsb.tsub, 5)
+- self.assertEqual(cfsab.ttot, 10)
+- self.assertEqual(cfsab.tsub, 5)
+- self.assertEqual(cfsab.ncall, 2)
+- self.assertEqual(cfsab.nactualcall, 1)
+- self.assertEqual(cfsba.ttot, 6)
+- self.assertEqual(cfsba.tsub, 5)
+-
+-
+-if __name__ == '__main__':
+- # import sys;sys.argv = ['', 'BasicUsage.test_run_as_script']
+- # import sys;sys.argv = ['', 'MultithreadedScenarios.test_subsequent_profile']
+- unittest.main()
++import os ++import sys ++import time ++import threading ++import unittest ++import yappi ++import _yappi ++import tests.utils as utils ++import multiprocessing # added to fix http://bugs.python.org/issue15881 for > Py2.6 ++import subprocess ++ ++_counter = 0 ++ ++ ++class BasicUsage(utils.YappiUnitTestCase): ++ ++ def test_callback_function_int_return_overflow(self): ++ # this test is just here to check if any errors are generated, as the err ++ # is printed in C side, I did not include it here. THere are ways to test ++ # this deterministically, I did not bother ++ import ctypes ++ ++ def _unsigned_overflow_margin(): ++ return 2**(ctypes.sizeof(ctypes.c_void_p) * 8) - 1 ++ ++ def foo(): ++ pass ++ ++ #with utils.captured_output() as (out, err): ++ yappi.set_context_id_callback(_unsigned_overflow_margin) ++ yappi.set_tag_callback(_unsigned_overflow_margin) ++ yappi.start() ++ foo() ++ ++ def test_issue60(self): ++ ++ def foo(): ++ buf = bytearray() ++ buf += b't' * 200 ++ view = memoryview(buf)[10:] ++ view = view.tobytes() ++ del buf[:10] # this throws exception ++ return view ++ ++ yappi.start(builtins=True) ++ foo() ++ self.assertTrue( ++ len( ++ yappi.get_func_stats( ++ filter_callback=lambda x: yappi. ++ func_matches(x, [memoryview.tobytes]) ++ ) ++ ) > 0 ++ ) ++ yappi.stop() ++ ++ def test_issue54(self): ++ ++ def _tag_cbk(): ++ global _counter ++ _counter += 1 ++ return _counter ++ ++ def a(): ++ pass ++ ++ def b(): ++ pass ++ ++ yappi.set_tag_callback(_tag_cbk) ++ yappi.start() ++ a() ++ a() ++ a() ++ yappi.stop() ++ stats = yappi.get_func_stats() ++ self.assertEqual(stats.pop().ncall, 3) # aggregated if no tag is given ++ stats = yappi.get_func_stats(tag=1) ++ ++ for i in range(1, 3): ++ stats = yappi.get_func_stats(tag=i) ++ stats = yappi.get_func_stats( ++ tag=i, filter_callback=lambda x: yappi.func_matches(x, [a]) ++ ) ++ ++ stat = stats.pop() ++ self.assertEqual(stat.ncall, 1) ++ ++ yappi.set_tag_callback(None) ++ yappi.clear_stats() ++ yappi.start() ++ b() ++ b() ++ stats = yappi.get_func_stats() ++ self.assertEqual(len(stats), 1) ++ stat = stats.pop() ++ self.assertEqual(stat.ncall, 2) ++ ++ def test_filter(self): ++ ++ def a(): ++ pass ++ ++ def b(): ++ a() ++ ++ def c(): ++ b() ++ ++ _TCOUNT = 5 ++ ++ ts = [] ++ yappi.start() ++ for i in range(_TCOUNT): ++ t = threading.Thread(target=c) ++ t.start() ++ ts.append(t) ++ ++ for t in ts: ++ t.join() ++ ++ yappi.stop() ++ ++ ctx_ids = [] ++ for tstat in yappi.get_thread_stats(): ++ if tstat.name == '_MainThread': ++ main_ctx_id = tstat.id ++ else: ++ ctx_ids.append(tstat.id) ++ ++ fstats = yappi.get_func_stats(filter={"ctx_id": 9}) ++ self.assertTrue(fstats.empty()) ++ fstats = yappi.get_func_stats( ++ filter={ ++ "ctx_id": main_ctx_id, ++ "name": "c" ++ } ++ ) # main thread ++ self.assertTrue(fstats.empty()) ++ ++ for i in ctx_ids: ++ fstats = yappi.get_func_stats( ++ filter={ ++ "ctx_id": i, ++ "name": "a", ++ "ncall": 1 ++ } ++ ) ++ self.assertEqual(fstats.pop().ncall, 1) ++ fstats = yappi.get_func_stats(filter={"ctx_id": i, "name": "b"}) ++ self.assertEqual(fstats.pop().ncall, 1) ++ fstats = yappi.get_func_stats(filter={"ctx_id": i, "name": "c"}) ++ self.assertEqual(fstats.pop().ncall, 1) ++ ++ yappi.clear_stats() ++ yappi.start(builtins=True) ++ time.sleep(0.1) ++ yappi.stop() ++ fstats = yappi.get_func_stats(filter={"module": "time"}) ++ self.assertEqual(len(fstats), 1) ++ ++ # invalid filters` ++ self.assertRaises( ++ Exception, yappi.get_func_stats, filter={'tag': "sss"} ++ ) ++ self.assertRaises( ++ Exception, yappi.get_func_stats, filter={'ctx_id': "None"} ++ ) ++ ++ def test_filter_callback(self): ++ ++ def a(): ++ time.sleep(0.1) ++ ++ def b(): ++ a() ++ ++ def c(): ++ pass ++ ++ def d(): ++ pass ++ ++ yappi.set_clock_type("wall") ++ yappi.start(builtins=True) ++ a() ++ b() ++ c() ++ d() ++ stats = yappi.get_func_stats( ++ filter_callback=lambda x: yappi.func_matches(x, [a, b]) ++ ) ++ #stats.print_all() ++ r1 = ''' ++ tests/test_functionality.py:98 a 2 0.000000 0.200350 0.100175 ++ tests/test_functionality.py:101 b 1 0.000000 0.120000 0.100197 ++ ''' ++ self.assert_traces_almost_equal(r1, stats) ++ self.assertEqual(len(stats), 2) ++ stats = yappi.get_func_stats( ++ filter_callback=lambda x: yappi. ++ module_matches(x, [sys.modules[__name__]]) ++ ) ++ r1 = ''' ++ tests/test_functionality.py:98 a 2 0.000000 0.230130 0.115065 ++ tests/test_functionality.py:101 b 1 0.000000 0.120000 0.109011 ++ tests/test_functionality.py:104 c 1 0.000000 0.000002 0.000002 ++ tests/test_functionality.py:107 d 1 0.000000 0.000001 0.000001 ++ ''' ++ self.assert_traces_almost_equal(r1, stats) ++ self.assertEqual(len(stats), 4) ++ ++ stats = yappi.get_func_stats( ++ filter_callback=lambda x: yappi.func_matches(x, [time.sleep]) ++ ) ++ self.assertEqual(len(stats), 1) ++ r1 = ''' ++ time.sleep 2 0.206804 0.220000 0.103402 ++ ''' ++ self.assert_traces_almost_equal(r1, stats) ++ ++ def test_print_formatting(self): ++ ++ def a(): ++ pass ++ ++ def b(): ++ a() ++ ++ func_cols = { ++ 1: ("name", 48), ++ 0: ("ncall", 5), ++ 2: ("tsub", 8), ++ } ++ thread_cols = { ++ 1: ("name", 48), ++ 0: ("ttot", 8), ++ } ++ ++ yappi.start() ++ a() ++ b() ++ yappi.stop() ++ fs = yappi.get_func_stats() ++ cs = fs[1].children ++ ts = yappi.get_thread_stats() ++ #fs.print_all(out=sys.stderr, columns={1:("name", 70), }) ++ #cs.print_all(out=sys.stderr, columns=func_cols) ++ #ts.print_all(out=sys.stderr, columns=thread_cols) ++ #cs.print_all(out=sys.stderr, columns={}) ++ ++ self.assertRaises( ++ yappi.YappiError, fs.print_all, columns={1: ("namee", 9)} ++ ) ++ self.assertRaises( ++ yappi.YappiError, cs.print_all, columns={1: ("dd", 0)} ++ ) ++ self.assertRaises( ++ yappi.YappiError, ts.print_all, columns={1: ("tidd", 0)} ++ ) ++ ++ def test_get_clock(self): ++ yappi.set_clock_type('cpu') ++ self.assertEqual('cpu', yappi.get_clock_type()) ++ clock_info = yappi.get_clock_info() ++ self.assertTrue('api' in clock_info) ++ self.assertTrue('resolution' in clock_info) ++ ++ yappi.set_clock_type('wall') ++ self.assertEqual('wall', yappi.get_clock_type()) ++ ++ t0 = yappi.get_clock_time() ++ time.sleep(0.1) ++ duration = yappi.get_clock_time() - t0 ++ self.assertTrue(0.05 < duration < 0.3) ++ ++ def test_profile_decorator(self): ++ ++ def aggregate(func, stats): ++ fname = "tests/%s.profile" % (func.__name__) ++ try: ++ stats.add(fname) ++ except IOError: ++ pass ++ stats.save(fname) ++ raise Exception("messing around") ++ ++ @yappi.profile(return_callback=aggregate) ++ def a(x, y): ++ if x + y == 25: ++ raise Exception("") ++ return x + y ++ ++ def b(): ++ pass ++ ++ try: ++ os.remove( ++ "tests/a.profile" ++ ) # remove the one from prev test, if available ++ except: ++ pass ++ ++ # global profile is on to mess things up ++ yappi.start() ++ b() ++ ++ # assert functionality and call function at same time ++ try: ++ self.assertEqual(a(1, 2), 3) ++ except: ++ pass ++ try: ++ self.assertEqual(a(2, 5), 7) ++ except: ++ pass ++ try: ++ a(4, 21) ++ except: ++ pass ++ stats = yappi.get_func_stats().add("tests/a.profile") ++ fsa = utils.find_stat_by_name(stats, 'a') ++ self.assertEqual(fsa.ncall, 3) ++ self.assertEqual(len(stats), 1) # b() should be cleared out. ++ ++ @yappi.profile(return_callback=aggregate) ++ def count_down_rec(n): ++ if n == 0: ++ return ++ count_down_rec(n - 1) ++ ++ try: ++ os.remove( ++ "tests/count_down_rec.profile" ++ ) # remove the one from prev test, if available ++ except: ++ pass ++ ++ try: ++ count_down_rec(4) ++ except: ++ pass ++ try: ++ count_down_rec(3) ++ except: ++ pass ++ ++ stats = yappi.YFuncStats("tests/count_down_rec.profile") ++ fsrec = utils.find_stat_by_name(stats, 'count_down_rec') ++ self.assertEqual(fsrec.ncall, 9) ++ self.assertEqual(fsrec.nactualcall, 2) ++ ++ def test_strip_dirs(self): ++ ++ def a(): ++ pass ++ ++ stats = utils.run_and_get_func_stats(a, ) ++ stats.strip_dirs() ++ fsa = utils.find_stat_by_name(stats, "a") ++ self.assertEqual(fsa.module, os.path.basename(fsa.module)) ++ ++ @unittest.skipIf(os.name == "nt", "do not run on Windows") ++ def test_run_as_script(self): ++ import re ++ p = subprocess.Popen( ++ ['yappi', os.path.join('./tests', 'run_as_script.py')], ++ stdout=subprocess.PIPE ++ ) ++ out, err = p.communicate() ++ self.assertEqual(p.returncode, 0) ++ func_stats, thread_stats = re.split( ++ b'name\\s+id\\s+tid\\s+ttot\\s+scnt\\s*\n', out ++ ) ++ self.assertTrue(b'FancyThread' in thread_stats) ++ ++ def test_yappi_overhead(self): ++ LOOP_COUNT = 100000 ++ ++ def a(): ++ pass ++ ++ def b(): ++ for i in range(LOOP_COUNT): ++ a() ++ ++ t0 = time.time() ++ yappi.start() ++ b() ++ yappi.stop() ++ time_with_yappi = time.time() - t0 ++ t0 = time.time() ++ b() ++ time_without_yappi = time.time() - t0 ++ if time_without_yappi == 0: ++ time_without_yappi = 0.000001 ++ ++ # in latest v0.82, I calculated this as close to "7.0" in my machine. ++ # however, %83 of this overhead is coming from tickcount(). The other %17 ++ # seems to have been evenly distributed to the internal bookkeeping ++ # structures/algorithms which seems acceptable. Note that our test only ++ # tests one function being profiled at-a-time in a short interval. ++ # profiling high number of functions in a small time ++ # is a different beast, (which is pretty unlikely in most applications) ++ # So as a conclusion: I cannot see any optimization window for Yappi that ++ # is worth implementing as we will only optimize %17 of the time. ++ sys.stderr.write("\r\nYappi puts %0.1f times overhead to the profiled application in average.\r\n" % \ ++ (time_with_yappi / time_without_yappi)) ++ ++ def test_clear_stats_while_running(self): ++ ++ def a(): ++ pass ++ ++ yappi.start() ++ a() ++ yappi.clear_stats() ++ a() ++ stats = yappi.get_func_stats() ++ fsa = utils.find_stat_by_name(stats, 'a') ++ self.assertEqual(fsa.ncall, 1) ++ ++ def test_generator(self): ++ ++ def _gen(n): ++ while (n > 0): ++ yield n ++ n -= 1 ++ ++ yappi.start() ++ for x in _gen(5): ++ pass ++ self.assertTrue( ++ yappi.convert2pstats(yappi.get_func_stats()) is not None ++ ) ++ ++ def test_slice_child_stats_and_strip_dirs(self): ++ ++ def b(): ++ for i in range(10000000): ++ pass ++ ++ def a(): ++ b() ++ ++ yappi.start(builtins=True) ++ a() ++ stats = yappi.get_func_stats() ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ self.assertTrue(fsa.children[0:1] is not None) ++ prev_afullname = fsa.full_name ++ prev_bchildfullname = fsa.children[fsb].full_name ++ stats.strip_dirs() ++ self.assertTrue(len(prev_afullname) > len(fsa.full_name)) ++ self.assertTrue( ++ len(prev_bchildfullname) > len(fsa.children[fsb].full_name) ++ ) ++ ++ def test_children_stat_functions(self): ++ _timings = {"a_1": 5, "b_1": 3, "c_1": 1} ++ _yappi._set_test_timings(_timings) ++ ++ def b(): ++ pass ++ ++ def c(): ++ pass ++ ++ def a(): ++ b() ++ c() ++ ++ yappi.start() ++ a() ++ b() # non-child call ++ c() # non-child call ++ stats = yappi.get_func_stats() ++ fsa = utils.find_stat_by_name(stats, 'a') ++ childs_of_a = fsa.children.get().sort("tavg", "desc") ++ prev_item = None ++ for item in childs_of_a: ++ if prev_item: ++ self.assertTrue(prev_item.tavg > item.tavg) ++ prev_item = item ++ childs_of_a.sort("name", "desc") ++ prev_item = None ++ for item in childs_of_a: ++ if prev_item: ++ self.assertTrue(prev_item.name > item.name) ++ prev_item = item ++ childs_of_a.clear() ++ self.assertTrue(childs_of_a.empty()) ++ ++ def test_no_stats_different_clock_type_load(self): ++ ++ def a(): ++ pass ++ ++ yappi.start() ++ a() ++ yappi.stop() ++ yappi.get_func_stats().save("tests/ystats1.ys") ++ yappi.clear_stats() ++ yappi.set_clock_type("WALL") ++ yappi.start() ++ yappi.stop() ++ stats = yappi.get_func_stats().add("tests/ystats1.ys") ++ fsa = utils.find_stat_by_name(stats, 'a') ++ self.assertTrue(fsa is not None) ++ ++ def test_subsequent_profile(self): ++ _timings = {"a_1": 1, "b_1": 1} ++ _yappi._set_test_timings(_timings) ++ ++ def a(): ++ pass ++ ++ def b(): ++ pass ++ ++ yappi.start() ++ a() ++ yappi.stop() ++ yappi.start() ++ b() ++ yappi.stop() ++ stats = yappi.get_func_stats() ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ self.assertTrue(fsa is not None) ++ self.assertTrue(fsb is not None) ++ self.assertEqual(fsa.ttot, 1) ++ self.assertEqual(fsb.ttot, 1) ++ ++ def test_lambda(self): ++ f = lambda: time.sleep(0.3) ++ yappi.set_clock_type("wall") ++ yappi.start() ++ f() ++ stats = yappi.get_func_stats() ++ fsa = utils.find_stat_by_name(stats, '<lambda>') ++ self.assertTrue(fsa.ttot > 0.1) ++ ++ def test_module_stress(self): ++ self.assertEqual(yappi.is_running(), False) ++ ++ yappi.start() ++ yappi.clear_stats() ++ self.assertRaises(_yappi.error, yappi.set_clock_type, "wall") ++ ++ yappi.stop() ++ yappi.clear_stats() ++ yappi.set_clock_type("cpu") ++ self.assertRaises(yappi.YappiError, yappi.set_clock_type, "dummy") ++ self.assertEqual(yappi.is_running(), False) ++ yappi.clear_stats() ++ yappi.clear_stats() ++ ++ def test_stat_sorting(self): ++ _timings = {"a_1": 13, "b_1": 10, "a_2": 6, "b_2": 1} ++ _yappi._set_test_timings(_timings) ++ ++ self._ncall = 1 ++ ++ def a(): ++ b() ++ ++ def b(): ++ if self._ncall == 2: ++ return ++ self._ncall += 1 ++ a() ++ ++ stats = utils.run_and_get_func_stats(a) ++ stats = stats.sort("totaltime", "desc") ++ prev_stat = None ++ for stat in stats: ++ if prev_stat: ++ self.assertTrue(prev_stat.ttot >= stat.ttot) ++ prev_stat = stat ++ stats = stats.sort("totaltime", "asc") ++ prev_stat = None ++ for stat in stats: ++ if prev_stat: ++ self.assertTrue(prev_stat.ttot <= stat.ttot) ++ prev_stat = stat ++ stats = stats.sort("avgtime", "asc") ++ prev_stat = None ++ for stat in stats: ++ if prev_stat: ++ self.assertTrue(prev_stat.tavg <= stat.tavg) ++ prev_stat = stat ++ stats = stats.sort("name", "asc") ++ prev_stat = None ++ for stat in stats: ++ if prev_stat: ++ self.assertTrue(prev_stat.name <= stat.name) ++ prev_stat = stat ++ stats = stats.sort("subtime", "asc") ++ prev_stat = None ++ for stat in stats: ++ if prev_stat: ++ self.assertTrue(prev_stat.tsub <= stat.tsub) ++ prev_stat = stat ++ ++ self.assertRaises( ++ yappi.YappiError, stats.sort, "invalid_func_sorttype_arg" ++ ) ++ self.assertRaises( ++ yappi.YappiError, stats.sort, "totaltime", ++ "invalid_func_sortorder_arg" ++ ) ++ ++ def test_start_flags(self): ++ self.assertEqual(_yappi._get_start_flags(), None) ++ yappi.start() ++ ++ def a(): ++ pass ++ ++ a() ++ self.assertEqual(_yappi._get_start_flags()["profile_builtins"], 0) ++ self.assertEqual(_yappi._get_start_flags()["profile_multicontext"], 1) ++ self.assertEqual(len(yappi.get_thread_stats()), 1) ++ ++ def test_builtin_profiling(self): ++ ++ def a(): ++ time.sleep(0.4) # is a builtin function ++ ++ yappi.set_clock_type('wall') ++ ++ yappi.start(builtins=True) ++ a() ++ stats = yappi.get_func_stats() ++ fsa = utils.find_stat_by_name(stats, 'sleep') ++ self.assertTrue(fsa is not None) ++ self.assertTrue(fsa.ttot > 0.3) ++ yappi.stop() ++ yappi.clear_stats() ++ ++ def a(): ++ pass ++ ++ yappi.start() ++ t = threading.Thread(target=a) ++ t.start() ++ t.join() ++ stats = yappi.get_func_stats() ++ ++ def test_singlethread_profiling(self): ++ yappi.set_clock_type('wall') ++ ++ def a(): ++ time.sleep(0.2) ++ ++ class Worker1(threading.Thread): ++ ++ def a(self): ++ time.sleep(0.3) ++ ++ def run(self): ++ self.a() ++ ++ yappi.start(profile_threads=False) ++ ++ c = Worker1() ++ c.start() ++ c.join() ++ a() ++ stats = yappi.get_func_stats() ++ fsa1 = utils.find_stat_by_name(stats, 'Worker1.a') ++ fsa2 = utils.find_stat_by_name(stats, 'a') ++ self.assertTrue(fsa1 is None) ++ self.assertTrue(fsa2 is not None) ++ self.assertTrue(fsa2.ttot > 0.1) ++ ++ def test_run(self): ++ ++ def profiled(): ++ pass ++ ++ yappi.clear_stats() ++ try: ++ with yappi.run(): ++ profiled() ++ stats = yappi.get_func_stats() ++ finally: ++ yappi.clear_stats() ++ ++ self.assertIsNotNone(utils.find_stat_by_name(stats, 'profiled')) ++ ++ def test_run_recursive(self): ++ ++ def profiled(): ++ pass ++ ++ def not_profiled(): ++ pass ++ ++ yappi.clear_stats() ++ try: ++ with yappi.run(): ++ with yappi.run(): ++ profiled() ++ # Profiling stopped here ++ not_profiled() ++ stats = yappi.get_func_stats() ++ finally: ++ yappi.clear_stats() ++ ++ self.assertIsNotNone(utils.find_stat_by_name(stats, 'profiled')) ++ self.assertIsNone(utils.find_stat_by_name(stats, 'not_profiled')) ++ ++ ++class StatSaveScenarios(utils.YappiUnitTestCase): ++ ++ def test_pstats_conversion(self): ++ ++ def pstat_id(fs): ++ return (fs.module, fs.lineno, fs.name) ++ ++ def a(): ++ d() ++ ++ def b(): ++ d() ++ ++ def c(): ++ pass ++ ++ def d(): ++ pass ++ ++ _timings = {"a_1": 12, "b_1": 7, "c_1": 5, "d_1": 2} ++ _yappi._set_test_timings(_timings) ++ stats = utils.run_and_get_func_stats(a, ) ++ stats.strip_dirs() ++ stats.save("tests/a1.pstats", type="pstat") ++ fsa_pid = pstat_id(utils.find_stat_by_name(stats, "a")) ++ fsd_pid = pstat_id(utils.find_stat_by_name(stats, "d")) ++ yappi.clear_stats() ++ _yappi._set_test_timings(_timings) ++ stats = utils.run_and_get_func_stats(a, ) ++ stats.strip_dirs() ++ stats.save("tests/a2.pstats", type="pstat") ++ yappi.clear_stats() ++ _yappi._set_test_timings(_timings) ++ stats = utils.run_and_get_func_stats(b, ) ++ stats.strip_dirs() ++ stats.save("tests/b1.pstats", type="pstat") ++ fsb_pid = pstat_id(utils.find_stat_by_name(stats, "b")) ++ yappi.clear_stats() ++ _yappi._set_test_timings(_timings) ++ stats = utils.run_and_get_func_stats(c, ) ++ stats.strip_dirs() ++ stats.save("tests/c1.pstats", type="pstat") ++ fsc_pid = pstat_id(utils.find_stat_by_name(stats, "c")) ++ ++ # merge saved stats and check pstats values are correct ++ import pstats ++ p = pstats.Stats( ++ 'tests/a1.pstats', 'tests/a2.pstats', 'tests/b1.pstats', ++ 'tests/c1.pstats' ++ ) ++ p.strip_dirs() ++ # ct = ttot, tt = tsub ++ (cc, nc, tt, ct, callers) = p.stats[fsa_pid] ++ self.assertEqual(cc, nc, 2) ++ self.assertEqual(tt, 20) ++ self.assertEqual(ct, 24) ++ (cc, nc, tt, ct, callers) = p.stats[fsd_pid] ++ self.assertEqual(cc, nc, 3) ++ self.assertEqual(tt, 6) ++ self.assertEqual(ct, 6) ++ self.assertEqual(len(callers), 2) ++ (cc, nc, tt, ct) = callers[fsa_pid] ++ self.assertEqual(cc, nc, 2) ++ self.assertEqual(tt, 4) ++ self.assertEqual(ct, 4) ++ (cc, nc, tt, ct) = callers[fsb_pid] ++ self.assertEqual(cc, nc, 1) ++ self.assertEqual(tt, 2) ++ self.assertEqual(ct, 2) ++ ++ def test_merge_stats(self): ++ _timings = { ++ "a_1": 15, ++ "b_1": 14, ++ "c_1": 12, ++ "d_1": 10, ++ "e_1": 9, ++ "f_1": 7, ++ "g_1": 6, ++ "h_1": 5, ++ "i_1": 1 ++ } ++ _yappi._set_test_timings(_timings) ++ ++ def a(): ++ b() ++ ++ def b(): ++ c() ++ ++ def c(): ++ d() ++ ++ def d(): ++ e() ++ ++ def e(): ++ f() ++ ++ def f(): ++ g() ++ ++ def g(): ++ h() ++ ++ def h(): ++ i() ++ ++ def i(): ++ pass ++ ++ yappi.start() ++ a() ++ a() ++ yappi.stop() ++ stats = yappi.get_func_stats() ++ self.assertRaises( ++ NotImplementedError, stats.save, "", "INVALID_SAVE_TYPE" ++ ) ++ stats.save("tests/ystats2.ys") ++ yappi.clear_stats() ++ _yappi._set_test_timings(_timings) ++ yappi.start() ++ a() ++ stats = yappi.get_func_stats().add("tests/ystats2.ys") ++ fsa = utils.find_stat_by_name(stats, "a") ++ fsb = utils.find_stat_by_name(stats, "b") ++ fsc = utils.find_stat_by_name(stats, "c") ++ fsd = utils.find_stat_by_name(stats, "d") ++ fse = utils.find_stat_by_name(stats, "e") ++ fsf = utils.find_stat_by_name(stats, "f") ++ fsg = utils.find_stat_by_name(stats, "g") ++ fsh = utils.find_stat_by_name(stats, "h") ++ fsi = utils.find_stat_by_name(stats, "i") ++ self.assertEqual(fsa.ttot, 45) ++ self.assertEqual(fsa.ncall, 3) ++ self.assertEqual(fsa.nactualcall, 3) ++ self.assertEqual(fsa.tsub, 3) ++ self.assertEqual(fsa.children[fsb].ttot, fsb.ttot) ++ self.assertEqual(fsa.children[fsb].tsub, fsb.tsub) ++ self.assertEqual(fsb.children[fsc].ttot, fsc.ttot) ++ self.assertEqual(fsb.children[fsc].tsub, fsc.tsub) ++ self.assertEqual(fsc.tsub, 6) ++ self.assertEqual(fsc.children[fsd].ttot, fsd.ttot) ++ self.assertEqual(fsc.children[fsd].tsub, fsd.tsub) ++ self.assertEqual(fsd.children[fse].ttot, fse.ttot) ++ self.assertEqual(fsd.children[fse].tsub, fse.tsub) ++ self.assertEqual(fse.children[fsf].ttot, fsf.ttot) ++ self.assertEqual(fse.children[fsf].tsub, fsf.tsub) ++ self.assertEqual(fsf.children[fsg].ttot, fsg.ttot) ++ self.assertEqual(fsf.children[fsg].tsub, fsg.tsub) ++ self.assertEqual(fsg.ttot, 18) ++ self.assertEqual(fsg.tsub, 3) ++ self.assertEqual(fsg.children[fsh].ttot, fsh.ttot) ++ self.assertEqual(fsg.children[fsh].tsub, fsh.tsub) ++ self.assertEqual(fsh.ttot, 15) ++ self.assertEqual(fsh.tsub, 12) ++ self.assertEqual(fsh.tavg, 5) ++ self.assertEqual(fsh.children[fsi].ttot, fsi.ttot) ++ self.assertEqual(fsh.children[fsi].tsub, fsi.tsub) ++ #stats.debug_print() ++ ++ def test_merge_multithreaded_stats(self): ++ import _yappi ++ timings = {"a_1": 2, "b_1": 1} ++ _yappi._set_test_timings(timings) ++ ++ def a(): ++ pass ++ ++ def b(): ++ pass ++ ++ yappi.start() ++ t = threading.Thread(target=a) ++ t.start() ++ t.join() ++ t = threading.Thread(target=b) ++ t.start() ++ t.join() ++ yappi.get_func_stats().save("tests/ystats1.ys") ++ yappi.clear_stats() ++ _yappi._set_test_timings(timings) ++ self.assertEqual(len(yappi.get_func_stats()), 0) ++ self.assertEqual(len(yappi.get_thread_stats()), 1) ++ t = threading.Thread(target=a) ++ t.start() ++ t.join() ++ ++ self.assertEqual(_yappi._get_start_flags()["profile_builtins"], 0) ++ self.assertEqual(_yappi._get_start_flags()["profile_multicontext"], 1) ++ yappi.get_func_stats().save("tests/ystats2.ys") ++ ++ stats = yappi.YFuncStats([ ++ "tests/ystats1.ys", ++ "tests/ystats2.ys", ++ ]) ++ fsa = utils.find_stat_by_name(stats, "a") ++ fsb = utils.find_stat_by_name(stats, "b") ++ self.assertEqual(fsa.ncall, 2) ++ self.assertEqual(fsb.ncall, 1) ++ self.assertEqual(fsa.tsub, fsa.ttot, 4) ++ self.assertEqual(fsb.tsub, fsb.ttot, 1) ++ ++ def test_merge_load_different_clock_types(self): ++ yappi.start(builtins=True) ++ ++ def a(): ++ b() ++ ++ def b(): ++ c() ++ ++ def c(): ++ pass ++ ++ t = threading.Thread(target=a) ++ t.start() ++ t.join() ++ yappi.get_func_stats().sort("name", "asc").save("tests/ystats1.ys") ++ yappi.stop() ++ yappi.clear_stats() ++ yappi.start(builtins=False) ++ t = threading.Thread(target=a) ++ t.start() ++ t.join() ++ yappi.get_func_stats().save("tests/ystats2.ys") ++ yappi.stop() ++ self.assertRaises(_yappi.error, yappi.set_clock_type, "wall") ++ yappi.clear_stats() ++ yappi.set_clock_type("wall") ++ yappi.start() ++ t = threading.Thread(target=a) ++ t.start() ++ t.join() ++ yappi.get_func_stats().save("tests/ystats3.ys") ++ self.assertRaises( ++ yappi.YappiError, ++ yappi.YFuncStats().add("tests/ystats1.ys").add, "tests/ystats3.ys" ++ ) ++ stats = yappi.YFuncStats(["tests/ystats1.ys", ++ "tests/ystats2.ys"]).sort("name") ++ fsa = utils.find_stat_by_name(stats, "a") ++ fsb = utils.find_stat_by_name(stats, "b") ++ fsc = utils.find_stat_by_name(stats, "c") ++ self.assertEqual(fsa.ncall, 2) ++ self.assertEqual(fsa.ncall, fsb.ncall, fsc.ncall) ++ ++ def test_merge_aabab_aabbc(self): ++ _timings = { ++ "a_1": 15, ++ "a_2": 14, ++ "b_1": 12, ++ "a_3": 10, ++ "b_2": 9, ++ "c_1": 4 ++ } ++ _yappi._set_test_timings(_timings) ++ ++ def a(): ++ if self._ncall == 1: ++ self._ncall += 1 ++ a() ++ elif self._ncall == 5: ++ self._ncall += 1 ++ a() ++ else: ++ b() ++ ++ def b(): ++ if self._ncall == 2: ++ self._ncall += 1 ++ a() ++ elif self._ncall == 6: ++ self._ncall += 1 ++ b() ++ elif self._ncall == 7: ++ c() ++ else: ++ return ++ ++ def c(): ++ pass ++ ++ self._ncall = 1 ++ stats = utils.run_and_get_func_stats(a, ) ++ stats.save("tests/ystats1.ys") ++ yappi.clear_stats() ++ _yappi._set_test_timings(_timings) ++ #stats.print_all() ++ ++ self._ncall = 5 ++ stats = utils.run_and_get_func_stats(a, ) ++ stats.save("tests/ystats2.ys") ++ ++ #stats.print_all() ++ ++ def a(): # same name but another function(code object) ++ pass ++ ++ yappi.start() ++ a() ++ stats = yappi.get_func_stats().add( ++ ["tests/ystats1.ys", "tests/ystats2.ys"] ++ ) ++ #stats.print_all() ++ self.assertEqual(len(stats), 4) ++ ++ fsa = None ++ for stat in stats: ++ if stat.name == "a" and stat.ttot == 45: ++ fsa = stat ++ break ++ self.assertTrue(fsa is not None) ++ ++ self.assertEqual(fsa.ncall, 7) ++ self.assertEqual(fsa.nactualcall, 3) ++ self.assertEqual(fsa.ttot, 45) ++ self.assertEqual(fsa.tsub, 10) ++ fsb = utils.find_stat_by_name(stats, "b") ++ fsc = utils.find_stat_by_name(stats, "c") ++ self.assertEqual(fsb.ncall, 6) ++ self.assertEqual(fsb.nactualcall, 3) ++ self.assertEqual(fsb.ttot, 36) ++ self.assertEqual(fsb.tsub, 27) ++ self.assertEqual(fsb.tavg, 6) ++ self.assertEqual(fsc.ttot, 8) ++ self.assertEqual(fsc.tsub, 8) ++ self.assertEqual(fsc.tavg, 4) ++ self.assertEqual(fsc.nactualcall, fsc.ncall, 2) ++ ++ ++class MultithreadedScenarios(utils.YappiUnitTestCase): ++ ++ def test_issue_32(self): ++ ''' ++ Start yappi from different thread and we get Internal Error(15) as ++ the current_ctx_id() called while enumerating the threads in start() ++ and as it does not swap to the enumerated ThreadState* the THreadState_GetDict() ++ returns wrong object and thus sets an invalid id for the _ctx structure. ++ ++ When this issue happens multiple Threads have same tid as the internal ts_ptr ++ will be same for different contexts. So, let's see if that happens ++ ''' ++ ++ def foo(): ++ time.sleep(0.2) ++ ++ def bar(): ++ time.sleep(0.1) ++ ++ def thread_func(): ++ yappi.set_clock_type("wall") ++ yappi.start() ++ ++ bar() ++ ++ t = threading.Thread(target=thread_func) ++ t.start() ++ t.join() ++ ++ foo() ++ ++ yappi.stop() ++ ++ thread_ids = set() ++ for tstat in yappi.get_thread_stats(): ++ self.assertTrue(tstat.tid not in thread_ids) ++ thread_ids.add(tstat.tid) ++ ++ def test_subsequent_profile(self): ++ WORKER_COUNT = 5 ++ ++ def a(): ++ pass ++ ++ def b(): ++ pass ++ ++ def c(): ++ pass ++ ++ _timings = { ++ "a_1": 3, ++ "b_1": 2, ++ "c_1": 1, ++ } ++ ++ yappi.start() ++ ++ def g(): ++ pass ++ ++ g() ++ yappi.stop() ++ yappi.clear_stats() ++ _yappi._set_test_timings(_timings) ++ yappi.start() ++ ++ _dummy = [] ++ for i in range(WORKER_COUNT): ++ t = threading.Thread(target=a) ++ t.start() ++ t.join() ++ for i in range(WORKER_COUNT): ++ t = threading.Thread(target=b) ++ t.start() ++ _dummy.append(t) ++ t.join() ++ for i in range(WORKER_COUNT): ++ t = threading.Thread(target=a) ++ t.start() ++ t.join() ++ for i in range(WORKER_COUNT): ++ t = threading.Thread(target=c) ++ t.start() ++ t.join() ++ yappi.stop() ++ yappi.start() ++ ++ def f(): ++ pass ++ ++ f() ++ stats = yappi.get_func_stats() ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ fsc = utils.find_stat_by_name(stats, 'c') ++ self.assertEqual(fsa.ncall, 10) ++ self.assertEqual(fsb.ncall, 5) ++ self.assertEqual(fsc.ncall, 5) ++ self.assertEqual(fsa.ttot, fsa.tsub, 30) ++ self.assertEqual(fsb.ttot, fsb.tsub, 10) ++ self.assertEqual(fsc.ttot, fsc.tsub, 5) ++ ++ # MACOSx optimizes by only creating one worker thread ++ self.assertTrue(len(yappi.get_thread_stats()) >= 2) ++ ++ def test_basic(self): ++ yappi.set_clock_type('wall') ++ ++ def dummy(): ++ pass ++ ++ def a(): ++ time.sleep(0.2) ++ ++ class Worker1(threading.Thread): ++ ++ def a(self): ++ time.sleep(0.3) ++ ++ def run(self): ++ self.a() ++ ++ yappi.start(builtins=False, profile_threads=True) ++ ++ c = Worker1() ++ c.start() ++ c.join() ++ a() ++ stats = yappi.get_func_stats() ++ fsa1 = utils.find_stat_by_name(stats, 'Worker1.a') ++ fsa2 = utils.find_stat_by_name(stats, 'a') ++ self.assertTrue(fsa1 is not None) ++ self.assertTrue(fsa2 is not None) ++ self.assertTrue(fsa1.ttot > 0.2) ++ self.assertTrue(fsa2.ttot > 0.1) ++ tstats = yappi.get_thread_stats() ++ self.assertEqual(len(tstats), 2) ++ tsa = utils.find_stat_by_name(tstats, 'Worker1') ++ tsm = utils.find_stat_by_name(tstats, '_MainThread') ++ dummy() # call dummy to force ctx name to be retrieved again. ++ self.assertTrue(tsa is not None) ++ # TODO: I put dummy() to fix below, remove the comments after a while. ++ self.assertTrue( # FIX: I see this fails sometimes? ++ tsm is not None, ++ 'Could not find "_MainThread". Found: %s' % (', '.join(utils.get_stat_names(tstats)))) ++ ++ def test_ctx_stats(self): ++ from threading import Thread ++ DUMMY_WORKER_COUNT = 5 ++ yappi.start() ++ ++ class DummyThread(Thread): ++ pass ++ ++ def dummy(): ++ pass ++ ++ def dummy_worker(): ++ pass ++ ++ for i in range(DUMMY_WORKER_COUNT): ++ t = DummyThread(target=dummy_worker) ++ t.start() ++ t.join() ++ yappi.stop() ++ stats = yappi.get_thread_stats() ++ tsa = utils.find_stat_by_name(stats, "DummyThread") ++ self.assertTrue(tsa is not None) ++ yappi.clear_stats() ++ time.sleep(1.0) ++ _timings = { ++ "a_1": 6, ++ "b_1": 5, ++ "c_1": 3, ++ "d_1": 1, ++ "a_2": 4, ++ "b_2": 3, ++ "c_2": 2, ++ "d_2": 1 ++ } ++ _yappi._set_test_timings(_timings) ++ ++ class Thread1(Thread): ++ pass ++ ++ class Thread2(Thread): ++ pass ++ ++ def a(): ++ b() ++ ++ def b(): ++ c() ++ ++ def c(): ++ d() ++ ++ def d(): ++ time.sleep(0.6) ++ ++ yappi.set_clock_type("wall") ++ yappi.start() ++ t1 = Thread1(target=a) ++ t1.start() ++ t2 = Thread2(target=a) ++ t2.start() ++ t1.join() ++ t2.join() ++ stats = yappi.get_thread_stats() ++ ++ # the fist clear_stats clears the context table? ++ tsa = utils.find_stat_by_name(stats, "DummyThread") ++ self.assertTrue(tsa is None) ++ ++ tst1 = utils.find_stat_by_name(stats, "Thread1") ++ tst2 = utils.find_stat_by_name(stats, "Thread2") ++ tsmain = utils.find_stat_by_name(stats, "_MainThread") ++ dummy() # call dummy to force ctx name to be retrieved again. ++ self.assertTrue(len(stats) == 3) ++ self.assertTrue(tst1 is not None) ++ self.assertTrue(tst2 is not None) ++ # TODO: I put dummy() to fix below, remove the comments after a while. ++ self.assertTrue( # FIX: I see this fails sometimes ++ tsmain is not None, ++ 'Could not find "_MainThread". Found: %s' % (', '.join(utils.get_stat_names(stats)))) ++ self.assertTrue(1.0 > tst2.ttot >= 0.5) ++ self.assertTrue(1.0 > tst1.ttot >= 0.5) ++ ++ # test sorting of the ctx stats ++ stats = stats.sort("totaltime", "desc") ++ prev_stat = None ++ for stat in stats: ++ if prev_stat: ++ self.assertTrue(prev_stat.ttot >= stat.ttot) ++ prev_stat = stat ++ stats = stats.sort("totaltime", "asc") ++ prev_stat = None ++ for stat in stats: ++ if prev_stat: ++ self.assertTrue(prev_stat.ttot <= stat.ttot) ++ prev_stat = stat ++ stats = stats.sort("schedcount", "desc") ++ prev_stat = None ++ for stat in stats: ++ if prev_stat: ++ self.assertTrue(prev_stat.sched_count >= stat.sched_count) ++ prev_stat = stat ++ stats = stats.sort("name", "desc") ++ prev_stat = None ++ for stat in stats: ++ if prev_stat: ++ self.assertTrue(prev_stat.name.lower() >= stat.name.lower()) ++ prev_stat = stat ++ self.assertRaises( ++ yappi.YappiError, stats.sort, "invalid_thread_sorttype_arg" ++ ) ++ self.assertRaises( ++ yappi.YappiError, stats.sort, "invalid_thread_sortorder_arg" ++ ) ++ ++ def test_ctx_stats_cpu(self): ++ ++ def get_thread_name(): ++ try: ++ return threading.current_thread().name ++ except AttributeError: ++ return "Anonymous" ++ ++ def burn_cpu(sec): ++ t0 = yappi.get_clock_time() ++ elapsed = 0 ++ while (elapsed < sec): ++ for _ in range(1000): ++ pass ++ elapsed = yappi.get_clock_time() - t0 ++ ++ def test(): ++ ++ ts = [] ++ for i in (0.01, 0.05, 0.1): ++ t = threading.Thread(target=burn_cpu, args=(i, )) ++ t.name = "burn_cpu-%s" % str(i) ++ t.start() ++ ts.append(t) ++ for t in ts: ++ t.join() ++ ++ yappi.set_clock_type("cpu") ++ yappi.set_context_name_callback(get_thread_name) ++ ++ yappi.start() ++ ++ test() ++ ++ yappi.stop() ++ ++ tstats = yappi.get_thread_stats() ++ r1 = ''' ++ burn_cpu-0.1 3 123145356058624 0.100105 8 ++ burn_cpu-0.05 2 123145361313792 0.050149 8 ++ burn_cpu-0.01 1 123145356058624 0.010127 2 ++ MainThread 0 4321620864 0.001632 6 ++ ''' ++ self.assert_ctx_stats_almost_equal(r1, tstats) ++ ++ def test_producer_consumer_with_queues(self): ++ # we currently just stress yappi, no functionality test is done here. ++ yappi.start() ++ if utils.is_py3x(): ++ from queue import Queue ++ else: ++ from Queue import Queue ++ from threading import Thread ++ WORKER_THREAD_COUNT = 50 ++ WORK_ITEM_COUNT = 2000 ++ ++ def worker(): ++ while True: ++ item = q.get() ++ # do the work with item ++ q.task_done() ++ ++ q = Queue() ++ for i in range(WORKER_THREAD_COUNT): ++ t = Thread(target=worker) ++ t.daemon = True ++ t.start() ++ ++ for item in range(WORK_ITEM_COUNT): ++ q.put(item) ++ q.join() # block until all tasks are done ++ #yappi.get_func_stats().sort("callcount").print_all() ++ yappi.stop() ++ ++ def test_temporary_lock_waiting(self): ++ yappi.start() ++ _lock = threading.Lock() ++ ++ def worker(): ++ _lock.acquire() ++ try: ++ time.sleep(1.0) ++ finally: ++ _lock.release() ++ ++ t1 = threading.Thread(target=worker) ++ t2 = threading.Thread(target=worker) ++ t1.start() ++ t2.start() ++ t1.join() ++ t2.join() ++ #yappi.get_func_stats().sort("callcount").print_all() ++ yappi.stop() ++ ++ @unittest.skipIf(os.name != "posix", "requires Posix compliant OS") ++ def test_signals_with_blocking_calls(self): ++ import signal, os, time ++ ++ # just to verify if signal is handled correctly and stats/yappi are not corrupted. ++ def handler(signum, frame): ++ raise Exception("Signal handler executed!") ++ ++ yappi.start() ++ signal.signal(signal.SIGALRM, handler) ++ signal.alarm(1) ++ self.assertRaises(Exception, time.sleep, 2) ++ stats = yappi.get_func_stats() ++ fsh = utils.find_stat_by_name(stats, "handler") ++ self.assertTrue(fsh is not None) ++ ++ @unittest.skipIf(not sys.version_info >= (3, 2), "requires Python 3.2") ++ def test_concurrent_futures(self): ++ yappi.start() ++ from concurrent.futures import ThreadPoolExecutor ++ with ThreadPoolExecutor(max_workers=5) as executor: ++ f = executor.submit(pow, 5, 2) ++ self.assertEqual(f.result(), 25) ++ time.sleep(1.0) ++ yappi.stop() ++ ++ @unittest.skipIf(not sys.version_info >= (3, 2), "requires Python 3.2") ++ def test_barrier(self): ++ yappi.start() ++ b = threading.Barrier(2, timeout=1) ++ ++ def worker(): ++ try: ++ b.wait() ++ except threading.BrokenBarrierError: ++ pass ++ except Exception: ++ raise Exception("BrokenBarrierError not raised") ++ ++ t1 = threading.Thread(target=worker) ++ t1.start() ++ #b.wait() ++ t1.join() ++ yappi.stop() ++ ++ ++class NonRecursiveFunctions(utils.YappiUnitTestCase): ++ ++ def test_abcd(self): ++ _timings = {"a_1": 6, "b_1": 5, "c_1": 3, "d_1": 1} ++ _yappi._set_test_timings(_timings) ++ ++ def a(): ++ b() ++ ++ def b(): ++ c() ++ ++ def c(): ++ d() ++ ++ def d(): ++ pass ++ ++ stats = utils.run_and_get_func_stats(a) ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ fsc = utils.find_stat_by_name(stats, 'c') ++ fsd = utils.find_stat_by_name(stats, 'd') ++ cfsab = fsa.children[fsb] ++ cfsbc = fsb.children[fsc] ++ cfscd = fsc.children[fsd] ++ ++ self.assertEqual(fsa.ttot, 6) ++ self.assertEqual(fsa.tsub, 1) ++ self.assertEqual(fsb.ttot, 5) ++ self.assertEqual(fsb.tsub, 2) ++ self.assertEqual(fsc.ttot, 3) ++ self.assertEqual(fsc.tsub, 2) ++ self.assertEqual(fsd.ttot, 1) ++ self.assertEqual(fsd.tsub, 1) ++ self.assertEqual(cfsab.ttot, 5) ++ self.assertEqual(cfsab.tsub, 2) ++ self.assertEqual(cfsbc.ttot, 3) ++ self.assertEqual(cfsbc.tsub, 2) ++ self.assertEqual(cfscd.ttot, 1) ++ self.assertEqual(cfscd.tsub, 1) ++ ++ def test_stop_in_middle(self): ++ _timings = {"a_1": 6, "b_1": 4} ++ _yappi._set_test_timings(_timings) ++ ++ def a(): ++ b() ++ yappi.stop() ++ ++ def b(): ++ time.sleep(0.2) ++ ++ yappi.start() ++ a() ++ stats = yappi.get_func_stats() ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ ++ self.assertEqual(fsa.ncall, 1) ++ self.assertEqual(fsa.nactualcall, 0) ++ self.assertEqual(fsa.ttot, 0) # no call_leave called ++ self.assertEqual(fsa.tsub, 0) # no call_leave called ++ self.assertEqual(fsb.ttot, 4) ++ ++ ++class RecursiveFunctions(utils.YappiUnitTestCase): ++ ++ def test_fibonacci(self): ++ ++ def fib(n): ++ if n > 1: ++ return fib(n - 1) + fib(n - 2) ++ else: ++ return n ++ ++ stats = utils.run_and_get_func_stats(fib, 22) ++ fs = utils.find_stat_by_name(stats, 'fib') ++ self.assertEqual(fs.ncall, 57313) ++ self.assertEqual(fs.ttot, fs.tsub) ++ ++ def test_abcadc(self): ++ _timings = { ++ "a_1": 20, ++ "b_1": 19, ++ "c_1": 17, ++ "a_2": 13, ++ "d_1": 12, ++ "c_2": 10, ++ "a_3": 5 ++ } ++ _yappi._set_test_timings(_timings) ++ ++ def a(n): ++ if n == 3: ++ return ++ if n == 1 + 1: ++ d(n) ++ else: ++ b(n) ++ ++ def b(n): ++ c(n) ++ ++ def c(n): ++ a(n + 1) ++ ++ def d(n): ++ c(n) ++ ++ stats = utils.run_and_get_func_stats(a, 1) ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ fsc = utils.find_stat_by_name(stats, 'c') ++ fsd = utils.find_stat_by_name(stats, 'd') ++ self.assertEqual(fsa.ncall, 3) ++ self.assertEqual(fsa.nactualcall, 1) ++ self.assertEqual(fsa.ttot, 20) ++ self.assertEqual(fsa.tsub, 7) ++ self.assertEqual(fsb.ttot, 19) ++ self.assertEqual(fsb.tsub, 2) ++ self.assertEqual(fsc.ttot, 17) ++ self.assertEqual(fsc.tsub, 9) ++ self.assertEqual(fsd.ttot, 12) ++ self.assertEqual(fsd.tsub, 2) ++ cfsca = fsc.children[fsa] ++ self.assertEqual(cfsca.nactualcall, 0) ++ self.assertEqual(cfsca.ncall, 2) ++ self.assertEqual(cfsca.ttot, 13) ++ self.assertEqual(cfsca.tsub, 6) ++ ++ def test_aaaa(self): ++ _timings = {"d_1": 9, "d_2": 7, "d_3": 3, "d_4": 2} ++ _yappi._set_test_timings(_timings) ++ ++ def d(n): ++ if n == 3: ++ return ++ d(n + 1) ++ ++ stats = utils.run_and_get_func_stats(d, 0) ++ fsd = utils.find_stat_by_name(stats, 'd') ++ self.assertEqual(fsd.ncall, 4) ++ self.assertEqual(fsd.nactualcall, 1) ++ self.assertEqual(fsd.ttot, 9) ++ self.assertEqual(fsd.tsub, 9) ++ cfsdd = fsd.children[fsd] ++ self.assertEqual(cfsdd.ttot, 7) ++ self.assertEqual(cfsdd.tsub, 7) ++ self.assertEqual(cfsdd.ncall, 3) ++ self.assertEqual(cfsdd.nactualcall, 0) ++ ++ def test_abcabc(self): ++ _timings = { ++ "a_1": 20, ++ "b_1": 19, ++ "c_1": 17, ++ "a_2": 13, ++ "b_2": 11, ++ "c_2": 9, ++ "a_3": 6 ++ } ++ _yappi._set_test_timings(_timings) ++ ++ def a(n): ++ if n == 3: ++ return ++ else: ++ b(n) ++ ++ def b(n): ++ c(n) ++ ++ def c(n): ++ a(n + 1) ++ ++ stats = utils.run_and_get_func_stats(a, 1) ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ fsc = utils.find_stat_by_name(stats, 'c') ++ self.assertEqual(fsa.ncall, 3) ++ self.assertEqual(fsa.nactualcall, 1) ++ self.assertEqual(fsa.ttot, 20) ++ self.assertEqual(fsa.tsub, 9) ++ self.assertEqual(fsb.ttot, 19) ++ self.assertEqual(fsb.tsub, 4) ++ self.assertEqual(fsc.ttot, 17) ++ self.assertEqual(fsc.tsub, 7) ++ cfsab = fsa.children[fsb] ++ cfsbc = fsb.children[fsc] ++ cfsca = fsc.children[fsa] ++ self.assertEqual(cfsab.ttot, 19) ++ self.assertEqual(cfsab.tsub, 4) ++ self.assertEqual(cfsbc.ttot, 17) ++ self.assertEqual(cfsbc.tsub, 7) ++ self.assertEqual(cfsca.ttot, 13) ++ self.assertEqual(cfsca.tsub, 8) ++ ++ def test_abcbca(self): ++ _timings = {"a_1": 10, "b_1": 9, "c_1": 7, "b_2": 4, "c_2": 2, "a_2": 1} ++ _yappi._set_test_timings(_timings) ++ self._ncall = 1 ++ ++ def a(): ++ if self._ncall == 1: ++ b() ++ else: ++ return ++ ++ def b(): ++ c() ++ ++ def c(): ++ if self._ncall == 1: ++ self._ncall += 1 ++ b() ++ else: ++ a() ++ ++ stats = utils.run_and_get_func_stats(a) ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ fsc = utils.find_stat_by_name(stats, 'c') ++ cfsab = fsa.children[fsb] ++ cfsbc = fsb.children[fsc] ++ cfsca = fsc.children[fsa] ++ self.assertEqual(fsa.ttot, 10) ++ self.assertEqual(fsa.tsub, 2) ++ self.assertEqual(fsb.ttot, 9) ++ self.assertEqual(fsb.tsub, 4) ++ self.assertEqual(fsc.ttot, 7) ++ self.assertEqual(fsc.tsub, 4) ++ self.assertEqual(cfsab.ttot, 9) ++ self.assertEqual(cfsab.tsub, 2) ++ self.assertEqual(cfsbc.ttot, 7) ++ self.assertEqual(cfsbc.tsub, 4) ++ self.assertEqual(cfsca.ttot, 1) ++ self.assertEqual(cfsca.tsub, 1) ++ self.assertEqual(cfsca.ncall, 1) ++ self.assertEqual(cfsca.nactualcall, 0) ++ ++ def test_aabccb(self): ++ _timings = { ++ "a_1": 13, ++ "a_2": 11, ++ "b_1": 9, ++ "c_1": 5, ++ "c_2": 3, ++ "b_2": 1 ++ } ++ _yappi._set_test_timings(_timings) ++ self._ncall = 1 ++ ++ def a(): ++ if self._ncall == 1: ++ self._ncall += 1 ++ a() ++ else: ++ b() ++ ++ def b(): ++ if self._ncall == 3: ++ return ++ else: ++ c() ++ ++ def c(): ++ if self._ncall == 2: ++ self._ncall += 1 ++ c() ++ else: ++ b() ++ ++ stats = utils.run_and_get_func_stats(a) ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ fsc = utils.find_stat_by_name(stats, 'c') ++ cfsaa = fsa.children[fsa.index] ++ cfsab = fsa.children[fsb] ++ cfsbc = fsb.children[fsc.full_name] ++ cfscc = fsc.children[fsc] ++ cfscb = fsc.children[fsb] ++ self.assertEqual(fsb.ttot, 9) ++ self.assertEqual(fsb.tsub, 5) ++ self.assertEqual(cfsbc.ttot, 5) ++ self.assertEqual(cfsbc.tsub, 2) ++ self.assertEqual(fsa.ttot, 13) ++ self.assertEqual(fsa.tsub, 4) ++ self.assertEqual(cfsab.ttot, 9) ++ self.assertEqual(cfsab.tsub, 4) ++ self.assertEqual(cfsaa.ttot, 11) ++ self.assertEqual(cfsaa.tsub, 2) ++ self.assertEqual(fsc.ttot, 5) ++ self.assertEqual(fsc.tsub, 4) ++ ++ def test_abaa(self): ++ _timings = {"a_1": 13, "b_1": 10, "a_2": 9, "a_3": 5} ++ _yappi._set_test_timings(_timings) ++ ++ self._ncall = 1 ++ ++ def a(): ++ if self._ncall == 1: ++ b() ++ elif self._ncall == 2: ++ self._ncall += 1 ++ a() ++ else: ++ return ++ ++ def b(): ++ self._ncall += 1 ++ a() ++ ++ stats = utils.run_and_get_func_stats(a) ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ cfsaa = fsa.children[fsa] ++ cfsba = fsb.children[fsa] ++ self.assertEqual(fsb.ttot, 10) ++ self.assertEqual(fsb.tsub, 1) ++ self.assertEqual(fsa.ttot, 13) ++ self.assertEqual(fsa.tsub, 12) ++ self.assertEqual(cfsaa.ttot, 5) ++ self.assertEqual(cfsaa.tsub, 5) ++ self.assertEqual(cfsba.ttot, 9) ++ self.assertEqual(cfsba.tsub, 4) ++ ++ def test_aabb(self): ++ _timings = {"a_1": 13, "a_2": 10, "b_1": 9, "b_2": 5} ++ _yappi._set_test_timings(_timings) ++ ++ self._ncall = 1 ++ ++ def a(): ++ if self._ncall == 1: ++ self._ncall += 1 ++ a() ++ elif self._ncall == 2: ++ b() ++ else: ++ return ++ ++ def b(): ++ if self._ncall == 2: ++ self._ncall += 1 ++ b() ++ else: ++ return ++ ++ stats = utils.run_and_get_func_stats(a) ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ cfsaa = fsa.children[fsa] ++ cfsab = fsa.children[fsb] ++ cfsbb = fsb.children[fsb] ++ self.assertEqual(fsa.ttot, 13) ++ self.assertEqual(fsa.tsub, 4) ++ self.assertEqual(fsb.ttot, 9) ++ self.assertEqual(fsb.tsub, 9) ++ self.assertEqual(cfsaa.ttot, 10) ++ self.assertEqual(cfsaa.tsub, 1) ++ self.assertEqual(cfsab.ttot, 9) ++ self.assertEqual(cfsab.tsub, 4) ++ self.assertEqual(cfsbb.ttot, 5) ++ self.assertEqual(cfsbb.tsub, 5) ++ ++ def test_abbb(self): ++ _timings = {"a_1": 13, "b_1": 10, "b_2": 6, "b_3": 1} ++ _yappi._set_test_timings(_timings) ++ ++ self._ncall = 1 ++ ++ def a(): ++ if self._ncall == 1: ++ b() ++ ++ def b(): ++ if self._ncall == 3: ++ return ++ self._ncall += 1 ++ b() ++ ++ stats = utils.run_and_get_func_stats(a) ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ cfsab = fsa.children[fsb] ++ cfsbb = fsb.children[fsb] ++ self.assertEqual(fsa.ttot, 13) ++ self.assertEqual(fsa.tsub, 3) ++ self.assertEqual(fsb.ttot, 10) ++ self.assertEqual(fsb.tsub, 10) ++ self.assertEqual(fsb.ncall, 3) ++ self.assertEqual(fsb.nactualcall, 1) ++ self.assertEqual(cfsab.ttot, 10) ++ self.assertEqual(cfsab.tsub, 4) ++ self.assertEqual(cfsbb.ttot, 6) ++ self.assertEqual(cfsbb.tsub, 6) ++ self.assertEqual(cfsbb.nactualcall, 0) ++ self.assertEqual(cfsbb.ncall, 2) ++ ++ def test_aaab(self): ++ _timings = {"a_1": 13, "a_2": 10, "a_3": 6, "b_1": 1} ++ _yappi._set_test_timings(_timings) ++ ++ self._ncall = 1 ++ ++ def a(): ++ if self._ncall == 3: ++ b() ++ return ++ self._ncall += 1 ++ a() ++ ++ def b(): ++ return ++ ++ stats = utils.run_and_get_func_stats(a) ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ cfsaa = fsa.children[fsa] ++ cfsab = fsa.children[fsb] ++ self.assertEqual(fsa.ttot, 13) ++ self.assertEqual(fsa.tsub, 12) ++ self.assertEqual(fsb.ttot, 1) ++ self.assertEqual(fsb.tsub, 1) ++ self.assertEqual(cfsaa.ttot, 10) ++ self.assertEqual(cfsaa.tsub, 9) ++ self.assertEqual(cfsab.ttot, 1) ++ self.assertEqual(cfsab.tsub, 1) ++ ++ def test_abab(self): ++ _timings = {"a_1": 13, "b_1": 10, "a_2": 6, "b_2": 1} ++ _yappi._set_test_timings(_timings) ++ ++ self._ncall = 1 ++ ++ def a(): ++ b() ++ ++ def b(): ++ if self._ncall == 2: ++ return ++ self._ncall += 1 ++ a() ++ ++ stats = utils.run_and_get_func_stats(a) ++ fsa = utils.find_stat_by_name(stats, 'a') ++ fsb = utils.find_stat_by_name(stats, 'b') ++ cfsab = fsa.children[fsb] ++ cfsba = fsb.children[fsa] ++ self.assertEqual(fsa.ttot, 13) ++ self.assertEqual(fsa.tsub, 8) ++ self.assertEqual(fsb.ttot, 10) ++ self.assertEqual(fsb.tsub, 5) ++ self.assertEqual(cfsab.ttot, 10) ++ self.assertEqual(cfsab.tsub, 5) ++ self.assertEqual(cfsab.ncall, 2) ++ self.assertEqual(cfsab.nactualcall, 1) ++ self.assertEqual(cfsba.ttot, 6) ++ self.assertEqual(cfsba.tsub, 5) ++ ++ ++if __name__ == '__main__': ++ # import sys;sys.argv = ['', 'BasicUsage.test_run_as_script'] ++ # import sys;sys.argv = ['', 'MultithreadedScenarios.test_subsequent_profile'] ++ unittest.main() +--- a/tests/test_gevent.py ++++ b/tests/test_gevent.py +@@ -4,7 +4,7 @@ import yappi + import gevent + from gevent.event import Event + import threading +-from utils import ( ++from .utils import ( + YappiUnitTestCase, find_stat_by_name, burn_cpu, burn_io, + burn_io_gevent + ) +--- a/tests/test_hooks.py ++++ b/tests/test_hooks.py +@@ -5,7 +5,7 @@ import unittest + import time + + import yappi +-import utils ++import tests.utils as utils + + + def a(): +--- a/tests/test_tags.py ++++ b/tests/test_tags.py +@@ -2,7 +2,7 @@ import unittest + import yappi + import threading + import time +-from utils import YappiUnitTestCase, find_stat_by_name, burn_cpu, burn_io ++from .utils import YappiUnitTestCase, find_stat_by_name, burn_cpu, burn_io + + + class MultiThreadTests(YappiUnitTestCase): diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.2.bb index 7c3f0fd4b..8a1aca21f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yappi_1.3.2.bb @@ -8,6 +8,7 @@ SRC_URI[sha256sum] = "a51d3e6e5563cc74b5bb82ed6e7bd44a9c1a7eae3d97e4d52e9465edb3 SRC_URI += " \ file://run-ptest \ + file://0001-Fix-imports-for-ptests.patch \ " inherit pypi setuptools3 ptest @@ -19,9 +20,11 @@ RDEPENDS_${PN} += "\ " RDEPENDS_${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-gevent \ ${PYTHON_PN}-multiprocessing \ + ${PYTHON_PN}-pytest \ ${PYTHON_PN}-profile \ + ${PYTHON_PN}-zopeinterface \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl/0001-Drop-tests-for-semicolon-as-a-separator.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl/0001-Drop-tests-for-semicolon-as-a-separator.patch new file mode 100644 index 000000000..1a9d5d02d --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl/0001-Drop-tests-for-semicolon-as-a-separator.patch @@ -0,0 +1,45 @@ +From 47eabc562a8883d757e3cff487c6c6e98def5a21 Mon Sep 17 00:00:00 2001 +From: Andrew Svetlov <andrew.svetlov@gmail.com> +Date: Fri, 28 May 2021 12:42:17 +0300 +Subject: [PATCH] Drop tests for semicolon as a separator + +yarl 1.6.3 ptests check the use of semicolons as separators in URLs, +which are no longer valid by default in newer versions of Python. This +patch is in python3-yarl master, but there is no release with it yet, so +backport it until there is a new release. + +For more info, see: +https://bugs.python.org/issue42967 +https://github.com/aio-libs/yarl/issues/563 + +Upstream-Status: Backport +(https://github.com/aio-libs/yarl/commit/47eabc562a8883d757e3cff487c6c6e98def5a21) + +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> + +--- + tests/test_url_query.py | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/tests/test_url_query.py b/tests/test_url_query.py +index d2ca640..07f858b 100644 +--- a/tests/test_url_query.py ++++ b/tests/test_url_query.py +@@ -60,14 +60,3 @@ def test_ampersand_as_value(): + u = URL("http://127.0.0.1/?a=1%26b=2") + assert len(u.query) == 1 + assert u.query["a"] == "1&b=2" +- +- +-def test_semicolon_as_separator(): +- u = URL("http://127.0.0.1/?a=1;b=2") +- assert len(u.query) == 2 +- +- +-def test_semicolon_as_value(): +- u = URL("http://127.0.0.1/?a=1%3Bb=2") +- assert len(u.query) == 1 +- assert u.query["a"] == "1;b=2" +-- +2.31.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.3.bb index 01682a46d..e0e262646 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.6.3.bb @@ -7,6 +7,7 @@ SRC_URI[sha256sum] = "8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b4 SRC_URI += " \ file://run-ptest \ + file://0001-Drop-tests-for-semicolon-as-a-separator.patch \ " PYPI_PACKAGE = "yarl" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.33.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.33.1.bb new file mode 100644 index 000000000..a0af8420f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.33.1.bb @@ -0,0 +1,13 @@ +SUMMARY = "Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)" +HOMEPAGE = "https://github.com/jstasiak/python-zeroconf" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bb705b228ea4a14ea2728215b780d80" + +SRC_URI[sha256sum] = "ac88738639669f924859a4e01d9742f3783e619e710103f4a0d321a47f260fd2" + +inherit pypi setuptools3 + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-ifaddr \ + ${PYTHON_PN}-asyncio \ +" diff --git a/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.5.0.bb b/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.5.0.bb deleted file mode 100644 index d906c0b9e..000000000 --- a/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.5.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Send file to trash natively under Mac OS X, Windows and Linux" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=05faa35ba1ca10b723f19d286c9d5237" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "60001cc07d707fe247c94f74ca6ac0d3255aabcb930529690897ca2a39db28b2" - -PYPI_PACKAGE = "Send2Trash" diff --git a/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.7.1.bb b/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.7.1.bb new file mode 100644 index 000000000..d3554c803 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-extended/send2trash/python3-send2trash_1.7.1.bb @@ -0,0 +1,9 @@ +SUMMARY = "Send file to trash natively under Mac OS X, Windows and Linux" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a02659c2d5f4cc626e4dcf6504b865eb" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "17730aa0a33ab82ed6ca76be3bb25f0433d0014f1ccf63c979bab13a5b9db2b2" + +PYPI_PACKAGE = "Send2Trash" diff --git a/meta-openembedded/meta-xfce/README b/meta-openembedded/meta-xfce/README index 70ad47a2d..bbf4b2edf 100644 --- a/meta-openembedded/meta-xfce/README +++ b/meta-openembedded/meta-xfce/README @@ -17,6 +17,6 @@ BBMASK = "meta-xfce/recipes-multimedia" Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-xfce][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][PATCH' Layer maintainer: Kai Kang <kai.kang@windriver.com> diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/files/0001-Plugin-support-Properly-handle-plugin-settings.patch b/meta-openembedded/meta-xfce/recipes-apps/mousepad/files/0001-Plugin-support-Properly-handle-plugin-settings.patch new file mode 100644 index 000000000..0ace907c4 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/files/0001-Plugin-support-Properly-handle-plugin-settings.patch @@ -0,0 +1,279 @@ +From 6d1800a305698f801236a2d73ebe178fa2d1139d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org> +Date: Sat, 12 Jun 2021 16:45:56 +0200 +Subject: [PATCH] Plugin support: Properly handle plugin settings + +What was done in !92 was strictly speaking only suitable for one plugin. +This could be extended to several plugins by adding a `.gschema.xml` +file in `plugins/`, intermediate between the one of the application and +those of the plugins, or by refactoring the Makefiles with inclusions +and a single call to `@GSETTINGS_RULES@`. + +But in any case, due to the relative rigidity of the `.gschema.xml` file +format and the internal workings of `glib-compile-schemas`, this would +only be suitable for plugins that are present at compile time, i.e. +"fake plugins". + +Instead, this commit adds the plugin settings at load time, as is +natural and as the `GSettingsSchema` documentation states. To do this, +the setting store is extended to contain several roots: the application +root and the plugin roots. + +For the latter, a unified naming convention is preserved, with the +prefix `org.xfce.mousepad.plugins.`, but they are in fact completely +independent of each other and independent of the application root. + +Fixes #136, related to !92. + +Upstream-Status: Backport [https://gitlab.xfce.org/apps/mousepad/-/commit/0d9d4f05aace800118d0a390e4e5dc5ebb940ca5] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + mousepad/mousepad-application.c | 12 +++- + mousepad/mousepad-settings-store.c | 70 ++++++++++++------- + mousepad/mousepad-settings-store.h | 3 + + mousepad/mousepad-settings.c | 14 +++- + mousepad/mousepad-settings.h | 1 + + mousepad/org.xfce.mousepad.gschema.xml | 1 - + ...g.xfce.mousepad.plugins.gspell.gschema.xml | 4 -- + 7 files changed, 71 insertions(+), 34 deletions(-) + +diff --git a/mousepad/mousepad-application.c b/mousepad/mousepad-application.c +index d9a64ff..378d78e 100644 +--- a/mousepad/mousepad-application.c ++++ b/mousepad/mousepad-application.c +@@ -721,7 +721,7 @@ mousepad_application_load_plugins (MousepadApplication *application) + GError *error = NULL; + GDir *dir; + const gchar *basename; +- gchar *provider_name; ++ gchar *provider_name, *schema_id; + gchar **strs; + gsize n_strs; + +@@ -775,6 +775,16 @@ mousepad_application_load_plugins (MousepadApplication *application) + application, G_CONNECT_SWAPPED); + g_action_map_add_action (G_ACTION_MAP (application), G_ACTION (action)); + ++ /* add its settings to the setting store */ ++ if (g_str_has_prefix (provider_name, "mousepad-plugin-")) ++ schema_id = provider_name + 16; ++ else ++ schema_id = provider_name; ++ ++ schema_id = g_strconcat (MOUSEPAD_ID, ".plugins.", schema_id, NULL); ++ mousepad_settings_add_root (schema_id); ++ g_free (schema_id); ++ + /* instantiate this provider types and initialize its action state */ + if (g_strv_contains ((const gchar *const *) strs, provider_name)) + { +diff --git a/mousepad/mousepad-settings-store.c b/mousepad/mousepad-settings-store.c +index de989bd..d117c53 100644 +--- a/mousepad/mousepad-settings-store.c ++++ b/mousepad/mousepad-settings-store.c +@@ -29,9 +29,11 @@ + + struct MousepadSettingsStore_ + { +- GObject parent; +- GSettings *root; +- GHashTable *keys; ++ GObject parent; ++ ++ GSettingsBackend *backend; ++ GList *roots; ++ GHashTable *keys; + }; + + +@@ -76,8 +78,10 @@ mousepad_setting_key_new (const gchar *key_name, + + + static void +-mousepad_setting_key_free (MousepadSettingKey *key) ++mousepad_setting_key_free (gpointer data) + { ++ MousepadSettingKey *key = data; ++ + if (G_LIKELY (key != NULL)) + { + g_object_unref (key->settings); +@@ -138,16 +142,16 @@ mousepad_settings_store_class_init (MousepadSettingsStoreClass *klass) + static void + mousepad_settings_store_finalize (GObject *object) + { +- MousepadSettingsStore *self; ++ MousepadSettingsStore *self = MOUSEPAD_SETTINGS_STORE (object); + + g_return_if_fail (MOUSEPAD_IS_SETTINGS_STORE (object)); + +- self = MOUSEPAD_SETTINGS_STORE (object); ++ if (self->backend != NULL) ++ g_object_unref (self->backend); + ++ g_list_free_full (self->roots, g_object_unref); + g_hash_table_destroy (self->keys); + +- g_object_unref (self->root); +- + G_OBJECT_CLASS (mousepad_settings_store_parent_class)->finalize (object); + } + +@@ -212,28 +216,19 @@ static void + mousepad_settings_store_init (MousepadSettingsStore *self) + { + #ifdef MOUSEPAD_SETTINGS_KEYFILE_BACKEND +- GSettingsBackend *backend; +- gchar *conf_file; +- conf_file = g_build_filename (g_get_user_config_dir (), +- "Mousepad", +- "settings.conf", +- NULL); +- backend = g_keyfile_settings_backend_new (conf_file, "/", NULL); ++ gchar *conf_file; ++ ++ conf_file = g_build_filename (g_get_user_config_dir (), "Mousepad", "settings.conf", NULL); ++ self->backend = g_keyfile_settings_backend_new (conf_file, "/", NULL); + g_free (conf_file); +- self->root = g_settings_new_with_backend (MOUSEPAD_ID, backend); +- g_object_unref (backend); + #else +- self->root = g_settings_new (MOUSEPAD_ID); ++ self->backend = NULL; + #endif + +- self->keys = g_hash_table_new_full (g_str_hash, +- g_str_equal, +- NULL, +- (GDestroyNotify) mousepad_setting_key_free); ++ self->roots = NULL; ++ self->keys = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, mousepad_setting_key_free); + +- mousepad_settings_store_add_settings (self, MOUSEPAD_ID, +- g_settings_schema_source_get_default (), +- self->root); ++ mousepad_settings_store_add_root (self, MOUSEPAD_ID); + } + + +@@ -246,6 +241,31 @@ mousepad_settings_store_new (void) + + + ++void ++mousepad_settings_store_add_root (MousepadSettingsStore *self, ++ const gchar *schema_id) ++{ ++ GSettingsSchemaSource *source; ++ GSettingsSchema *schema; ++ GSettings *root; ++ ++ source = g_settings_schema_source_get_default (); ++ schema = g_settings_schema_source_lookup (source, schema_id, TRUE); ++ ++ /* exit silently if no schema is found: plugins may have settings or not */ ++ if (schema == NULL) ++ return; ++ ++ root = g_settings_new_full (schema, self->backend, NULL); ++ g_settings_schema_unref (schema); ++ ++ self->roots = g_list_prepend (self->roots, root); ++ ++ mousepad_settings_store_add_settings (self, schema_id, source, root); ++} ++ ++ ++ + const gchar * + mousepad_settings_store_lookup_key_name (MousepadSettingsStore *self, + const gchar *setting) +diff --git a/mousepad/mousepad-settings-store.h b/mousepad/mousepad-settings-store.h +index 3f5cae1..4842036 100644 +--- a/mousepad/mousepad-settings-store.h ++++ b/mousepad/mousepad-settings-store.h +@@ -38,6 +38,9 @@ GType mousepad_settings_store_get_type (void); + + MousepadSettingsStore *mousepad_settings_store_new (void); + ++void mousepad_settings_store_add_root (MousepadSettingsStore *store, ++ const gchar *schema_id); ++ + const gchar *mousepad_settings_store_lookup_key_name (MousepadSettingsStore *store, + const gchar *setting); + +diff --git a/mousepad/mousepad-settings.c b/mousepad/mousepad-settings.c +index d071de6..66b338d 100644 +--- a/mousepad/mousepad-settings.c ++++ b/mousepad/mousepad-settings.c +@@ -24,6 +24,15 @@ static MousepadSettingsStore *settings_store = NULL; + + + ++void ++mousepad_settings_init (void) ++{ ++ if (settings_store == NULL) ++ settings_store = mousepad_settings_store_new (); ++} ++ ++ ++ + void + mousepad_settings_finalize (void) + { +@@ -39,10 +48,9 @@ mousepad_settings_finalize (void) + + + void +-mousepad_settings_init (void) ++mousepad_settings_add_root (const gchar *schema_id) + { +- if (settings_store == NULL) +- settings_store = mousepad_settings_store_new (); ++ mousepad_settings_store_add_root (settings_store, schema_id); + } + + +diff --git a/mousepad/mousepad-settings.h b/mousepad/mousepad-settings.h +index bc63d11..615be51 100644 +--- a/mousepad/mousepad-settings.h ++++ b/mousepad/mousepad-settings.h +@@ -87,6 +87,7 @@ G_BEGIN_DECLS + + void mousepad_settings_init (void); + void mousepad_settings_finalize (void); ++void mousepad_settings_add_root (const gchar *schema_id); + + void mousepad_setting_bind (const gchar *setting, + gpointer object, +diff --git a/mousepad/org.xfce.mousepad.gschema.xml b/mousepad/org.xfce.mousepad.gschema.xml +index e802719..8509ee3 100644 +--- a/mousepad/org.xfce.mousepad.gschema.xml ++++ b/mousepad/org.xfce.mousepad.gschema.xml +@@ -39,7 +39,6 @@ + + <!-- generic schemas --> + <schema id="org.xfce.mousepad" path="/org/xfce/mousepad/" gettext-domain="mousepad"> +- <child name="plugins" schema="org.xfce.mousepad.plugins"/> + <child name="preferences" schema="org.xfce.mousepad.preferences"/> + <child name="state" schema="org.xfce.mousepad.state"/> + </schema> +diff --git a/plugins/gspell-plugin/org.xfce.mousepad.plugins.gspell.gschema.xml b/plugins/gspell-plugin/org.xfce.mousepad.plugins.gspell.gschema.xml +index 6db65b6..95295ba 100644 +--- a/plugins/gspell-plugin/org.xfce.mousepad.plugins.gspell.gschema.xml ++++ b/plugins/gspell-plugin/org.xfce.mousepad.plugins.gspell.gschema.xml +@@ -1,9 +1,5 @@ + <schemalist> + +- <schema id="org.xfce.mousepad.plugins" path="/org/xfce/mousepad/plugins/" gettext-domain="mousepad"> +- <child name="gspell" schema="org.xfce.mousepad.plugins.gspell"/> +- </schema> +- + <schema id="org.xfce.mousepad.plugins.gspell" path="/org/xfce/mousepad/plugins/gspell/" gettext-domain="mousepad"> + <child name="preferences" schema="org.xfce.mousepad.plugins.gspell.preferences"/> + </schema> +-- +2.17.1 + diff --git a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.5.bb b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.5.bb index 830d86b8a..a93ff551b 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.5.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/mousepad/mousepad_0.5.5.bb @@ -7,6 +7,8 @@ DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native" inherit xfce-app gsettings mime-xdg +SRC_URI += "file://0001-Plugin-support-Properly-handle-plugin-settings.patch" + SRC_URI[sha256sum] = "40c35f00e0e10df50a59bd0dbba9007d2fb5574ed8a2aa73b0fc5ef40e64abe1" PACKAGECONFIG ??= "" diff --git a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.11.0.bb index fbca96f60..e611ddd93 100644 --- a/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb +++ b/meta-openembedded/meta-xfce/recipes-apps/ristretto/ristretto_0.11.0.bb @@ -10,7 +10,6 @@ inherit xfce-app mime-xdg RRECOMMENDS_${PN} += "tumbler" -SRC_URI[md5sum] = "4249e14fba78728481d89ce61a8771fc" -SRC_URI[sha256sum] = "16225dd74245eb6e0f82b9c72c6112f161bb8d8b11f3fc77277b7bc3432d4769" +SRC_URI[sha256sum] = "877e30d412c8cbfa9706f4ac0cab1a478f5829beafb773addc7722ca0cb78823" FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.1.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb index ccd55723a..bf853bfed 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.1.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb @@ -9,7 +9,7 @@ inherit xfce features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-xsettings.xml-Set-default-themes.patch" -SRC_URI[sha256sum] = "bb28e1be7aa34d0edb1cfbaacc509a4267db56828b36cd6be312a202973635c6" +SRC_URI[sha256sum] = "4dd7cb420860535e687f673c0b5c0274e0d2fb67181281d4b85be9197da03d7e" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" diff --git a/meta-openpower/classes/openpower-software-manager-mmc.bbclass b/meta-openpower/classes/openpower-software-manager-mmc.bbclass index 808e68965..38ae63150 100644 --- a/meta-openpower/classes/openpower-software-manager-mmc.bbclass +++ b/meta-openpower/classes/openpower-software-manager-mmc.bbclass @@ -3,4 +3,6 @@ PACKAGECONFIG_append = " mmc_layout" SYSTEMD_SERVICE_${PN} += " \ obmc-flash-bios-init.service \ obmc-flash-bios-patch.service \ + openpower-process-host-firmware.service \ + openpower-update-bios-attr-table.service \ " diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc index b5f5f78fc..821d75804 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-debug-collector" -SRCREV = "96f3c8536ba9fae1a3b3050ade03cbd1af416b48" +SRCREV = "bce0d4a571c9ce3f62ad6c2bda6d32f26eb238c8" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index 505e23255..482aaaf9d 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -4,8 +4,7 @@ DESCRIPTION = "Application to log error during host checkstop and watchdog timeo PR = "r1" PV = "1.0+git${SRCPV}" -inherit autotools \ - pkgconfig \ +inherit meson \ obmc-phosphor-systemd \ python3native \ phosphor-dbus-yaml @@ -15,7 +14,6 @@ require ${BPN}-systemd-links.inc DEPENDS += " \ phosphor-logging \ - autoconf-archive-native \ ${PYTHON_PN}-sdbus++-native \ " S = "${WORKDIR}/git" @@ -33,23 +31,3 @@ DEPENDS_remove_class-native = "phosphor-logging" # Do not depend on phosphor-logging for native SDK build DEPENDS_remove_class-nativesdk = "phosphor-logging" - -# Provide a means to enable/disable install_error_yaml feature -PACKAGECONFIG ??= "install_error_yaml" -PACKAGECONFIG[install_error_yaml] = " \ - --enable-install_error_yaml, \ - --disable-install_error_yaml, ,\ - " - -# Enable install_error_yaml during native and native SDK build -PACKAGECONFIG_add_class-native = "install_error_yaml" -PACKAGECONFIG_add_class-nativesdk = "install_error_yaml" - -# Disable install_error_yaml during target build -PACKAGECONFIG_remove_class-target = "install_error_yaml" - -# Disable generating elog error header file during bitbake. Applications -# should be using the elog header generated by phosphor-logging recipe -EXTRA_OECONF += "--disable-gen_errors" - -BBCLASSEXTEND += "native nativesdk" 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 8cd50970c..1c6df5a11 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -44,6 +44,7 @@ EXTRA_OEMESON += " \ DEPENDS += " \ cli11 \ dbus \ + nlohmann-json \ openssl \ phosphor-dbus-interfaces \ phosphor-logging \ @@ -60,7 +61,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "fdc91fa011c28b857220e30320fba65e69907f20" +SRCREV = "5dc5d6cc6796ef038c59e41297349a982c8dd296" DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service" diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb index 7ce65f927..c0132b80c 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -57,6 +57,10 @@ pkg_postinst_${PN}() { LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.requires/proc-pre-poweroff@0.service" TARGET="../proc-pre-poweroff@.service" ln -s $TARGET $LINK + + LINK="$D$systemd_system_unitdir/obmc-host-reset@0.target.requires/op-reset-host-check@0.service" + TARGET="../op-reset-host-check@.service" + ln -s $TARGET $LINK fi # If the memory preserving reboot feature is enabled, set it up 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 546031bbf..39a6f7bbb 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 meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "f8c14bcfd507e0224fe258d38bdef8d32ebfbf48" +SRCREV = "c3d6b876e7bf82df3dc023245c0622464dc4db42" DEPENDS += " \ phosphor-logging \ @@ -39,4 +39,6 @@ SYSTEMD_SERVICE_${PN} += " \ op-enter-mpreboot@.service \ ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ + ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ + ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ " diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index 3c3c5325e..6b7aeff5d 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,7 +15,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "324234b4b560ce1d136d96a6950daeb1da1469a5" +SRCREV = "897a6f7d8ea2ac37d4c66ecd067928085d31879b" S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc index 715c04964..e799168d2 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -2,5 +2,5 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-libhei" -SRCREV = "47ca5c2e7a172e39d104551ff2ed8db4eea51217" +SRCREV = "c905d2b5e693dfd2ace58ebb8629c3e8b7405cb3" diff --git a/meta-openpower/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/meta-openpower/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend deleted file mode 100644 index 60b23b790..000000000 --- a/meta-openpower/recipes-phosphor/packagegroups/nativesdk-packagegroup-sdk-host.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -RDEPENDS_${PN}_append_df-openpower = " \ - nativesdk-openpower-debug-collector-yaml \ - " diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index d8499cffe..b6d77c3ee 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 = "b0f3749d793ff1e11310ca5b729274afbbd85241" +SRCREV = "8cc5b15ca630e3f2daf6a6ef5c8b19dd1b6349e2" diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/recipes-core/systemd/obmc-targets.bb index 2ab0c22c6..a95535e85 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets.bb +++ b/meta-phosphor/recipes-core/systemd/obmc-targets.bb @@ -5,5 +5,12 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -# TODO Will be removed once dependencies in other layers on this recipe are moved -DEPENDS += "phosphor-state-manager" +inherit allarch obmc-phosphor-systemd + +SRC_URI += "\ + file://obmc-mapper.target \ +" + +SYSTEMD_SERVICE_${PN} += " \ + obmc-mapper.target \ +" diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target new file mode 100644 index 000000000..5e52f4cd5 --- /dev/null +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target @@ -0,0 +1,4 @@ +[Unit] +Description=Phosphor Object Mapper +RefuseManualStart=yes +RefuseManualStop=yes diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc index 696415554..12b67d4dc 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc @@ -3,4 +3,4 @@ PR = "r1" PV = "1.0+git${SRCPV}" SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "270f242cc2d80c2c77e5774eb461ca8a23863fb9" +SRCREV = "2dcf64bf84650791f2ad56fd07284806935eb42d" diff --git a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb index d4a61d30a..1705759d2 100644 --- a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb +++ b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb @@ -20,6 +20,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/stdplus" -SRCREV = "73a20c4a7bc4bdb4b47465e2c4d5d51a696d996b" +SRCREV = "a9cf86f1d26243c99f607ebdff6f71645d3a9276" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb index 00866ce28..9b427b76a 100644 --- a/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb +++ b/meta-phosphor/recipes-graphics/obmc-ikvm/obmc-ikvm_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e" DEPENDS = " libvncserver systemd sdbusplus phosphor-logging phosphor-dbus-interfaces" SRC_URI = "git://github.com/openbmc/obmc-ikvm" -SRCREV = "7a420e4c928ce4f0720a82a74e05d23ef3c362fb" +SRCREV = "2d2f3dab4253a3d6edf6bef98c5f880f51d2394b" PV = "1.0+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index a867ec48f..f9887da38 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 file://blocklist.json" -SRCREV = "c02d8cbbe8ded5368014d66bcf3279de758011d9" +SRCREV = "ee70147add704c40e1999900ec8e67d1213729cc" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" 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 1b3a9d646..98a5c7881 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -18,7 +18,7 @@ DEPENDS += " \ " SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "531c90e34497bbc571c18c50fe078c0d86e61d91" +SRCREV = "5795dacbc5763a0f1d1e1ac59d73baf4ca2ae616" # Process OBMC_ORG_YAML_SUBDIRS to create Meson config options. # ex. xyz/openbmc_project -> -Ddata_xyz_openbmc_project=true diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb index 143c78cea..d5e919812 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb @@ -26,7 +26,7 @@ SYSTEMD_SERVICE_${PN} += " \ " SRC_URI += "git://github.com/openbmc/phosphor-objmgr" -SRCREV = "2b7789c0180e9678909407df2c195dd3191dfc68" +SRCREV = "bdaa7f8bb4b34ec4d5f806135364e3ffcc427c0e" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index 784e57cdc..5c30040bf 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 = "6341919fc147335ce64d838435d4a7b9bc625f62" +SRCREV = "0eadeb7e78ea549da1c40016c9dc43f52df8b70d" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/ramoops-monitor.service b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/ramoops-monitor.service new file mode 100644 index 000000000..efb95c39e --- /dev/null +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector/ramoops-monitor.service @@ -0,0 +1,13 @@ +[Unit] +Description=Ramoops monitor. +ConditionPathExists=/var/lib/systemd/pstore +After=xyz.openbmc_project.Dump.Manager.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/phosphor-ramoops-monitor +SyslogIdentifier=ramoops-monitor + +[Install] +WantedBy=multi-user.target + diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb index 374d32a07..41b2370e3 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -38,6 +38,7 @@ DEPENDS += " \ ${PYTHON_PN}-pyyaml-native \ ${PYTHON_PN}-setuptools-native \ ${PYTHON_PN}-mako-native \ + fmt \ " RDEPENDS_${PN}-manager += " \ @@ -63,11 +64,13 @@ FILES_${PN}-manager += " \ ${datadir}/dump/ \ " FILES_${PN}-monitor += "${bindir}/phosphor-dump-monitor" +FILES_${PN}-monitor += "${bindir}/phosphor-ramoops-monitor" FILES_${PN}-dreport += "${bindir}/dreport" FILES_${PN}-scripts += "${dreport_dir}" DBUS_SERVICE_${PN}-manager += "${MGR_SVC}" SYSTEMD_SERVICE_${PN}-monitor += "obmc-dump-monitor.service" +SYSTEMD_SERVICE_${PN}-monitor += "ramoops-monitor.service" EXTRA_OEMESON = " \ -DBMC_DUMP_PATH=${bmc_dump_path} \ diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index eb6c9240d..d3ff224ef 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-fan-presence" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-fan-presence" -SRCREV = "2feab0873d1852157043bc41e4c53ee2eb1e2af4" +SRCREV = "de72d5d1342d4b18119d82ffb94b66bd21127757" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service deleted file mode 100644 index 96b40f666..000000000 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control-init@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Fan Control Initialization -Wants=obmc-power-on@%i.target -After=obmc-power-on@%i.target -Conflicts=obmc-chassis-powered-off@%i.target - -[Service] -Restart=on-failure -ExecStart=/usr/bin/env phosphor-fan-control --init -SyslogIdentifier=phosphor-fan-control - -[Install] -WantedBy=obmc-chassis-poweron@%i.target diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service b/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service deleted file mode 100644 index 8c5903e08..000000000 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan/phosphor-fan-control@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Phosphor Fan Control Daemon -Conflicts=obmc-chassis-powered-off@%i.target - -[Service] -Restart=on-failure -ExecStart=/usr/bin/env phosphor-fan-control --control -SyslogIdentifier=phosphor-fan-control - -[Install] -RequiredBy=obmc-fan-control-ready@%i.target diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index e13434eef..708fe4d22 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -84,15 +84,25 @@ FAN_CONTROL_TGT = "obmc-fan-control-ready@{0}.target" TMPL_CONTROL = "phosphor-fan-control@.service" INSTFMT_CONTROL = "phosphor-fan-control@{0}.service" FMT_CONTROL = "../${TMPL_CONTROL}:${FAN_CONTROL_TGT}.requires/${INSTFMT_CONTROL}" +FMT_CONTROL_MUSR = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}" +FMT_CONTROL_PWRON = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${INSTFMT_CONTROL}" TMPL_CONTROL_INIT = "phosphor-fan-control-init@.service" INSTFMT_CONTROL_INIT = "phosphor-fan-control-init@{0}.service" FMT_CONTROL_INIT = "../${TMPL_CONTROL_INIT}:${POWERON_TGT}.wants/${INSTFMT_CONTROL_INIT}" FILES_${PN}-control = "${bindir}/phosphor-fan-control" -SYSTEMD_SERVICE_${PN}-control += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}" -SYSTEMD_LINK_${PN}-control += "${@compose_list(d, 'FMT_CONTROL', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN}-control += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_SERVICE_${PN}-control += "${TMPL_CONTROL}" +SYSTEMD_SERVICE_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', '', '${TMPL_CONTROL_INIT}', d)}" + +# JSON: Linked to multi-user and poweron +# YAML: Linked to fans-ready and fan control-init poweron +SYSTEMD_LINK_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ + compose_list(d, 'FMT_CONTROL_MUSR', 'OBMC_CHASSIS_INSTANCES'), \ + compose_list(d, 'FMT_CONTROL', 'OBMC_CHASSIS_INSTANCES'), d)}" +SYSTEMD_LINK_${PN}-control += "${@bb.utils.contains('PACKAGECONFIG', 'json', \ + compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES'), \ + compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES'), d)}" # -------------------------------------- # ${PN}-monitor specific configuration 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 5f505d43d..719538ebd 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -13,7 +13,7 @@ inherit systemd S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "18d5bb18dcb4ebf7340b0b7a0b39daa887d530ce" +SRCREV = "f7575a70018c09962500da8f4ba6883253651f62" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 06df71f38..14530dbbc 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-bmc-code-mgmt" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt" -SRCREV = "16aa28a057a3d8036ea5a0e963ebb731c3a6ab43" +SRCREV = "7eebeaac3630bb0ccbb293b916c06509b15524ee" diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb index 0c7a88cd9..aa55d1be9 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb +++ b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init.bb @@ -8,8 +8,10 @@ PR = "r1" inherit allarch RDEPENDS_${PN} += " \ + ${@d.getVar('PREFERRED_PROVIDER_u-boot-fw-utils', True) or 'u-boot-fw-utils'} \ ${VIRTUAL-RUNTIME_base-utils} \ e2fsprogs-e2fsck \ + e2fsprogs-mke2fs \ gptfdisk \ parted \ udev \ diff --git a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init/mmc-init.sh b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init/mmc-init.sh index 3fad5e6fa..575b7605a 100644 --- a/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init/mmc-init.sh +++ b/meta-phosphor/recipes-phosphor/initrdscripts/phosphor-mmc-init/mmc-init.sh @@ -49,6 +49,18 @@ if ! mount /dev/disk/by-partlabel/"$(get_root)" $rodir -t ext4 -o ro; then fi rwfsdev="/dev/disk/by-partlabel/rwfs" +mkdir -p /var/lock +if test $(fw_printenv -n rwreset) = "true"; then + echo "Factory reset requested." + if ! mkfs.ext4 -F "${rwfsdev}"; then + echo "Reformat for factory reset failed." + /bin/sh + else + fw_setenv rwreset + echo "Formatting of rwfs is complete." + fi +fi + fsck.ext4 -p "${rwfsdev}" if ! mount "${rwfsdev}" $rodir/var -t ext4 -o rw; then /bin/sh diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index f7db798b6..3db77d998 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -8,12 +8,12 @@ USERADD_PARAM_${PN} = "-r -s /usr/sbin/nologin bmcweb" GROUPADD_PARAM_${PN} = "web; redfish" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=175792518e4ac015ab6696d16c4f607e" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "1981771bbd8aac1d689a9c5e258a99e655a76b29" +SRCREV = "ff3f835ad47f7a4f61d5fe9345dccdd3e496c47c" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc index 9bd95c146..638a1ac53 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-inventory-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-inventory-manager" -SRCREV = "903b0de230f01d14aee794dbf8ca713c128b0bde" +SRCREV = "706a9fcc53d2b96393aeb9e829599b2605f92595" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc index fc26d1a7e..991e3aa03 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser" LICENSE = "GPL-3.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" SRC_URI += "git://github.com/openbmc/ipmi-fru-parser" -SRCREV = "472d3e2fd7f2409cbe88e23128b46d6f4d982af3" +SRCREV = "904a2184832efe9b8d1cf66ecace4eb8001ec334" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 4e32d1a72..38ca9ccec 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "7fd91fa260a4c56448b46ae2735a0dd84e78225e" +SRCREV = "8f1b0b932a7567d1d64733582e8d44e5e6734fec" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb index 22eeff752..44a1b0c53 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -18,7 +18,7 @@ DEPENDS += "phosphor-ipmi-host" RRECOMMENDS_${PN} = "pam-ipmi" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "ecc8efad10bc2101a434a0c1fbd253eeaa1a3a99" +SRCREV = "60d6e4ed2b74c88621f43081951d86956557baa0" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index 56ca9580d..5ad350d67 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -24,6 +24,9 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-hostlogger" SRCREV = "042b5ba8438d1423f807feb5ef739cda063ea8d2" +# Disable unit tests +EXTRA_OEMESON += "-Dtests=disabled" + # Systemd service template SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "hostlogger@.service" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 29bc43b94..9d9e93078 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -54,7 +54,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "1d8835bbc52fe7077bef8d079cdb5df47d52abbf" +SRCREV = "7f1ec94d55bec2f482fa8169c2df6aebdc9ccf0c" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index df85547f0..fe6c5facd 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -11,7 +11,7 @@ inherit python3native inherit systemd SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "bdbbfb628fad902e3f72e393e6d1f639f8b8c92f" +SRCREV = "1ea359943afbd59168f490778a528c858903b74d" DEPENDS += "systemd" DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index bff21e53c..1598a7edb 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -37,6 +37,7 @@ SUMMARY_${PN}-bmc-state-mgmt = "BMC state management" RDEPENDS_${PN}-bmc-state-mgmt = " \ ${VIRTUAL-RUNTIME_obmc-bmc-state-manager} \ phosphor-state-manager-systemd-target-monitor \ + obmc-targets \ " SUMMARY_${PN}-bmcweb = "bmcweb support" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index ce0db1e8c..1430aaacf 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "b8cc3257fd3a09ff19eb8b45801392456a44acb6" +SRCREV = "ab8017917ee36507bcfe4aacce5bc3fff6872c0f" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 4652e51b4..890c9ce2a 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "70e7f939fd06a873ca1e93258cb1fe99c7417d21" +SRCREV = "10eb00f68e444f3d7f4f23217820aff5e850bd46" diff --git a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb index d1f37c275..de720730a 100644 --- a/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb +++ b/meta-phosphor/recipes-phosphor/sel-logger/phosphor-sel-logger_git.bb @@ -15,11 +15,23 @@ S = "${WORKDIR}/git" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -DEPENDS += "systemd sdbusplus boost phosphor-ipmi-host" +DEPENDS += " \ + boost \ + sdbusplus \ + systemd \ + phosphor-logging \ + " SRC_URI = "git://github.com/openbmc/phosphor-sel-logger.git;protocol=git" -SRCREV = "486e42e9db215070d631b7ac1f8f32537cb3bfe7" +SRCREV = "e9da2599f10f1b696f61c97f8c8036acfde05e18" PV = "0.1+git${SRCPV}" SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Logging.IPMI.service" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[log-threshold] = "-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=ON,-DSEL_LOGGER_MONITOR_THRESHOLD_EVENTS=OFF," +PACKAGECONFIG[log-pulse] = "-DREDFISH_LOG_MONITOR_PULSE_EVENTS=ON,-DREDFISH_LOG_MONITOR_PULSE_EVENTS=OFF," +PACKAGECONFIG[log-watchdog] = "-DSEL_LOGGER_MONITOR_WATCHDOG_EVENTS=ON,-DSEL_LOGGER_MONITOR_WATCHDOG_EVENTS=OFF," +PACKAGECONFIG[log-alarm] = "-DSEL_LOGGER_MONITOR_THRESHOLD_ALARM_EVENTS=ON,-DSEL_LOGGER_MONITOR_THRESHOLD_ALARM_EVENTS=OFF," +PACKAGECONFIG[send-to-logger] = "-DSEL_LOGGER_SEND_TO_LOGGING_SERVICE=ON,-DSEL_LOGGER_SEND_TO_LOGGING_SERVICE=OFF,phosphor-logging" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 54bee1508..ec9e5b86a 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 = "8685b17ab14a187eae08399153b9ec6bace2ab9b" +SRCREV = "5cf0f99210890d0cd52d5929e919316d238a5701" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index d81b1d7d0..d0c99e4bd 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -45,7 +45,7 @@ RDEPENDS_max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools bash" SRC_URI += "git://github.com/openbmc/phosphor-hwmon" -SRCREV = "9c4053455f479c85221712f790187076669e0d59" +SRCREV = "04da055198fe03f119e53578ac80a6188461b748" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb index 10d3bfb95..235ac42be 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -15,7 +15,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "nlohmann-json" SRC_URI = "git://github.com/openbmc/phosphor-nvme.git;protocol=git" -SRCREV = "5e23bcde0a3317f401f9c1b47d8bdb91569ec878" +SRCREV = "be3439961f5aedbff56d30bae4cd64b02e6125ae" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.nvme.manager.service" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb index 98a9a638c..51ad59a0b 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-virtual-sensor_git.bb @@ -16,7 +16,7 @@ DEPENDS += "nlohmann-json" DEPENDS += "exprtk" SRC_URI = "git://github.com/openbmc/phosphor-virtual-sensor.git;protocol=git" -SRCREV = "1846d8225c933ed3de0f9da7d255606cbcb9d7a9" +SRCREV = "4ac7a7f28e7469f0b2e9be096c31294334a6cd1a" S = "${WORKDIR}/git" SYSTEMD_SERVICE_${PN} = "phosphor-virtual-sensor.service" diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml index a4119e6cc..d51ba0369 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml @@ -25,20 +25,16 @@ Properties: BootMode: Default: Mode::Modes::Regular + - Interface: xyz.openbmc_project.Object.Enable + Properties: + Enabled: + Default: 'false' /xyz/openbmc_project/control/host0/boot/one_time: - - Interface: xyz.openbmc_project.Control.Boot.Source - Properties: - BootSource: - Default: Source::Sources::Default - - Interface: xyz.openbmc_project.Control.Boot.Mode - Properties: - BootMode: - Default: Mode::Modes::Regular - Interface: xyz.openbmc_project.Object.Enable Properties: Enabled: - Default: 'true' + Default: 'false' /xyz/openbmc_project/control/host0/power_cap: - Interface: xyz.openbmc_project.Control.Power.Cap diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/boot_type.override.yml b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/boot_type.override.yml index da1501302..458961177 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/boot_type.override.yml +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/boot_type.override.yml @@ -11,22 +11,14 @@ Properties: BootType: Default: Type::Types::EFI + - Interface: xyz.openbmc_project.Object.Enable + Properties: + Enabled: + Default: 'false' /xyz/openbmc_project/control/host0/boot/one_time: - - Interface: xyz.openbmc_project.Control.Boot.Source - Properties: - BootSource: - Default: Source::Sources::Default - - Interface: xyz.openbmc_project.Control.Boot.Mode - Properties: - BootMode: - Default: Mode::Modes::Regular - - Interface: xyz.openbmc_project.Control.Boot.Type - Properties: - BootType: - Default: Type::Types::EFI - Interface: xyz.openbmc_project.Object.Enable Properties: Enabled: - Default: 'true' + Default: 'false' diff --git a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb index c7483ca81..f2be54c58 100644 --- a/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/srvcfg-manager/srvcfg-manager_git.bb @@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" SRC_URI = "git://github.com/openbmc/service-config-manager" -SRCREV = "1f3813f819f11b27f515891c239113f0b4e60936" +SRCREV = "a19b509352cc7d9fcacf345f81163bf6998ec7b4" inherit meson pkgconfig systemd diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 98f944c74..acc96e18d 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -164,7 +164,6 @@ QUIESCE_INSTFMT = "obmc-host-quiesce@{1}.target" QUIESCE_FMT = "../${QUIESCE_TMPL}:${CRASH_TIMEOUT_TGTFMT}.wants/${QUIESCE_INSTFMT}" SYSTEMD_SERVICE_${PN}-obmc-targets += " \ - obmc-mapper.target \ obmc-fans-ready.target \ obmc-fan-control.target \ obmc-fan-control-ready@.target \ @@ -184,6 +183,6 @@ SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHA SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "3ac78dfd6e3c6bf1c673e6acc8e6dc2deb6bd98b" +SRCREV = "65bfcf57920d6fac62dbc9dd4a4fabdfe0c53228" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb index 2274a73d6..0499052bf 100644 --- a/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb +++ b/meta-phosphor/recipes-phosphor/telemetry/telemetry_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/telemetry" PV = "1.0+git${SRCPV}" -SRCREV = "4ab1d496d8a50d0466afb7f49668c40758bfe6a9" +SRCREV = "a74e44f6ef7db43d38eb600fbfee152b31b30514" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb index cd2225330..eb97c9816 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog_git.bb @@ -20,7 +20,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "systemd" SRC_URI += "git://github.com/openbmc/phosphor-watchdog" -SRCREV = "86e09d749fec944a251006242cf81617e35fb776" +SRCREV = "61bc6cdd56285e64642c26e86d84a824f25c9e88" S = "${WORKDIR}/git" EXTRA_OEMESON = " \ diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 14d3e66a4..c7af9f7b1 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 = "339db9a4c8610c5ecb92993c0bbc2219933bc858" +SRCREV = "51229f8005cb20a12e8d0f057d4565f31d84fa29" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index 23fb6aefb..6986026f5 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "240c056c8989c5e3e0f0ff640f38f3e4cdbc6ac5" +SRCREV = "03dc2b7b9f0672aac84349fbc77aab55403447e0" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native nlf-native " diff --git a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb index 69339eaa4..16926c663 100755 --- a/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb +++ b/meta-phosphor/recipes-x86/chassis/x86-power-control_git.bb @@ -2,7 +2,7 @@ SUMMARY = "Chassis Power Control service for Intel based platforms" DESCRIPTION = "Chassis Power Control service for Intel based platforms" SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "b4d03b1399ef12242cee7716617bef9a3935cf0c" +SRCREV = "2a26943210a7b26525638bb9dacfd2868c7cdad7" PV = "1.0+git${SRCPV}" @@ -14,8 +14,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit cmake systemd inherit obmc-phosphor-dbus-service -SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Chassis.Control.Power.service \ - chassis-system-reset.service \ +def get_service(d): + if(d.getVar('OBMC_HOST_INSTANCES') == '0'): + return "xyz.openbmc_project.Chassis.Control.Power@0.service" + else: + return " ".join(["xyz.openbmc_project.Chassis.Control.Power@{}.service".format(x) for x in d.getVar('OBMC_HOST_INSTANCES').split()]) + +SYSTEMD_SERVICE_${PN} = "${@get_service(d)}" + +SYSTEMD_SERVICE_${PN} += "chassis-system-reset.service \ chassis-system-reset.target" DEPENDS += " \ @@ -26,3 +33,4 @@ DEPENDS += " \ sdbusplus \ phosphor-logging \ " +FILES_${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.Chassis.Control.Power@.service"
\ No newline at end of file diff --git a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb index fedf93e24..6716d9a22 100644 --- a/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb +++ b/meta-phosphor/recipes-x86/peci-pcie/peci-pcie_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/openbmc/peci-pcie" DEPENDS = "boost sdbusplus libpeci" PV = "0.1+git${SRCPV}" -SRCREV = "e55832b23f8f833a3d5448505355eba18806fbee" +SRCREV = "6f55203b70316baec228073abcd581b64985af93" S = "${WORKDIR}/git" diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index a7a59e9ba..59973e80c 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -12,7 +12,6 @@ require conf/machine/include/obmc-bsp-common.inc SERIAL_CONSOLES = "115200;ttyS0" GBMC_NCSI_IF_NAME = "eth0" -GBMC_KCS_DEV = "ipmi-kcs1" # Overwrite flash offsets FLASH_KERNEL_OFFSET_flash-65536 = "2048" @@ -20,9 +19,10 @@ FLASH_ROFS_OFFSET_flash-65536 = "7168" FLASH_RWFS_OFFSET_flash-65536 = "62400" FLASH_SIZE = "65536" -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "gbmc-kcs-config" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "gbs-led-manager-config-native" PREFERRED_PROVIDER_virtual/bios-update = "gbs-bios-update" +PREFERRED_PROVIDER_virtual/bmc-update = "gbs-bmc-update" # Remove unneeded binaries from image IMAGE_FEATURES_remove = "obmc-bmc-state-mgmt" diff --git a/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh b/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh index a80082a1c..4723c20b4 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh +++ b/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh @@ -1,6 +1,6 @@ #!/bin/bash -BOOT_SERVICE_NAME="xyz.openbmc_project.State.Host" +BOOT_SERVICE_NAME="xyz.openbmc_project.State.Host0" BOOT_STATUS_OBJPATH="/xyz/openbmc_project/state/os" BOOT_INTERFACE_NAME="xyz.openbmc_project.State.OperatingSystem.Status" BOOT_Property="OperatingSystemState" @@ -11,7 +11,7 @@ LED_STANDBY_OBJPATH="/xyz/openbmc_project/led/groups/boot_status_standby" LED_INTERFACE_NAME="xyz.openbmc_project.Led.Group" LED_Property="Asserted" -PWR_STATE_SERVICE="xyz.openbmc_project.State.Chassis" +PWR_STATE_SERVICE="xyz.openbmc_project.State.Chassis0" PWR_STATE_OBJPATH="/xyz/openbmc_project/state/chassis0" PWR_STATE_INTERFACE_NAME="xyz.openbmc_project.State.Chassis" PWR_STATE_Property="CurrentPowerState" diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb index a177586ca..da672001e 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb @@ -2,11 +2,9 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - inherit systemd inherit obmc-phosphor-systemd - SRC_URI = " file://phosphor-ipmi-flash-bmc-verify.service \ file://bmc-verify.sh \ file://config-bmc.json \ @@ -14,6 +12,9 @@ SRC_URI = " file://phosphor-ipmi-flash-bmc-verify.service \ FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" +PROVIDES += "virtual/bmc-update" +RPROVIDES_${PN} += "virtual/bmc-update" + DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-flash" RDEPENDS_${PN} = "bash" diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh index dd5852a70..cb652a2a8 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/files/detect-gpio-present.sh @@ -11,7 +11,8 @@ PRESENT_OBJPATH=("/xyz/openbmc_project/inventory/system/chassis/cable/ss_cab0_pr "/xyz/openbmc_project/inventory/system/chassis/entity/sata0_prsnt" "/xyz/openbmc_project/inventory/system/chassis/entity/pe_slot0_prsnt" "/xyz/openbmc_project/inventory/system/chassis/entity/pe_slot1_prsnt" -"/xyz/openbmc_project/inventory/system/chassis/entity/fans_efuse_pg") +"/xyz/openbmc_project/inventory/system/chassis/entity/fans_efuse_pg" +"/xyz/openbmc_project/inventory/system/chassis/entity/pwrgd_p12v_slots") INTERFACE_NAME="xyz.openbmc_project.Inventory.Item" IPMI_LOG_SERVICE="xyz.openbmc_project.Logging.IPMI" @@ -24,7 +25,7 @@ LOG_EVENT_DATA="3 0x01 0xff 0xfe" LOG_ASSERT_FLAG="true" LOG_DEASSERT_FLAG="false" LOG_GENID_FLAG="0x0020" -present_state=("true" "true" "true" "true" "true" "true" "true" "true" "true" "true" "true") +present_state=("true" "true" "true" "true" "true" "true" "true" "true" "true" "true" "true" "true") for i in ${!PRESENT_OBJPATH[@]} do diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh index 8c7cbd54a..17074ddaf 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh @@ -134,13 +134,10 @@ KERNEL_SYSFS_FIU="/sys/bus/platform/drivers/NPCM-FIU" # the node of FIU is spi for kernel 5.10, but # for less than or equal kernel 5.4, the node # is fiu -for fname in $(find ${KERNEL_SYSFS_FIU} -type l) -do - if [ "${fname##*\.}" == "fiu" ] - then - KERNEL_FIU_ID="c0000000.fiu" - break - fi +shopt -s nullglob +for fiu in "$KERNEL_SYSFS_FIU"/*.fiu; do + KERNEL_FIU_ID="c0000000.fiu" + break done bind_host_mtd() { @@ -224,7 +221,7 @@ parse_pe_fru() { } check_power_status() { - res0="$(busctl get-property -j xyz.openbmc_project.State.Chassis \ + res0="$(busctl get-property -j xyz.openbmc_project.State.Chassis0 \ /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis \ CurrentPowerState | jq -r '.["data"]')" echo $res0 @@ -263,7 +260,7 @@ main() { set_gpio_persistence echo "Starting host power!" >&2 - busctl set-property xyz.openbmc_project.State.Host \ + busctl set-property xyz.openbmc_project.State.Host0 \ /xyz/openbmc_project/state/host0 \ xyz.openbmc_project.State.Host \ RequestedHostTransition s \ diff --git a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh index 6580fbe91..f6f1be4e0 100644 --- a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh +++ b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh @@ -16,7 +16,7 @@ main() { local pgd_val - pgd_val="$(busctl get-property -j xyz.openbmc_project.State.Chassis \ + pgd_val="$(busctl get-property -j xyz.openbmc_project.State.Chassis0 \ /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis \ CurrentPowerState | jq -r '.["data"]')" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-inventory-sensors.yaml b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-inventory-sensors.yaml index 76eaa4e51..3cf240ca0 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-inventory-sensors.yaml +++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-inventory-sensors.yaml @@ -433,6 +433,11 @@ sensorID: 0xFC sensorType: 0x25 offset: 0x01 +/xyz/openbmc_project/inventory/system/chassis/entity/pwrgd_p12v_slots: + eventReadingType: 0x6f + sensorID: 0xFD + sensorType: 0x25 + offset: 0x01 # map non-IPMI-SEL to the system event sensor as "Undetermined system hardware failure." /xyz/openbmc_project/inventory/system: eventReadingType: 0x6f diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml index 043136b5e..b8ad0761d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml +++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config/gbs-ipmi-sensors.yaml @@ -1279,3 +1279,24 @@ sensorReadingType: 0x6f sensorType: 0x25 serviceInterface: org.freedesktop.DBus.Properties + +0xFD: + entityID: 0x13 + entityInstance: 0 + interfaces: + xyz.openbmc_project.Inventory.Item: + Present: + Offsets: + 0x00: + assert: true + type: bool + 0x01: + assert: false + type: bool + mutability: Mutability::Write|Mutability::Read + path: /xyz/openbmc_project/inventory/system/chassis/entity/pwrgd_p12v_slots + readingType: assertion + sensorNamePattern: nameLeaf + sensorReadingType: 0x6f + sensorType: 0x25 + serviceInterface: org.freedesktop.DBus.Properties diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-11.conf b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-11.conf new file mode 100644 index 000000000..398356e8b --- /dev/null +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/gpios-11.conf @@ -0,0 +1,6 @@ +#The gpio 88 is a real gpio, which is used to +#store the PWRGD_P12V_ALL_SLOTS signal +INVENTORY=/system/chassis/entity/pwrgd_p12v_slots +DEVPATH=/dev/input/event0 +KEY=88 +NAME=pwrgd_p12v_slots
\ No newline at end of file diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 4b9a84100..f4ac6066d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -19,7 +19,8 @@ SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-7.conf" SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-8.conf" SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-9.conf" SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-10.conf" -GBS_OBMC_PRESENT_INSTANCES = "0 1 2 3 4 5 6 7 8 9 10" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-11.conf" +GBS_OBMC_PRESENT_INSTANCES = "0 1 2 3 4 5 6 7 8 9 10 11" SYSTEMD_LINK_${PN}-presence_append_gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend index 9e2666417..2ed0fb7e9 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -38,7 +38,8 @@ OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ${VIRTUAL-RUNTIME_obmc-led-monitor}" # Required for the front port. Part of obmc-console OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " obmc-console" # Required from packagegroup-gbs-apps -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-bmc-update" OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " virtual/bios-update" OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " x86-power-control" OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-pid-control" +# Required for phosphor-ipmi-kcs +OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " virtual-obmc-host-ipmi-hw" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-inventory-cleanup/inventory-cleanup.yaml b/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-inventory-cleanup/inventory-cleanup.yaml index 78e03fee0..eb791630c 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-inventory-cleanup/inventory-cleanup.yaml +++ b/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-inventory-cleanup/inventory-cleanup.yaml @@ -12,5 +12,5 @@ events: /system/chassis: xyz.openbmc_project.Inventory.Item.Chassis: Type: - value: "RackMount" + value: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" type: string diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend new file mode 100644 index 000000000..34b6b790c --- /dev/null +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend @@ -0,0 +1 @@ +KCS_DEVICE_gbs = "ipmi-kcs1" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index e887b1935..30bf313cb 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -3,10 +3,6 @@ SRC_URI_append_gbs = " file://service-override.conf" FILES_${PN}_append_gbs = " ${systemd_system_unitdir}/xyz.openbmc_project.LED.GroupManager.service.d/service-override.conf" -do_compile_prepend_gbs() { - install -m 0644 ${STAGING_DATADIR_NATIVE}/${PN}/led.yaml ${S} -} - do_install_append_gbs() { rm -rf ${D}${datadir}/${PN}/* diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 5c28b0435..9bd1ffd04 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1,4 +1 @@ -# Enable threshold monitoring -EXTRA_OECMAKE_append_gbs = "-DSEL_LOGGER_SEND_TO_LOGGING_SERVICE=ON \ - -DSEL_LOGGER_MONITOR_THRESHOLD_ALARM_EVENTS=ON \ - " +PACKAGECONFIG_append_gbs = " send-to-logger log-alarm" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh index 91dcb5cb3..c8e328ac6 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh @@ -202,9 +202,9 @@ cat > $TARGET_FILE_NAME << EOF1 ], "threshold": [ { - "criticalHigh": 77, + "criticalHigh": 72, "criticalLow": 0, - "warningHigh": 77, + "warningHigh": 72, "warningLow": 0, "maxValue": 127, "minValue": -128 diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor/config-virtual-sensor.json b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor/config-virtual-sensor.json index 7be584152..6a088ba59 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor/config-virtual-sensor.json +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor/config-virtual-sensor.json @@ -47,7 +47,7 @@ "MinValue": -128.0 }, "Threshold": { - "CriticalHigh": 70, + "CriticalHigh": 75, "CriticalLow": 0, "WarningHigh": 70, "WarningLow": 0 diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service index 9b8b0d691..6c3592f88 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service @@ -4,6 +4,6 @@ After=xyz.openbmc_project.Chassis.Control.Power.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.PowerCycle -ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis0 /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.PowerCycle +ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause0 /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer SyslogIdentifier=phosphor-watchdog diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service index af7e6ef0d..603856cb9 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service @@ -4,5 +4,5 @@ After=xyz.openbmc_project.Chassis.Control.Power.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis0 /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off SyslogIdentifier=phosphor-watchdog diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service index 655618b05..b444c6b1b 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service @@ -4,6 +4,6 @@ After=xyz.openbmc_project.Chassis.Control.Power.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Host /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s xyz.openbmc_project.State.Host.Transition.ForceWarmReboot -ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer +ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s xyz.openbmc_project.State.Host.Transition.ForceWarmReboot +ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause0 /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer SyslogIdentifier=phosphor-watchdog diff --git a/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control/power-config-host0.json b/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control/power-config-host0.json index 5916ccc72..5c32a3a66 100644 --- a/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control/power-config-host0.json +++ b/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control/power-config-host0.json @@ -1,10 +1,34 @@ { - "gpio_configs":{ - "PostComplete": "POST_COMPLETE", - "PwrButton": "POWER_BUTTON", - "PwrOK": "PS_PWROK", - "PwrOut": "POWER_OUT", - "RstButton": "RESET_BUTTON", - "RstOut": "RESET_OUT" - } + "gpio_configs":[ + { + "Name" : "PostComplete", + "LineName" : "POST_COMPLETE", + "Type" : "GPIO" + }, + { + "Name" : "PowerButton", + "LineName" : "POWER_BUTTON", + "Type" : "GPIO" + }, + { + "Name" : "PowerOk", + "LineName" : "PS_PWROK", + "Type" : "GPIO" + }, + { + "Name" : "PowerOut", + "LineName" : "POWER_OUT", + "Type" : "GPIO" + }, + { + "Name" : "ResetButton", + "LineName" : "RESET_BUTTON", + "Type" : "GPIO" + }, + { + "Name" : "ResetOut", + "LineName" : "RESET_OUT", + "Type" : "GPIO" + } + ] } diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup/inventory-cleanup.yaml b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup/inventory-cleanup.yaml index 34d8e794b..838062ec4 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup/inventory-cleanup.yaml +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup/inventory-cleanup.yaml @@ -12,5 +12,5 @@ events: /system/chassis: xyz.openbmc_project.Inventory.Item.Chassis: Type: - value: "RackMount" + value: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" type: string diff --git a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb index 13fe304a5..74550efd1 100644 --- a/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb +++ b/meta-raspberrypi/recipes-bsp/bootfiles/rpi-cmdline.bb @@ -7,7 +7,9 @@ INHIBIT_DEFAULT_DEPS = "1" inherit deploy nopackages CMDLINE_DWC_OTG ?= "dwc_otg.lpm_enable=0" -CMDLINE_ROOTFS ?= "root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" + +CMDLINE_ROOT_FSTYPE ?= "rootfstype=ext4" +CMDLINE_ROOTFS ?= "root=/dev/mmcblk0p2 ${CMDLINE_ROOT_FSTYPE} rootwait" CMDLINE_SERIAL ?= "${@oe.utils.conditional("ENABLE_UART", "1", "console=serial0,115200", "", d)}" diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index 6358fba4f..891bd1ac3 100644 --- a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc +++ b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc @@ -1,9 +1,9 @@ -RPIFW_DATE ?= "20210421" -SRCREV ?= "2ac4de4eaac5c1d1b25acec4a5e0a9fdb16f0c91" +RPIFW_DATE ?= "20210527" +SRCREV ?= "1eb8921ae7158249894f89e8bb6c4bfb04ec7377" RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz;downloadfilename=raspberrypi-firmware-${SRCREV}.tar.gz" RPIFW_S ?= "${WORKDIR}/firmware-${SRCREV}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[sha256sum] = "c687aa1b5127a8dc0773e8aefb1f009f24bf71ccb4c9e8b40a1d46cbbb7bee0c" +SRC_URI[sha256sum] = "32fb5cc72703247622839c3cb4df2f369f91d2185770df867ac9758283bf5380" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb index 7d3120f76..dc9e6802b 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-blinka_6.2.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_Blinka" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=660e614bc7efb0697cc793d8a22a55c2" -SRC_URI = "git://github.com/adafruit/Adafruit_Blinka.git" +SRC_URI = "git://github.com/adafruit/Adafruit_Blinka.git;branch=main" SRCREV = "dc688f354fe779c9267c208b99f310af87e79272" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb index c14d6f3d6..7c1a26742 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-busdevice_5.0.5.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_BusDevice" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e" -SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git" +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_BusDevice.git;branch=main" SRCREV = "1bfe8005293205e2f7b2cc498ab5a946f1133b40" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb index e05e2ab5e..b0475e6ef 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motor_3.2.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_Motor" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b72678307cc7c10910b5ef460216af07" -SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Motor.git" +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Motor.git;branch=main" SRCREV = "2251bfc0501d0acfb96c0a43f4f2b4c6a10ca14e" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb index f35d48cf2..12a63f3a5 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-motorkit_1.6.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_MotorKit" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ad4a8854b39ad474755ef1aea813bac" -SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_MotorKit.git" +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_MotorKit.git;branch=main" SRCREV = "8c1462b4129b21f6db156d1517abb017bb74b982" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb index 0b65c81ea..a46b13044 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-pca9685_3.3.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_PCA9685" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e7eb6b599fb0cfb06485c64cd4242f62" -SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_PCA9685.git" +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_PCA9685.git;branch=main" SRCREV = "2780c4102f4c23fbab252aa1198b61ba7e2d1b2c" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb index f1af80bea..7d0377b49 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-circuitpython-register_1.9.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_CircuitPython_Register" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6ec69d6e9e6c85adfb7799d7f8cf044e" -SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Register.git" +SRC_URI = "git://github.com/adafruit/Adafruit_CircuitPython_Register.git;branch=main" S = "${WORKDIR}/git" SRCREV = "5fee6e0c3878110844bc51e16063eeae7d94c457" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb index 4454d247d..0574c532a 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-platformdetect_3.1.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_Python_PlatformDetect" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fccd531dce4b989c05173925f0bbb76c" -SRC_URI = "git://github.com/adafruit/Adafruit_Python_PlatformDetect.git" +SRC_URI = "git://github.com/adafruit/Adafruit_Python_PlatformDetect.git;branch=main" SRCREV = "e0fe1b012898fa824944d6805ca74be0fa027968" S = "${WORKDIR}/git" diff --git a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb index 82415f954..a59e6f573 100644 --- a/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb +++ b/meta-raspberrypi/recipes-devtools/python/python3-adafruit-pureio_1.1.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/adafruit/Adafruit_Python_PureIO" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2a21fcca821a506d4c36f7bbecc0d009" -SRC_URI = "git://github.com/adafruit/Adafruit_Python_PureIO.git" +SRC_URI = "git://github.com/adafruit/Adafruit_Python_PureIO.git;branch=main" SRCREV = "f4d0973da05b8b21905ff6bab69cdb652128f342" S = "${WORKDIR}/git" diff --git a/meta-security/.gitlab-ci.yml b/meta-security/.gitlab-ci.yml index 206d7241b..762ba66e1 100644 --- a/meta-security/.gitlab-ci.yml +++ b/meta-security/.gitlab-ci.yml @@ -66,7 +66,7 @@ qemux86: qemux86-musl: extends: .musl - needs: ['qemux86-parsec'] + needs: ['qemux86'] script: - kas build --target security-build-image kas/$CI_JOB_NAME.yml diff --git a/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.37.bb b/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.38.bb index 34e72e9cb..38dece9b1 100644 --- a/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.37.bb +++ b/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/libhtp_0.5.38.bb @@ -5,7 +5,7 @@ require suricata.inc LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=596ab7963a1a0e5198e5a1c4aa621843" SRC_URI = "git://github.com/OISF/libhtp.git;protocol=https;branch=0.5.x" -SRCREV = "eaa2db29e65e7f2691c18a9022aeb5fb836ec5f1" +SRCREV = "fca44158911a1642880ea5c774151a33ad33d906" DEPENDS = "zlib" diff --git a/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc b/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc index 85f419e48..7d3509aa9 100644 --- a/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc +++ b/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/suricata.inc @@ -1,8 +1,3 @@ HOMEPAGE = "http://suricata-ids.org/" SECTION = "security Monitor/Admin" LICENSE = "GPLv2" - -VER = "6.0.2" -SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${VER}.tar.gz" - -SRC_URI[sha256sum] = "5e4647a07cb31b5d6d0049972a45375c137de908a964a44e2d6d231fa3ad4b52" diff --git a/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.2.bb b/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.3.bb index a4255d247..632f1d874 100644 --- a/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.2.bb +++ b/meta-security/dynamic-layers/meta-rust/recipes-ids/suricata/suricata_6.0.3.bb @@ -2,10 +2,13 @@ SUMMARY = "The Suricata Engine is an Open Source Next Generation Intrusion Detec require suricata.inc -DEPENDS = "lz4 libhtp" - LIC_FILES_CHKSUM = "file://LICENSE;beginline=1;endline=2;md5=c70d8d3310941dcdfcd1e02800a1f548" +SRC_URI = "http://www.openinfosecfoundation.org/download/suricata-${PV}.tar.gz" +SRC_URI[sha256sum] = "daf134bb2d7c980035e9ae60f7aaf313323a809340009f26e48110ccde81f602" + +DEPENDS = "lz4 libhtp" + SRC_URI += " \ file://volatiles.03_suricata \ file://tmpfiles.suricata \ @@ -84,6 +87,16 @@ SRC_URI += " \ crate://crates.io/log/0.4.0 \ crate://crates.io/rand_hc/0.2.0 \ crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \ + crate://crates.io/sawp/0.5.0 \ + crate://crates.io/sawp-modbus/0.5.0 \ + crate://crates.io/brotli/3.3.0 \ + crate://crates.io/flate2/1.0.20 \ + crate://crates.io/alloc-no-stdlib/2.0.1 \ + crate://crates.io/alloc-stdlib/0.2.1 \ + crate://crates.io/brotli-decompressor/2.3.1 \ + crate://crates.io/crc32fast/1.2.1 \ + crate://crates.io/miniz_oxide/0.4.4 \ + crate://crates.io/adler/1.0.2 \ " # test case support diff --git a/meta-security/kas/kas-security-alt.yml b/meta-security/kas/kas-security-alt.yml index 151452452..25384dfba 100644 --- a/meta-security/kas/kas-security-alt.yml +++ b/meta-security/kas/kas-security-alt.yml @@ -3,6 +3,11 @@ header: includes: - kas-security-base.yml +repos: + meta-rust: + url: https://github.com/meta-rust/meta-rust.git + refspec: master + local_conf_header: alt: | DISTRO_FEATURES_append = " systemd" diff --git a/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.7.0.bb b/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.7.0.bb index 0e149558c..d57a43a5a 100644 --- a/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.7.0.bb +++ b/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_0.7.0.bb @@ -10,8 +10,7 @@ SRC_URI += "crate://crates.io/parsec-service/${PV} \ file://parsec-tmpfiles.conf \ " -DEPENDS = "tpm2-tss" -TOOLCHAIN = "clang" +DEPENDS = "tpm2-tss clang-native" CARGO_BUILD_FLAGS += " --features all-providers,cryptoki/generate-bindings,tss-esapi/generate-bindings" diff --git a/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.3.0.bb b/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.3.0.bb index 35c65c02a..881f8d896 100644 --- a/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.3.0.bb +++ b/meta-security/meta-parsec/recipes-parsec/parsec-tool/parsec-tool_0.3.0.bb @@ -7,8 +7,6 @@ inherit cargo SRC_URI += "crate://crates.io/parsec-tool/${PV} \ " -TOOLCHAIN = "clang" - do_install() { install -d ${D}/${bindir} install -m 755 "${B}/target/${TARGET_SYS}/release/parsec-tool" "${D}${bindir}/parsec-tool" diff --git a/meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_1.3.9.2.bb b/meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_1.3.9.2.bb index 8aeb8ac4b..9e0a6862b 100644 --- a/meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_1.3.9.2.bb +++ b/meta-security/meta-tpm/recipes-tpm/tpm-tools/tpm-tools_1.3.9.2.bb @@ -9,16 +9,16 @@ SECTION = "tpm" LICENSE = "CPL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=059e8cd6165cb4c31e351f2b69388fd9" -DEPENDS = "libtspi openssl" +DEPENDS = "libtspi openssl perl" DEPENDS_class-native = "trousers-native" SRCREV = "bf43837575c5f7d31865562dce7778eae970052e" SRC_URI = " \ - git://git.code.sf.net/p/trousers/tpm-tools \ - file://tpm-tools-extendpcr.patch \ - file://04-fix-FTBFS-clang.patch \ - file://openssl1.1_fix.patch \ - " + git://git.code.sf.net/p/trousers/tpm-tools \ + file://tpm-tools-extendpcr.patch \ + file://04-fix-FTBFS-clang.patch \ + file://openssl1.1_fix.patch \ + " inherit autotools-brokensep gettext diff --git a/meta-security/recipes-core/initrdscripts/initramfs-framework/dmverity b/meta-security/recipes-core/initrdscripts/initramfs-framework-dm/dmverity index 888052ccd..888052ccd 100644 --- a/meta-security/recipes-core/initrdscripts/initramfs-framework/dmverity +++ b/meta-security/recipes-core/initrdscripts/initramfs-framework-dm/dmverity diff --git a/meta-security/recipes-core/initrdscripts/initramfs-framework.inc b/meta-security/recipes-core/initrdscripts/initramfs-framework.inc index dad9c967c..12010bf34 100644 --- a/meta-security/recipes-core/initrdscripts/initramfs-framework.inc +++ b/meta-security/recipes-core/initrdscripts/initramfs-framework.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework-dm:" SRC_URI_append = "\ file://dmverity \ diff --git a/meta-security/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend b/meta-security/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend index dc74e017f..f5d476edb 100644 --- a/meta-security/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend +++ b/meta-security/recipes-core/initrdscripts/initramfs-framework_1.0.bbappend @@ -1 +1 @@ -require ${@bb.utils.contains('IMAGE_CLASSES', 'dm-verity', 'initramfs-framework.inc', '', d)} +require ${@bb.utils.contains('IMAGE_CLASSES', 'dm-verity-img', 'initramfs-framework.inc', '', d)} diff --git a/meta-security/recipes-core/packagegroup/packagegroup-core-security.bb b/meta-security/recipes-core/packagegroup/packagegroup-core-security.bb index e7b6d9bf3..8e06f30bc 100644 --- a/meta-security/recipes-core/packagegroup/packagegroup-core-security.bb +++ b/meta-security/recipes-core/packagegroup/packagegroup-core-security.bb @@ -40,6 +40,7 @@ RDEPENDS_packagegroup-security-utils = "\ softhsm \ libest \ opendnssec \ + sshguard \ ${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 ", "", " libseccomp",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sssd google-authenticator-libpam", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pax", "pax-utils packctl", "",d)} \ diff --git a/meta-security/recipes-mac/AppArmor/apparmor_3.0.bb b/meta-security/recipes-mac/AppArmor/apparmor_3.0.1.bb index d9c3e4d83..ff5b39b05 100644 --- a/meta-security/recipes-mac/AppArmor/apparmor_3.0.bb +++ b/meta-security/recipes-mac/AppArmor/apparmor_3.0.1.bb @@ -15,24 +15,16 @@ DEPENDS = "bison-native apr gettext-native coreutils-native swig-native" SRC_URI = " \ git://gitlab.com/apparmor/apparmor.git;protocol=https;branch=apparmor-3.0 \ + file://run-ptest \ file://disable_perl_h_check.patch \ file://crosscompile_perl_bindings.patch \ - file://apparmor.rc \ - file://functions \ - file://apparmor \ - file://apparmor.service \ file://0001-Makefile.am-suppress-perllocal.pod.patch \ - file://run-ptest \ - file://0001-apparmor-fix-manpage-order.patch \ file://0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch \ - file://0001-libapparmor-add-missing-include-for-socklen_t.patch \ - file://0002-libapparmor-add-aa_features_new_from_file-to-public-.patch \ - file://0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch \ - file://0001-aa_status-Fix-build-issue-with-musl.patch \ - file://0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch \ + file://0001-Makefile-fix-hardcoded-installation-directories.patch \ + file://0001-rc.apparmor.debian-add-missing-functions.patch \ " -SRCREV = "5d51483bfecf556183558644dc8958135397a7e2" +SRCREV = "b0f08aa9d678197b8e3477c2fbff790f50a1de5e" S = "${WORKDIR}/git" PARALLEL_MAKE = "" @@ -85,8 +77,6 @@ do_compile () { } do_install () { - install -d ${D}/${INIT_D_DIR} - install -d ${D}/lib/apparmor oe_runmake -C ${B}/libraries/libapparmor DESTDIR="${D}" install oe_runmake -C ${B}/binutils DESTDIR="${D}" install oe_runmake -C ${B}/utils DESTDIR="${D}" install @@ -102,16 +92,16 @@ do_install () { fi if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then - install -d ${D}/lib/security oe_runmake -C ${B}/changehat/pam_apparmor DESTDIR="${D}" install fi - install -m 755 ${WORKDIR}/apparmor ${D}/${INIT_D_DIR}/apparmor - install -m 755 ${WORKDIR}/functions ${D}/lib/apparmor + if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 755 ${B}/parser/rc.apparmor.debian ${D}${sysconfdir}/init.d/apparmor + fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/apparmor.service ${D}${systemd_system_unitdir} + oe_runmake -C ${B}/parser DESTDIR="${D}" install-systemd fi } @@ -158,15 +148,6 @@ do_install_ptest_arm() { : } -pkg_postinst_ontarget_${PN} () { -if [ ! -d /etc/apparmor.d/cache ] ; then - mkdir /etc/apparmor.d/cache -fi -} - -# We need the init script so don't rm it -RMINITDIR_class-target_remove = " rm_sysvinit_initddir" - INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME = "apparmor" INITSCRIPT_PARAMS = "start 16 2 3 4 5 . stop 35 0 1 6 ." @@ -177,9 +158,9 @@ SYSTEMD_AUTO_ENABLE ?= "enable" PACKAGES += "mod-${PN}" -FILES_${PN} += "/lib/apparmor/ /lib/security/ ${sysconfdir}/apparmor ${nonarch_libdir}/${PYTHON_DIR}/site-packages" +FILES_${PN} += "${nonarch_base_libdir}/apparmor/ ${base_libdir}/security/ ${sysconfdir}/apparmor ${nonarch_libdir}/${PYTHON_DIR}/site-packages" FILES_mod-${PN} = "${libdir}/apache2/modules/*" -FILES_${PN}-dbg += "/lib/security/" +FILES_${PN}-dbg += "${base_libdir}/security/.debug" DEPENDS_append_libc-musl = " fts " RDEPENDS_${PN}_libc-musl += "musl-utils" diff --git a/meta-security/recipes-mac/AppArmor/files/0001-Makefile-fix-hardcoded-installation-directories.patch b/meta-security/recipes-mac/AppArmor/files/0001-Makefile-fix-hardcoded-installation-directories.patch new file mode 100644 index 000000000..f10acb163 --- /dev/null +++ b/meta-security/recipes-mac/AppArmor/files/0001-Makefile-fix-hardcoded-installation-directories.patch @@ -0,0 +1,51 @@ +From 363114dcd72abf1c0dcd637c66037227b8be229b Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Mon, 21 Jun 2021 14:18:30 +0800 +Subject: [PATCH 1/2] Makefile: fix hardcoded installation directories + +Update the installation directories to fix the do_install error for +multilib and usrmerge. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + changehat/pam_apparmor/Makefile | 2 +- + parser/Makefile | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/changehat/pam_apparmor/Makefile b/changehat/pam_apparmor/Makefile +index f6ece2d1..0143ae9f 100644 +--- a/changehat/pam_apparmor/Makefile ++++ b/changehat/pam_apparmor/Makefile +@@ -77,7 +77,7 @@ $(NAME).so: ${OBJECTS} + + # need some better way of determining this + DESTDIR=/ +-SECDIR ?= ${DESTDIR}/lib/security ++SECDIR ?= ${DESTDIR}/${base_libdir}/security + + .PHONY: install + install: $(NAME).so +diff --git a/parser/Makefile b/parser/Makefile +index 8250ac45..cf18bc11 100644 +--- a/parser/Makefile ++++ b/parser/Makefile +@@ -23,10 +23,10 @@ COMMONDIR=../common/ + include $(COMMONDIR)/Make.rules + + DESTDIR=/ +-APPARMOR_BIN_PREFIX=${DESTDIR}/lib/apparmor +-SBINDIR=${DESTDIR}/sbin +-USR_SBINDIR=${DESTDIR}/usr/sbin +-SYSTEMD_UNIT_DIR=${DESTDIR}/usr/lib/systemd/system ++APPARMOR_BIN_PREFIX=${DESTDIR}/${nonarch_base_libdir}/apparmor ++SBINDIR=${DESTDIR}/${base_sbindir} ++USR_SBINDIR=${DESTDIR}/${sbindir} ++SYSTEMD_UNIT_DIR=${DESTDIR}/${systemd_system_unitdir} + CONFDIR=/etc/apparmor + INSTALL_CONFDIR=${DESTDIR}${CONFDIR} + LOCALEDIR=/usr/share/locale +-- +2.17.1 + diff --git a/meta-security/recipes-mac/AppArmor/files/0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch b/meta-security/recipes-mac/AppArmor/files/0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch index 791437d1d..e7abd602c 100644 --- a/meta-security/recipes-mac/AppArmor/files/0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch +++ b/meta-security/recipes-mac/AppArmor/files/0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Revert "profiles: Update 'make check' to select tools based This reverts commit 6016f931ebf7b61e1358f19453ef262d9d184a4e. -Upstream-Statue: OE specific +Upstream-Status: Inappropriate [OE specific] These changes cause during packaging with perms changing. Signed-off-by: Armin Kuster <akuster808@gmail.com> diff --git a/meta-security/recipes-mac/AppArmor/files/0001-aa_status-Fix-build-issue-with-musl.patch b/meta-security/recipes-mac/AppArmor/files/0001-aa_status-Fix-build-issue-with-musl.patch deleted file mode 100644 index 239562a45..000000000 --- a/meta-security/recipes-mac/AppArmor/files/0001-aa_status-Fix-build-issue-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2bf15cc68f31c9f41962bb60a669ab2b453a039b Mon Sep 17 00:00:00 2001 -From: Armin Kuster <akuster808@gmail.com> -Date: Wed, 7 Oct 2020 08:27:11 -0700 -Subject: [PATCH] aa_status: Fix build issue with musl - -add limits.h - -aa_status.c:269:22: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'AF_MAX'? -| 269 | real_exe = calloc(PATH_MAX + 1, sizeof(char)); - -Upstream-Status: Pending -Signed-off-by: Armin Kuster <akuster808@gmail.com> ---- - binutils/aa_status.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/binutils/aa_status.c b/binutils/aa_status.c -index 78b03409..41f1954e 100644 ---- a/binutils/aa_status.c -+++ b/binutils/aa_status.c -@@ -10,6 +10,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <limits.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/wait.h> --- -2.17.1 - diff --git a/meta-security/recipes-mac/AppArmor/files/0001-apparmor-fix-manpage-order.patch b/meta-security/recipes-mac/AppArmor/files/0001-apparmor-fix-manpage-order.patch deleted file mode 100644 index 9f3dce426..000000000 --- a/meta-security/recipes-mac/AppArmor/files/0001-apparmor-fix-manpage-order.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c9baef0c70122e1be33b627874772e6e9a5d7744 Mon Sep 17 00:00:00 2001 -From: Armin Kuster <akuster808@gmail.com> -Date: Fri, 2 Oct 2020 19:43:44 -0700 -Subject: [PATCH] apparmor: fix manpage order - -It trys to create a symlink before the man pages are installed. - - ln -sf aa-status.8 /(path}/apparmor/3.0-r0/image/usr/share/man/man8/apparmor_status.8 - | ln: failed to create symbolic link '{path}/apparmor/3.0-r0/image/usr/share/man/man8/apparmor_status.8': No such file or directory - -Upstream-Status: Pending -Signed-off-by: Armin Kuster <akuster808@gmail.com> - -... - -install -d /{path}/apparmor/3.0-r0/image/usr/share/man/man8 ; install -m 644 aa-status.8 /{path}/apparmor/3.0-r0/image/usr/share/man/man8; - -Signed-off-by: Armin Kuster <akuster@mvista.com> ---- - binutils/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/binutils/Makefile b/binutils/Makefile -index 99e54875..3f1d0011 100644 ---- a/binutils/Makefile -+++ b/binutils/Makefile -@@ -156,12 +156,12 @@ install-arch: arch - install -m 755 -d ${SBINDIR} - ln -sf aa-status ${SBINDIR}/apparmor_status - install -m 755 ${SBINTOOLS} ${SBINDIR} -- ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8 - - .PHONY: install-indep - install-indep: indep - $(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR} - $(MAKE) install_manpages DESTDIR=${DESTDIR} -+ ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8 - - ifndef VERBOSE - .SILENT: clean --- -2.17.1 - diff --git a/meta-security/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch b/meta-security/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch deleted file mode 100644 index 2a56d8b85..000000000 --- a/meta-security/recipes-mac/AppArmor/files/0001-libapparmor-add-missing-include-for-socklen_t.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 47263a3a74d7973e7a54b17db6aa903701468ffd Mon Sep 17 00:00:00 2001 -From: Patrick Steinhardt <ps@pks.im> -Date: Sat, 3 Oct 2020 20:37:55 +0200 -Subject: [PATCH] libapparmor: add missing include for `socklen_t` - -While `include/sys/apparmor.h` makes use of `socklen_t`, it doesn't -include the `<sys/socket.h>` header to make its declaration available. -While this works on systems using glibc via transitive includes, it -breaks compilation on musl libc. - -Fix the issue by including the header. - -Signed-off-by: Patrick Steinhardt <ps@pks.im> - -Upstream-Status: Backport -Signed-off-by: Armin Kuster <akuster808@gmail.com> - ---- - libraries/libapparmor/include/sys/apparmor.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libraries/libapparmor/include/sys/apparmor.h b/libraries/libapparmor/include/sys/apparmor.h -index 32892d06..d70eff94 100644 ---- a/libraries/libapparmor/include/sys/apparmor.h -+++ b/libraries/libapparmor/include/sys/apparmor.h -@@ -21,6 +21,7 @@ - #include <stdbool.h> - #include <stdint.h> - #include <unistd.h> -+#include <sys/socket.h> - #include <sys/types.h> - - #ifdef __cplusplus --- -2.17.1 - diff --git a/meta-security/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch b/meta-security/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch deleted file mode 100644 index 9f7ad3c55..000000000 --- a/meta-security/recipes-mac/AppArmor/files/0001-parser-Makefile-dont-force-host-cpp-to-detect-reallo.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 965bb9c3e464f756b258a7c259a92bce3cde74e7 Mon Sep 17 00:00:00 2001 -From: Armin Kuster <akuster@mvista.com> -Date: Wed, 7 Oct 2020 20:50:38 -0700 -Subject: [PATCH] parser/Makefile: dont force host cpp to detect reallocarray - -In cross build environments, using the hosts cpp gives incorrect -detection of reallocarray. Change cpp to a variable. - -fixes: -parser_misc.c: In function 'int capable_add_cap(const char*, int, unsigned int, capability_flags)': -| parser_misc.c:297:37: error: 'reallocarray' was not declared in this scope -| 297 | tmp = (struct capability_table *) reallocarray(cap_table, sizeof(struct capability_table), cap_table_size+1); - -Signed-off-by: Armin Kuster <akuster808@gmail.com> - -Upstream-Status: Pending - ---- - parser/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parser/Makefile b/parser/Makefile -index acef3d77..8250ac45 100644 ---- a/parser/Makefile -+++ b/parser/Makefile -@@ -54,7 +54,7 @@ endif - CPPFLAGS += -D_GNU_SOURCE - - STDLIB_INCLUDE:="\#include <stdlib.h>" --HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | cpp ${CPPFLAGS} | grep -q reallocarray && echo true) -+HAVE_REALLOCARRAY:=$(shell echo $(STDLIB_INCLUDE) | ${CPP} ${CPPFLAGS} | grep -q reallocarray && echo true) - - WARNINGS = -Wall - CXX_WARNINGS = ${WARNINGS} ${EXTRA_WARNINGS} --- -2.17.1 - diff --git a/meta-security/recipes-mac/AppArmor/files/0001-rc.apparmor.debian-add-missing-functions.patch b/meta-security/recipes-mac/AppArmor/files/0001-rc.apparmor.debian-add-missing-functions.patch new file mode 100644 index 000000000..53bdde807 --- /dev/null +++ b/meta-security/recipes-mac/AppArmor/files/0001-rc.apparmor.debian-add-missing-functions.patch @@ -0,0 +1,57 @@ +From a737c95ac0f887c365fe8f16583ea95da79de1e9 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Mon, 21 Jun 2021 16:53:39 +0800 +Subject: [PATCH] rc.apparmor.debian: add missing functions + +Add missing functions: + aa_log_action_start + aa_log_action_end + aa_log_daemon_msg + aa_log_end_msg + +Fixes: +$ /etc/init.d/apparmor start +/lib/apparmor/rc.apparmor.functions: line 294: aa_log_daemon_msg: command not found +/lib/apparmor/rc.apparmor.functions: line 214: aa_log_action_start: command not found + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + parser/rc.apparmor.debian | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/parser/rc.apparmor.debian b/parser/rc.apparmor.debian +index 8efd4400..f35124e8 100644 +--- a/parser/rc.apparmor.debian ++++ b/parser/rc.apparmor.debian +@@ -70,6 +70,26 @@ aa_log_skipped_msg() { + echo ": Skipped." + } + ++aa_log_action_start() ++{ ++ echo "$@" ++} ++ ++aa_log_action_end() ++{ ++ printf "" ++} ++ ++aa_log_daemon_msg() ++{ ++ echo "$@" ++} ++ ++aa_log_end_msg() ++{ ++ printf "" ++} ++ + usage() { + echo "Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status|kill}" + } +-- +2.17.1 + diff --git a/meta-security/recipes-mac/AppArmor/files/0002-libapparmor-add-aa_features_new_from_file-to-public-.patch b/meta-security/recipes-mac/AppArmor/files/0002-libapparmor-add-aa_features_new_from_file-to-public-.patch deleted file mode 100644 index 333f40fbd..000000000 --- a/meta-security/recipes-mac/AppArmor/files/0002-libapparmor-add-aa_features_new_from_file-to-public-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c9255a03436e6a91bd4e410601da8d43a341ffc2 Mon Sep 17 00:00:00 2001 -From: Patrick Steinhardt <ps@pks.im> -Date: Sat, 3 Oct 2020 20:58:45 +0200 -Subject: [PATCH] libapparmor: add `aa_features_new_from_file` to public - symbols - -With AppArmor release 3.0, a new function `aa_features_new_from_file` -was added, but not added to the list of public symbols. As a result, -it's not possible to make use of this function when linking against -libapparmor.so. - -Fix the issue by adding it to the symbol map. - -Signed-off-by: Patrick Steinhardt <ps@pks.im> - -Upstream-Status: Backport -Signed-off-by: Armin Kuster <akuster808@gmail.com> - ---- - libraries/libapparmor/src/libapparmor.map | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libraries/libapparmor/src/libapparmor.map b/libraries/libapparmor/src/libapparmor.map -index bbff51f5..1579509a 100644 ---- a/libraries/libapparmor/src/libapparmor.map -+++ b/libraries/libapparmor/src/libapparmor.map -@@ -117,6 +117,7 @@ APPARMOR_2.13.1 { - - APPARMOR_3.0 { - global: -+ aa_features_new_from_file; - aa_features_write_to_fd; - aa_features_value; - local: --- -2.17.1 - diff --git a/meta-security/recipes-mac/AppArmor/files/0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch b/meta-security/recipes-mac/AppArmor/files/0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch deleted file mode 100644 index 543c7a185..000000000 --- a/meta-security/recipes-mac/AppArmor/files/0003-libapparmor-add-_aa_asprintf-to-private-symbols.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9a8fee6bf1c79c261374d928b838b5eb9244ee9b Mon Sep 17 00:00:00 2001 -From: Patrick Steinhardt <ps@pks.im> -Date: Sat, 3 Oct 2020 21:04:57 +0200 -Subject: [PATCH] libapparmor: add _aa_asprintf to private symbols - -While `_aa_asprintf` is supposed to be of private visibility, it's used -by apparmor_parser and thus required to be visible when linking. This -commit thus adds it to the list of private symbols to make it available -for linking in apparmor_parser. - -Signed-off-by: Patrick Steinhardt <ps@pks.im> - -Upstream-Status: Backport -Signed-off-by: Armin Kuster <akuster808@gmail.com> - ---- - libraries/libapparmor/src/libapparmor.map | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libraries/libapparmor/src/libapparmor.map b/libraries/libapparmor/src/libapparmor.map -index 1579509a..41e541ac 100644 ---- a/libraries/libapparmor/src/libapparmor.map -+++ b/libraries/libapparmor/src/libapparmor.map -@@ -127,6 +127,7 @@ APPARMOR_3.0 { - PRIVATE { - global: - _aa_is_blacklisted; -+ _aa_asprintf; - _aa_autofree; - _aa_autoclose; - _aa_autofclose; --- -2.17.1 - diff --git a/meta-security/recipes-mac/AppArmor/files/apparmor b/meta-security/recipes-mac/AppArmor/files/apparmor deleted file mode 100644 index 604e48d56..000000000 --- a/meta-security/recipes-mac/AppArmor/files/apparmor +++ /dev/null @@ -1,226 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------- -# Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -# NOVELL (All rights reserved) -# Copyright (c) 2008, 2009 Canonical, Ltd. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# ---------------------------------------------------------------------- -# Authors: -# Steve Beattie <steve.beattie@canonical.com> -# Kees Cook <kees@ubuntu.com> -# -# /etc/init.d/apparmor -# -### BEGIN INIT INFO -# Provides: apparmor -# Required-Start: $local_fs -# Required-Stop: umountfs -# Default-Start: S -# Default-Stop: -# Short-Description: AppArmor initialization -# Description: AppArmor init script. This script loads all AppArmor profiles. -### END INIT INFO - -log_daemon_msg() { - echo $* -} - -log_end_msg () { - retval=$1 - if [ $retval -eq 0 ]; then - echo "." - else - echo " failed!" - fi - return $retval -} - -. /lib/apparmor/functions - -usage() { - echo "Usage: $0 {start|stop|restart|reload|force-reload|status|recache}" -} - -test -x ${PARSER} || exit 0 # by debian policy -# LSM is built-in, so it is either there or not enabled for this boot -test -d /sys/module/apparmor || exit 0 - -securityfs() { - # Need securityfs for any mode - if [ ! -d "${AA_SFS}" ]; then - if cut -d" " -f2,3 /proc/mounts | grep -q "^${SECURITYFS} securityfs"'$' ; then - log_daemon_msg "AppArmor not available as kernel LSM." - log_end_msg 1 - exit 1 - else - log_daemon_msg "Mounting securityfs on ${SECURITYFS}" - if ! mount -t securityfs none "${SECURITYFS}"; then - log_end_msg 1 - exit 1 - fi - fi - fi - if [ ! -w "$AA_SFS"/.load ]; then - log_daemon_msg "Insufficient privileges to change profiles." - log_end_msg 1 - exit 1 - fi -} - -handle_system_policy_package_updates() { - apparmor_was_updated=0 - - if ! compare_previous_version ; then - # On snappy flavors, if the current and previous versions are - # different then clear the system cache. snappy will handle - # "$PROFILES_CACHE_VAR" itself (on Touch flavors - # compare_previous_version always returns '0' since snappy - # isn't available). - clear_cache_system - apparmor_was_updated=1 - elif ! compare_and_save_debsums apparmor ; then - # If the system policy has been updated since the last time we - # ran, clear the cache to prevent potentially stale binary - # cache files after an Ubuntu image based upgrade (LP: - # #1350673). This can be removed once all system image flavors - # move to snappy (on snappy systems compare_and_save_debsums - # always returns '0' since /var/lib/dpkg doesn't exist). - clear_cache - apparmor_was_updated=1 - fi - - if [ -x /usr/bin/aa-clickhook ] || [ -x /usr/bin/aa-profile-hook ] ; then - # If packages for system policy that affect click packages have - # been updated since the last time we ran, run aa-clickhook -f - force_clickhook=0 - force_profile_hook=0 - if ! compare_and_save_debsums apparmor-easyprof-ubuntu ; then - force_clickhook=1 - fi - if ! compare_and_save_debsums apparmor-easyprof-ubuntu-snappy ; then - force_clickhook=1 - fi - if ! compare_and_save_debsums click-apparmor ; then - force_clickhook=1 - force_profile_hook=1 - fi - if [ -x /usr/bin/aa-clickhook ] && ([ $force_clickhook -eq 1 ] || [ $apparmor_was_updated -eq 1 ]) ; then - aa-clickhook -f - fi - if [ -x /usr/bin/aa-profile-hook ] && ([ $force_profile_hook -eq 1 ] || [ $apparmor_was_updated -eq 1 ]) ; then - aa-profile-hook -f - fi - fi -} - -# Allow "recache" even when running on the liveCD -if [ "$1" = "recache" ]; then - log_daemon_msg "Recaching AppArmor profiles" - recache_profiles - rc=$? - log_end_msg "$rc" - exit $rc -fi - -# do not perform start/stop/reload actions when running from liveCD -test -d /rofs/etc/apparmor.d && exit 0 - -rc=255 -case "$1" in - start) - if test -x /sbin/systemd-detect-virt && \ - systemd-detect-virt --quiet --container && \ - ! is_container_with_internal_policy; then - log_daemon_msg "Not starting AppArmor in container" - log_end_msg 0 - exit 0 - fi - log_daemon_msg "Starting AppArmor profiles" - securityfs - # That is only useful for click, snappy and system images, - # i.e. not in Debian. And it reads and writes to /var, that - # can be remote-mounted, so it would prevent us from using - # Before=sysinit.target without possibly introducing dependency - # loops. - handle_system_policy_package_updates - load_configured_profiles - rc=$? - log_end_msg "$rc" - ;; - stop) - log_daemon_msg "Clearing AppArmor profiles cache" - clear_cache - rc=$? - log_end_msg "$rc" - cat >&2 <<EOM -All profile caches have been cleared, but no profiles have been unloaded. -Unloading profiles will leave already running processes permanently -unconfined, which can lead to unexpected situations. - -To set a process to complain mode, use the command line tool -'aa-complain'. To really tear down all profiles, run the init script -with the 'teardown' option." -EOM - ;; - teardown) - if test -x /sbin/systemd-detect-virt && \ - systemd-detect-virt --quiet --container && \ - ! is_container_with_internal_policy; then - log_daemon_msg "Not tearing down AppArmor in container" - log_end_msg 0 - exit 0 - fi - log_daemon_msg "Unloading AppArmor profiles" - securityfs - running_profile_names | while read profile; do - if ! unload_profile "$profile" ; then - log_end_msg 1 - exit 1 - fi - done - rc=0 - log_end_msg $rc - ;; - restart|reload|force-reload) - if test -x /sbin/systemd-detect-virt && \ - systemd-detect-virt --quiet --container && \ - ! is_container_with_internal_policy; then - log_daemon_msg "Not reloading AppArmor in container" - log_end_msg 0 - exit 0 - fi - log_daemon_msg "Reloading AppArmor profiles" - securityfs - clear_cache - load_configured_profiles - rc=$? - unload_obsolete_profiles - - log_end_msg "$rc" - ;; - status) - securityfs - if [ -x /usr/sbin/aa-status ]; then - aa-status --verbose - else - cat "$AA_SFS"/profiles - fi - rc=$? - ;; - *) - usage - rc=1 - ;; - esac -exit $rc diff --git a/meta-security/recipes-mac/AppArmor/files/apparmor.rc b/meta-security/recipes-mac/AppArmor/files/apparmor.rc deleted file mode 100644 index 1507d7b5f..000000000 --- a/meta-security/recipes-mac/AppArmor/files/apparmor.rc +++ /dev/null @@ -1,98 +0,0 @@ -description "Pre-cache and pre-load apparmor profiles" -author "Dimitri John Ledkov <xnox@ubuntu.com> and Jamie Strandboge <jamie@ubuntu.com>" - -task - -start on starting rc-sysinit - -script - [ -d /rofs/etc/apparmor.d ] && exit 0 # do not load on liveCD - [ -d /sys/module/apparmor ] || exit 0 # do not load without AppArmor - [ -x /sbin/apparmor_parser ] || exit 0 # do not load without parser - - . /lib/apparmor/functions - - systemd-detect-virt --quiet --container && ! is_container_with_internal_policy && exit 0 || true - - # Need securityfs for any mode - if [ ! -d /sys/kernel/security/apparmor ]; then - if cut -d" " -f2,3 /proc/mounts | grep -q "^/sys/kernel/security securityfs"'$' ; then - exit 0 - else - mount -t securityfs none /sys/kernel/security || exit 0 - fi - fi - - [ -w /sys/kernel/security/apparmor/.load ] || exit 0 - - apparmor_was_updated=0 - if ! compare_previous_version ; then - # On snappy flavors, if the current and previous versions are - # different then clear the system cache. snappy will handle - # "$PROFILES_CACHE_VAR" itself (on Touch flavors - # compare_previous_version always returns '0' since snappy - # isn't available). - clear_cache_system - apparmor_was_updated=1 - elif ! compare_and_save_debsums apparmor ; then - # If the system policy has been updated since the last time we - # ran, clear the cache to prevent potentially stale binary - # cache files after an Ubuntu image based upgrade (LP: - # #1350673). This can be removed once all system image flavors - # move to snappy (on snappy systems compare_and_save_debsums - # always returns '0' since /var/lib/dpkg doesn't exist). - clear_cache - apparmor_was_updated=1 - fi - - if [ -x /usr/bin/aa-clickhook ] || [ -x /usr/bin/aa-profile-hook ] ; then - # If packages for system policy that affect click packages have - # been updated since the last time we ran, run aa-clickhook -f - force_clickhook=0 - force_profile_hook=0 - if ! compare_and_save_debsums apparmor-easyprof-ubuntu ; then - force_clickhook=1 - fi - if ! compare_and_save_debsums apparmor-easyprof-ubuntu-snappy ; then - force_clickhook=1 - fi - if ! compare_and_save_debsums click-apparmor ; then - force_clickhook=1 - force_profile_hook=1 - fi - if [ -x /usr/bin/aa-clickhook ] && ([ $force_clickhook -eq 1 ] || [ $apparmor_was_updated -eq 1 ]) ; then - aa-clickhook -f - fi - if [ -x /usr/bin/aa-profile-hook ] && ([ $force_profile_hook -eq 1 ] || [ $apparmor_was_updated -eq 1 ]) ; then - aa-profile-hook -f - fi - fi - - if [ "$ACTION" = "teardown" ]; then - running_profile_names | while read profile; do - unload_profile "$profile" - done - exit 0 - fi - - if [ "$ACTION" = "clear" ]; then - clear_cache - exit 0 - fi - - if [ "$ACTION" = "reload" ] || [ "$ACTION" = "force-reload" ]; then - clear_cache - load_configured_profiles - unload_obsolete_profiles - exit 0 - fi - - # Note: if apparmor-easyprof-ubuntu md5sums didn't match up above, - # aa-clickhook will have already compiled the policy, generated the cache - # files and loaded them into the kernel by this point, so reloading click - # policy from cache, while fairly fast (<2 seconds for 250 profiles on - # armhf), is redundant. Fixing this would complicate the logic quite a bit - # and it wouldn't improve the (by far) common case (ie, when - # 'aa-clickhook -f' is not run). - load_configured_profiles -end script diff --git a/meta-security/recipes-mac/AppArmor/files/apparmor.service b/meta-security/recipes-mac/AppArmor/files/apparmor.service deleted file mode 100644 index e66afe4e1..000000000 --- a/meta-security/recipes-mac/AppArmor/files/apparmor.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=AppArmor initialization -After=local-fs.target -Before=sysinit.target -AssertPathIsReadWrite=/sys/kernel/security/apparmor/.load -ConditionSecurity=apparmor -DefaultDependencies=no -Documentation=man:apparmor(7) -Documentation=http://wiki.apparmor.net/ - -# Don't start this unit on the Ubuntu Live CD -ConditionPathExists=!/rofs/etc/apparmor.d - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/etc/init.d/apparmor start -ExecStop=/etc/init.d/apparmor stop -ExecReload=/etc/init.d/apparmor reload - -[Install] -WantedBy=sysinit.target diff --git a/meta-security/recipes-mac/AppArmor/files/disable_pdf.patch b/meta-security/recipes-mac/AppArmor/files/disable_pdf.patch deleted file mode 100644 index c6b4bddc2..000000000 --- a/meta-security/recipes-mac/AppArmor/files/disable_pdf.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: apparmor-2.10.95/parser/Makefile -=================================================================== ---- apparmor-2.10.95.orig/parser/Makefile -+++ apparmor-2.10.95/parser/Makefile -@@ -139,17 +139,6 @@ export Q VERBOSE BUILD_OUTPUT - po/${NAME}.pot: ${SRCS} ${HDRS} - $(MAKE) -C po ${NAME}.pot NAME=${NAME} SOURCES="${SRCS} ${HDRS}" - --techdoc.pdf: techdoc.tex -- timestamp=$(shell date --utc "+%Y%m%d%H%M%S%z" -r $< );\ -- while pdflatex "\def\fixedpdfdate{$$timestamp}\input $<" ${BUILD_OUTPUT} || exit 1 ; \ -- grep -q "Label(s) may have changed" techdoc.log; \ -- do :; done -- --techdoc/index.html: techdoc.pdf -- latex2html -show_section_numbers -split 0 -noinfo -nonavigation -noaddress techdoc.tex ${BUILD_OUTPUT} -- --techdoc.txt: techdoc/index.html -- w3m -dump $< > $@ - - # targets arranged this way so that people who don't want full docs can - # pick specific targets they want. -@@ -159,9 +148,7 @@ manpages: $(MANPAGES) - - htmlmanpages: $(HTMLMANPAGES) - --pdf: techdoc.pdf -- --docs: manpages htmlmanpages pdf -+docs: manpages htmlmanpages - - indep: docs - $(Q)$(MAKE) -C po all diff --git a/meta-security/recipes-mac/AppArmor/files/functions b/meta-security/recipes-mac/AppArmor/files/functions deleted file mode 100644 index e9e2bbfbf..000000000 --- a/meta-security/recipes-mac/AppArmor/files/functions +++ /dev/null @@ -1,271 +0,0 @@ -# /lib/apparmor/functions for Debian -*- shell-script -*- -# ---------------------------------------------------------------------- -# Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -# NOVELL (All rights reserved) -# Copyright (c) 2008-2010 Canonical, Ltd. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, contact Novell, Inc. -# ---------------------------------------------------------------------- -# Authors: -# Kees Cook <kees@ubuntu.com> - -PROFILES="/etc/apparmor.d" -PROFILES_CACHE="$PROFILES/cache" -PROFILES_VAR="/var/lib/apparmor/profiles" -PROFILES_SNAPPY="/var/lib/snapd/apparmor/profiles" -PROFILES_CACHE_VAR="/var/cache/apparmor" -PARSER="/sbin/apparmor_parser" -SECURITYFS="/sys/kernel/security" -export AA_SFS="$SECURITYFS/apparmor" - -# Suppress warnings when booting in quiet mode -quiet_arg="" -[ "${QUIET:-no}" = yes ] && quiet_arg="-q" -[ "${quiet:-n}" = y ] && quiet_arg="-q" - -foreach_configured_profile() { - rc_all="0" - for pdir in "$PROFILES" "$PROFILES_VAR" "$PROFILES_SNAPPY" ; do - if [ ! -d "$pdir" ]; then - continue - fi - num=`find "$pdir" -type f ! -name '*.md5sums' | wc -l` - if [ "$num" = "0" ]; then - continue - fi - - cache_dir="$PROFILES_CACHE" - if [ -d "$PROFILES_CACHE_VAR" ] && [ "$pdir" = "$PROFILES_VAR" ] || [ "$pdir" = "$PROFILES_SNAPPY" ]; then - cache_dir="$PROFILES_CACHE_VAR" - fi - cache_args="--cache-loc=$cache_dir" - if [ ! -d "$cache_dir" ]; then - cache_args= - fi - - # LP: #1383858 - expr tree simplification is too slow for - # Touch policy on ARM, so disable it for now - cache_extra_args= - if [ -d "$PROFILES_CACHE_VAR" ] && [ "$pdir" = "$PROFILES_VAR" ] || [ "$pdir" = "$PROFILES_SNAPPY" ]; then - cache_extra_args="-O no-expr-simplify" - fi - - # If need to compile everything, then use -n1 with xargs to - # take advantage of -P. When cache files are in use, omit -n1 - # since it is considerably faster on moderately sized profile - # sets to give the parser all the profiles to load at once - n1_args= - num=`find "$cache_dir" -type f ! -name '.features' | wc -l` - if [ "$num" = "0" ]; then - n1_args="-n1" - fi - - (ls -1 "$pdir" | egrep -v '(\.dpkg-(new|old|dist|bak)|~)$' | \ - while read profile; do - if [ -f "$pdir"/"$profile" ]; then - echo "$pdir"/"$profile" - fi - done) | \ - xargs $n1_args -d"\n" -P$(getconf _NPROCESSORS_ONLN) "$PARSER" "$@" $cache_args $cache_extra_args -- || { - rc_all="$?" - # FIXME: when the parser properly handles broken - # profiles (LP: #1377338), remove this if statement. - # For now, if the xargs returns with error, just run - # through everything with -n1. (This could be broken - # out and refactored, but this is temporary so make it - # easy to understand and revert) - if [ "$rc_all" != "0" ]; then - (ls -1 "$pdir" | \ - egrep -v '(\.dpkg-(new|old|dist|bak)|~)$' | \ - while read profile; do - if [ -f "$pdir"/"$profile" ]; then - echo "$pdir"/"$profile" - fi - done) | \ - xargs -n1 -d"\n" -P$(getconf _NPROCESSORS_ONLN) "$PARSER" "$@" $cache_args $cache_extra_args -- || { - rc_all="$?" - } - fi - } - done - return $rc_all -} - -load_configured_profiles() { - clear_cache_if_outdated - foreach_configured_profile $quiet_arg --write-cache --replace -} - -load_configured_profiles_without_caching() { - foreach_configured_profile $quiet_arg --replace -} - -recache_profiles() { - clear_cache - foreach_configured_profile $quiet_arg --write-cache --skip-kernel-load -} - -configured_profile_names() { - foreach_configured_profile $quiet_arg -N 2>/dev/null | LC_COLLATE=C sort | grep -v '//' -} - -running_profile_names() { - # Output a sorted list of loaded profiles, skipping libvirt's - # dynamically generated files - cat "$AA_SFS"/profiles | sed -e "s/ (\(enforce\|complain\))$//" | egrep -v '^libvirt-[0-9a-f\-]+$' | LC_COLLATE=C sort | grep -v '//' -} - -unload_profile() { - echo -n "$1" > "$AA_SFS"/.remove -} - -clear_cache() { - clear_cache_system - clear_cache_var -} - -clear_cache_system() { - find "$PROFILES_CACHE" -maxdepth 1 -type f -print0 | xargs -0 rm -f -- -} - -clear_cache_var() { - find "$PROFILES_CACHE_VAR" -maxdepth 1 -type f -print0 | xargs -0 rm -f -- -} - -read_features_dir() -{ - for f in `ls -A "$1"` ; do - if [ -f "$1/$f" ] ; then - read -r KF < "$1/$f" || true - echo -n "$f {$KF } " - elif [ -d "$1/$f" ] ; then - echo -n "$f {" - KF=`read_features_dir "$1/$f"` || true - echo -n "$KF} " - fi - done -} - -clear_cache_if_outdated() { - if [ -r "$PROFILES_CACHE"/.features ]; then - if [ -d "$AA_SFS"/features ]; then - KERN_FEATURES=`read_features_dir "$AA_SFS"/features` - else - read -r KERN_FEATURES < "$AA_SFS"/features - fi - CACHE_FEATURES=`tr '\n' ' ' < "$PROFILES_CACHE"/.features` - if [ "$KERN_FEATURES" != "$CACHE_FEATURES" ]; then - clear_cache - fi - fi -} - -unload_obsolete_profiles() { - # Currently we must re-parse all the profiles to get policy names. :( - aa_configured=$(mktemp -t aa-XXXXXX) - configured_profile_names > "$aa_configured" || true - aa_loaded=$(mktemp -t aa-XXXXXX) - running_profile_names > "$aa_loaded" || true - LC_COLLATE=C comm -2 -3 "$aa_loaded" "$aa_configured" | while read profile ; do - unload_profile "$profile" - done - rm -f "$aa_configured" "$aa_loaded" -} - -# If the system debsum differs from the saved debsum, the new system debsum is -# saved and non-zero is returned. Returns 0 if the two debsums matched or if -# the system debsum file does not exist. This can be removed when system image -# flavors all move to snappy. -compare_and_save_debsums() { - pkg="$1" - - if [ -n $pkg ] && [ -d "$PROFILES_VAR" ]; then - sums="/var/lib/dpkg/info/${pkg}.md5sums" - # store saved md5sums in /var/lib/apparmor/profiles since - # /var/cache/apparmor might be cleared by apparmor - saved_sums="${PROFILES_VAR}/.${pkg}.md5sums" - - if [ -f "$sums" ] && \ - ! diff -q "$sums" "$saved_sums" 2>&1 >/dev/null ; then - cp -f "$sums" "$saved_sums" - return 1 - fi - fi - - return 0 -} - -compare_previous_version() { - installed="/usr/share/snappy/security-policy-version" - previous="/var/lib/snappy/security-policy-version" - - # When just $previous doesn't exist, assume this is a new system with - # no cache and don't do anything special. - if [ -f "$installed" ] && [ -f "$previous" ]; then - pv=`grep '^apparmor/' "$previous" | cut -d ' ' -f 2` - iv=`grep '^apparmor/' "$installed" | cut -d ' ' -f 2` - if [ -n "$iv" ] && [ -n "$pv" ] && [ "$iv" != "$pv" ]; then - # snappy updates $previous elsewhere, so just return - return 1 - fi - fi - - return 0 -} - -# Checks to see if the current container is capable of having internal AppArmor -# profiles that should be loaded. Callers of this function should have already -# verified that they're running inside of a container environment with -# something like `systemd-detect-virt --container`. -# -# The only known container environments capable of supporting internal policy -# are LXD and LXC environment. -# -# Returns 0 if the container environment is capable of having its own internal -# policy and non-zero otherwise. -# -# IMPORTANT: This function will return 0 in the case of a non-LXD/non-LXC -# system container technology being nested inside of a LXD/LXC container that -# utilized an AppArmor namespace and profile stacking. The reason 0 will be -# returned is because .ns_stacked will be "yes" and .ns_name will still match -# "lx[dc]-*" since the nested system container technology will not have set up -# a new AppArmor profile namespace. This will result in the nested system -# container's boot process to experience failed policy loads but the boot -# process should continue without any loss of functionality. This is an -# unsupported configuration that cannot be properly handled by this function. -is_container_with_internal_policy() { - local ns_stacked_path="${AA_SFS}/.ns_stacked" - local ns_name_path="${AA_SFS}/.ns_name" - local ns_stacked - local ns_name - - if ! [ -f "$ns_stacked_path" ] || ! [ -f "$ns_name_path" ]; then - return 1 - fi - - read -r ns_stacked < "$ns_stacked_path" - if [ "$ns_stacked" != "yes" ]; then - return 1 - fi - - # LXD and LXC set up AppArmor namespaces starting with "lxd-" and - # "lxc-", respectively. Return non-zero for all other namespace - # identifiers. - read -r ns_name < "$ns_name_path" - if [ "${ns_name#lxd-*}" = "$ns_name" ] && \ - [ "${ns_name#lxc-*}" = "$ns_name" ]; then - return 1 - fi - - return 0 -} diff --git a/meta-security/recipes-security/sshguard/sshguard_2.4.2.bb b/meta-security/recipes-security/sshguard/sshguard_2.4.2.bb new file mode 100644 index 000000000..bd7f97927 --- /dev/null +++ b/meta-security/recipes-security/sshguard/sshguard_2.4.2.bb @@ -0,0 +1,11 @@ +SUMARRY=" Intelligently block brute-force attacks by aggregating system logs " +HOMEPAGE = "https://www.sshguard.net/" +LIC_FILES_CHKSUM = "file://COPYING;md5=47a33fc98cd20713882c4d822a57bf4d" +LICENSE = "BSD-1-Clause" + + +SRC_URI="https://sourceforge.net/projects/sshguard/files/sshguard/${PV}/sshguard-${PV}.tar.gz" + +SRC_URI[sha256sum] = "2770b776e5ea70a9bedfec4fd84d57400afa927f0f7522870d2dcbbe1ace37e8" + +inherit autotools-brokensep diff --git a/meta-security/recipes-security/sssd/files/musl_fixup.patch b/meta-security/recipes-security/sssd/files/musl_fixup.patch new file mode 100644 index 000000000..68f267c7c --- /dev/null +++ b/meta-security/recipes-security/sssd/files/musl_fixup.patch @@ -0,0 +1,53 @@ +fix musl build failures + +Missing _PATH_HOSTS and some NETDB defines when musl is enabled. + +These are work arounds for now while we figure out where the real fix should reside (musl, gcompact, sssd): + +./sssd-2.5.1/src/providers/fail_over.c:1199:19: error: '_PATH_HOSTS' undeclared (first use in this function) +| 1199 | _PATH_HOSTS); +| | ^~~~~~~~~~~ + +and + +i./sssd-2.5.1/src/sss_client/nss_ipnetworks.c:415:21: error: 'NETDB_INTERNAL' undeclared (first use in this function) +| 415 | *h_errnop = NETDB_INTERNAL; + + +Upstream-Status: Pending +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +Index: sssd-2.5.1/src/providers/fail_over.c +=================================================================== +--- sssd-2.5.1.orig/src/providers/fail_over.c ++++ sssd-2.5.1/src/providers/fail_over.c +@@ -31,6 +31,10 @@ + #include <talloc.h> + #include <netdb.h> + ++#if !defined(_PATH_HOSTS) ++#define _PATH_HOSTS "/etc/hosts" ++#endif ++ + #include "util/dlinklist.h" + #include "util/refcount.h" + #include "util/util.h" +Index: sssd-2.5.1/src/sss_client/sss_cli.h +=================================================================== +--- sssd-2.5.1.orig/src/sss_client/sss_cli.h ++++ sssd-2.5.1/src/sss_client/sss_cli.h +@@ -44,6 +44,14 @@ typedef int errno_t; + #define EOK 0 + #endif + ++#ifndef NETDB_INTERNAL ++# define NETDB_INTERNAL (-1) ++#endif ++ ++#ifndef NETDB_SUCCESS ++# define NETDB_SUCCESS (0) ++#endif ++ + #define SSS_NSS_PROTOCOL_VERSION 1 + #define SSS_PAM_PROTOCOL_VERSION 3 + #define SSS_SUDO_PROTOCOL_VERSION 1 diff --git a/meta-security/recipes-security/sssd/sssd_2.5.0.bb b/meta-security/recipes-security/sssd/sssd_2.5.1.bb index 84b7b0e46..92058437d 100644 --- a/meta-security/recipes-security/sssd/sssd_2.5.0.bb +++ b/meta-security/recipes-security/sssd/sssd_2.5.1.bb @@ -15,15 +15,17 @@ DEPENDS_append_libc-musl = " musl-nscd" DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'nss', '', \ bb.utils.contains('PACKAGECONFIG', 'crypto', '', 'nss', d), d)}" -SRC_URI = "https://github.com/SSSD/sssd/releases/download/2.5.0/sssd-2.5.0.tar.gz \ +SRC_URI = "https://github.com/SSSD/sssd/releases/download/${PV}/sssd-${PV}.tar.gz \ file://sssd.conf \ file://volatiles.99_sssd \ file://no_gen.patch \ file://fix_gid.patch \ file://drop_ntpdate_chk.patch \ file://fix-ldblibdir.patch \ + file://musl_fixup.patch \ " -SRC_URI[sha256sum] = "afa62d7d8d23fca3aba093abe4ec0d14e7d9346c5b28ceb7c2c624bed98caa06" + +SRC_URI[sha256sum] = "ce2f5d84a3f1750093318afd27f4fd75b1e3e75f7d80fc42d21a40cc54b58ea4" inherit autotools pkgconfig gettext python3-dir features_check systemd diff --git a/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb index 83deb434b..31cd0450e 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-occ-control +inherit native PROVIDES += "virtual/openpower-occ-control-config-native" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager/bootmailbox.override.yml b/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager/bootmailbox.override.yml index e4e5745f4..b01e8b9b2 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager/bootmailbox.override.yml +++ b/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager/bootmailbox.override.yml @@ -13,4 +13,25 @@ # So the minimum is 77 bytes. 512 bytes look enough to accomodate # all boot settings, yet not too big to waste space. # 512 - 3 = 509 - Default: 'std::vector<uint8_t>(509)' + Default: > + {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0} diff --git a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-inventory-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-inventory-native.bb index 0a5d73c6b..e65a7141e 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-inventory-native.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-inventory-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://inventory" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-properties-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-properties-native.bb index 05be1df15..fc144c1aa 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-properties-native.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-properties-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://properties.yaml" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-vpd-layout-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-vpd-layout-native.bb index 35c4de4de..cfa315957 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-vpd-layout-native.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/vpd/nicole-openpower-fru-vpd-layout-native.bb @@ -3,8 +3,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit native inherit openpower-fru-vpd +inherit native SRC_URI += "file://layout.yaml" diff --git a/meta-yadro/meta-vesnin/README.md b/meta-yadro/meta-vesnin/README.md deleted file mode 100644 index aa0f56cf3..000000000 --- a/meta-yadro/meta-vesnin/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# VESNIN SERVER - -The world's first OpenPOWER enterprise class high performance server designed -for data intensive applications with outstanding footprint. Four-socket server -supporting up to 48 POWER8 cores and 8 TB memory in ultra dense 2U form factor. - -https://yadro.com/products/vesnin diff --git a/meta-yadro/meta-vesnin/conf/bblayers.conf.sample b/meta-yadro/meta-vesnin/conf/bblayers.conf.sample deleted file mode 100644 index 5571b9d76..000000000 --- a/meta-yadro/meta-vesnin/conf/bblayers.conf.sample +++ /dev/null @@ -1,33 +0,0 @@ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -LCONF_VERSION = "8" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" - -BBLAYERS ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-yadro \ - ##OEROOT##/meta-yadro/meta-vesnin \ - " -BBLAYERS_NON_REMOVABLE ?= " \ - ##OEROOT##/meta \ - ##OEROOT##/meta-openembedded/meta-oe \ - ##OEROOT##/meta-openembedded/meta-networking \ - ##OEROOT##/meta-openembedded/meta-perl \ - ##OEROOT##/meta-openembedded/meta-python \ - ##OEROOT##/meta-security \ - ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ - ##OEROOT##/meta-yadro \ - ##OEROOT##/meta-yadro/meta-vesnin \ - " diff --git a/meta-yadro/meta-vesnin/conf/conf-notes.txt b/meta-yadro/meta-vesnin/conf/conf-notes.txt deleted file mode 100644 index 9b3c01a55..000000000 --- a/meta-yadro/meta-vesnin/conf/conf-notes.txt +++ /dev/null @@ -1,2 +0,0 @@ -Common targets are: - obmc-phosphor-image diff --git a/meta-yadro/meta-vesnin/conf/layer.conf b/meta-yadro/meta-vesnin/conf/layer.conf deleted file mode 100644 index 47ce75ec6..000000000 --- a/meta-yadro/meta-vesnin/conf/layer.conf +++ /dev/null @@ -1,10 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "vesnin-layer" -BBFILE_PATTERN_vesnin-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_vesnin-layer = "gatesgarth hardknott" diff --git a/meta-yadro/meta-vesnin/conf/local.conf.sample b/meta-yadro/meta-vesnin/conf/local.conf.sample deleted file mode 100644 index 6fe59e72b..000000000 --- a/meta-yadro/meta-vesnin/conf/local.conf.sample +++ /dev/null @@ -1,237 +0,0 @@ -# -# This file is your local configuration file and is where all local user settings -# are placed. The comments in this file give some guide to the options a new user -# to the system might want to change but pretty much any configuration option can -# be set in this file. More adventurous users can look at local.conf.extended -# which contains other examples of configuration which can be placed in this file -# but new users likely won't need any of them initially. -# -# Lines starting with the '#' character are commented out and in some cases the -# default values are provided as comments to show people example syntax. Enabling -# the option is a question of removing the # character and making any change to the -# variable as required. - -# -# Machine Selection -# -# You need to select a specific machine to target the build with. There are a selection -# of emulated machines available which can boot and run in the QEMU emulator: -# -#MACHINE ?= "qemuarm" -#MACHINE ?= "qemuarm64" -#MACHINE ?= "qemumips" -#MACHINE ?= "qemuppc" -#MACHINE ?= "qemux86" -#MACHINE ?= "qemux86-64" -# -# There are also the following hardware board target machines included for -# demonstration purposes: -# -#MACHINE ?= "beaglebone" -#MACHINE ?= "genericx86" -#MACHINE ?= "genericx86-64" -#MACHINE ?= "mpc8315e-rdb" -#MACHINE ?= "edgerouter" -# -# This sets the default machine to be qemux86 if no other machine is selected: -MACHINE ??= "vesnin" - -# -# Where to place downloads -# -# During a first build the system will download many different source code tarballs -# from various upstream projects. This can take a while, particularly if your network -# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you -# can preserve this directory to speed up this part of subsequent builds. This directory -# is safe to share between multiple builds on the same machine too. -# -# The default is a downloads directory under TOPDIR which is the build directory. -# -#DL_DIR ?= "${TOPDIR}/downloads" - -# -# Where to place shared-state files -# -# BitBake has the capability to accelerate builds based on previously built output. -# This is done using "shared state" files which can be thought of as cache objects -# and this option determines where those files are placed. -# -# You can wipe out TMPDIR leaving this directory intact and the build would regenerate -# from these files if no changes were made to the configuration. If changes were made -# to the configuration, only shared state files where the state was still valid would -# be used (done using checksums). -# -# The default is a sstate-cache directory under TOPDIR. -# -#SSTATE_DIR ?= "${TOPDIR}/sstate-cache" - -# -# Where to place the build output -# -# This option specifies where the bulk of the building work should be done and -# where BitBake should place its temporary files and output. Keep in mind that -# this includes the extraction and compilation of many applications and the toolchain -# which can use Gigabytes of hard disk space. -# -# The default is a tmp directory under TOPDIR. -# -#TMPDIR = "${TOPDIR}/tmp" - -# -# Default policy config -# -# The distribution setting controls which policy settings are used as defaults. -# The default value is fine for general Yocto project use, at least initially. -# Ultimately when creating custom policy, people will likely end up subclassing -# these defaults. -# -DISTRO ?= "openbmc-openpower" -# As an example of a subclass there is a "bleeding" edge policy configuration -# where many versions are set to the absolute latest code from the upstream -# source control systems. This is just mentioned here as an example, its not -# useful to most new users. -# DISTRO ?= "poky-bleeding" - -# -# Package Management configuration -# -# This variable lists which packaging formats to enable. Multiple package backends -# can be enabled at once and the first item listed in the variable will be used -# to generate the root filesystems. -# Options are: -# - 'package_deb' for debian style deb files -# - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) -# - 'package_rpm' for rpm style packages -# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" -# We default to rpm: -PACKAGE_CLASSES ?= "package_rpm" - -# -# SDK/ADT target architecture -# -# This variable specifies the architecture to build SDK/ADT items for and means -# you can build the SDK packages for architectures other than the machine you are -# running the build on (i.e. building i686 packages on an x86_64 host). -# Supported values are i686 and x86_64 -#SDKMACHINE ?= "i686" - -SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" - -# -# Extra image configuration defaults -# -# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated -# images. Some of these options are added to certain image types automatically. The -# variable can contain the following options: -# "dbg-pkgs" - add -dbg packages for all installed packages -# (adds symbol information for debugging/profiling) -# "dev-pkgs" - add -dev packages for all installed packages -# (useful if you want to develop against libs in the image) -# "ptest-pkgs" - add -ptest packages for all ptest-enabled packages -# (useful if you want to run the package test suites) -# "tools-sdk" - add development tools (gcc, make, pkgconfig etc.) -# "tools-debug" - add debugging tools (gdb, strace) -# "eclipse-debug" - add Eclipse remote debugging support -# "tools-profile" - add profiling tools (oprofile, exmap, lttng, valgrind) -# "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.) -# "debug-tweaks" - make an image suitable for development -# e.g. ssh root access has a blank password -# There are other application targets that can be used here too, see -# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. -# We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" - -# -# Additional image features -# -# The following is a list of additional classes to use when building images which -# enable extra features. Some available options which can be included in this variable -# are: -# - 'buildstats' collect build statistics -# - 'image-prelink' in order to prelink the filesystem image -# - 'image-swab' to perform host system intrusion detection -# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink -# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-prelink" - -# -# Runtime testing of images -# -# The build system can test booting virtual machine images under qemu (an emulator) -# after any root filesystems are created and run tests against those images. To -# enable this uncomment this line. See classes/testimage(-auto).bbclass for -# further details. -#TEST_IMAGE = "1" -# -# Interactive shell configuration -# -# Under certain circumstances the system may need input from you and to do this it -# can launch an interactive shell. It needs to do this since the build is -# multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is iterate over the available -# terminal types to find one that works. -# -# Examples of the occasions this may happen are when resolving patches which cannot -# be applied, to use the devshell or the kernel menuconfig -# -# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none -# Note: currently, Konsole support only works for KDE 3.x due to the way -# newer Konsole versions behave -#OE_TERMINAL = "auto" -# By default disable interactive patch resolution (tasks will just fail instead): -PATCHRESOLVE = "noop" - -# -# Disk Space Monitoring during the build -# -# Monitor the disk space during the build. If there is less that 1GB of space or less -# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully -# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort -# of the build. The reason for this is that running completely out of space can corrupt -# files and damages the build in ways which may not be easily recoverable. -# It's necessary to monitor /tmp, if there is no space left the build will fail -# with very exotic errors. -BB_DISKMON_DIRS = "\ - STOPTASKS,${TMPDIR},1G,100K \ - STOPTASKS,${DL_DIR},1G,100K \ - STOPTASKS,${SSTATE_DIR},1G,100K \ - STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" - -# -# Shared-state files from other locations -# -# As mentioned above, shared state files are prebuilt cache data objects which can -# used to accelerate build time. This variable can be used to configure the system -# to search other mirror locations for these objects before it builds the data itself. -# -# This can be a filesystem directory, or a remote url such as http or ftp. These -# would contain the sstate-cache results from previous builds (possibly from other -# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the -# cache locations to check for the shared objects. -# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH -# at the end as shown in the examples below. This will be substituted with the -# correct path within the directory structure. -#SSTATE_MIRRORS ?= "\ -#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ -#file://.* file:///some/local/dir/sstate/PATH" - - -# -# Qemu configuration -# -# By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. This assumes there is a -# libsdl library available on your build system. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" - - -# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to -# track the version of this file when it was generated. This can safely be ignored if -# this doesn't mean anything to you. -CONF_VERSION = "1" diff --git a/meta-yadro/meta-vesnin/conf/machine/vesnin.conf b/meta-yadro/meta-vesnin/conf/machine/vesnin.conf deleted file mode 100644 index 6ba66faa4..000000000 --- a/meta-yadro/meta-vesnin/conf/machine/vesnin.conf +++ /dev/null @@ -1,21 +0,0 @@ -KMACHINE = "aspeed" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" - -require conf/machine/include/ast2400.inc -require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/openpower.inc -require conf/machine/include/p8.inc - -UBOOT_MACHINE_vesnin = "ast_g4_ncsi_config" -UBOOT_ENTRYPOINT = "0x40008000" -UBOOT_LOADADDRESS = "0x40008000" - -FLASH_SIZE = "32768" - -SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS4" - -PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "vesnin-led-manager-config-native" -PREFERRED_PROVIDER_virtual/openpower-fru-properties = "vesnin-openpower-fru-properties-native" -PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "vesnin-openpower-fru-vpd-layout-native" -PREFERRED_PROVIDER_virtual/openpower-fru-inventory = "vesnin-openpower-fru-inventory-native" -PREFERRED_PROVIDER_virtual/openpower-occ-control-config-native = "vesnin-openpower-occ-control-config-native" diff --git a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/0002-vesnin-remap-aspeed-uart.patch b/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/0002-vesnin-remap-aspeed-uart.patch deleted file mode 100644 index a745a18a7..000000000 --- a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/0002-vesnin-remap-aspeed-uart.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c10401d8c349610ea9cd29d28f87dd630c907aeb Mon Sep 17 00:00:00 2001 -From: Alexander Filippov <a.filippov@yadro.com> -Date: Wed, 28 Mar 2018 17:46:28 +0300 -Subject: [PATCH] vesnin: remap aspeed-uart - -Remaps UART2 <-> UART3 - -Signed-off-by: Alexander Filippov <a.filippov@yadro.com> ---- - drivers/soc/aspeed/aspeed-lpc-ctrl.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c -index 01ed21e8bfee..cbdca53a8805 100644 ---- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c -+++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c -@@ -23,6 +23,7 @@ - - #define HICR7 0x8 - #define HICR8 0xc -+#define HICRA 0x1c - - struct aspeed_lpc_ctrl { - struct miscdevice miscdev; -@@ -271,6 +272,13 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev) - goto err; - } - -+ /* Switch UART2 to IO3 and UART3 to IO2 */ -+ rc = regmap_write(lpc_ctrl->regmap, HICRA, 0x00C80108); -+ if (rc) { -+ dev_err(dev, "Unable to switch UART 2<->3\n"); -+ goto err; -+ } -+ - return 0; - - err: --- -2.20.1 - diff --git a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/vesnin.cfg b/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/vesnin.cfg deleted file mode 100644 index 59a232127..000000000 --- a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed/vesnin.cfg +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG_EEPROM_AT24=y -CONFIG_SENSORS_LM75=y -CONFIG_SENSORS_W83795=y -CONFIG_SENSORS_PMBUS=y -CONFIG_RTC_DRV_DS1307_HWMON=y - -CONFIG_FSI=n -CONFIG_FSI_MASTER_HUB=n -CONFIG_FSI_MASTER_AST_CF=n -CONFIG_FSI_SCOM=n diff --git a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend deleted file mode 100644 index 5680c6938..000000000 --- a/meta-yadro/meta-vesnin/recipes-kernel/linux/linux-aspeed_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_vesnin = "\ - file://vesnin.cfg \ - file://0002-vesnin-remap-aspeed-uart.patch \ -" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb deleted file mode 100644 index 94000a0a7..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "YAML configuration for Vesnin" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit allarch - -SRC_URI = " \ - file://vesnin-ipmi-fru.yaml \ - " - -S = "${WORKDIR}" - -do_install() { - install -m 0644 -D vesnin-ipmi-fru.yaml \ - ${D}${datadir}/${BPN}/ipmi-fru-read.yaml -} - -FILES_${PN}-dev = " \ - ${datadir}/${BPN}/ipmi-fru-read.yaml \ - " - -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml b/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml deleted file mode 100644 index a1de5712e..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/configuration/vesnin-yaml-config/vesnin-ipmi-fru.yaml +++ /dev/null @@ -1,863 +0,0 @@ -0: - /system/chassis/bmc: - entityID: 6 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board -1: - /system/chassis/motherboard/cpu0: &CPU_DEFAULTS - entityID: 3 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Custom Field 2 - IPMIFruSection: Board - IPMIFruValueDelimiter: 58 - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board - Value: False -2: - /system/chassis/motherboard/cpu1: - <<: *CPU_DEFAULTS - entityInstance: 2 -3: - /system/chassis/motherboard/cpu2: - <<: *CPU_DEFAULTS - entityInstance: 3 -4: - /system/chassis/motherboard/cpu3: - <<: *CPU_DEFAULTS - entityInstance: 4 -5: - /system/chassis/motherboard: - entityID: 7 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - Model: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board - /system: - entityID: 25 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Chassis - Model: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board -6: - /system/chassis/motherboard/membuf1: &MEMBUF_DEFAULTS - entityID: 23 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board -7: - /system/chassis/motherboard/membuf0: - <<: *MEMBUF_DEFAULTS - entityInstance: 2 -8: - /system/chassis/motherboard/membuf5: - <<: *MEMBUF_DEFAULTS - entityInstance: 3 -9: - /system/chassis/motherboard/membuf4: - <<: *MEMBUF_DEFAULTS - entityInstance: 4 -10: - /system/chassis/motherboard/membuf9: - <<: *MEMBUF_DEFAULTS - entityInstance: 5 -11: - /system/chassis/motherboard/membuf8: - <<: *MEMBUF_DEFAULTS - entityInstance: 6 -12: - /system/chassis/motherboard/membuf13: - <<: *MEMBUF_DEFAULTS - entityInstance: 7 -13: - /system/chassis/motherboard/membuf12: - <<: *MEMBUF_DEFAULTS - entityInstance: 8 -14: - /system/chassis/motherboard/membuf17: - <<: *MEMBUF_DEFAULTS - entityInstance: 9 -15: - /system/chassis/motherboard/membuf16: - <<: *MEMBUF_DEFAULTS - entityInstance: 10 -16: - /system/chassis/motherboard/membuf21: - <<: *MEMBUF_DEFAULTS - entityInstance: 11 -17: - /system/chassis/motherboard/membuf20: - <<: *MEMBUF_DEFAULTS - entityInstance: 12 -18: - /system/chassis/motherboard/membuf25: - <<: *MEMBUF_DEFAULTS - entityInstance: 13 -19: - /system/chassis/motherboard/membuf24: - <<: *MEMBUF_DEFAULTS - entityInstance: 14 -20: - /system/chassis/motherboard/membuf29: - <<: *MEMBUF_DEFAULTS - entityInstance: 15 -21: - /system/chassis/motherboard/membuf28: - <<: *MEMBUF_DEFAULTS - entityInstance: 16 -22: - /system/chassis/motherboard/dimm8: &DIMM_DEFAULTS - entityID: 32 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version -23: - /system/chassis/motherboard/dimm9: - <<: *DIMM_DEFAULTS - entityInstance: 2 -24: - /system/chassis/motherboard/dimm10: - <<: *DIMM_DEFAULTS - entityInstance: 3 -25: - /system/chassis/motherboard/dimm11: - <<: *DIMM_DEFAULTS - entityInstance: 4 -26: - /system/chassis/motherboard/dimm12: - <<: *DIMM_DEFAULTS - entityInstance: 5 -27: - /system/chassis/motherboard/dimm13: - <<: *DIMM_DEFAULTS - entityInstance: 6 -28: - /system/chassis/motherboard/dimm14: - <<: *DIMM_DEFAULTS - entityInstance: 7 -29: - /system/chassis/motherboard/dimm15: - <<: *DIMM_DEFAULTS - entityInstance: 8 -30: - /system/chassis/motherboard/dimm0: - <<: *DIMM_DEFAULTS - entityInstance: 9 -31: - /system/chassis/motherboard/dimm1: - <<: *DIMM_DEFAULTS - entityInstance: 10 -32: - /system/chassis/motherboard/dimm2: - <<: *DIMM_DEFAULTS - entityInstance: 11 -33: - /system/chassis/motherboard/dimm3: - <<: *DIMM_DEFAULTS - entityInstance: 12 -34: - /system/chassis/motherboard/dimm4: - <<: *DIMM_DEFAULTS - entityInstance: 13 -35: - /system/chassis/motherboard/dimm5: - <<: *DIMM_DEFAULTS - entityInstance: 14 -36: - /system/chassis/motherboard/dimm6: - <<: *DIMM_DEFAULTS - entityInstance: 15 -37: - /system/chassis/motherboard/dimm7: - <<: *DIMM_DEFAULTS - entityInstance: 16 -38: - /system/chassis/motherboard/dimm16: - <<: *DIMM_DEFAULTS - entityInstance: 17 -39: - /system/chassis/motherboard/dimm17: - <<: *DIMM_DEFAULTS - entityInstance: 18 -40: - /system/chassis/motherboard/dimm18: - <<: *DIMM_DEFAULTS - entityInstance: 19 -41: - /system/chassis/motherboard/dimm19: - <<: *DIMM_DEFAULTS - entityInstance: 20 -42: - /system/chassis/motherboard/dimm20: - <<: *DIMM_DEFAULTS - entityInstance: 21 -43: - /system/chassis/motherboard/dimm21: - <<: *DIMM_DEFAULTS - entityInstance: 22 -44: - /system/chassis/motherboard/dimm22: - <<: *DIMM_DEFAULTS - entityInstance: 23 -45: - /system/chassis/motherboard/dimm23: - <<: *DIMM_DEFAULTS - entityInstance: 24 -46: - /system/chassis/motherboard/dimm24: - <<: *DIMM_DEFAULTS - entityInstance: 25 -47: - /system/chassis/motherboard/dimm25: - <<: *DIMM_DEFAULTS - entityInstance: 26 -48: - /system/chassis/motherboard/dimm26: - <<: *DIMM_DEFAULTS - entityInstance: 27 -49: - /system/chassis/motherboard/dimm27: - <<: *DIMM_DEFAULTS - entityInstance: 28 -50: - /system/chassis/motherboard/dimm28: - <<: *DIMM_DEFAULTS - entityInstance: 29 -51: - /system/chassis/motherboard/dimm29: - <<: *DIMM_DEFAULTS - entityInstance: 30 -52: - /system/chassis/motherboard/dimm30: - <<: *DIMM_DEFAULTS - entityInstance: 31 -53: - /system/chassis/motherboard/dimm31: - <<: *DIMM_DEFAULTS - entityInstance: 32 -54: - /system/chassis/motherboard/dimm40: - <<: *DIMM_DEFAULTS - entityInstance: 33 -55: - /system/chassis/motherboard/dimm41: - <<: *DIMM_DEFAULTS - entityInstance: 34 -56: - /system/chassis/motherboard/dimm42: - <<: *DIMM_DEFAULTS - entityInstance: 35 -57: - /system/chassis/motherboard/dimm43: - <<: *DIMM_DEFAULTS - entityInstance: 36 -58: - /system/chassis/motherboard/dimm44: - <<: *DIMM_DEFAULTS - entityInstance: 37 -59: - /system/chassis/motherboard/dimm45: - <<: *DIMM_DEFAULTS - entityInstance: 38 -60: - /system/chassis/motherboard/dimm46: - <<: *DIMM_DEFAULTS - entityInstance: 39 -61: - /system/chassis/motherboard/dimm47: - <<: *DIMM_DEFAULTS - entityInstance: 40 -62: - /system/chassis/motherboard/dimm32: - <<: *DIMM_DEFAULTS - entityInstance: 41 -63: - /system/chassis/motherboard/dimm33: - <<: *DIMM_DEFAULTS - entityInstance: 42 -64: - /system/chassis/motherboard/dimm34: - <<: *DIMM_DEFAULTS - entityInstance: 43 -65: - /system/chassis/motherboard/dimm35: - <<: *DIMM_DEFAULTS - entityInstance: 44 -66: - /system/chassis/motherboard/dimm36: - <<: *DIMM_DEFAULTS - entityInstance: 45 -67: - /system/chassis/motherboard/dimm37: - <<: *DIMM_DEFAULTS - entityInstance: 46 -68: - /system/chassis/motherboard/dimm38: - <<: *DIMM_DEFAULTS - entityInstance: 47 -69: - /system/chassis/motherboard/dimm39: - <<: *DIMM_DEFAULTS - entityInstance: 48 -70: - /system/chassis/motherboard/dimm48: - <<: *DIMM_DEFAULTS - entityInstance: 49 -71: - /system/chassis/motherboard/dimm49: - <<: *DIMM_DEFAULTS - entityInstance: 50 -72: - /system/chassis/motherboard/dimm50: - <<: *DIMM_DEFAULTS - entityInstance: 51 -73: - /system/chassis/motherboard/dimm51: - <<: *DIMM_DEFAULTS - entityInstance: 52 -74: - /system/chassis/motherboard/dimm52: - <<: *DIMM_DEFAULTS - entityInstance: 53 -75: - /system/chassis/motherboard/dimm53: - <<: *DIMM_DEFAULTS - entityInstance: 54 -76: - /system/chassis/motherboard/dimm54: - <<: *DIMM_DEFAULTS - entityInstance: 55 -77: - /system/chassis/motherboard/dimm55: - <<: *DIMM_DEFAULTS - entityInstance: 56 -78: - /system/chassis/motherboard/dimm56: - <<: *DIMM_DEFAULTS - entityInstance: 57 -79: - /system/chassis/motherboard/dimm57: - <<: *DIMM_DEFAULTS - entityInstance: 58 -80: - /system/chassis/motherboard/dimm58: - <<: *DIMM_DEFAULTS - entityInstance: 59 -81: - /system/chassis/motherboard/dimm59: - <<: *DIMM_DEFAULTS - entityInstance: 60 -82: - /system/chassis/motherboard/dimm60: - <<: *DIMM_DEFAULTS - entityInstance: 61 -83: - /system/chassis/motherboard/dimm61: - <<: *DIMM_DEFAULTS - entityInstance: 62 -84: - /system/chassis/motherboard/dimm62: - <<: *DIMM_DEFAULTS - entityInstance: 63 -85: - /system/chassis/motherboard/dimm63: - <<: *DIMM_DEFAULTS - entityInstance: 64 -86: - /system/chassis/motherboard/dimm72: - <<: *DIMM_DEFAULTS - entityInstance: 65 -87: - /system/chassis/motherboard/dimm73: - <<: *DIMM_DEFAULTS - entityInstance: 66 -88: - /system/chassis/motherboard/dimm74: - <<: *DIMM_DEFAULTS - entityInstance: 67 -89: - /system/chassis/motherboard/dimm75: - <<: *DIMM_DEFAULTS - entityInstance: 68 -90: - /system/chassis/motherboard/dimm76: - <<: *DIMM_DEFAULTS - entityInstance: 69 -91: - /system/chassis/motherboard/dimm77: - <<: *DIMM_DEFAULTS - entityInstance: 70 -92: - /system/chassis/motherboard/dimm78: - <<: *DIMM_DEFAULTS - entityInstance: 71 -93: - /system/chassis/motherboard/dimm79: - <<: *DIMM_DEFAULTS - entityInstance: 72 -94: - /system/chassis/motherboard/dimm64: - <<: *DIMM_DEFAULTS - entityInstance: 73 -95: - /system/chassis/motherboard/dimm65: - <<: *DIMM_DEFAULTS - entityInstance: 74 -96: - /system/chassis/motherboard/dimm66: - <<: *DIMM_DEFAULTS - entityInstance: 75 -97: - /system/chassis/motherboard/dimm67: - <<: *DIMM_DEFAULTS - entityInstance: 76 -98: - /system/chassis/motherboard/dimm68: - <<: *DIMM_DEFAULTS - entityInstance: 77 -99: - /system/chassis/motherboard/dimm69: - <<: *DIMM_DEFAULTS - entityInstance: 78 -100: - /system/chassis/motherboard/dimm70: - <<: *DIMM_DEFAULTS - entityInstance: 79 -101: - /system/chassis/motherboard/dimm71: - <<: *DIMM_DEFAULTS - entityInstance: 80 -102: - /system/chassis/motherboard/dimm80: - <<: *DIMM_DEFAULTS - entityInstance: 81 -103: - /system/chassis/motherboard/dimm81: - <<: *DIMM_DEFAULTS - entityInstance: 82 -104: - /system/chassis/motherboard/dimm82: - <<: *DIMM_DEFAULTS - entityInstance: 83 -105: - /system/chassis/motherboard/dimm83: - <<: *DIMM_DEFAULTS - entityInstance: 84 -106: - /system/chassis/motherboard/dimm84: - <<: *DIMM_DEFAULTS - entityInstance: 85 -107: - /system/chassis/motherboard/dimm85: - <<: *DIMM_DEFAULTS - entityInstance: 86 -108: - /system/chassis/motherboard/dimm86: - <<: *DIMM_DEFAULTS - entityInstance: 87 -109: - /system/chassis/motherboard/dimm87: - <<: *DIMM_DEFAULTS - entityInstance: 88 -110: - /system/chassis/motherboard/dimm88: - <<: *DIMM_DEFAULTS - entityInstance: 89 -111: - /system/chassis/motherboard/dimm89: - <<: *DIMM_DEFAULTS - entityInstance: 90 -112: - /system/chassis/motherboard/dimm90: - <<: *DIMM_DEFAULTS - entityInstance: 91 -113: - /system/chassis/motherboard/dimm91: - <<: *DIMM_DEFAULTS - entityInstance: 92 -114: - /system/chassis/motherboard/dimm92: - <<: *DIMM_DEFAULTS - entityInstance: 93 -115: - /system/chassis/motherboard/dimm93: - <<: *DIMM_DEFAULTS - entityInstance: 94 -116: - /system/chassis/motherboard/dimm94: - <<: *DIMM_DEFAULTS - entityInstance: 95 -117: - /system/chassis/motherboard/dimm95: - <<: *DIMM_DEFAULTS - entityInstance: 96 -118: - /system/chassis/motherboard/dimm104: - <<: *DIMM_DEFAULTS - entityInstance: 97 -119: - /system/chassis/motherboard/dimm105: - <<: *DIMM_DEFAULTS - entityInstance: 98 -120: - /system/chassis/motherboard/dimm106: - <<: *DIMM_DEFAULTS - entityInstance: 99 -121: - /system/chassis/motherboard/dimm107: - <<: *DIMM_DEFAULTS - entityInstance: 100 -122: - /system/chassis/motherboard/dimm108: - <<: *DIMM_DEFAULTS - entityInstance: 101 -123: - /system/chassis/motherboard/dimm109: - <<: *DIMM_DEFAULTS - entityInstance: 102 -124: - /system/chassis/motherboard/dimm110: - <<: *DIMM_DEFAULTS - entityInstance: 103 -125: - /system/chassis/motherboard/dimm111: - <<: *DIMM_DEFAULTS - entityInstance: 104 -126: - /system/chassis/motherboard/dimm96: - <<: *DIMM_DEFAULTS - entityInstance: 105 -127: - /system/chassis/motherboard/dimm97: - <<: *DIMM_DEFAULTS - entityInstance: 106 -128: - /system/chassis/motherboard/dimm98: - <<: *DIMM_DEFAULTS - entityInstance: 107 -129: - /system/chassis/motherboard/dimm99: - <<: *DIMM_DEFAULTS - entityInstance: 108 -130: - /system/chassis/motherboard/dimm100: - <<: *DIMM_DEFAULTS - entityInstance: 109 -131: - /system/chassis/motherboard/dimm101: - <<: *DIMM_DEFAULTS - entityInstance: 110 -132: - /system/chassis/motherboard/dimm102: - <<: *DIMM_DEFAULTS - entityInstance: 111 -133: - /system/chassis/motherboard/dimm103: - <<: *DIMM_DEFAULTS - entityInstance: 112 -134: - /system/chassis/motherboard/dimm112: - <<: *DIMM_DEFAULTS - entityInstance: 113 -135: - /system/chassis/motherboard/dimm113: - <<: *DIMM_DEFAULTS - entityInstance: 114 -136: - /system/chassis/motherboard/dimm114: - <<: *DIMM_DEFAULTS - entityInstance: 115 -137: - /system/chassis/motherboard/dimm115: - <<: *DIMM_DEFAULTS - entityInstance: 116 -138: - /system/chassis/motherboard/dimm116: - <<: *DIMM_DEFAULTS - entityInstance: 117 -139: - /system/chassis/motherboard/dimm117: - <<: *DIMM_DEFAULTS - entityInstance: 118 -140: - /system/chassis/motherboard/dimm118: - <<: *DIMM_DEFAULTS - entityInstance: 119 -141: - /system/chassis/motherboard/dimm119: - <<: *DIMM_DEFAULTS - entityInstance: 120 -142: - /system/chassis/motherboard/dimm120: - <<: *DIMM_DEFAULTS - entityInstance: 121 -143: - /system/chassis/motherboard/dimm121: - <<: *DIMM_DEFAULTS - entityInstance: 122 -144: - /system/chassis/motherboard/dimm122: - <<: *DIMM_DEFAULTS - entityInstance: 123 -145: - /system/chassis/motherboard/dimm123: - <<: *DIMM_DEFAULTS - entityInstance: 124 -146: - /system/chassis/motherboard/dimm124: - <<: *DIMM_DEFAULTS - entityInstance: 125 -147: - /system/chassis/motherboard/dimm125: - <<: *DIMM_DEFAULTS - entityInstance: 126 -148: - /system/chassis/motherboard/dimm126: - <<: *DIMM_DEFAULTS - entityInstance: 127 -149: - /system/chassis/motherboard/dimm127: - <<: *DIMM_DEFAULTS - entityInstance: 128 - -150: - /system/chassis/motherboard/powersupply0: - entityID: 19 - entityInstance: 0 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version - /system/chassis/motherboard/powersupply0/info: - entityID: 19 - entityInstance: 0 - interfaces: - xyz.openbmc_project.Inventory.MultiRecord.PowerSupply: - Data: - IPMIFruProperty: PowerSupply - IPMIFruSection: MultiRecord - /system/chassis/motherboard/powersupply0/dc_output: - entityID: 19 - entityInstance: 0 - interfaces: - xyz.openbmc_project.Inventory.MultiRecord.DcOutput: - Data: - IPMIFruProperty: DcOutput - IPMIFruSection: MultiRecord - -151: - /system/chassis/motherboard/powersupply1: - entityID: 19 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Product - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version - /system/chassis/motherboard/powersupply1/info: - entityID: 19 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.MultiRecord.PowerSupply: - Data: - IPMIFruProperty: PowerSupply - IPMIFruSection: MultiRecord - /system/chassis/motherboard/powersupply1/dc_output: - entityID: 19 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.MultiRecord.DcOutput: - Data: - IPMIFruProperty: DcOutput - IPMIFruSection: MultiRecord - -152: - /system/chassis/motherboard/fan0: &FAN_DEFAULTS - entityID: 29 - entityInstance: 0 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - PartNumber: - IPMIFruProperty: Model Number - IPMIFruSection: Product - Model: - IPMIFruProperty: Model Number - IPMIFruSection: Product - -153: - /system/chassis/motherboard/fan1: - <<: *FAN_DEFAULTS - entityInstance: 1 - -154: - /system/chassis/motherboard/fan2: - <<: *FAN_DEFAULTS - entityInstance: 2 - -155: - /system/chassis/motherboard/fan3: - <<: *FAN_DEFAULTS - entityInstance: 3 - -156: - /system/chassis/motherboard/fan4: - <<: *FAN_DEFAULTS - entityInstance: 4 - -254: - /system/chassis/motherboard/opfw: - entityID: 34 - entityInstance: 0 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version - IPMIFruSection: Product diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/images/obmc-phosphor-image.bbappend deleted file mode 100644 index 36c136893..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ /dev/null @@ -1 +0,0 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd first-boot-set-mac" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend deleted file mode 100644 index 3e79e4831..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/initfs/obmc-phosphor-initfs.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -RDEPENDS_${PN}_remove += " cf-fsi-firmware " - -do_install_append() { - echo "/etc/hostname" >> ${D}/whitelist -} diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend deleted file mode 100644 index 3ee4501d7..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -DEPENDS_append_vesnin = " vesnin-yaml-config" - -EXTRA_OECONF_vesnin = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/vesnin-yaml-config/ipmi-fru-read.yaml \ - " diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend deleted file mode 100644 index cf846c7fa..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -DEPENDS_append_vesnin = " vesnin-yaml-config" - -EXTRA_OECONF_vesnin = " \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/vesnin-yaml-config/ipmi-fru-read.yaml \ - " diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb b/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb deleted file mode 100644 index c10301060..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config-native.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Phosphor LED Group Management for Vesnin" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit native -inherit obmc-phosphor-utils - -PROVIDES += "virtual/phosphor-led-manager-config-native" - -SRC_URI += "file://led.yaml" -S = "${WORKDIR}" - -# Copies example led layout yaml file -do_install() { - SRC=${S} - DEST=${D}${datadir}/phosphor-led-manager - install -D ${SRC}/led.yaml ${DEST}/led.yaml -} diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config/led.yaml b/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config/led.yaml deleted file mode 100644 index 3dfc46193..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/leds/vesnin-led-manager-config/led.yaml +++ /dev/null @@ -1,43 +0,0 @@ -BmcBooted: - heartbeat: - Action: 'Blink' - DutyOn: 50 - Period: 1000 - alarm_yel: - Action: 'On' - Priority: 'Blink' -PowerOn: - power_green: - Action: 'On' - Priority: 'On' -PgoodTimeout: - power_red: - Action: 'On' - Priority: 'On' -HostQuiesced: - alarm_red: - Action: 'On' - Priority: 'Blink' -Overheat: - alarm_red: - Action: 'Blink' - DutyOn: 50 - Period: 1000 - Priority: 'Blink' -PsuSmbalert: - alarm_yel: - Action: 'Blink' - DutyOn: 50 - Period: 1000 - Priority: 'Blink' -EnclosureIdentify: - id_blue: - Action: 'Blink' - Priority: 'On' -FruFault: - alarm_yel: - Action: 'Blink' - DutyOn: 50 - Period: 200 - Priority: 'Blink' - diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/mboxd/mboxd_%.bbappend deleted file mode 100644 index 8b6248a46..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/mboxd/mboxd_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -MBOXD_FLASH_SIZE = "64M" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/network/first-boot-set-mac_%.bbappend deleted file mode 100644 index 29d23c8c4..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -SYSTEMD_SERVICE_${PN} += "first-boot-set-mac@eth0.service" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/occ/files/occ_sensor.yaml b/meta-yadro/meta-vesnin/recipes-phosphor/occ/files/occ_sensor.yaml deleted file mode 100644 index 97fd3f76c..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/occ/files/occ_sensor.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- Instance: 0 - SensorID: 0x08 - SensorName: occ0 -- Instance: 1 - SensorID: 0x09 - SensorName: occ1 -- Instance: 6 - SensorID: 0x06 - SensorName: occ2 -- Instance: 7 - SensorID: 0x07 - SensorName: occ3 diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/occ/openpower-occ-control_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/occ/openpower-occ-control_%.bbappend deleted file mode 100644 index 6a7aa8c5e..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/occ/openpower-occ-control_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -EXTRA_OECONF_append = " --enable-i2c-occ" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb b/meta-yadro/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb deleted file mode 100644 index 71ce60ce2..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/occ/vesnin-openpower-occ-control-config-native.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Vesnin OCC Control sensor IDs" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit native -inherit openpower-occ-control - -PROVIDES += "virtual/openpower-occ-control-config-native" - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://occ_sensor.yaml" - -S = "${WORKDIR}" -do_install() { - install -d ${YAML_DEST}/ - install ${S}/occ_sensor.yaml ${YAML_DEST}/ -} diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend deleted file mode 100644 index e5b837abc..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ /dev/null @@ -1 +0,0 @@ -RDEPENDS_${PN}-inventory += "openpower-occ-control" diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json deleted file mode 100644 index 75b0480bd..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "gpio_configs": { - "power_config": { - "power_good_in": "SYS_PWROK_BUFF", - "power_up_outs": [ - {"name": "BMC_POWER_UP", "polarity": false} - ], - "reset_outs": [ - {"name": "CM1_OE_R_N", "polarity": true}, - {"name": "BMC_CP0_RESET_N", "polarity": false} - ], - "pci_reset_outs": [ - {"name": "PEX8718_DEVICES_RESET_N", "polarity": false, "hold": true} - ] - } - }, - - "gpio_definitions": [ - { - "name": "BMC_POWER_UP", - "pin": "E1", - "direction": "out" - }, - { - "name": "SYS_PWROK_BUFF", - "pin": "E6", - "direction": "in" - }, - { - "name": "BMC_WD_CLEAR_PULSE_N", - "pin": "N4", - "direction": "out" - }, - { - "name": "CM1_OE_R_N", - "pin": "Q6", - "direction": "out" - }, - { - "name": "BMC_CP0_RESET_N", - "pin": "O2", - "direction": "out" - }, - { - "name": "PSU_PG", - "pin": "J2", - "direction": "in" - }, - { - "name": "PEX8718_DEVICES_RESET_N", - "pin": "B6", - "direction": "out" - }, - { - "name": "CP0_DEVICES_RESET_N", - "pin": "N3", - "direction": "in" - }, - { - "name": "CP1_DEVICES_RESET_N", - "pin": "N5", - "direction": "in" - }, - { - "name": "CP2_DEVICES_RESET_N", - "pin": "P0", - "direction": "in" - }, - - { - "name": "CP3_DEVICES_RESET_N", - "pin": "P1", - "direction": "in" - }, - { - "name": "IDBTN", - "pin": "Q7", - "direction": "out" - }, - { - "name": "POWER_BUTTON", - "pin": "E0", - "direction": "both" - }, - { - "name": "RESET_BUTTON", - "pin": "E2", - "direction": "both" - }, - { - "name": "CHECKSTOP", - "pin": "P5", - "direction": "falling" - }, - { - "name": "PS0_PRES_N", - "pin": "P7", - "direction": "in" - }, - { - "name": "PS1_PRES_N", - "pin": "N0", - "direction": "in" - }, - { - "name": "FSI_DATA", - "pin": "A5", - "direction": "out" - }, - { - "name": "FSI_CLK", - "pin": "A4", - "direction": "out" - }, - { - "name": "FSI_ENABLE", - "pin": "E5", - "direction": "out" - }, - { - "name": "CRONUS_SEL", - "pin": "A6", - "direction": "out" - }, - { - "name": "CP0_FSI0_DATA_EN", - "pin": "H6", - "direction": "out" - } - ] -} diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host/0001-Replace-ColdFire-FSI-with-plain-FSI-over-GPIO.patch b/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host/0001-Replace-ColdFire-FSI-with-plain-FSI-over-GPIO.patch deleted file mode 100644 index 33b1bb32f..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host/0001-Replace-ColdFire-FSI-with-plain-FSI-over-GPIO.patch +++ /dev/null @@ -1,358 +0,0 @@ -From b6b1cda6a526bad8c7f50aa4427bedbc6e539a4d Mon Sep 17 00:00:00 2001 -From: Artem Senichev <a.senichev@yadro.com> -Date: Fri, 23 Nov 2018 10:31:59 +0300 -Subject: [PATCH] Replace ColdFire FSI with plain FSI-over-GPIO - -Workaround to fix ColdFire FSI performance issue: -https://github.com/openbmc/openbmc/issues/3433 -Current implementation based on an old version of skeleton -(revision 517b35ed92ad2c0df5e048711c175bacb632f6d0), mostly it's -a copy-paste of op-hostctl module. - -Signed-off-by: Artem Senichev <a.senichev@yadro.com> -Signed-off-by: Alexander Filippov <a.filippov@yadro.com> ---- - control_host_obj.c | 259 ++++++++++++++++++++-------------- - 1 file changed, 152 insertions(+), 107 deletions(-) - -diff --git a/control_host_obj.c b/control_host_obj.c -index 27f7fc7..ca45182 100644 ---- a/control_host_obj.c -+++ b/control_host_obj.c -@@ -5,10 +5,10 @@ - #include <unistd.h> - #include <sys/stat.h> - #include <sys/mman.h> --#include <errno.h> -- - #include <openbmc_intf.h> - #include <openbmc.h> -+#include <gpio.h> -+#include <gpio_configs.h> - - /* ------------------------------------------------------------------------- */ - static const gchar* dbus_object_path = "/org/openbmc/control"; -@@ -17,36 +17,31 @@ static const gchar* dbus_name = "org.openbmc.control.Host"; - - static GDBusObjectManagerServer *manager = NULL; - --#define PPC_BIT32(bit) (0x80000000UL >> (bit)) -- --#define FSI_EXTERNAL_MODE_PATH "/sys/devices/platform/gpio-fsi/external_mode" --#define FSI_SCAN_PATH "/sys/devices/platform/gpio-fsi/fsi0/rescan" -- --/* TODO: Change this over to the cfam path once the cfam chardev patches have landed */ --#define FSI_RAW_PATH "/sys/devices/platform/gpio-fsi/fsi0/slave@00:00/raw" -- --#define FSI_SCAN_DELAY_US 10000 -+static GPIO* fsi_data; -+static GPIO* fsi_clk; -+static GPIO* fsi_enable; -+static GPIO* cronus_sel; -+static size_t num_optionals; -+static GPIO* optionals; -+static gboolean* optional_pols; - --/* Attention registers */ --#define FSI_A_SI1S 0x081c --#define TRUE_MASK 0x100d --#define INTERRUPT_STATUS_REG 0x100b -+/* Bit bang patterns */ - --/* SBE boot register and values */ --#define SBE_VITAL 0x281c --#define SBE_WARMSTART PPC_BIT32(0) --#define SBE_HW_TRIGGER PPC_BIT32(2) --#define SBE_UPDATE_1ST_NIBBLE PPC_BIT32(3) --#define SBE_IMAGE_SELECT PPC_BIT32(8) --#define SBE_UPDATE_3RD_NIBBLE PPC_BIT32(11) -+//putcfam pu 281c 30000000 -p0 (Primary Side Select) -+static const char* primary = "000011111111110101111000111001100111111111111111111111111111101111111111"; -+//putcfam pu 281c B0000000 -p0 -+static const char* go = "000011111111110101111000111000100111111111111111111111111111101101111111"; -+//putcfam pu 0x281c 30900000 (Golden Side Select) -+static const char* golden = "000011111111110101111000111001100111101101111111111111111111101001111111"; - --/* Once the side is selected and attention bits are set, this starts the SBE */ --#define START_SBE (SBE_WARMSTART | SBE_HW_TRIGGER | SBE_UPDATE_1ST_NIBBLE) -+/* Setup attentions */ -+//putcfam pu 0x081C 20000000 -+static const char* attnA = "000011111111111101111110001001101111111111111111111111111111110001111111"; -+//putcfam pu 0x100D 40000000 -+static const char* attnB = "000011111111111011111100101001011111111111111111111111111111110001111111"; -+//putcfam pu 0x100B FFFFFFFF -+static const char* attnC = "000011111111111011111101001000000000000000000000000000000000001011111111"; - --/* Primary is first side. Golden is second side */ --#define PRIMARY_SIDE (SBE_HW_TRIGGER | SBE_UPDATE_1ST_NIBBLE) --#define GOLDEN_SIDE (SBE_HW_TRIGGER | SBE_UPDATE_1ST_NIBBLE | \ -- SBE_IMAGE_SELECT | SBE_UPDATE_3RD_NIBBLE) - - static gboolean - on_init(Control *control, -@@ -57,126 +52,147 @@ on_init(Control *control, - return TRUE; - } - --static gint --fsi_putcfam(int fd, uint64_t addr64, uint32_t val_host) -+int gpio_clock_cycle(GPIO* gpio, int num_clks) - { -- int rc; -- uint32_t val = htobe32(val_host); -- /* Map FSI to FSI_BYTE, as the 'raw' kernel interface expects this */ -- uint32_t addr = (addr64 & 0x7ffc00) | ((addr64 & 0x3ff) << 2); -- -- rc = lseek(fd, addr, SEEK_SET); -- if (rc < 0) { -- g_print("ERROR HostControl: cfam seek failed (0x%08x): %s\n", addr, -- strerror(errno)); -- return errno; -- }; -- -- rc = write(fd, &val, sizeof(val)); -- if (rc < 0) { -- g_print("ERROR HostControl: cfam write failed: %s\n", -- strerror(errno)); -- return errno; -- } -- -- return 0; -+ g_assert(gpio != NULL); -+ int i = 0; -+ int r = GPIO_OK; -+ for (i = 0; i < num_clks; i++) -+ { -+ if (gpio_write(gpio, 0) == -1) -+ { -+ r = GPIO_WRITE_ERROR; -+ break; -+ } -+ if (gpio_write(gpio, 1) == -1) -+ { -+ r = GPIO_WRITE_ERROR; -+ break; -+ } -+ } -+ -+ return r; - } - --static int fsi_rescan(void) -+int -+fsi_bitbang(const char* pattern) - { -- char *one = "1"; -- int fd, rc; -- -- fd = open(FSI_SCAN_PATH, O_WRONLY); -- if (fd < 0) { -- g_print("ERROR HostControl: Failed to open path '%s': %s\n", -- FSI_SCAN_PATH, strerror(errno)); -- return errno; -- } -- rc = write(fd, one, sizeof(one)); -- close(fd); -- if (rc < 0) { -- g_print("ERROR HostControl: Failed to perform FSI scan: %s\n", -- strerror(errno)); -- return errno; -+ int rc=GPIO_OK; -+ int i; -+ for(i=0;i<strlen(pattern);i++) { -+ rc = gpio_write(fsi_data,pattern[i] - '0'); -+ if(rc!=GPIO_OK) { break; } -+ rc = gpio_clock_cycle(fsi_clk,1); -+ if(rc!=GPIO_OK) { break; } - } -- g_print("HostControl: Performing FSI scan (delay %d us)\n", -- FSI_SCAN_DELAY_US); -- usleep(FSI_SCAN_DELAY_US); -+ return rc; -+} - -- return 0; -+int -+fsi_standby() -+{ -+ int rc=GPIO_OK; -+ rc = gpio_write(fsi_data,1); -+ if(rc!=GPIO_OK) { return rc; } -+ rc = gpio_clock_cycle(fsi_clk,5000); -+ if(rc!=GPIO_OK) { return rc; } -+ return rc; - } - -+ - static gboolean - on_boot(ControlHost *host, - GDBusMethodInvocation *invocation, - gpointer user_data) - { -- int rc, cfam_fd; -+ int rc = GPIO_OK; - GDBusProxy *proxy; - GError *error = NULL; - GDBusConnection *connection = - g_dbus_object_manager_server_get_connection(manager); - -+ if (!(fsi_data && fsi_clk && fsi_enable && cronus_sel)) { -+ g_print("ERROR invalid GPIO configuration, will not boot\n"); -+ return FALSE; -+ } - if(control_host_get_debug_mode(host)==1) { -- int fd; -- char *one = "1"; - g_print("Enabling debug mode; not booting host\n"); -- fd = open(FSI_EXTERNAL_MODE_PATH, O_RDWR); -- if (fd < 0) { -- g_print("ERROR HostControl: Failed to open path '%s'\n", -- FSI_EXTERNAL_MODE_PATH); -- return TRUE; -+ rc |= gpio_open(fsi_enable, 1); -+ rc |= gpio_open(cronus_sel, 0); -+ if(rc!=GPIO_OK) { -+ g_print("ERROR enabling debug mode: %d\n",rc); - } -- rc = write(fd, one, sizeof(one)); -- if (rc < 0) { -- g_print("ERROR HostControl: Failed to enable debug mode '%s'\n", -- FSI_EXTERNAL_MODE_PATH); -- } -- close(fd); - return TRUE; - } - g_print("Booting host\n"); -- -- rc = fsi_rescan(); -- if (rc < 0) -- return FALSE; -- -- cfam_fd = open(FSI_RAW_PATH, O_RDWR); -- if (cfam_fd < 0) { -- g_print("ERROR HostControl: Failed to open '%s'\n", FSI_RAW_PATH); -- return FALSE; -- } -- - Control* control = object_get_control((Object*)user_data); - control_host_complete_boot(host,invocation); - do { -- rc = fsi_putcfam(cfam_fd, FSI_A_SI1S, 0x20000000); -- rc |= fsi_putcfam(cfam_fd, TRUE_MASK, 0x40000000); -- rc |= fsi_putcfam(cfam_fd, INTERRUPT_STATUS_REG, 0xFFFFFFFF); -- if(rc) { break; } -+ rc = gpio_open(fsi_clk, 1); -+ rc |= gpio_open(fsi_data, 0); -+ rc |= gpio_open(fsi_enable, 1); -+ rc |= gpio_open(cronus_sel, 1); -+ for (size_t i = 0; i < num_optionals; ++i) { -+ rc |= gpio_open(&optionals[i], optional_pols[i]); -+ } -+ if(rc!=GPIO_OK) { break; } -+ -+ //data standy state -+ rc = fsi_standby(); -+ -+ //clear out pipes -+ rc |= gpio_write(fsi_data,0); -+ rc |= gpio_clock_cycle(fsi_clk,256); -+ rc |= gpio_write(fsi_data,1); -+ rc |= gpio_clock_cycle(fsi_clk,50); -+ if(rc!=GPIO_OK) { break; } -+ -+ rc = fsi_bitbang(attnA); -+ rc |= fsi_standby(); -+ -+ rc |= fsi_bitbang(attnB); -+ rc |= fsi_standby(); -+ -+ rc |= fsi_bitbang(attnC); -+ rc |= fsi_standby(); -+ if(rc!=GPIO_OK) { break; } - - const gchar* flash_side = control_host_get_flash_side(host); - g_print("Using %s side of the bios flash\n",flash_side); - if(strcmp(flash_side,"primary")==0) { -- rc |= fsi_putcfam(cfam_fd, SBE_VITAL, PRIMARY_SIDE); -+ rc |= fsi_bitbang(primary); - } else if(strcmp(flash_side,"golden") == 0) { -- rc |= fsi_putcfam(cfam_fd, SBE_VITAL, GOLDEN_SIDE); -+ rc |= fsi_bitbang(golden); - } else { - g_print("ERROR: Invalid flash side: %s\n",flash_side); - rc = 0xff; - - } -- if(rc) { break; } -+ rc |= fsi_standby(); -+ if(rc!=GPIO_OK) { break; } -+ -+ rc = fsi_bitbang(go); -+ -+ rc |= gpio_write(fsi_data,1); /* Data standby state */ -+ rc |= gpio_clock_cycle(fsi_clk,2); -+ -+ rc |= gpio_write(fsi_clk,0); /* hold clk low for clock mux */ -+ rc |= gpio_write(fsi_enable,0); -+ rc |= gpio_clock_cycle(fsi_clk,16); -+ rc |= gpio_write(fsi_clk,0); /* Data standby state */ - -- rc = fsi_putcfam(cfam_fd, SBE_VITAL, START_SBE); - } while(0); -- if(rc) -+ if(rc != GPIO_OK) - { -- g_print("ERROR HostControl: SBE sequence failed (rc=%d)\n",rc); -+ g_print("ERROR HostControl: GPIO sequence failed (rc=%d)\n",rc); -+ } -+ gpio_close(fsi_clk); -+ gpio_close(fsi_data); -+ gpio_close(fsi_enable); -+ gpio_close(cronus_sel); -+ for (size_t i = 0; i < num_optionals; ++i) { -+ gpio_close(&optionals[i]); - } -- /* Close file descriptor */ -- close(cfam_fd); - - control_host_emit_booted(host); - -@@ -222,6 +238,35 @@ on_bus_acquired(GDBusConnection *connection, - g_dbus_object_manager_server_set_connection(manager, connection); - g_dbus_object_manager_server_export(manager, G_DBUS_OBJECT_SKELETON(object)); - g_object_unref(object); -+ -+ // We don't free allocated memory as the service is a singleton, -+ // this function can be called only once and these GPIO objects -+ // have a process lifetime. -+ fsi_data = malloc(sizeof(GPIO)); -+ fsi_data->name = g_strdup("FSI_DATA"); // GPIO struct has non-const char pointer -+ fsi_clk = malloc(sizeof(GPIO)); -+ fsi_clk->name = g_strdup("FSI_CLK"); -+ fsi_enable = malloc(sizeof(GPIO)); -+ fsi_enable->name = g_strdup("FSI_ENABLE"); -+ cronus_sel = malloc(sizeof(GPIO)); -+ cronus_sel->name = g_strdup("CRONUS_SEL"); -+ -+ // WARNING: This portion of the hardcode is usable only with VESNIN. -+ // For the upstream, it should be rewritten for reading this data from the -+ // JSON file. -+ num_optionals = 1; -+ optionals = malloc(sizeof(GPIO)); -+ optionals->name = g_strdup("CP0_FSI0_DATA_EN"); -+ optional_pols = malloc(sizeof(gboolean)); -+ optional_pols[0] = TRUE; -+ -+ gpio_get_params(fsi_data); -+ gpio_get_params(fsi_clk); -+ gpio_get_params(fsi_enable); -+ gpio_get_params(cronus_sel); -+ for (int i = 0; i < num_optionals; ++i) { -+ gpio_get_params(&optionals[i]); -+ } - } - - static void --- -2.20.1 - diff --git a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host_%.bbappend b/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host_%.bbappend deleted file mode 100644 index 068edeac8..000000000 --- a/meta-yadro/meta-vesnin/recipes-phosphor/skeleton/obmc-op-control-host_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://0001-Replace-ColdFire-FSI-with-plain-FSI-over-GPIO.patch" diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb index 558c7612c..5cdf3164d 100644 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb +++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-cli_git.bb @@ -13,10 +13,11 @@ DEPENDS = "phosphor-user-manager" RDEPENDS_${PN} = " \ ${VIRTUAL-RUNTIME_base-utils} \ bash \ - obmc-console \ obmc-yadro-fwupdate \ obmc-yadro-lssensors \ obmc-yadro-netconfig \ + phosphor-debug-collector-dreport \ + phosphor-debug-collector-scripts \ sudo \ systemd \ " @@ -27,11 +28,12 @@ RDEPENDS_${PN} = " \ # Directory with command handlers FILES_${PN} += "${datadir}/cli" +MACHINE_NAME ?= "${MACHINE}" # Custom installation procedure do_install() { ${B}/install.sh \ --dir ${D} \ - --machine ${@'${MACHINE}'.split('-')[0]} \ + --machine ${@'${MACHINE_NAME}'.split('-')[0]} \ --admin priv-admin \ --operator priv-operator \ --user priv-user @@ -40,4 +42,4 @@ do_install() { # Source code repository S = "${WORKDIR}/git" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-cli" -SRCREV = "29768c2fb743318d459a40281e328ee8e8944a75" +SRCREV = "76743c3706516bae6b2bb8749706b4ea673e9358" diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb index 90f377bbe..dd7f39716 100644 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb +++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-fwupdate_git.bb @@ -7,7 +7,6 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit meson -inherit pkgconfig DEPENDS += " \ sdbusplus \ @@ -23,5 +22,5 @@ PACKAGECONFIG ??= " obmc-phosphor-image reboot-guard-support " PACKAGECONFIG_append_df-openpower = "openpower-support" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-fwupdate" -SRCREV = "f141bdf92f92971caa4e8e5eb0727821241416e8" +SRCREV = "0e3c0714f344a2f7f289c851434955360e6f075b" S = "${WORKDIR}/git" diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb index 234d3cdad..5a08c7a3e 100644 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb +++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-lssensors_git.bb @@ -13,4 +13,4 @@ DEPENDS += "sdbusplus" S = "${WORKDIR}/git" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-lssensors.git" -SRCREV = "f76bf429d212d803cff7e4f1e3ca21097c65f18f" +SRCREV = "39c37655bb777f1876cdddc4b624b38d75105b8e" diff --git a/meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb b/meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb index e868bbfb4..7ec34edfa 100644 --- a/meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb +++ b/meta-yadro/recipes-phosphor/cli/obmc-yadro-netconfig_git.bb @@ -16,4 +16,4 @@ DEPENDS = "sdbusplus" # Source code repository S = "${WORKDIR}/git" SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-netconfig.git" -SRCREV = "b300465732616c6d456bdc2df2cce9d1246636a8" +SRCREV = "1d991868023b80a9361a7a46c6e6b8058b482f01" diff --git a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Add-support-for-boot-initiator-mailbox.patch b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Add-support-for-boot-initiator-mailbox.patch index dd7610975..04ea96421 100644 --- a/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Add-support-for-boot-initiator-mailbox.patch +++ b/meta-yadro/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Add-support-for-boot-initiator-mailbox.patch @@ -1,4 +1,4 @@ -From ec6765e9aa35871f8d02cb0b5b47d96be18f4804 Mon Sep 17 00:00:00 2001 +From a193c5ce59758ed5971b5bd7494f1aaf3489ed9d Mon Sep 17 00:00:00 2001 From: Alexander Amelkin <a.amelkin@yadro.com> Date: Mon, 8 Apr 2019 17:58:42 +0300 Subject: [PATCH] Add support for boot initiator mailbox @@ -21,35 +21,37 @@ Resolves openbmc/openbmc#3391 Change-Id: Iccbf74c0775f20c70e8deaa7b0a8bd995ebbffea Signed-off-by: Alexander Amelkin <a.amelkin@yadro.com> Signed-off-by: Ivan Mikhaylov <i.mikhaylov@yadro.com> + --- - chassishandler.cpp | 328 ++++++++++++++++++++++++++++++++++++++++++++- + chassishandler.cpp | 329 ++++++++++++++++++++++++++++++++++++++++++++- chassishandler.hpp | 1 + - 2 files changed, 325 insertions(+), 4 deletions(-) + 2 files changed, 326 insertions(+), 4 deletions(-) diff --git a/chassishandler.cpp b/chassishandler.cpp -index 3250b2c..48cda21 100644 +index fb3d644..7f92b85 100644 --- a/chassishandler.cpp +++ b/chassishandler.cpp -@@ -136,6 +136,7 @@ namespace internal +@@ -131,6 +131,7 @@ namespace internal { constexpr auto bootModeIntf = "xyz.openbmc_project.Control.Boot.Mode"; +constexpr auto bootMboxIntf = "xyz.openbmc_project.Control.Boot.Mailbox"; + constexpr auto bootTypeIntf = "xyz.openbmc_project.Control.Boot.Type"; constexpr auto bootSourceIntf = "xyz.openbmc_project.Control.Boot.Source"; constexpr auto powerRestoreIntf = - "xyz.openbmc_project.Control.Power.RestorePolicy"; -@@ -151,8 +152,8 @@ settings::Objects& getObjects() +@@ -147,8 +148,9 @@ settings::Objects& getObjects() if (objectsPtr == nullptr) { objectsPtr = std::make_unique<settings::Objects>( -- dbus, std::vector<std::string>{bootModeIntf, bootSourceIntf, -- powerRestoreIntf}); -+ dbus, std::vector<std::string>{bootMboxIntf, bootModeIntf, -+ bootSourceIntf, powerRestoreIntf}); +- dbus, std::vector<std::string>{bootModeIntf, bootTypeIntf, +- bootSourceIntf, powerRestoreIntf}); ++ dbus, ++ std::vector<std::string>{bootMboxIntf, bootModeIntf, bootTypeIntf, ++ bootSourceIntf, powerRestoreIntf}); } return *objectsPtr; } -@@ -1670,6 +1671,127 @@ static ipmi::Cc setBootMode(const Mode::Modes& mode) +@@ -1708,6 +1710,127 @@ static ipmi::Cc setBootType(ipmi::Context::ptr& ctx, const Type::Types& type) return ipmi::ccSuccess; } @@ -174,15 +176,15 @@ index 3250b2c..48cda21 100644 +static constexpr size_t normalBlockSize = 16; +static constexpr size_t IANAEnterpriseLength = 3; + - /** @brief implements the Get Chassis system boot option - * @param bootOptionParameter - boot option parameter selector - * @param reserved1 - reserved bit -@@ -1783,6 +1905,87 @@ ipmi::RspType<ipmi::message::Payload> + static constexpr uint8_t setComplete = 0x0; + static constexpr uint8_t setInProgress = 0x1; + static uint8_t transferStatus = setComplete; +@@ -1882,6 +2005,87 @@ ipmi::RspType<ipmi::message::Payload> return ipmi::responseUnspecifiedError(); } } -+ else if (static_cast<uint8_t>(bootOptionParameter) == -+ static_cast<uint8_t>(BootOptionParameter::bootInitiatorMbox)) ++ else if (types::enum_cast<BootOptionParameter>(bootOptionParameter) == ++ BootOptionParameter::bootInitiatorMbox) + { + // Only allow reading the boot initiator mailbox if Mailbox is supported + // @@ -265,9 +267,9 @@ index 3250b2c..48cda21 100644 else { if ((bootOptionParameter >= oemParmStart) && -@@ -1825,9 +2028,8 @@ ipmi::RspType<> ipmiChassisSetSysBootOptions(ipmi::Context::ptr ctx, - using namespace boot_options; - ipmi::Cc rc; +@@ -1946,9 +2150,8 @@ ipmi::RspType<> ipmiChassisSetSysBootOptions(ipmi::Context::ptr ctx, + return ipmi::responseSuccess(); + } - /* 000101 + /* @@ -275,13 +277,13 @@ index 3250b2c..48cda21 100644 - * This is the only parameter used by petitboot. */ - if (parameterSelector == -@@ -1954,6 +2156,124 @@ ipmi::RspType<> ipmiChassisSetSysBootOptions(ipmi::Context::ptr ctx, + if (types::enum_cast<BootOptionParameter>(parameterSelector) == +@@ -2084,6 +2287,124 @@ ipmi::RspType<> ipmiChassisSetSysBootOptions(ipmi::Context::ptr ctx, return ipmi::responseUnspecifiedError(); } } -+ else if (parameterSelector == -+ static_cast<uint7_t>(BootOptionParameter::bootInitiatorMbox)) ++ else if (types::enum_cast<BootOptionParameter>(parameterSelector) == ++ BootOptionParameter::bootInitiatorMbox) + { + // Only allow writing to boot initiator mailbox if: + // 1. Mailbox is supported @@ -398,21 +400,18 @@ index 3250b2c..48cda21 100644 + return ipmi::responseUnspecifiedError(); + } + } - else if (parameterSelector == - static_cast<uint7_t>(BootOptionParameter::bootInfo)) + else if (types::enum_cast<BootOptionParameter>(parameterSelector) == + BootOptionParameter::bootInfo) { diff --git a/chassishandler.hpp b/chassishandler.hpp -index 93de2c0..33ad25f 100644 +index 2957127..a783bff 100644 --- a/chassishandler.hpp +++ b/chassishandler.hpp -@@ -48,6 +48,7 @@ enum class BootOptionParameter : size_t - { +@@ -51,6 +51,7 @@ enum class BootOptionParameter : size_t + bootFlagValidClr = 0x3, bootInfo = 0x4, bootFlags = 0x5, + bootInitiatorMbox = 0x07, opalNetworkSettings = 0x61 }; --- -2.26.2 - diff --git a/poky/README.OE-Core b/poky/README.OE-Core.md index 521916cd4..521916cd4 100644 --- a/poky/README.OE-Core +++ b/poky/README.OE-Core.md diff --git a/poky/README.md b/poky/README.md new file mode 120000 index 000000000..6d6b2976f --- /dev/null +++ b/poky/README.md @@ -0,0 +1 @@ +README.poky.md
\ No newline at end of file diff --git a/poky/README.qemu b/poky/README.qemu.md index 9f56b7d66..9f56b7d66 100644 --- a/poky/README.qemu +++ b/poky/README.qemu.md diff --git a/poky/bitbake/bin/bitbake-selftest b/poky/bitbake/bin/bitbake-selftest index 6c0737416..aec470692 100755 --- a/poky/bitbake/bin/bitbake-selftest +++ b/poky/bitbake/bin/bitbake-selftest @@ -29,6 +29,7 @@ tests = ["bb.tests.codeparser", "bb.tests.runqueue", "bb.tests.siggen", "bb.tests.utils", + "bb.tests.compression", "hashserv.tests", "layerindexlib.tests.layerindexobj", "layerindexlib.tests.restapi", diff --git a/poky/bitbake/lib/bb/compress/_pipecompress.py b/poky/bitbake/lib/bb/compress/_pipecompress.py new file mode 100644 index 000000000..4b9f66214 --- /dev/null +++ b/poky/bitbake/lib/bb/compress/_pipecompress.py @@ -0,0 +1,194 @@ +# +# SPDX-License-Identifier: GPL-2.0-only +# +# Helper library to implement streaming compression and decompression using an +# external process +# +# This library should be used directly by end users; a wrapper library for the +# specific compression tool should be created + +import builtins +import io +import os +import subprocess + + +def open_wrap( + cls, filename, mode="rb", *, encoding=None, errors=None, newline=None, **kwargs +): + """ + Open a compressed file in binary or text mode. + + Users should not call this directly. A specific compression library can use + this helper to provide it's own "open" command + + The filename argument can be an actual filename (a str or bytes object), or + an existing file object to read from or write to. + + The mode argument can be "r", "rb", "w", "wb", "x", "xb", "a" or "ab" for + binary mode, or "rt", "wt", "xt" or "at" for text mode. The default mode is + "rb". + + For binary mode, this function is equivalent to the cls constructor: + cls(filename, mode). In this case, the encoding, errors and newline + arguments must not be provided. + + For text mode, a cls object is created, and wrapped in an + io.TextIOWrapper instance with the specified encoding, error handling + behavior, and line ending(s). + """ + if "t" in mode: + if "b" in mode: + raise ValueError("Invalid mode: %r" % (mode,)) + else: + if encoding is not None: + raise ValueError("Argument 'encoding' not supported in binary mode") + if errors is not None: + raise ValueError("Argument 'errors' not supported in binary mode") + if newline is not None: + raise ValueError("Argument 'newline' not supported in binary mode") + + file_mode = mode.replace("t", "") + if isinstance(filename, (str, bytes, os.PathLike)): + binary_file = cls(filename, file_mode, **kwargs) + elif hasattr(filename, "read") or hasattr(filename, "write"): + binary_file = cls(None, file_mode, fileobj=filename, **kwargs) + else: + raise TypeError("filename must be a str or bytes object, or a file") + + if "t" in mode: + return io.TextIOWrapper( + binary_file, encoding, errors, newline, write_through=True + ) + else: + return binary_file + + +class CompressionError(OSError): + pass + + +class PipeFile(io.RawIOBase): + """ + Class that implements generically piping to/from a compression program + + Derived classes should add the function get_compress() and get_decompress() + that return the required commands. Input will be piped into stdin and the + (de)compressed output should be written to stdout, e.g.: + + class FooFile(PipeCompressionFile): + def get_decompress(self): + return ["fooc", "--decompress", "--stdout"] + + def get_compress(self): + return ["fooc", "--compress", "--stdout"] + + """ + + READ = 0 + WRITE = 1 + + def __init__(self, filename=None, mode="rb", *, stderr=None, fileobj=None): + if "t" in mode or "U" in mode: + raise ValueError("Invalid mode: {!r}".format(mode)) + + if not "b" in mode: + mode += "b" + + if mode.startswith("r"): + self.mode = self.READ + elif mode.startswith("w"): + self.mode = self.WRITE + else: + raise ValueError("Invalid mode %r" % mode) + + if fileobj is not None: + self.fileobj = fileobj + else: + self.fileobj = builtins.open(filename, mode or "rb") + + if self.mode == self.READ: + self.p = subprocess.Popen( + self.get_decompress(), + stdin=self.fileobj, + stdout=subprocess.PIPE, + stderr=stderr, + close_fds=True, + ) + self.pipe = self.p.stdout + else: + self.p = subprocess.Popen( + self.get_compress(), + stdin=subprocess.PIPE, + stdout=self.fileobj, + stderr=stderr, + close_fds=True, + ) + self.pipe = self.p.stdin + + self.__closed = False + + def _check_process(self): + if self.p is None: + return + + returncode = self.p.wait() + if returncode: + raise CompressionError("Process died with %d" % returncode) + self.p = None + + def close(self): + if self.closed: + return + + self.pipe.close() + if self.p is not None: + self._check_process() + self.fileobj.close() + + self.__closed = True + + @property + def closed(self): + return self.__closed + + def fileno(self): + return self.pipe.fileno() + + def flush(self): + self.pipe.flush() + + def isatty(self): + return self.pipe.isatty() + + def readable(self): + return self.mode == self.READ + + def writable(self): + return self.mode == self.WRITE + + def readinto(self, b): + if self.mode != self.READ: + import errno + + raise OSError( + errno.EBADF, "read() on write-only %s object" % self.__class__.__name__ + ) + size = self.pipe.readinto(b) + if size == 0: + self._check_process() + return size + + def write(self, data): + if self.mode != self.WRITE: + import errno + + raise OSError( + errno.EBADF, "write() on read-only %s object" % self.__class__.__name__ + ) + data = self.pipe.write(data) + + if not data: + self._check_process() + + return data diff --git a/poky/bitbake/lib/bb/compress/lz4.py b/poky/bitbake/lib/bb/compress/lz4.py new file mode 100644 index 000000000..0f6bc51a5 --- /dev/null +++ b/poky/bitbake/lib/bb/compress/lz4.py @@ -0,0 +1,17 @@ +# +# SPDX-License-Identifier: GPL-2.0-only +# + +import bb.compress._pipecompress + + +def open(*args, **kwargs): + return bb.compress._pipecompress.open_wrap(LZ4File, *args, **kwargs) + + +class LZ4File(bb.compress._pipecompress.PipeFile): + def get_compress(self): + return ["lz4c", "-z", "-c"] + + def get_decompress(self): + return ["lz4c", "-d", "-c"] diff --git a/poky/bitbake/lib/bb/compress/zstd.py b/poky/bitbake/lib/bb/compress/zstd.py new file mode 100644 index 000000000..50c42133f --- /dev/null +++ b/poky/bitbake/lib/bb/compress/zstd.py @@ -0,0 +1,28 @@ +# +# SPDX-License-Identifier: GPL-2.0-only +# + +import bb.compress._pipecompress +import shutil + + +def open(*args, **kwargs): + return bb.compress._pipecompress.open_wrap(ZstdFile, *args, **kwargs) + + +class ZstdFile(bb.compress._pipecompress.PipeFile): + def __init__(self, *args, num_threads=1, compresslevel=3, **kwargs): + self.num_threads = num_threads + self.compresslevel = compresslevel + super().__init__(*args, **kwargs) + + def _get_zstd(self): + if self.num_threads == 1 or not shutil.which("pzstd"): + return ["zstd"] + return ["pzstd", "-p", "%d" % self.num_threads] + + def get_compress(self): + return self._get_zstd() + ["-c", "-%d" % self.compresslevel] + + def get_decompress(self): + return self._get_zstd() + ["-d", "-c"] diff --git a/poky/bitbake/lib/bb/data_smart.py b/poky/bitbake/lib/bb/data_smart.py index 2328c334a..f48726a34 100644 --- a/poky/bitbake/lib/bb/data_smart.py +++ b/poky/bitbake/lib/bb/data_smart.py @@ -481,6 +481,7 @@ class DataSmart(MutableMapping): def setVar(self, var, value, **loginfo): #print("var=" + str(var) + " val=" + str(value)) + var = var.replace(":", "_") self.expand_cache = {} parsing=False if 'parsing' in loginfo: @@ -589,6 +590,8 @@ class DataSmart(MutableMapping): """ Rename the variable key to newkey """ + key = key.replace(":", "_") + newkey = newkey.replace(":", "_") if key == newkey: bb.warn("Calling renameVar with equivalent keys (%s) is invalid" % key) return @@ -637,6 +640,7 @@ class DataSmart(MutableMapping): self.setVar(var + "_prepend", value, ignore=True, parsing=True) def delVar(self, var, **loginfo): + var = var.replace(":", "_") self.expand_cache = {} loginfo['detail'] = "" @@ -664,6 +668,7 @@ class DataSmart(MutableMapping): override = None def setVarFlag(self, var, flag, value, **loginfo): + var = var.replace(":", "_") self.expand_cache = {} if 'op' not in loginfo: @@ -687,6 +692,7 @@ class DataSmart(MutableMapping): self.dict["__exportlist"]["_content"].add(var) def getVarFlag(self, var, flag, expand=True, noweakdefault=False, parsing=False, retparser=False): + var = var.replace(":", "_") if flag == "_content": cachename = var else: @@ -814,6 +820,7 @@ class DataSmart(MutableMapping): return value def delVarFlag(self, var, flag, **loginfo): + var = var.replace(":", "_") self.expand_cache = {} local_var, _ = self._findVar(var) @@ -831,6 +838,7 @@ class DataSmart(MutableMapping): del self.dict[var][flag] def appendVarFlag(self, var, flag, value, **loginfo): + var = var.replace(":", "_") loginfo['op'] = 'append' loginfo['flag'] = flag self.varhistory.record(**loginfo) @@ -838,6 +846,7 @@ class DataSmart(MutableMapping): self.setVarFlag(var, flag, newvalue, ignore=True) def prependVarFlag(self, var, flag, value, **loginfo): + var = var.replace(":", "_") loginfo['op'] = 'prepend' loginfo['flag'] = flag self.varhistory.record(**loginfo) @@ -845,6 +854,7 @@ class DataSmart(MutableMapping): self.setVarFlag(var, flag, newvalue, ignore=True) def setVarFlags(self, var, flags, **loginfo): + var = var.replace(":", "_") self.expand_cache = {} infer_caller_details(loginfo) if not var in self.dict: @@ -859,6 +869,7 @@ class DataSmart(MutableMapping): self.dict[var][i] = flags[i] def getVarFlags(self, var, expand = False, internalflags=False): + var = var.replace(":", "_") local_var, _ = self._findVar(var) flags = {} @@ -875,6 +886,7 @@ class DataSmart(MutableMapping): def delVarFlags(self, var, **loginfo): + var = var.replace(":", "_") self.expand_cache = {} if not var in self.dict: self._makeShadowCopy(var) diff --git a/poky/bitbake/lib/bb/fetch2/__init__.py b/poky/bitbake/lib/bb/fetch2/__init__.py index c8e91262a..0d49e1da3 100644 --- a/poky/bitbake/lib/bb/fetch2/__init__.py +++ b/poky/bitbake/lib/bb/fetch2/__init__.py @@ -834,7 +834,10 @@ def runfetchcmd(cmd, d, quiet=False, cleanup=None, log=None, workdir=None): 'SSH_AUTH_SOCK', 'SSH_AGENT_PID', 'SOCKS5_USER', 'SOCKS5_PASSWD', 'DBUS_SESSION_BUS_ADDRESS', - 'P4CONFIG'] + 'P4CONFIG', + 'AWS_ACCESS_KEY_ID', + 'AWS_SECRET_ACCESS_KEY', + 'AWS_DEFAULT_REGION'] if not cleanup: cleanup = [] diff --git a/poky/bitbake/lib/bb/fetch2/git.py b/poky/bitbake/lib/bb/fetch2/git.py index 5e65c83c6..488f4c741 100644 --- a/poky/bitbake/lib/bb/fetch2/git.py +++ b/poky/bitbake/lib/bb/fetch2/git.py @@ -231,7 +231,7 @@ class Git(FetchMethod): for name in ud.names: ud.unresolvedrev[name] = 'HEAD' - ud.basecmd = d.getVar("FETCHCMD_git") or "git -c core.fsyncobjectfiles=0" + ud.basecmd = d.getVar("FETCHCMD_git") or "git -c core.fsyncobjectfiles=0 -c gc.autoDetach=false" write_tarballs = d.getVar("BB_GENERATE_MIRROR_TARBALLS") or "0" ud.write_tarballs = write_tarballs != "0" or ud.rebaseable diff --git a/poky/bitbake/lib/bb/parse/ast.py b/poky/bitbake/lib/bb/parse/ast.py index 50a88f7da..db2bdc35e 100644 --- a/poky/bitbake/lib/bb/parse/ast.py +++ b/poky/bitbake/lib/bb/parse/ast.py @@ -97,6 +97,7 @@ class DataNode(AstNode): def eval(self, data): groupd = self.groupd key = groupd["var"] + key = key.replace(":", "_") loginfo = { 'variable': key, 'file': self.filename, @@ -207,6 +208,7 @@ class ExportFuncsNode(AstNode): def eval(self, data): for func in self.n: + func = func.replace(":", "_") calledfunc = self.classname + "_" + func if data.getVar(func, False) and not data.getVarFlag(func, 'export_func', False): diff --git a/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py b/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py index f8988b863..152ef6ab7 100644 --- a/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/poky/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -22,7 +22,7 @@ from .ConfHandler import include, init # For compatibility bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"]) -__func_start_regexp__ = re.compile(r"(((?P<py>python(?=(\s|\()))|(?P<fr>fakeroot(?=\s)))\s*)*(?P<func>[\w\.\-\+\{\}\$]+)?\s*\(\s*\)\s*{$" ) +__func_start_regexp__ = re.compile(r"(((?P<py>python(?=(\s|\()))|(?P<fr>fakeroot(?=\s)))\s*)*(?P<func>[\w\.\-\+\{\}\$:]+)?\s*\(\s*\)\s*{$" ) __inherit_regexp__ = re.compile(r"inherit\s+(.+)" ) __export_func_regexp__ = re.compile(r"EXPORT_FUNCTIONS\s+(.+)" ) __addtask_regexp__ = re.compile(r"addtask\s+(?P<func>\w+)\s*((before\s*(?P<before>((.*(?=after))|(.*))))|(after\s*(?P<after>((.*(?=before))|(.*)))))*") diff --git a/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py index f171c5c93..0834fe3f9 100644 --- a/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/poky/bitbake/lib/bb/parse/parse_py/ConfHandler.py @@ -20,7 +20,7 @@ from bb.parse import ParseError, resolve_file, ast, logger, handle __config_regexp__ = re.compile( r""" ^ (?P<exp>export\s+)? - (?P<var>[a-zA-Z0-9\-_+.${}/~]+?) + (?P<var>[a-zA-Z0-9\-_+.${}/~:]+?) (\[(?P<flag>[a-zA-Z0-9\-_+.]+)\])? \s* ( diff --git a/poky/bitbake/lib/bb/providers.py b/poky/bitbake/lib/bb/providers.py index 3ec11a40e..516d45e4a 100644 --- a/poky/bitbake/lib/bb/providers.py +++ b/poky/bitbake/lib/bb/providers.py @@ -133,7 +133,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): if required_v is not None: if preferred_v is not None: - logger.warn("REQUIRED_VERSION and PREFERRED_VERSION for package %s%s are both set using REQUIRED_VERSION %s", pn, itemstr, required_v) + logger.warning("REQUIRED_VERSION and PREFERRED_VERSION for package %s%s are both set using REQUIRED_VERSION %s", pn, itemstr, required_v) else: logger.debug("REQUIRED_VERSION is set for package %s%s", pn, itemstr) # REQUIRED_VERSION always takes precedence over PREFERRED_VERSION @@ -173,7 +173,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): pv_str = '%s:%s' % (preferred_e, pv_str) if preferred_file is None: if not required: - logger.warn("preferred version %s of %s not available%s", pv_str, pn, itemstr) + logger.warning("preferred version %s of %s not available%s", pv_str, pn, itemstr) available_vers = [] for file_set in pkg_pn: for f in file_set: @@ -185,7 +185,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): available_vers.append(ver_str) if available_vers: available_vers.sort() - logger.warn("versions of %s available: %s", pn, ' '.join(available_vers)) + logger.warning("versions of %s available: %s", pn, ' '.join(available_vers)) if required: logger.error("required version %s of %s not available%s", pv_str, pn, itemstr) else: diff --git a/poky/bitbake/lib/bb/server/process.py b/poky/bitbake/lib/bb/server/process.py index 155e8d131..a0955722e 100644 --- a/poky/bitbake/lib/bb/server/process.py +++ b/poky/bitbake/lib/bb/server/process.py @@ -147,7 +147,7 @@ class ProcessServer(): conn = newconnections.pop(-1) fds.append(conn) self.controllersock = conn - elif self.timeout is None and not ready: + elif not self.timeout and not ready: serverlog("No timeout, exiting.") self.quit = True diff --git a/poky/bitbake/lib/bb/tests/compression.py b/poky/bitbake/lib/bb/tests/compression.py new file mode 100644 index 000000000..d3ddf67f1 --- /dev/null +++ b/poky/bitbake/lib/bb/tests/compression.py @@ -0,0 +1,98 @@ +# +# SPDX-License-Identifier: GPL-2.0-only +# + +from pathlib import Path +import bb.compress.lz4 +import bb.compress.zstd +import contextlib +import os +import shutil +import tempfile +import unittest +import subprocess + + +class CompressionTests(object): + def setUp(self): + self._t = tempfile.TemporaryDirectory() + self.tmpdir = Path(self._t.name) + self.addCleanup(self._t.cleanup) + + def _file_helper(self, mode_suffix, data): + tmp_file = self.tmpdir / "compressed" + + with self.do_open(tmp_file, mode="w" + mode_suffix) as f: + f.write(data) + + with self.do_open(tmp_file, mode="r" + mode_suffix) as f: + read_data = f.read() + + self.assertEqual(read_data, data) + + def test_text_file(self): + self._file_helper("t", "Hello") + + def test_binary_file(self): + self._file_helper("b", "Hello".encode("utf-8")) + + def _pipe_helper(self, mode_suffix, data): + rfd, wfd = os.pipe() + with open(rfd, "rb") as r, open(wfd, "wb") as w: + with self.do_open(r, mode="r" + mode_suffix) as decompress: + with self.do_open(w, mode="w" + mode_suffix) as compress: + compress.write(data) + read_data = decompress.read() + + self.assertEqual(read_data, data) + + def test_text_pipe(self): + self._pipe_helper("t", "Hello") + + def test_binary_pipe(self): + self._pipe_helper("b", "Hello".encode("utf-8")) + + def test_bad_decompress(self): + tmp_file = self.tmpdir / "compressed" + with tmp_file.open("wb") as f: + f.write(b"\x00") + + with self.assertRaises(OSError): + with self.do_open(tmp_file, mode="rb", stderr=subprocess.DEVNULL) as f: + data = f.read() + + +class LZ4Tests(CompressionTests, unittest.TestCase): + def setUp(self): + if shutil.which("lz4c") is None: + self.skipTest("'lz4c' not found") + super().setUp() + + @contextlib.contextmanager + def do_open(self, *args, **kwargs): + with bb.compress.lz4.open(*args, **kwargs) as f: + yield f + + +class ZStdTests(CompressionTests, unittest.TestCase): + def setUp(self): + if shutil.which("zstd") is None: + self.skipTest("'zstd' not found") + super().setUp() + + @contextlib.contextmanager + def do_open(self, *args, **kwargs): + with bb.compress.zstd.open(*args, **kwargs) as f: + yield f + + +class PZStdTests(CompressionTests, unittest.TestCase): + def setUp(self): + if shutil.which("pzstd") is None: + self.skipTest("'pzstd' not found") + super().setUp() + + @contextlib.contextmanager + def do_open(self, *args, **kwargs): + with bb.compress.zstd.open(*args, num_threads=2, **kwargs) as f: + yield f diff --git a/poky/documentation/bsp-guide/bsp.rst b/poky/documentation/bsp-guide/bsp.rst index 5c43f53d0..5f62376d6 100644 --- a/poky/documentation/bsp-guide/bsp.rst +++ b/poky/documentation/bsp-guide/bsp.rst @@ -1365,7 +1365,7 @@ Project Reference Manual. - :term:`IMAGE_INSTALL`: Specifies packages to install into an image through the :ref:`image <ref-classes-image>` class. Recipes - use the ``IMAGE_INSTALL`` variable. + use the :term:`IMAGE_INSTALL` variable. - ``do_image_wic[depends]``: A task that is constructed during the build. In this example, the task depends on specific tools in order diff --git a/poky/documentation/dev-manual/common-tasks.rst b/poky/documentation/dev-manual/common-tasks.rst index 762636a17..2af289617 100644 --- a/poky/documentation/dev-manual/common-tasks.rst +++ b/poky/documentation/dev-manual/common-tasks.rst @@ -268,7 +268,7 @@ following list: quickly. In summary, you need to place all files referenced from - ``SRC_URI`` in a machine-specific subdirectory within the layer in + :term:`SRC_URI` in a machine-specific subdirectory within the layer in order to restrict those files to machine-specific builds. - *Perform Steps to Apply for Yocto Project Compatibility:* If you want @@ -1305,7 +1305,7 @@ scanning directory locations for local files in :term:`SRC_URI`. The :term:`SRC_URI` variable in your recipe must define each unique location for your source files. It is good practice to not hard-code version -numbers in a URL used in ``SRC_URI``. Rather than hard-code these +numbers in a URL used in :term:`SRC_URI`. Rather than hard-code these values, use ``${``\ :term:`PV`\ ``}``, which causes the fetch process to use the version specified in the recipe filename. Specifying the version in this manner means that @@ -2743,7 +2743,7 @@ recognizes the machine as "crownbay". The most important variables you must set in your machine configuration file or include from a lower-level configuration file are as follows: -- ``TARGET_ARCH`` (e.g. "arm") +- :term:`TARGET_ARCH` (e.g. "arm") - ``PREFERRED_PROVIDER_virtual/kernel`` @@ -2751,9 +2751,9 @@ file or include from a lower-level configuration file are as follows: You might also need these variables: -- ``SERIAL_CONSOLES`` (e.g. "115200;ttyS0 115200;ttyS1") +- :term:`SERIAL_CONSOLES` (e.g. "115200;ttyS0 115200;ttyS1") -- ``KERNEL_IMAGETYPE`` (e.g. "zImage") +- :term:`KERNEL_IMAGETYPE` (e.g. "zImage") - :term:`IMAGE_FSTYPES` (e.g. "tar.gz jffs2") @@ -3277,7 +3277,7 @@ The actual directory depends on several things: - :term:`EXTENDPE`: The epoch - (if :term:`PE` is not specified, which is - usually the case for most recipes, then ``EXTENDPE`` is blank). + usually the case for most recipes, then :term:`EXTENDPE` is blank). - :term:`PV`: The recipe version. @@ -4167,7 +4167,7 @@ your tunings to best consider build times and package feed maintenance. If :term:`DISTRO` settings change or fundamental configuration settings such as the filesystem layout, you need to work with a clean :term:`TMPDIR`. Sharing :term:`TMPDIR` under these circumstances might work but since it is - not guaranteed, you should use a clean ``TMPDIR``. + not guaranteed, you should use a clean :term:`TMPDIR`. - *Enable the Appropriate Package Architecture:* By default, the OpenEmbedded build system enables three levels of package @@ -4392,7 +4392,7 @@ directory: INHERIT += "own-mirrors" BB_NO_NETWORK = "1" - The ``SOURCE_MIRROR_URL`` and ``own-mirror`` + The :term:`SOURCE_MIRROR_URL` and ``own-mirror`` class set up the system to use the downloads directory as your "own mirror". Using the :term:`BB_NO_NETWORK` variable makes sure that BitBake's fetching process in step 3 stays local, which means files @@ -4676,7 +4676,7 @@ needed. For the most part, the Multilib class extension works automatically to extend the package name from ``${PN}`` to ``${MLPREFIX}${PN}``, where -``MLPREFIX`` is the particular multilib (e.g. "lib32-" or "lib64-"). +:term:`MLPREFIX` is the particular multilib (e.g. "lib32-" or "lib64-"). Standard variables such as :term:`DEPENDS`, :term:`RDEPENDS`, @@ -6258,7 +6258,7 @@ the following: software being packaged. Do not confuse :term:`PV` with the binary package version. -- ``PR``: The recipe revision. +- :term:`PR`: The recipe revision. - :term:`SRCPV`: The OpenEmbedded build system uses this string to help define the value of :term:`PV` when @@ -7946,8 +7946,8 @@ output from this command:: Here are some notes on using the ``buildhistory-collect-srcrevs`` command: - By default, only values where the :term:`SRCREV` was not hardcoded - (usually when ``AUTOREV`` is used) are reported. Use the ``-a`` - option to see all ``SRCREV`` values. + (usually when :term:`AUTOREV` is used) are reported. Use the ``-a`` + option to see all :term:`SRCREV` values. - The output statements might not have any effect if overrides are applied elsewhere in the build system configuration. Use the @@ -8002,7 +8002,7 @@ Here is an example of ``image-info.txt``: DISTRO = poky DISTRO_VERSION = 1.7 - USER_CLASSES = buildstats image-mklibs image-prelink + USER_CLASSES = buildstats image-prelink IMAGE_CLASSES = image_types IMAGE_FEATURES = debug-tweaks IMAGE_LINGUAS = diff --git a/poky/documentation/kernel-dev/common.rst b/poky/documentation/kernel-dev/common.rst index de62df5b1..a97140b0b 100644 --- a/poky/documentation/kernel-dev/common.rst +++ b/poky/documentation/kernel-dev/common.rst @@ -81,7 +81,7 @@ section: variable to include kernel modules. In this example we wish to build for qemux86 so we must set the - ``MACHINE`` variable to "qemux86" and also add the "kernel-modules". + :term:`MACHINE` variable to "qemux86" and also add the "kernel-modules". As described we do this by appending to ``conf/local.conf``:: MACHINE = "qemux86" @@ -259,7 +259,7 @@ section: variable to include kernel modules. In this example we wish to build for qemux86 so we must set the - ``MACHINE`` variable to "qemux86" and also add the "kernel-modules". + :term:`MACHINE` variable to "qemux86" and also add the "kernel-modules". As described we do this by appending to ``conf/local.conf``:: MACHINE = "qemux86" @@ -588,7 +588,7 @@ recipe is processed. added to the Yocto Project. In general, however, the Yocto Project maintainers take care of - moving the ``SRC_URI``-specified configuration options to the + moving the :term:`SRC_URI`-specified configuration options to the kernel's ``meta`` branch. Not only is it easier for BSP developers not to have to put those configurations in the branch, but having the maintainers do it allows them to apply 'global' @@ -730,7 +730,7 @@ a Raspberry Pi 2, which is based on the Broadcom 2708/2709 chipset:: Aside from modifying your kernel recipe and providing your own ``defconfig`` file, you need to be sure no files or statements set -``SRC_URI`` to use a ``defconfig`` other than your "in-tree" file (e.g. +:term:`SRC_URI` to use a ``defconfig`` other than your "in-tree" file (e.g. a kernel's ``linux-``\ `machine`\ ``.inc`` file). In other words, if the build system detects a statement that identifies an "out-of-tree" ``defconfig`` file, that statement will override your diff --git a/poky/documentation/migration-guides/migration-1.5.rst b/poky/documentation/migration-guides/migration-1.5.rst index e956d9fff..e1ba4a9a1 100644 --- a/poky/documentation/migration-guides/migration-1.5.rst +++ b/poky/documentation/migration-guides/migration-1.5.rst @@ -124,7 +124,7 @@ The following directory changes exist: need to refer to this directory. The ``runqemu`` script now uses this variable to find images and kernel binaries and will use BitBake to determine the directory. Alternatively, you can set the - ``DEPLOY_DIR_IMAGE`` variable in the external environment. + :term:`DEPLOY_DIR_IMAGE` variable in the external environment. - When buildhistory is enabled, its output is now written under the :term:`Build Directory` rather than @@ -333,7 +333,7 @@ Following is a list of short entries describing other changes: :term:`BAD_RECOMMENDATIONS` supports pre-renamed package names. -- ``classes/rootfs_rpm``: Implement ``BAD_RECOMMENDATIONS`` for RPM. +- ``classes/rootfs_rpm``: Implement :term:`BAD_RECOMMENDATIONS` for RPM. - ``systemd``: Remove ``systemd_unitdir`` if ``systemd`` is not in :term:`DISTRO_FEATURES`. diff --git a/poky/documentation/migration-guides/migration-1.7.rst b/poky/documentation/migration-guides/migration-1.7.rst index c3a50eec8..8c642da20 100644 --- a/poky/documentation/migration-guides/migration-1.7.rst +++ b/poky/documentation/migration-guides/migration-1.7.rst @@ -13,7 +13,7 @@ The QEMU recipe now uses a number of :term:`PACKAGECONFIG` options to enable various optional features. The method used to set defaults for these options means that existing ``local.conf`` files will need to be modified to -append to ``PACKAGECONFIG`` for ``qemu-native`` and ``nativesdk-qemu`` +append to :term:`PACKAGECONFIG` for ``qemu-native`` and ``nativesdk-qemu`` instead of setting it. In other words, to enable graphical output for QEMU, you should now have these lines in ``local.conf``:: diff --git a/poky/documentation/migration-guides/migration-2.1.rst b/poky/documentation/migration-guides/migration-2.1.rst index 6c5ed965d..3135d69ca 100644 --- a/poky/documentation/migration-guides/migration-2.1.rst +++ b/poky/documentation/migration-guides/migration-2.1.rst @@ -62,12 +62,12 @@ Makefile Environment Changes ---------------------------- :term:`EXTRA_OEMAKE` now defaults to "" instead of -"-e MAKEFLAGS=". Setting ``EXTRA_OEMAKE`` to "-e MAKEFLAGS=" by default +"-e MAKEFLAGS=". Setting :term:`EXTRA_OEMAKE` to "-e MAKEFLAGS=" by default was a historical accident that has required many classes (e.g. ``autotools``, ``module``) and recipes to override this default in order to work with sensible build systems. When upgrading to the release, you must edit any recipe that relies upon this old default by either setting -``EXTRA_OEMAKE`` back to "-e MAKEFLAGS=" or by explicitly setting any +:term:`EXTRA_OEMAKE` back to "-e MAKEFLAGS=" or by explicitly setting any required variable value overrides using :term:`EXTRA_OEMAKE`, which is typically only needed when a Makefile sets a default value for a variable that is inappropriate for cross-compilation using the "=" diff --git a/poky/documentation/migration-guides/migration-2.2.rst b/poky/documentation/migration-guides/migration-2.2.rst index d6dacdf34..cbdc6a739 100644 --- a/poky/documentation/migration-guides/migration-2.2.rst +++ b/poky/documentation/migration-guides/migration-2.2.rst @@ -271,7 +271,7 @@ update the references to ensure they continue to work. The :term:`IMGDEPLOYDIR` variable was introduced to allow sstate caching of image creation results. Image recipes defining custom :term:`IMAGE_CMD` or doing postprocessing on the generated images need to be adapted to use -``IMGDEPLOYDIR`` instead of :term:`DEPLOY_DIR_IMAGE`. ``IMAGE_MANIFEST`` +:term:`IMGDEPLOYDIR` instead of :term:`DEPLOY_DIR_IMAGE`. :term:`IMAGE_MANIFEST` creation and symlinking of the most recent image file will fail otherwise. .. _migration-2.2-bitbake-changes: @@ -292,7 +292,7 @@ The following changes took place for BitBake: change is more in-line with how the other fetchers work for source control systems. Recipes that fetch from Perforce will need to be updated to use :term:`SRCREV` in place of specifying the source revision - within ``SRC_URI``. + within :term:`SRC_URI`. - Some of BitBake's internal code structures for accessing the recipe cache needed to be changed to support the new multi-configuration diff --git a/poky/documentation/migration-guides/migration-2.3.rst b/poky/documentation/migration-guides/migration-2.3.rst index 886d579f9..b79bc541c 100644 --- a/poky/documentation/migration-guides/migration-2.3.rst +++ b/poky/documentation/migration-guides/migration-2.3.rst @@ -36,7 +36,7 @@ Consider the following: has a ``pkg_postinst`` that calls ``systemctl`` if "systemd" is in :term:`DISTRO_FEATURES`. In the example, ``systemd-systemctl-native`` is added to :term:`PACKAGE_WRITE_DEPS`, - which is also conditional on "systemd" being in ``DISTRO_FEATURES``. + which is also conditional on "systemd" being in :term:`DISTRO_FEATURES`. - Examine Recipes that Use ``SSTATEPOSTINSTFUNCS``: You need to examine any recipe that uses ``SSTATEPOSTINSTFUNCS`` and determine diff --git a/poky/documentation/migration-guides/migration-2.4.rst b/poky/documentation/migration-guides/migration-2.4.rst index 07f2bef62..cab81356d 100644 --- a/poky/documentation/migration-guides/migration-2.4.rst +++ b/poky/documentation/migration-guides/migration-2.4.rst @@ -51,7 +51,7 @@ occurred: ``su`` is normally provided through the shadow file format. The main ``util-linux`` package has runtime dependencies (i.e. :term:`RDEPENDS`) on the ``util-linux-su`` package - when "pam" is in ``DISTRO_FEATURES``. + when "pam" is in :term:`DISTRO_FEATURES`. - The ``switch_root`` program is now packaged in a separate "util-linux-switch-root" package for small initramfs images that @@ -72,10 +72,10 @@ occurred: change also eliminates needing to pull in the entire ``initscripts`` package. The main ``initscripts`` package has a runtime dependency (i.e. :term:`RDEPENDS`) on the ``sushell`` package when "selinux" is in - ``DISTRO_FEATURES``. + :term:`DISTRO_FEATURES`. - ``glib-2.0``: The ``glib-2.0`` package now has a recommended - runtime dependency (i.e. ``RRECOMMENDS``) on the ``shared-mime-info`` + runtime dependency (i.e. :term:`RRECOMMENDS`) on the ``shared-mime-info`` package, since large portions of GIO are not useful without the MIME database. You can remove the dependency by using the :term:`BAD_RECOMMENDATIONS` variable if diff --git a/poky/documentation/migration-guides/migration-2.5.rst b/poky/documentation/migration-guides/migration-2.5.rst index d14580df2..79f804fa1 100644 --- a/poky/documentation/migration-guides/migration-2.5.rst +++ b/poky/documentation/migration-guides/migration-2.5.rst @@ -278,12 +278,12 @@ The following are additional changes: performance and compression. In order to build a live image with squashfs+lz4 compression enabled you should now set ``LIVE_ROOTFS_TYPE = "squashfs-lz4"`` and ensure that ``live`` is in - ``IMAGE_FSTYPES``. + :term:`IMAGE_FSTYPES`. - Recipes with an unconditional dependency on ``libpam`` are only buildable with ``pam`` in :term:`DISTRO_FEATURES`. If the dependency is truly optional then it is recommended that the dependency be - conditional upon ``pam`` being in ``DISTRO_FEATURES``. + conditional upon ``pam`` being in :term:`DISTRO_FEATURES`. - For EFI-based machines, the bootloader (``grub-efi`` by default) is installed into the image at /boot. Wic can be used to split the diff --git a/poky/documentation/migration-guides/migration-2.6.rst b/poky/documentation/migration-guides/migration-2.6.rst index 3216ed5ae..a8c56ede7 100644 --- a/poky/documentation/migration-guides/migration-2.6.rst +++ b/poky/documentation/migration-guides/migration-2.6.rst @@ -430,7 +430,7 @@ The following miscellaneous changes occurred: .. note:: ``genericx86`` and ``genericx86-64`` retain ``kernel-modules`` as part of - the ``RRECOMMENDS`` variable setting. + the :term:`RRECOMMENDS` variable setting. - The ``LGPLv2_WHITELIST_GPL-3.0`` variable has been removed. If you are setting this variable in your configuration, set or append it to diff --git a/poky/documentation/migration-guides/migration-2.7.rst b/poky/documentation/migration-guides/migration-2.7.rst index 25d92296c..69bd39060 100644 --- a/poky/documentation/migration-guides/migration-2.7.rst +++ b/poky/documentation/migration-guides/migration-2.7.rst @@ -72,7 +72,7 @@ License Value Corrections The following corrections have been made to the :term:`LICENSE` values set by recipes: -- *socat*: Corrected ``LICENSE`` to be "GPLv2" rather than "GPLv2+". +- *socat*: Corrected :term:`LICENSE` to be "GPLv2" rather than "GPLv2+". - *libgfortran*: Set license to "GPL-3.0-with-GCC-exception". - *elfutils*: Removed "Elfutils-Exception" and set to "GPLv2" for shared libraries diff --git a/poky/documentation/migration-guides/migration-3.0.rst b/poky/documentation/migration-guides/migration-3.0.rst index 163c6201c..20c7026e8 100644 --- a/poky/documentation/migration-guides/migration-3.0.rst +++ b/poky/documentation/migration-guides/migration-3.0.rst @@ -243,7 +243,7 @@ The following sanity check changes occurred. - Setting ``DEPENDS_${PN}`` anywhere (i.e. typically in a recipe) now triggers an error. The error is triggered because :term:`DEPENDS` is not a package-specific variable - unlike RDEPENDS. You should set ``DEPENDS`` instead. + unlike RDEPENDS. You should set :term:`DEPENDS` instead. - systemd currently does not work well with the musl C library because only upstream officially supports linking the library with glibc. diff --git a/poky/documentation/overview-manual/concepts.rst b/poky/documentation/overview-manual/concepts.rst index 642ef15fe..1e5f0f903 100644 --- a/poky/documentation/overview-manual/concepts.rst +++ b/poky/documentation/overview-manual/concepts.rst @@ -774,7 +774,7 @@ Build Directory's hierarchy: - :term:`BPN`: The name of the recipe used to build the package. The :term:`BPN` variable is a version of - the ``PN`` variable but with common prefixes and suffixes removed. + the :term:`PN` variable but with common prefixes and suffixes removed. - :term:`PV`: The version of the recipe used to build the package. @@ -1918,7 +1918,7 @@ shared state files. Here is an example:: .. note:: - The shared state directory (``SSTATE_DIR``) is organized into two-character + The shared state directory (:term:`SSTATE_DIR`) is organized into two-character subdirectories, where the subdirectory names are based on the first two characters of the hash. If the shared state directory structure for a mirror has the same structure @@ -2028,7 +2028,7 @@ dependencies, you must manually declare the dependencies. .. note:: - By default, ``foo-dev`` also has an ``RDEPENDS``-style dependency on + By default, ``foo-dev`` also has an :term:`RDEPENDS`-style dependency on ``foo``, because the default value of ``RDEPENDS_${PN}-dev`` (set in bitbake.conf) includes "${PN}". diff --git a/poky/documentation/ref-manual/classes.rst b/poky/documentation/ref-manual/classes.rst index 09878c480..49905f272 100644 --- a/poky/documentation/ref-manual/classes.rst +++ b/poky/documentation/ref-manual/classes.rst @@ -116,7 +116,7 @@ It's useful to have some idea of how the tasks defined by the - :ref:`ref-tasks-compile` - Runs ``make`` with arguments that specify the compiler and linker. You can pass - additional arguments through the ``EXTRA_OEMAKE`` variable. + additional arguments through the :term:`EXTRA_OEMAKE` variable. - :ref:`ref-tasks-install` - Runs ``make install`` and passes in ``${``\ :term:`D`\ ``}`` as ``DESTDIR``. @@ -932,20 +932,6 @@ specified by :term:`EFI_PROVIDER` if Normally, you do not use this class directly. Instead, you add "live" to :term:`IMAGE_FSTYPES`. -.. _ref-classes-image-mklibs: - -``image-mklibs.bbclass`` -======================== - -The ``image-mklibs`` class enables the use of the ``mklibs`` utility -during the :ref:`ref-tasks-rootfs` task, which optimizes -the size of libraries contained in the image. - -By default, the class is enabled in the ``local.conf.template`` using -the :term:`USER_CLASSES` variable as follows:: - - USER_CLASSES ?= "buildstats image-mklibs image-prelink" - .. _ref-classes-image-prelink: ``image-prelink.bbclass`` @@ -959,7 +945,7 @@ time. By default, the class is enabled in the ``local.conf.template`` using the :term:`USER_CLASSES` variable as follows:: - USER_CLASSES ?= "buildstats image-mklibs image-prelink" + USER_CLASSES ?= "buildstats image-prelink" .. _ref-classes-insane: @@ -995,7 +981,7 @@ are meant to detect real or potential problems in the packaged output. So exercise caution when disabling these checks. Here are the tests you can list with the :term:`WARN_QA` and -``ERROR_QA`` variables: +:term:`ERROR_QA` variables: - ``already-stripped:`` Checks that produced binaries have not already been stripped prior to the build system extracting debug @@ -1030,7 +1016,7 @@ Here are the tests you can list with the :term:`WARN_QA` and adds a dependency on the ``initscripts-functions`` package to packages that install an initscript that refers to ``/etc/init.d/functions``. The recipe should really have an explicit - ``RDEPENDS`` for the package in question on ``initscripts-functions`` + :term:`RDEPENDS` for the package in question on ``initscripts-functions`` so that the OpenEmbedded build system is able to ensure that the ``initscripts`` recipe is actually built and thus the ``initscripts-functions`` package is made available. @@ -1200,7 +1186,7 @@ Here are the tests you can list with the :term:`WARN_QA` and turn into ``FILES = "xyz"``. - ``rpaths:`` Checks for rpaths in the binaries that contain build - system paths such as ``TMPDIR``. If this test fails, bad ``-rpath`` + system paths such as :term:`TMPDIR`. If this test fails, bad ``-rpath`` options are being passed to the linker commands and your binaries have potential security issues. @@ -1273,7 +1259,7 @@ themselves. The ``kernel`` class handles building Linux kernels. The class contains code to build all kernel trees. All needed headers are staged into the -``STAGING_KERNEL_DIR`` directory to allow out-of-tree module builds +:term:`STAGING_KERNEL_DIR` directory to allow out-of-tree module builds using the :ref:`module <ref-classes-module>` class. This means that each built kernel module is packaged separately and diff --git a/poky/documentation/ref-manual/faq.rst b/poky/documentation/ref-manual/faq.rst index 640ef77d0..c7322e762 100644 --- a/poky/documentation/ref-manual/faq.rst +++ b/poky/documentation/ref-manual/faq.rst @@ -292,7 +292,7 @@ download directory. If that location fails, Poky tries :term:`MIRRORS` in that order. Assuming your distribution is "poky", the OpenEmbedded build system uses -the Yocto Project source ``PREMIRRORS`` by default for SCM-based +the Yocto Project source :term:`PREMIRRORS` by default for SCM-based sources, upstreams for normal tarballs, and then falls back to a number of other mirrors including the Yocto Project source mirror if those fail. diff --git a/poky/documentation/ref-manual/kickstart.rst b/poky/documentation/ref-manual/kickstart.rst index a7443f9ea..fc723ccbe 100644 --- a/poky/documentation/ref-manual/kickstart.rst +++ b/poky/documentation/ref-manual/kickstart.rst @@ -208,7 +208,7 @@ supports the following options: bootloader times out and boots the default option. - ``--append``: Specifies kernel parameters. These parameters will be - added to the syslinux ``APPEND`` or ``grub`` kernel command line. + added to the syslinux :term:`APPEND` or ``grub`` kernel command line. - ``--configfile``: Specifies a user-defined configuration file for the bootloader. You can provide a full pathname for the file or a diff --git a/poky/documentation/ref-manual/qa-checks.rst b/poky/documentation/ref-manual/qa-checks.rst index a105acc2c..0ef203c70 100644 --- a/poky/documentation/ref-manual/qa-checks.rst +++ b/poky/documentation/ref-manual/qa-checks.rst @@ -604,7 +604,7 @@ Errors and Warnings so using ${:term:`BPN`} rather than ${:term:`PN`} as the latter will change for different variants of the same recipe e.g. when :term:`BBCLASSEXTEND` or multilib are being used. This check will fail if a reference to ``${PN}`` - is found within the ``SRC_URI`` value - change it to ``${BPN}`` instead. + is found within the :term:`SRC_URI` value - change it to ``${BPN}`` instead. .. _qa-check-unhandled-features-check: diff --git a/poky/documentation/ref-manual/variables.rst b/poky/documentation/ref-manual/variables.rst index 71c2e11d9..3de37a1ab 100644 --- a/poky/documentation/ref-manual/variables.rst +++ b/poky/documentation/ref-manual/variables.rst @@ -280,7 +280,7 @@ system and gives an overview of their function and contents. S = "${WORKDIR}/${BP}" You can separate the (:term:`S`) directory and the directory pointed to - by the ``B`` variable. Most Autotools-based recipes support + by the :term:`B` variable. Most Autotools-based recipes support separating these directories. The build system defaults to using separate directories for ``gcc`` and some kernel recipes. @@ -553,7 +553,7 @@ system and gives an overview of their function and contents. BB_SERVER_TIMEOUT = "20" If you want the server to never be unloaded, - set ``BB_SERVER_TIMEOUT`` to "-1". + set :term:`BB_SERVER_TIMEOUT` to "-1". :term:`BBCLASSEXTEND` Allows you to extend a recipe so that it builds variants of the @@ -577,7 +577,7 @@ system and gives an overview of their function and contents. variants by rewriting variable values and applying overrides such as ``_class-native``. For example, to generate a native version of a recipe, a :term:`DEPENDS` on "foo" is rewritten - to a ``DEPENDS`` on "foo-native". + to a :term:`DEPENDS` on "foo-native". Even when using :term:`BBCLASSEXTEND`, the recipe is only parsed once. Parsing once adds some limitations. For example, it is not @@ -892,13 +892,13 @@ system and gives an overview of their function and contents. the :term:`BUILD_CFLAGS` and :term:`BUILDSDK_CFLAGS` default values. - The default value of the ``BUILD_OPTIMIZATION`` variable is "-O2 + The default value of the :term:`BUILD_OPTIMIZATION` variable is "-O2 -pipe". :term:`BUILD_OS` Specifies the operating system in use on the build host (e.g. "linux"). The OpenEmbedded build system sets the value of - ``BUILD_OS`` from the OS reported by the ``uname`` command - the + :term:`BUILD_OS` from the OS reported by the ``uname`` command - the first word, converted to lower-case characters. :term:`BUILD_PREFIX` @@ -1021,6 +1021,20 @@ system and gives an overview of their function and contents. BUILDHISTORY_IMAGE_FILES ?= "/etc/passwd /etc/group" + :term:`BUILDHISTORY_PATH_PREFIX_STRIP` + When inheriting the :ref:`buildhistory <ref-classes-buildhistory>` + class, this variable specifies a common path prefix that should be + stripped off the beginning of paths in the task signature list when the + ``task`` feature is active in :term:`BUILDHISTORY_FEATURES`. This can be + useful when build history is populated from multiple sources that may not + all use the same top level directory. + + By default, the ``buildhistory`` class sets the variable as follows:: + + BUILDHISTORY_PATH_PREFIX_STRIP ?= "" + + In this case, no prefixes will be stripped. + :term:`BUILDHISTORY_PUSH_REPO` When inheriting the :ref:`buildhistory <ref-classes-buildhistory>` class, this variable optionally specifies a remote repository to @@ -1114,7 +1128,7 @@ system and gives an overview of their function and contents. .. note:: - ``CLASSOVERRIDE`` gets its default "class-target" value from the + :term:`CLASSOVERRIDE` gets its default "class-target" value from the ``bitbake.conf`` file. As an example, the following override allows you to install extra @@ -1205,7 +1219,7 @@ system and gives an overview of their function and contents. :term:`COMPONENTS_DIR` Stores sysroot components for each recipe. The OpenEmbedded build - system uses ``COMPONENTS_DIR`` when constructing recipe-specific + system uses :term:`COMPONENTS_DIR` when constructing recipe-specific sysroots for other recipes. The default is @@ -1611,7 +1625,7 @@ system and gives an overview of their function and contents. ":ref:`overview-manual/concepts:automatically added runtime dependencies`" section in the Yocto Project Overview and Concepts Manual, runtime dependencies will often be added automatically, meaning - ``DEPENDS`` alone is sufficient for most recipes. + :term:`DEPENDS` alone is sufficient for most recipes. - Counterintuitively, :term:`DEPENDS` is often necessary even for recipes that install precompiled components. For example, if @@ -1652,7 +1666,7 @@ system and gives an overview of their function and contents. "package_deb". The BitBake configuration file initially defines the - ``DEPLOY_DIR_DEB`` variable as a sub-folder of + :term:`DEPLOY_DIR_DEB` variable as a sub-folder of :term:`DEPLOY_DIR`:: DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" @@ -2568,7 +2582,7 @@ system and gives an overview of their function and contents. :term:`FONT_EXTRA_RDEPENDS` When inheriting the :ref:`fontcache <ref-classes-fontcache>` class, this variable specifies the runtime dependencies for font packages. - By default, the ``FONT_EXTRA_RDEPENDS`` is set to "fontconfig-utils". + By default, the :term:`FONT_EXTRA_RDEPENDS` is set to "fontconfig-utils". :term:`FONT_PACKAGES` When inheriting the :ref:`fontcache <ref-classes-fontcache>` class, @@ -3005,7 +3019,7 @@ system and gives an overview of their function and contents. - If an image recipe uses the "inherit image" line and you are setting :term:`IMAGE_FSTYPES` inside the recipe, you must set - ``IMAGE_FSTYPES`` prior to using the "inherit image" line. + :term:`IMAGE_FSTYPES` prior to using the "inherit image" line. - Due to the way the OpenEmbedded build system processes this variable, you cannot update its contents by using ``_append`` @@ -3334,13 +3348,13 @@ system and gives an overview of their function and contents. :term:`IMGDEPLOYDIR` When inheriting the :ref:`image <ref-classes-image>` class directly or through the :ref:`core-image <ref-classes-core-image>` class, the - ``IMGDEPLOYDIR`` points to a temporary work area for deployed files + :term:`IMGDEPLOYDIR` points to a temporary work area for deployed files that is set in the ``image`` class as follows:: IMGDEPLOYDIR = "${WORKDIR}/deploy-${PN}-image-complete" Recipes inheriting the ``image`` class should copy files to be - deployed into ``IMGDEPLOYDIR``, and the class will take care of + deployed into :term:`IMGDEPLOYDIR`, and the class will take care of copying them into :term:`DEPLOY_DIR_IMAGE` afterwards. :term:`INC_PR` @@ -3698,7 +3712,7 @@ system and gives an overview of their function and contents. - qemu - mips - You define the ``KARCH`` variable in the :ref:`kernel-dev/advanced:bsp descriptions`. + You define the :term:`KARCH` variable in the :ref:`kernel-dev/advanced:bsp descriptions`. :term:`KBRANCH` A regular expression used by the build process to explicitly identify @@ -4653,7 +4667,7 @@ system and gives an overview of their function and contents. :term:`module_autoload` This variable has been replaced by the :term:`KERNEL_MODULE_AUTOLOAD` - variable. You should replace all occurrences of ``module_autoload`` + variable. You should replace all occurrences of :term:`module_autoload` with additions to :term:`KERNEL_MODULE_AUTOLOAD`, for example:: module_autoload_rfcomm = "rfcomm" @@ -4684,9 +4698,9 @@ system and gives an overview of their function and contents. You must use the kernel module name override. Run ``man modprobe.d`` in the shell to find out more information on - the exact syntax you want to provide with ``module_conf``. + the exact syntax you want to provide with :term:`module_conf`. - Including ``module_conf`` causes the OpenEmbedded build system to + Including :term:`module_conf` causes the OpenEmbedded build system to populate the ``/etc/modprobe.d/modname.conf`` file with ``modprobe.d`` syntax lines. Here is an example that adds the options ``arg1`` and ``arg2`` to a module named ``mymodule``:: @@ -4876,7 +4890,7 @@ system and gives an overview of their function and contents. information, see the ":ref:`dev-manual/common-tasks:using a development shell`" section in the Yocto Project Development Tasks Manual. - You can use the following values for the ``OE_TERMINAL`` variable: + You can use the following values for the :term:`OE_TERMINAL` variable: - auto - gnome @@ -5260,7 +5274,7 @@ system and gives an overview of their function and contents. PACKAGECONFIG[f2] = "\ ... and so on and so on ... - The ``PACKAGECONFIG`` variable itself specifies a space-separated + The :term:`PACKAGECONFIG` variable itself specifies a space-separated list of the features to enable. Following the features, you can determine the behavior of each feature by providing up to six order-dependent arguments, which are separated by commas. You can @@ -5600,7 +5614,7 @@ system and gives an overview of their function and contents. If applicable, the :term:`PN` variable also contains any special suffix or prefix. For example, using ``bash`` to build packages for the - native machine, ``PN`` is ``bash-native``. Using ``bash`` to build + native machine, :term:`PN` is ``bash-native``. Using ``bash`` to build packages for the target and for Multilib, :term:`PN` would be ``bash`` and ``lib64-bash``, respectively. @@ -5670,7 +5684,7 @@ system and gives an overview of their function and contents. :term:`PR` does not need to be increased for changes that do not change the package contents or metadata. - Because manually managing ``PR`` can be cumbersome and error-prone, + Because manually managing :term:`PR` can be cumbersome and error-prone, an automated solution exists. See the ":ref:`dev-manual/common-tasks:working with a pr service`" section in the Yocto Project Development Tasks Manual for more information. @@ -6042,7 +6056,7 @@ system and gives an overview of their function and contents. In the example, the development package depends on the ``perl`` package. Thus, the - ``RDEPENDS`` variable has the ``${PN}-dev`` package name as part of + :term:`RDEPENDS` variable has the ``${PN}-dev`` package name as part of the variable. .. note:: @@ -7079,7 +7093,7 @@ system and gives an overview of their function and contents. :term:`SRC_URI_OVERRIDES_PACKAGE_ARCH` By default, the OpenEmbedded build system automatically detects - whether ``SRC_URI`` contains files that are machine-specific. If so, + whether :term:`SRC_URI` contains files that are machine-specific. If so, the build system automatically changes :term:`PACKAGE_ARCH`. Setting this variable to "0" disables this behavior. @@ -7292,7 +7306,7 @@ system and gives an overview of their function and contents. ``-native`` recipes are not installed into host paths like such as ``/usr``. Rather, these recipes are installed into - ``STAGING_DIR_NATIVE``. When compiling ``-native`` recipes, + :term:`STAGING_DIR_NATIVE`. When compiling ``-native`` recipes, standard build environment variables such as :term:`CPPFLAGS` and :term:`CFLAGS` are set up so that both host paths @@ -7726,13 +7740,13 @@ system and gives an overview of their function and contents. Specifies the prefix used for the toolchain binary target tools. Depending on the type of recipe and the build target, - ``TARGET_PREFIX`` is set as follows: + :term:`TARGET_PREFIX` is set as follows: - For recipes building for the target machine, the value is "${:term:`TARGET_SYS`}-". - For native recipes, the build system sets the variable to the - value of ``BUILD_PREFIX``. + value of :term:`BUILD_PREFIX`. - For native SDK recipes (``nativesdk``), the build system sets the variable to the value of :term:`SDK_PREFIX`. @@ -7778,7 +7792,7 @@ system and gives an overview of their function and contents. separate to avoid potential conflicts. In the ``defaultsetup.conf`` file, the default value of - ``TCLIBCAPPEND`` is "-${TCLIBC}". However, distros such as poky, + :term:`TCLIBCAPPEND` is "-${TCLIBC}". However, distros such as poky, which normally only support one ``libc`` variant, set :term:`TCLIBCAPPEND` to "" in their distro configuration file resulting in no suffix being applied. @@ -7960,7 +7974,7 @@ system and gives an overview of their function and contents. ``BaseTarget`` class, which is an abstract class that cannot be used as a value of :term:`TEST_TARGET`. - You can provide the following arguments with ``TEST_TARGET``: + You can provide the following arguments with :term:`TEST_TARGET`: - *"qemu":* Boots a QEMU image and runs the tests. See the ":ref:`dev-manual/common-tasks:enabling runtime tests on qemu`" section @@ -8298,7 +8312,7 @@ system and gives an overview of their function and contents. In this example, "sd" is selected as the configuration of the possible four for the :term:`UBOOT_MACHINE`. The "sd" configuration defines "mx6qsabreauto_config" as the value for :term:`UBOOT_MACHINE`, while the - "sdcard" specifies the ``IMAGE_FSTYPES`` to use for the U-Boot image. + "sdcard" specifies the :term:`IMAGE_FSTYPES` to use for the U-Boot image. For more information on how the :term:`UBOOT_CONFIG` is handled, see the :ref:`uboot-config <ref-classes-uboot-config>` @@ -8357,7 +8371,7 @@ system and gives an overview of their function and contents. :term:`UBOOT_MKIMAGE_DTCOPTS` Options for the device tree compiler passed to mkimage '-D' feature while creating FIT image in :ref:`kernel-fitimage <ref-classes-kernel-fitimage>` class. - If ``UBOOT_MKIMAGE_DTCOPTS`` is not set then kernel-fitimage will not + If :term:`UBOOT_MKIMAGE_DTCOPTS` is not set then kernel-fitimage will not pass the ``-D`` option to mkimage. :term:`UBOOT_MKIMAGE_SIGN` @@ -8502,11 +8516,11 @@ system and gives an overview of their function and contents. :term:`USER_CLASSES` A list of classes to globally inherit. These classes are used by the OpenEmbedded build system to enable extra features (e.g. - ``buildstats``, ``image-mklibs``, and so forth). + ``buildstats``, ``image-prelink``, and so forth). The default list is set in your ``local.conf`` file:: - USER_CLASSES ?= "buildstats image-mklibs image-prelink" + USER_CLASSES ?= "buildstats image-prelink" For more information, see ``meta-poky/conf/local.conf.sample`` in the :term:`Source Directory`. diff --git a/poky/documentation/releases.rst b/poky/documentation/releases.rst index 890cd037f..d6e1fb3c1 100644 --- a/poky/documentation/releases.rst +++ b/poky/documentation/releases.rst @@ -34,6 +34,7 @@ Release Series 3.1 (dunfell) - :yocto_docs:`3.1.6 Documentation </3.1.6>` - :yocto_docs:`3.1.7 Documentation </3.1.7>` - :yocto_docs:`3.1.8 Documentation </3.1.8>` +- :yocto_docs:`3.1.8 Documentation </3.1.9>` ========================== Outdated Release Manuals diff --git a/poky/documentation/sphinx-static/switchers.js b/poky/documentation/sphinx-static/switchers.js index 301c2315a..63649354b 100644 --- a/poky/documentation/sphinx-static/switchers.js +++ b/poky/documentation/sphinx-static/switchers.js @@ -5,7 +5,7 @@ 'dev': 'dev (3.4)', '3.3.1': '3.3.1', '3.2.4': '3.2.4', - '3.1.8': '3.1.8', + '3.1.9': '3.1.9', '3.0.4': '3.0.4', '2.7.4': '2.7.4', }; diff --git a/poky/meta-skeleton/README.skeleton b/poky/meta-skeleton/README.skeleton new file mode 100644 index 000000000..35503c1f7 --- /dev/null +++ b/poky/meta-skeleton/README.skeleton @@ -0,0 +1,4 @@ +meta-skeleton +============= + +The meta-skeleton layer contains example recipes and configuration files. diff --git a/poky/meta-skeleton/recipes-core/busybox/busybox_%.bbappend b/poky/meta-skeleton/recipes-core/busybox/busybox_%.bbappend index 64cdefc76..5c5e7c356 100644 --- a/poky/meta-skeleton/recipes-core/busybox/busybox_%.bbappend +++ b/poky/meta-skeleton/recipes-core/busybox/busybox_%.bbappend @@ -2,11 +2,12 @@ # mechanism as the linux-yocto kernel recipe. # # The entries here will override any entries in the base busybox recipe +# when DISTRO = "mydistro" is defined in your conf/local.conf file. # # More details can be found in the Kernel Dev Manual # http://www.yoctoproject.org/docs/current/kernel-dev/kernel-dev.html#changing-the-configuration FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ +SRC_URI_append_mydistro += " \ file://no_rfkill.cfg \ " diff --git a/poky/meta/classes/buildstats.bbclass b/poky/meta/classes/buildstats.bbclass index 8a1466d3f..0de605200 100644 --- a/poky/meta/classes/buildstats.bbclass +++ b/poky/meta/classes/buildstats.bbclass @@ -108,25 +108,31 @@ def write_host_data(logfile, e, d, type): import subprocess, os, datetime # minimum time allowed for each command to run, in seconds time_threshold = 0.5 + limit = 10 # the total number of commands num_cmds = 0 - # interval at which data will be logged - interval = int(d.getVar("BB_HEARTBEAT_EVENT", False)) msg = "" if type == "interval": + # interval at which data will be logged + interval = d.getVar("BB_HEARTBEAT_EVENT", False) + if interval is None: + bb.warn("buildstats: Collecting host data at intervals failed. Set BB_HEARTBEAT_EVENT=\"<interval>\" in conf/local.conf for the interval at which host data will be logged.") + d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") + return + interval = int(interval) cmds = d.getVar('BB_LOG_HOST_STAT_CMDS_INTERVAL') - msg = "Host Stats: Collecting data at interval.\n" + msg = "Host Stats: Collecting data at %d second intervals.\n" % interval if cmds is None: d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") - bb.warn("buildstats: Collecting host data at intervals failed. Set BB_LOG_HOST_STAT_CMDS_INTERVAL=\"command1 ; command2 ; ... \" in conf/local.conf\n") + bb.warn("buildstats: Collecting host data at intervals failed. Set BB_LOG_HOST_STAT_CMDS_INTERVAL=\"command1 ; command2 ; ... \" in conf/local.conf.") return if type == "failure": cmds = d.getVar('BB_LOG_HOST_STAT_CMDS_FAILURE') msg = "Host Stats: Collecting data on failure.\n" - msg += "Failed at task " + e.task + "\n" + msg += "Failed at task: " + e.task + "\n" if cmds is None: d.setVar("BB_LOG_HOST_STAT_ON_FAILURE", "0") - bb.warn("buildstats: Collecting host data on failure failed. Set BB_LOG_HOST_STAT_CMDS_FAILURE=\"command1 ; command2 ; ... \" in conf/local.conf\n") + bb.warn("buildstats: Collecting host data on failure failed. Set BB_LOG_HOST_STAT_CMDS_FAILURE=\"command1 ; command2 ; ... \" in conf/local.conf.") return c_san = [] for cmd in cmds.split(";"): @@ -134,18 +140,20 @@ def write_host_data(logfile, e, d, type): continue num_cmds += 1 c_san.append(cmd) - if num_cmds <= 0: - d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") - d.setVar("BB_LOG_HOST_STAT_ON_FAILURE", "0") + if num_cmds == 0: + if type == "interval": + d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") + if type == "failure": + d.setVar("BB_LOG_HOST_STAT_ON_FAILURE", "0") return # return if the interval is not enough to run all commands within the specified BB_HEARTBEAT_EVENT interval - limit = interval / num_cmds - if limit <= time_threshold: - d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") - d.setVar("BB_LOG_HOST_STAT_ON_FAILURE", "0") - bb.warn("buildstats: Collecting host data failed. BB_HEARTBEAT_EVENT interval not enough to run the specified commands. HINT: Increase value of BB_HEARTBEAT_EVENT in conf/local.conf\n") - return + if type == "interval": + limit = interval / num_cmds + if limit <= time_threshold: + d.setVar("BB_LOG_HOST_STAT_ON_INTERVAL", "0") + bb.warn("buildstats: Collecting host data failed. BB_HEARTBEAT_EVENT interval not enough to run the specified commands. Increase value of BB_HEARTBEAT_EVENT in conf/local.conf.") + return # set the environment variables path = d.getVar("PATH") @@ -179,7 +187,7 @@ python run_buildstats () { taskdir = os.path.join(bsdir, d.getVar('PF')) if isinstance(e, bb.event.HeartbeatEvent) and bb.utils.to_boolean(d.getVar("BB_LOG_HOST_STAT_ON_INTERVAL")): bb.utils.mkdirhier(bsdir) - write_host_data(os.path.join(bsdir, "host_stats"), e, d, "interval") + write_host_data(os.path.join(bsdir, "host_stats_interval"), e, d, "interval") if isinstance(e, bb.event.BuildStarted): ######################################################################## @@ -254,8 +262,8 @@ python run_buildstats () { build_status = os.path.join(bsdir, "build_stats") with open(build_status, "a") as f: f.write(d.expand("Failed at: ${PF} at task: %s \n" % e.task)) - if bb.utils.to_boolean(d.getVar("BB_LOG_HOST_STAT_ON_FAILURE")): - write_host_data(os.path.join(bsdir, "host_stats"), e, d, "failure") + if bb.utils.to_boolean(d.getVar("BB_LOG_HOST_STAT_ON_FAILURE")): + write_host_data(os.path.join(bsdir, "host_stats_%s_failure" % e.task), e, d, "failure") } addhandler run_buildstats diff --git a/poky/meta/classes/core-image.bbclass b/poky/meta/classes/core-image.bbclass index d81f68bd2..84fd3eeb3 100644 --- a/poky/meta/classes/core-image.bbclass +++ b/poky/meta/classes/core-image.bbclass @@ -31,6 +31,8 @@ # - post-install-logging # - dev-pkgs - development packages (headers, etc.) for all installed packages in the rootfs # - dbg-pkgs - debug symbol packages for all installed packages in the rootfs +# - lic-pkgs - license packages for all installed pacakges in the rootfs, requires +# LICENSE_CREATE_PACKAGE="1" to be set when building packages too # - doc-pkgs - documentation packages for all installed packages in the rootfs # - bash-completion-pkgs - bash-completion packages for recipes using bash-completion bbclass # - ptest-pkgs - ptest packages for all ptest-enabled recipes diff --git a/poky/meta/classes/kernel-devicetree.bbclass b/poky/meta/classes/kernel-devicetree.bbclass index d4f886420..27a4905ac 100644 --- a/poky/meta/classes/kernel-devicetree.bbclass +++ b/poky/meta/classes/kernel-devicetree.bbclass @@ -1,8 +1,11 @@ # Support for device tree generation -PACKAGES_append = " \ - ${KERNEL_PACKAGE_NAME}-devicetree \ - ${@[d.getVar('KERNEL_PACKAGE_NAME') + '-image-zimage-bundle', ''][d.getVar('KERNEL_DEVICETREE_BUNDLE') != '1']} \ -" +python () { + if not bb.data.inherits_class('nopackages', d): + d.appendVar("PACKAGES", " ${KERNEL_PACKAGE_NAME}-devicetree") + if d.getVar('KERNEL_DEVICETREE_BUNDLE') == '1': + d.appendVar("PACKAGES", " ${KERNEL_PACKAGE_NAME}-image-zimage-bundle") +} + FILES_${KERNEL_PACKAGE_NAME}-devicetree = "/${KERNEL_IMAGEDEST}/*.dtb /${KERNEL_IMAGEDEST}/*.dtbo" FILES_${KERNEL_PACKAGE_NAME}-image-zimage-bundle = "/${KERNEL_IMAGEDEST}/zImage-*.dtb.bin" diff --git a/poky/meta/classes/kernel.bbclass b/poky/meta/classes/kernel.bbclass index 379bed44f..846b19663 100644 --- a/poky/meta/classes/kernel.bbclass +++ b/poky/meta/classes/kernel.bbclass @@ -92,6 +92,8 @@ python __anonymous () { imagedest = d.getVar('KERNEL_IMAGEDEST') for type in types.split(): + if bb.data.inherits_class('nopackages', d): + continue typelower = type.lower() d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower)) d.setVar('FILES_' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type) diff --git a/poky/meta/classes/license.bbclass b/poky/meta/classes/license.bbclass index f7978e266..c87473cbb 100644 --- a/poky/meta/classes/license.bbclass +++ b/poky/meta/classes/license.bbclass @@ -63,14 +63,6 @@ def add_package_and_files(d): # first in PACKAGES to be sure that nothing else gets LICENSE_FILES_DIRECTORY d.setVar('PACKAGES', "%s %s" % (pn_lic, packages)) d.setVar('FILES_' + pn_lic, files) - for pn in packages.split(): - if pn == pn_lic: - continue - rrecommends_pn = d.getVar('RRECOMMENDS_' + pn) - if rrecommends_pn: - d.setVar('RRECOMMENDS_' + pn, "%s %s" % (pn_lic, rrecommends_pn)) - else: - d.setVar('RRECOMMENDS_' + pn, "%s" % (pn_lic)) def copy_license_files(lic_files_paths, destdir): import shutil diff --git a/poky/meta/classes/license_image.bbclass b/poky/meta/classes/license_image.bbclass index 73cebb4d5..5dbec288a 100644 --- a/poky/meta/classes/license_image.bbclass +++ b/poky/meta/classes/license_image.bbclass @@ -1,5 +1,15 @@ ROOTFS_LICENSE_DIR = "${IMAGE_ROOTFS}/usr/share/common-licenses" +# This requires LICENSE_CREATE_PACKAGE=1 to work too +COMPLEMENTARY_GLOB[lic-pkgs] = "*-lic" + +python() { + if not oe.data.typed_value('LICENSE_CREATE_PACKAGE', d): + features = set(oe.data.typed_value('IMAGE_FEATURES', d)) + if 'lic-pkgs' in features: + bb.error("'lic-pkgs' in IMAGE_FEATURES but LICENSE_CREATE_PACKAGE not enabled to generate -lic packages") +} + python write_package_manifest() { # Get list of installed packages license_image_dir = d.expand('${LICENSE_DIRECTORY}/${IMAGE_NAME}') diff --git a/poky/meta/classes/own-mirrors.bbclass b/poky/meta/classes/own-mirrors.bbclass index a77783513..d58a61fe0 100644 --- a/poky/meta/classes/own-mirrors.bbclass +++ b/poky/meta/classes/own-mirrors.bbclass @@ -10,4 +10,5 @@ osc://.*/.* ${SOURCE_MIRROR_URL} \n \ https?$://.*/.* ${SOURCE_MIRROR_URL} \n \ ftp://.*/.* ${SOURCE_MIRROR_URL} \n \ npm://.*/?.* ${SOURCE_MIRROR_URL} \n \ +s3://.*/.* ${SOURCE_MIRROR_URL} \n \ " diff --git a/poky/meta/classes/package_pkgdata.bbclass b/poky/meta/classes/package_pkgdata.bbclass index 18b7ed62e..a1ea8fc04 100644 --- a/poky/meta/classes/package_pkgdata.bbclass +++ b/poky/meta/classes/package_pkgdata.bbclass @@ -162,6 +162,6 @@ python package_prepare_pkgdata() { } package_prepare_pkgdata[cleandirs] = "${WORKDIR_PKGDATA}" -package_prepare_pkgdata[vardepsexclude] += "MACHINE_ARCH PACKAGE_EXTRA_ARCHS SDK_ARCH BUILD_ARCH SDK_OS BB_TASKDEPDATA" +package_prepare_pkgdata[vardepsexclude] += "MACHINE_ARCH PACKAGE_EXTRA_ARCHS SDK_ARCH BUILD_ARCH SDK_OS BB_TASKDEPDATA SSTATETASKS" diff --git a/poky/meta/classes/populate_sdk_ext.bbclass b/poky/meta/classes/populate_sdk_ext.bbclass index 517b4e45f..4aabafa07 100644 --- a/poky/meta/classes/populate_sdk_ext.bbclass +++ b/poky/meta/classes/populate_sdk_ext.bbclass @@ -750,6 +750,11 @@ fakeroot python do_populate_sdk_ext() { if d.getVar('SDK_ARCH') != d.getVar('BUILD_ARCH'): bb.fatal('The extensible SDK can currently only be built for the same architecture as the machine being built on - SDK_ARCH is set to %s (likely via setting SDKMACHINE) which is different from the architecture of the build machine (%s). Unable to continue.' % (d.getVar('SDK_ARCH'), d.getVar('BUILD_ARCH'))) + # FIXME hopefully we can remove this restriction at some point, but the eSDK + # can only be built for the primary (default) multiconfig + if d.getVar('BB_CURRENT_MC') != 'default': + bb.fatal('The extensible SDK can currently only be built for the default multiconfig. Currently trying to build for %s.' % d.getVar('BB_CURRENT_MC')) + d.setVar('SDK_INSTALL_TARGETS', get_sdk_install_targets(d)) if d.getVar('SDK_INCLUDE_BUILDTOOLS') == '1': buildtools_fn = get_current_buildtools(d) diff --git a/poky/meta/classes/pypi.bbclass b/poky/meta/classes/pypi.bbclass index 87b4c85fc..384a20987 100644 --- a/poky/meta/classes/pypi.bbclass +++ b/poky/meta/classes/pypi.bbclass @@ -19,7 +19,7 @@ PYPI_SRC_URI ?= "${@pypi_src_uri(d)}" HOMEPAGE ?= "https://pypi.python.org/pypi/${PYPI_PACKAGE}/" SECTION = "devel/python" -SRC_URI += "${PYPI_SRC_URI}" +SRC_URI_prepend = "${PYPI_SRC_URI} " S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}" UPSTREAM_CHECK_URI ?= "https://pypi.org/project/${PYPI_PACKAGE}/" diff --git a/poky/meta/classes/report-error.bbclass b/poky/meta/classes/report-error.bbclass index 9cb6b0bd3..de48e4ff0 100644 --- a/poky/meta/classes/report-error.bbclass +++ b/poky/meta/classes/report-error.bbclass @@ -6,8 +6,6 @@ # # Licensed under the MIT license, see COPYING.MIT for details -inherit base - ERR_REPORT_DIR ?= "${LOG_DIR}/error-report" def errorreport_getdata(e): diff --git a/poky/meta/classes/sstate.bbclass b/poky/meta/classes/sstate.bbclass index 3a3f7cc24..f6710fc28 100644 --- a/poky/meta/classes/sstate.bbclass +++ b/poky/meta/classes/sstate.bbclass @@ -123,8 +123,6 @@ SSTATE_HASHEQUIV_REPORT_TASKDATA[doc] = "Report additional useful data to the \ python () { if bb.data.inherits_class('native', d): d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH', False)) - if d.getVar("PN") == "pseudo-native": - d.appendVar('SSTATE_PKGARCH', '_${ORIGNATIVELSBSTRING}') elif bb.data.inherits_class('crosssdk', d): d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}")) elif bb.data.inherits_class('cross', d): @@ -483,7 +481,7 @@ def sstate_clean_cachefiles(d): ss = sstate_state_fromvars(ld, task) sstate_clean_cachefile(ss, ld) -def sstate_clean_manifest(manifest, d, prefix=None): +def sstate_clean_manifest(manifest, d, canrace=False, prefix=None): import oe.path mfile = open(manifest) @@ -501,7 +499,9 @@ def sstate_clean_manifest(manifest, d, prefix=None): if entry.endswith("/"): if os.path.islink(entry[:-1]): os.remove(entry[:-1]) - elif os.path.exists(entry) and len(os.listdir(entry)) == 0: + elif os.path.exists(entry) and len(os.listdir(entry)) == 0 and not canrace: + # Removing directories whilst builds are in progress exposes a race. Only + # do it in contexts where it is safe to do so. os.rmdir(entry[:-1]) else: os.remove(entry) @@ -539,7 +539,7 @@ def sstate_clean(ss, d): for lock in ss['lockfiles']: locks.append(bb.utils.lockfile(lock)) - sstate_clean_manifest(manifest, d) + sstate_clean_manifest(manifest, d, canrace=True) for lock in locks: bb.utils.unlockfile(lock) @@ -703,6 +703,10 @@ def sstate_package(ss, d): os.utime(siginfo, None) except PermissionError: pass + except OSError as e: + # Handle read-only file systems gracefully + if e.errno != errno.EROFS: + raise e return @@ -1145,6 +1149,10 @@ python sstate_eventhandler() { os.utime(siginfo, None) except PermissionError: pass + except OSError as e: + # Handle read-only file systems gracefully + if e.errno != errno.EROFS: + raise e } diff --git a/poky/meta/classes/staging.bbclass b/poky/meta/classes/staging.bbclass index 806a85773..32a615c74 100644 --- a/poky/meta/classes/staging.bbclass +++ b/poky/meta/classes/staging.bbclass @@ -409,7 +409,7 @@ python extend_recipe_sysroot() { if os.path.islink(f) and not os.path.exists(f): bb.note("%s no longer exists, removing from sysroot" % f) lnk = os.readlink(f.replace(".complete", "")) - sstate_clean_manifest(depdir + "/" + lnk, d, workdir) + sstate_clean_manifest(depdir + "/" + lnk, d, canrace=True, prefix=workdir) os.unlink(f) os.unlink(f.replace(".complete", "")) @@ -454,7 +454,7 @@ python extend_recipe_sysroot() { fl = depdir + "/" + l bb.note("Task %s no longer depends on %s, removing from sysroot" % (mytaskname, l)) lnk = os.readlink(fl) - sstate_clean_manifest(depdir + "/" + lnk, d, workdir) + sstate_clean_manifest(depdir + "/" + lnk, d, canrace=True, prefix=workdir) os.unlink(fl) os.unlink(fl + ".complete") @@ -475,7 +475,7 @@ python extend_recipe_sysroot() { continue else: bb.note("%s exists in sysroot, but is stale (%s vs. %s), removing." % (c, lnk, c + "." + taskhash)) - sstate_clean_manifest(depdir + "/" + lnk, d, workdir) + sstate_clean_manifest(depdir + "/" + lnk, d, canrace=True, prefix=workdir) os.unlink(depdir + "/" + c) if os.path.lexists(depdir + "/" + c + ".complete"): os.unlink(depdir + "/" + c + ".complete") diff --git a/poky/meta/classes/testimage.bbclass b/poky/meta/classes/testimage.bbclass index 43de9d4d7..ed3a885bd 100644 --- a/poky/meta/classes/testimage.bbclass +++ b/poky/meta/classes/testimage.bbclass @@ -130,6 +130,7 @@ testimage_dump_host () { testimage_dump_monitor () { query-status query-block + dump-guest-memory {"paging":false,"protocol":"file:%s.img"} } python do_testimage() { diff --git a/poky/meta/conf/distro/include/default-distrovars.inc b/poky/meta/conf/distro/include/default-distrovars.inc index ac1024576..e0726fa3b 100644 --- a/poky/meta/conf/distro/include/default-distrovars.inc +++ b/poky/meta/conf/distro/include/default-distrovars.inc @@ -13,6 +13,9 @@ LOCALE_UTF8_IS_DEFAULT_class-nativesdk = "0" # seccomp is not yet ported to rv32 DISTRO_FEATURES_DEFAULT_remove_riscv32 = "seccomp" +# seccomp is not yet ported to ARC +DISTRO_FEATURES_DEFAULT_remove_arc = "seccomp" + DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth debuginfod ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}" IMAGE_FEATURES ?= "" diff --git a/poky/meta/conf/distro/include/maintainers.inc b/poky/meta/conf/distro/include/maintainers.inc index e59f01d66..13e43297a 100644 --- a/poky/meta/conf/distro/include/maintainers.inc +++ b/poky/meta/conf/distro/include/maintainers.inc @@ -119,7 +119,7 @@ RECIPE_MAINTAINER_pn-core-image-x11 = "Richard Purdie <richard.purdie@linuxfound RECIPE_MAINTAINER_pn-core-image-sato-dev = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-coreutils = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-cpio = "Denys Dmytriyenko <denis@denix.org>" -RECIPE_MAINTAINER_pn-cracklib = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-cracklib = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-createrepo-c = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-cronie = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-cross-localedef-native = "Khem Raj <raj.khem@gmail.com>" @@ -127,7 +127,7 @@ RECIPE_MAINTAINER_pn-cryptodev-linux = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-cryptodev-module = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-cryptodev-tests = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-cups = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-curl = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-curl = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-cve-update-db-native = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-cwautomacros = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-db = "Unassigned <unassigned@yoctoproject.org>" @@ -139,7 +139,7 @@ RECIPE_MAINTAINER_pn-debianutils = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-dejagnu = "Nathan Rossi <nathan@nathanrossi.com>" RECIPE_MAINTAINER_pn-depmodwrapper-cross = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-desktop-file-utils = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-dhcpcd = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-dhcpcd = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-diffoscope = "Joshua Watt <JPEWhacker@gmail.com>" RECIPE_MAINTAINER_pn-diffstat = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-diffutils = "Chen Qi <Qi.Chen@windriver.com>" @@ -162,7 +162,7 @@ RECIPE_MAINTAINER_pn-efibootmgr = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-elfutils = "Zang Ruochen <zangrc.fnst@fujitsu.com>" RECIPE_MAINTAINER_pn-ell = "Zang Ruochen <zangrc.fnst@fujitsu.com>" RECIPE_MAINTAINER_pn-enchant2 = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-encodings = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-encodings = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-epiphany = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-erofs-utils = "Richard Weinberger <richard@nod.at>" RECIPE_MAINTAINER_pn-ethtool = "Changhyeok Bae <changhyeok.bae@gmail.com>" @@ -174,8 +174,8 @@ RECIPE_MAINTAINER_pn-file = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-findutils = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-flac = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-flex = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-font-util = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-font-alias = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-font-util = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-fontconfig = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-formfactor = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-freetype = "Ross Burton <ross.burton@arm.com>" @@ -216,7 +216,7 @@ RECIPE_MAINTAINER_pn-gnome-desktop-testing = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-gnu-config = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-gnu-efi = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-gnupg = "Hongxu Jia <hongxu.jia@windriver.com>" -RECIPE_MAINTAINER_pn-gnutls = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-gnutls = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-go = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-go-binary-native = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-go-cross-${TUNE_PKGARCH} = "Khem Raj <raj.khem@gmail.com>" @@ -286,10 +286,10 @@ RECIPE_MAINTAINER_pn-json-c = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-json-glib = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-jquery = "Joshua Watt <JPEWhacker@gmail.com>" RECIPE_MAINTAINER_pn-kbd = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-kea = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-kea = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-kern-tools-native = "Bruce Ashfield <bruce.ashfield@gmail.com>" RECIPE_MAINTAINER_pn-kernel-devsrc = "Bruce Ashfield <bruce.ashfield@gmail.com>" -RECIPE_MAINTAINER_pn-kexec-tools = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-kexec-tools = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-keymaps = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-kmod = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-kmod-native = "Chen Qi <Qi.Chen@windriver.com>" @@ -302,7 +302,7 @@ RECIPE_MAINTAINER_pn-liba52 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libacpi = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libaio = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libarchive = "Otavio Salvador <otavio.salvador@ossystems.com.br>" -RECIPE_MAINTAINER_pn-libassuan = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-libassuan = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libatomic-ops = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libbsd = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-libcap = "Yi Zhao <yi.zhao@windriver.com>" @@ -315,7 +315,7 @@ RECIPE_MAINTAINER_pn-libconvert-asn1-perl = "Tim Orling <timothy.t.orling@intel. RECIPE_MAINTAINER_pn-libcroco = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libdaemon = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libdazzle = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-libdmx = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-libdmx = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libdnf = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libdrm = "Otavio Salvador <otavio.salvador@ossystems.com.br>" RECIPE_MAINTAINER_pn-libedit = "Khem Raj <raj.khem@gmail.com>" @@ -329,7 +329,7 @@ RECIPE_MAINTAINER_pn-libfakekey = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libffi = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libfm = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libfm-extra = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-libfontenc = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-libfontenc = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libgcc = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libgcc-initial = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libgcrypt = "Hongxu Jia <hongxu.jia@windriver.com>" @@ -341,7 +341,7 @@ RECIPE_MAINTAINER_pn-libgpg-error = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-libgudev = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libhandy = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libical = "Ross Burton <ross.burton@arm.com>" -RECIPE_MAINTAINER_pn-libice = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-libice = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libid3tag = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libidn2 = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-libinput = "Ross Burton <ross.burton@arm.com>" @@ -366,7 +366,7 @@ RECIPE_MAINTAINER_pn-libpam = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libpcap = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libpciaccess = "Wang Mingyu <wangmy@fujitsu.com>" RECIPE_MAINTAINER_pn-libpcre = "Yi Zhao <yi.zhao@windriver.com>" -RECIPE_MAINTAINER_pn-libpcre2 = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-libpcre2 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libpipeline = "Wang Mingyu <wangmy@fujitsu.com>" RECIPE_MAINTAINER_pn-libpng = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libportal = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -377,9 +377,9 @@ RECIPE_MAINTAINER_pn-librepo = "Wang Mingyu <wangmy@fujitsu.com>" RECIPE_MAINTAINER_pn-librsvg = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libsamplerate0 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libsdl2 = "Yi Zhao <yi.zhao@windriver.com>" -RECIPE_MAINTAINER_pn-libseccomp = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-libseccomp = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libsecret = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-libsm = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-libsm = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libsndfile1 = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libsolv = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libsoup-2.4 = "Anuj Mittal <anuj.mittal@intel.com>" @@ -407,24 +407,24 @@ RECIPE_MAINTAINER_pn-libva-utils = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-libvorbis = "Zang Ruochen <zangrc.fnst@fujitsu.com>" RECIPE_MAINTAINER_pn-libwebp = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-libwpe = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-libx11 = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxau = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxcb = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxcomposite = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxcursor = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-libx11 = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxau = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxcb = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxcomposite = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxcursor = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libxcrypt = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-libxcrypt-compat = "Khem Raj <raj.khem@gmail.com>" -RECIPE_MAINTAINER_pn-libxdamage = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxdmcp = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxext = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxfixes = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxfont = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxfont2 = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxft = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxi = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxinerama = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxkbcommon = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxkbfile = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-libxdamage = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxdmcp = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxext = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxfixes = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxfont = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxfont2 = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxft = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxi = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxinerama = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxkbcommon = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxkbfile = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libxml-namespacesupport-perl = "Tim Orling <timothy.t.orling@intel.com>" RECIPE_MAINTAINER_pn-libxml-parser-perl = "Tim Orling <timothy.t.orling@intel.com>" RECIPE_MAINTAINER_pn-libxml-perl = "Tim Orling <timothy.t.orling@intel.com>" @@ -432,19 +432,19 @@ RECIPE_MAINTAINER_pn-libxml-sax-base-perl = "Tim Orling <timothy.t.orling@intel. RECIPE_MAINTAINER_pn-libxml-sax-perl = "Tim Orling <timothy.t.orling@intel.com>" RECIPE_MAINTAINER_pn-libxml-simple-perl = "Tim Orling <timothy.t.orling@intel.com>" RECIPE_MAINTAINER_pn-libxml2 = "Hongxu Jia <hongxu.jia@windriver.com>" -RECIPE_MAINTAINER_pn-libxmu = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxpm = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxrandr = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxrender = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxres = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxscrnsaver = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxshmfence = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-libxmu = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxpm = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxrandr = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxrender = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxres = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxscrnsaver = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxshmfence = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libxslt = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-libxt = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxtst = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxv = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-libxt = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxtst = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxv = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxvmc = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-libxxf86vm = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-libyaml = "Wang Mingyu <wangmy@fujitsu.com>" RECIPE_MAINTAINER_pn-lighttpd = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-linux-dummy = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -456,7 +456,7 @@ RECIPE_MAINTAINER_pn-linux-yocto-rt = "Bruce Ashfield <bruce.ashfield@gmail.com> RECIPE_MAINTAINER_pn-linux-yocto-tiny = "Bruce Ashfield <bruce.ashfield@gmail.com>" RECIPE_MAINTAINER_pn-llvm = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-logrotate = "Yi Zhao <yi.zhao@windriver.com>" -RECIPE_MAINTAINER_pn-log4cplus = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-log4cplus = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-lrzsz = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-lsb-release = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-lsof = "Ross Burton <ross.burton@arm.com>" @@ -500,9 +500,9 @@ RECIPE_MAINTAINER_pn-meta-ide-support = "Richard Purdie <richard.purdie@linuxfou RECIPE_MAINTAINER_pn-meta-toolchain = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-meta-world-pkgdata = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-mingetty = "Yi Zhao <yi.zhao@windriver.com>" -RECIPE_MAINTAINER_pn-mini-x-session = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-mini-x-session = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-minicom = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-mkfontscale = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-mkfontscale = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-mmc-utils = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-mobile-broadband-provider-info = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-modutils-initscripts = "Yi Zhao <yi.zhao@windriver.com>" @@ -527,9 +527,9 @@ RECIPE_MAINTAINER_pn-nativesdk-sdk-provides-dummy = "Richard Purdie <richard.pur RECIPE_MAINTAINER_pn-newlib = "Alejandro Hernandez <aehs29@gmail.com>" RECIPE_MAINTAINER_pn-ncurses = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-neard = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-net-tools = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-netbase = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-nettle = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-net-tools = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-netbase = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-nettle = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-nfs-export-root = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-nfs-utils = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-ninja = "Khem Raj <raj.khem@gmail.com>" @@ -538,7 +538,7 @@ RECIPE_MAINTAINER_pn-nss-myhostname = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-numactl = "Richard Purdie <richard.purdie@linuxfoundation.org>" RECIPE_MAINTAINER_pn-ofono = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-opensbi = "Alistair Francis <alistair.francis@wdc.com>" -RECIPE_MAINTAINER_pn-openssh = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-openssh = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-openssl = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-opkg = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" RECIPE_MAINTAINER_pn-opkg-arch-config = "Alejandro del Castillo <alejandro.delcastillo@ni.com>" @@ -562,7 +562,7 @@ RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-perlcross = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-piglit = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia <hongxu.jia@windriver.com>" -RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-pinentry = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-pixman = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-pkgconf = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-pkgconfig = "Ross Burton <ross.burton@arm.com>" @@ -646,7 +646,7 @@ RECIPE_MAINTAINER_pn-quota = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-re2c = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER_pn-readline = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-resolvconf = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-rgb = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-rgb = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-rpcbind = "Hongxu Jia <hongxu.jia@windriver.com>" RECIPE_MAINTAINER_pn-rng-tools = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-rpcsvc-proto = "Khem Raj <raj.khem@gmail.com>" @@ -655,7 +655,7 @@ RECIPE_MAINTAINER_pn-rsync = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER_pn-rt-tests = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-ruby = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-run-postinsts = "Ross Burton <ross.burton@arm.com>" -RECIPE_MAINTAINER_pn-rxvt-unicode = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-rxvt-unicode = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-sato-screenshot = "Ross Burton <ross.burton@arm.com>" RECIPE_MAINTAINER_pn-sbc = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-screen = "Anuj Mittal <anuj.mittal@intel.com>" @@ -713,8 +713,8 @@ RECIPE_MAINTAINER_pn-texinfo-dummy-native = "Anuj Mittal <anuj.mittal@intel.com> RECIPE_MAINTAINER_pn-tiff = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-time = "Robert Yang <liezhi.yang@windriver.com>" RECIPE_MAINTAINER_pn-ttf-bitstream-vera = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-tzcode-native = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-tzdata = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-u-boot = "Marek Vasut <marek.vasut@gmail.com>" RECIPE_MAINTAINER_pn-u-boot-tools = "Marek Vasut <marek.vasut@gmail.com>" RECIPE_MAINTAINER_pn-udev-extraconf = "Ross Burton <ross.burton@arm.com>" @@ -727,7 +727,7 @@ RECIPE_MAINTAINER_pn-usbinit = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-usbutils = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-util-linux = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER_pn-util-linux-libuuid = "Chen Qi <Qi.Chen@windriver.com>" -RECIPE_MAINTAINER_pn-util-macros = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-util-macros = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-v86d = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-vala = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-valgrind = "Alexander Kanavin <alex.kanavin@gmail.com>" @@ -755,54 +755,54 @@ RECIPE_MAINTAINER_pn-wic-tools = "Anuj Mittal <anuj.mittal@intel.com>" RECIPE_MAINTAINER_pn-wireless-regdb = "Adrian Bunk <bunk@kernel.org>" RECIPE_MAINTAINER_pn-wpa-supplicant = "Changhyeok Bae <changhyeok.bae@gmail.com>" RECIPE_MAINTAINER_pn-wpebackend-fdo = "Alexander Kanavin <alex.kanavin@gmail.com>" -RECIPE_MAINTAINER_pn-x11perf = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-x11perf = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-x264 = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-xauth = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xcb-proto = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xcb-util = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xcb-util-image = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xcb-util-keysyms = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xcb-util-renderutil = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xcb-util-wm = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xcursor-transparent-theme = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-xauth = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xcb-proto = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xcb-util = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xcb-util-image = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xcb-util-keysyms = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xcb-util-renderutil = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xcb-util-wm = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xcursor-transparent-theme = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-xdg-utils = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER_pn-xdpyinfo = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xev = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xeyes = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xf86-input-evdev = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xf86-input-keyboard = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xf86-input-libinput = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xf86-input-mouse = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xf86-input-synaptics = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xf86-input-vmmouse = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xf86-video-cirrus = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xf86-video-fbdev = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xf86-video-intel = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xf86-video-vesa = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xf86-video-vmware = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xhost = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-xdpyinfo = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xev = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xeyes = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xf86-input-evdev = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xf86-input-keyboard = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xf86-input-libinput = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xf86-input-mouse = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xf86-input-synaptics = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xf86-input-vmmouse = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xf86-video-cirrus = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xf86-video-fbdev = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xf86-video-intel = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xf86-video-vesa = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xf86-video-vmware = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xhost = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-xinetd = "Ross Burton <ross.burton@arm.com>" -RECIPE_MAINTAINER_pn-xinit = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xinput = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xinput-calibrator = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xkbcomp = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xkeyboard-config = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-xinit = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xinput = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xinput-calibrator = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xkbcomp = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xkeyboard-config = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-xmlto = "Hongxu Jia <hongxu.jia@windriver.com>" -RECIPE_MAINTAINER_pn-xmodmap = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xorg-minimal-fonts = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xorgproto = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xprop = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xrandr = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xrestop = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xserver-nodm-init = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xserver-xf86-config = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xserver-xorg = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xset = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xtrans = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xuser-account = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xvinfo = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xwayland = "Armin Kuster <akuster808@gmail.com>" -RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <akuster808@gmail.com>" +RECIPE_MAINTAINER_pn-xmodmap = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xorg-minimal-fonts = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xorgproto = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xprop = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xrandr = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xrestop = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xserver-nodm-init = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xserver-xf86-config = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xserver-xorg = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xset = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xtrans = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xuser-account = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xvinfo = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xwayland = "Unassigned <unassigned@yoctoproject.org>" +RECIPE_MAINTAINER_pn-xwininfo = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER_pn-xxhash = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denis@denix.org>" RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <denis@denix.org>" diff --git a/poky/meta/conf/distro/include/tcmode-default.inc b/poky/meta/conf/distro/include/tcmode-default.inc index c6e5ac61d..68e5d848b 100644 --- a/poky/meta/conf/distro/include/tcmode-default.inc +++ b/poky/meta/conf/distro/include/tcmode-default.inc @@ -21,7 +21,7 @@ SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.36%" GDBVERSION ?= "10.%" GLIBCVERSION ?= "2.33" -LINUXLIBCVERSION ?= "5.10%" +LINUXLIBCVERSION ?= "5.13%" QEMUVERSION ?= "6.0%" GOVERSION ?= "1.16%" # This can not use wildcards like 8.0.% since it is also used in mesa to denote diff --git a/poky/meta/lib/oe/package_manager/__init__.py b/poky/meta/lib/oe/package_manager/__init__.py index 4d22bc029..de5916d7d 100644 --- a/poky/meta/lib/oe/package_manager/__init__.py +++ b/poky/meta/lib/oe/package_manager/__init__.py @@ -344,10 +344,8 @@ class PackageManager(object, metaclass=ABCMeta): def install_complementary(self, globs=None): """ Install complementary packages based upon the list of currently installed - packages e.g. locales, *-dev, *-dbg, etc. This will only attempt to install - these packages, if they don't exist then no error will occur. Note: every - backend needs to call this function explicitly after the normal package - installation + packages e.g. locales, *-dev, *-dbg, etc. Note: every backend needs to + call this function explicitly after the normal package installation. """ if globs is None: globs = self.d.getVar('IMAGE_INSTALL_COMPLEMENTARY') @@ -398,7 +396,7 @@ class PackageManager(object, metaclass=ABCMeta): bb.note("Installing complementary packages ... %s (skipped already provided packages %s)" % ( ' '.join(install_pkgs), ' '.join(skip_pkgs))) - self.install(install_pkgs, attempt_only=True) + self.install(install_pkgs) except subprocess.CalledProcessError as e: bb.fatal("Could not compute complementary packages list. Command " "'%s' returned %d:\n%s" % diff --git a/poky/meta/lib/oeqa/manual/toaster-managed-mode.json b/poky/meta/lib/oeqa/manual/toaster-managed-mode.json index 38b396ab0..40eda6446 100644 --- a/poky/meta/lib/oeqa/manual/toaster-managed-mode.json +++ b/poky/meta/lib/oeqa/manual/toaster-managed-mode.json @@ -136,7 +136,7 @@ "expected_results": "" }, "3": { - "action": "Check that default values are as follows: \n\tDISTRO - poky \n\tIMAGE_FSTYPES - ext3 jffs2 tar.bz2 \n\tIMAGE_INSTALL_append - \"Not set\" \n\tPACKAGE_CLASES - package_rpm \n SSTATE_DIR - /homeDirectory/poky/sstate-cache \n\n", + "action": "Check that default values are as follows: \n\tDISTRO - poky \n\tIMAGE_FSTYPES - ext3 jffs2 tar.bz2 \n\tIMAGE_INSTALL_append - \"Not set\" \n\tPACKAGE_CLASSES - package_rpm \n SSTATE_DIR - /homeDirectory/poky/sstate-cache \n\n", "expected_results": "" }, "4": { diff --git a/poky/meta/lib/oeqa/runtime/cases/parselogs.py b/poky/meta/lib/oeqa/runtime/cases/parselogs.py index 1bb042552..73243c365 100644 --- a/poky/meta/lib/oeqa/runtime/cases/parselogs.py +++ b/poky/meta/lib/oeqa/runtime/cases/parselogs.py @@ -59,6 +59,7 @@ common_errors = [ "Failed to process device, ignoring: Device or resource busy", "Cannot find a map file", "[rdrand]: Initialization Failed", + "[rndr ]: Initialization Failed", "[pulseaudio] authkey.c: Failed to open cookie file", "[pulseaudio] authkey.c: Failed to load authentication key", ] diff --git a/poky/meta/lib/oeqa/selftest/cases/archiver.py b/poky/meta/lib/oeqa/selftest/cases/archiver.py index ddd08ecf8..0194ae9f6 100644 --- a/poky/meta/lib/oeqa/selftest/cases/archiver.py +++ b/poky/meta/lib/oeqa/selftest/cases/archiver.py @@ -35,11 +35,11 @@ class Archiver(OESelftestTestCase): src_path = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['TARGET_SYS']) # Check that include_recipe was included - included_present = len(glob.glob(src_path + '/%s-*' % include_recipe)) + included_present = len(glob.glob(src_path + '/%s-*/*' % include_recipe)) self.assertTrue(included_present, 'Recipe %s was not included.' % include_recipe) # Check that exclude_recipe was excluded - excluded_present = len(glob.glob(src_path + '/%s-*' % exclude_recipe)) + excluded_present = len(glob.glob(src_path + '/%s-*/*' % exclude_recipe)) self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % exclude_recipe) def test_archiver_filters_by_type(self): @@ -67,11 +67,11 @@ class Archiver(OESelftestTestCase): src_path_native = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['BUILD_SYS']) # Check that target_recipe was included - included_present = len(glob.glob(src_path_target + '/%s-*' % target_recipe)) + included_present = len(glob.glob(src_path_target + '/%s-*/*' % target_recipe)) self.assertTrue(included_present, 'Recipe %s was not included.' % target_recipe) # Check that native_recipe was excluded - excluded_present = len(glob.glob(src_path_native + '/%s-*' % native_recipe)) + excluded_present = len(glob.glob(src_path_native + '/%s-*/*' % native_recipe)) self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % native_recipe) def test_archiver_filters_by_type_and_name(self): @@ -104,17 +104,17 @@ class Archiver(OESelftestTestCase): src_path_native = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['BUILD_SYS']) # Check that target_recipe[0] and native_recipes[1] were included - included_present = len(glob.glob(src_path_target + '/%s-*' % target_recipes[0])) + included_present = len(glob.glob(src_path_target + '/%s-*/*' % target_recipes[0])) self.assertTrue(included_present, 'Recipe %s was not included.' % target_recipes[0]) - included_present = len(glob.glob(src_path_native + '/%s-*' % native_recipes[1])) + included_present = len(glob.glob(src_path_native + '/%s-*/*' % native_recipes[1])) self.assertTrue(included_present, 'Recipe %s was not included.' % native_recipes[1]) # Check that native_recipes[0] and target_recipes[1] were excluded - excluded_present = len(glob.glob(src_path_native + '/%s-*' % native_recipes[0])) + excluded_present = len(glob.glob(src_path_native + '/%s-*/*' % native_recipes[0])) self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % native_recipes[0]) - excluded_present = len(glob.glob(src_path_target + '/%s-*' % target_recipes[1])) + excluded_present = len(glob.glob(src_path_target + '/%s-*/*' % target_recipes[1])) self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % target_recipes[1]) diff --git a/poky/meta/lib/oeqa/selftest/cases/fetch.py b/poky/meta/lib/oeqa/selftest/cases/fetch.py index 67e85d3e4..cd15f6512 100644 --- a/poky/meta/lib/oeqa/selftest/cases/fetch.py +++ b/poky/meta/lib/oeqa/selftest/cases/fetch.py @@ -55,25 +55,26 @@ MIRRORS_forcevariable = "git://.*/.* http://downloads.yoctoproject.org/mirror/so class Dependencies(OESelftestTestCase): - def write_recipe(self, content): - f = tempfile.NamedTemporaryFile(mode="wt", suffix=".bb") - f.write(content) - f.flush() + def write_recipe(self, content, tempdir): + f = os.path.join(tempdir, "test.bb") + with open(f, "w") as fd: + fd.write(content) return f def test_dependencies(self): """ Verify that the correct dependencies are generated for specific SRC_URI entries. """ - with bb.tinfoil.Tinfoil() as tinfoil: + + with bb.tinfoil.Tinfoil() as tinfoil, tempfile.TemporaryDirectory(prefix="selftest-fetch") as tempdir: tinfoil.prepare(config_only=False, quiet=2) r = """ LICENSE="CLOSED" SRC_URI="http://example.com/tarball.zip" """ - f = self.write_recipe(textwrap.dedent(r)) - d = tinfoil.parse_recipe_file(f.name) + f = self.write_recipe(textwrap.dedent(r), tempdir) + d = tinfoil.parse_recipe_file(f) self.assertIn("wget-native", d.getVarFlag("do_fetch", "depends")) self.assertIn("unzip-native", d.getVarFlag("do_unpack", "depends")) @@ -82,8 +83,8 @@ class Dependencies(OESelftestTestCase): LICENSE="CLOSED" SRC_URI="https://example.com/tarball;downloadfilename=something.zip" """ - f = self.write_recipe(textwrap.dedent(r)) - d = tinfoil.parse_recipe_file(f.name) + f = self.write_recipe(textwrap.dedent(r), tempdir) + d = tinfoil.parse_recipe_file(f) self.assertIn("wget-native", d.getVarFlag("do_fetch", "depends")) self.assertIn("unzip-native", d.getVarFlag("do_unpack", "depends") or "") @@ -91,8 +92,8 @@ class Dependencies(OESelftestTestCase): LICENSE="CLOSED" SRC_URI="ftp://example.com/tarball.lz" """ - f = self.write_recipe(textwrap.dedent(r)) - d = tinfoil.parse_recipe_file(f.name) + f = self.write_recipe(textwrap.dedent(r), tempdir) + d = tinfoil.parse_recipe_file(f) self.assertIn("wget-native", d.getVarFlag("do_fetch", "depends")) self.assertIn("lzip-native", d.getVarFlag("do_unpack", "depends")) @@ -100,6 +101,6 @@ class Dependencies(OESelftestTestCase): LICENSE="CLOSED" SRC_URI="git://example.com/repo" """ - f = self.write_recipe(textwrap.dedent(r)) - d = tinfoil.parse_recipe_file(f.name) + f = self.write_recipe(textwrap.dedent(r), tempdir) + d = tinfoil.parse_recipe_file(f) self.assertIn("git-native", d.getVarFlag("do_fetch", "depends")) diff --git a/poky/meta/lib/oeqa/selftest/cases/oelib/utils.py b/poky/meta/lib/oeqa/selftest/cases/oelib/utils.py index a7214beb4..bbf67bf9c 100644 --- a/poky/meta/lib/oeqa/selftest/cases/oelib/utils.py +++ b/poky/meta/lib/oeqa/selftest/cases/oelib/utils.py @@ -64,7 +64,7 @@ class TestMultiprocessLaunch(TestCase): import bb def testfunction(item, d): - if item == "2" or item == "1": + if item == "2": raise KeyError("Invalid number %s" % item) return "Found %s" % item @@ -99,5 +99,4 @@ class TestMultiprocessLaunch(TestCase): # Assert the function prints exceptions with captured_output() as (out, err): self.assertRaises(bb.BBHandledException, multiprocess_launch, testfunction, ["1", "2", "3", "4", "5", "6"], d, extraargs=(d,)) - self.assertIn("KeyError: 'Invalid number 1'", out.getvalue()) self.assertIn("KeyError: 'Invalid number 2'", out.getvalue()) diff --git a/poky/meta/lib/oeqa/selftest/cases/recipetool.py b/poky/meta/lib/oeqa/selftest/cases/recipetool.py index 9d56e9e1e..f0685d371 100644 --- a/poky/meta/lib/oeqa/selftest/cases/recipetool.py +++ b/poky/meta/lib/oeqa/selftest/cases/recipetool.py @@ -374,7 +374,7 @@ class RecipetoolTests(RecipetoolBase): # Try adding a recipe temprecipe = os.path.join(self.tempdir, 'recipe') os.makedirs(temprecipe) - pv = '1.7.3.0' + pv = '1.7.4.1' srcuri = 'http://www.dest-unreach.org/socat/download/socat-%s.tar.bz2' % pv result = runCmd('recipetool create %s -o %s' % (srcuri, temprecipe)) dirlist = os.listdir(temprecipe) diff --git a/poky/meta/lib/oeqa/selftest/cases/runcmd.py b/poky/meta/lib/oeqa/selftest/cases/runcmd.py index fa6113d7f..e9612389f 100644 --- a/poky/meta/lib/oeqa/selftest/cases/runcmd.py +++ b/poky/meta/lib/oeqa/selftest/cases/runcmd.py @@ -27,8 +27,8 @@ class RunCmdTests(OESelftestTestCase): # The delta is intentionally smaller than the timeout, to detect cases where # we incorrectly apply the timeout more than once. - TIMEOUT = 5 - DELTA = 3 + TIMEOUT = 10 + DELTA = 8 def test_result_okay(self): result = runCmd("true") diff --git a/poky/meta/lib/oeqa/targetcontrol.py b/poky/meta/lib/oeqa/targetcontrol.py index 005ebaa7f..1fdff8288 100644 --- a/poky/meta/lib/oeqa/targetcontrol.py +++ b/poky/meta/lib/oeqa/targetcontrol.py @@ -152,6 +152,8 @@ class QemuTarget(BaseTarget): self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner) self.monitor_dumper = MonitorDumper(dump_monitor_cmds, dump_dir, self.runner) + if (self.monitor_dumper): + self.monitor_dumper.create_dir("qmp") def deploy(self): bb.utils.mkdirhier(self.testdir) diff --git a/poky/meta/lib/oeqa/utils/dump.py b/poky/meta/lib/oeqa/utils/dump.py index 843e19fe8..bb067f484 100644 --- a/poky/meta/lib/oeqa/utils/dump.py +++ b/poky/meta/lib/oeqa/utils/dump.py @@ -18,6 +18,7 @@ class BaseDumper(object): # Some testing doesn't inherit testimage, so it is needed # to set some defaults. self.parent_dir = parent_dir + self.dump_dir = parent_dir dft_cmds = """ top -bn1 iostat -x -z -N -d -p ALL 20 2 ps -ef @@ -47,7 +48,7 @@ class BaseDumper(object): raise err self.dump_dir = dump_dir - def _write_dump(self, command, output): + def _construct_filename(self, command): if isinstance(self, HostDumper): prefix = "host" elif isinstance(self, TargetDumper): @@ -61,6 +62,10 @@ class BaseDumper(object): fullname = os.path.join(self.dump_dir, filename) if not os.path.exists(fullname): break + return fullname + + def _write_dump(self, command, output): + fullname = self._construct_filename(command) if isinstance(self, MonitorDumper): with open(fullname, 'w') as json_file: json.dump(output, json_file, indent=4) @@ -117,8 +122,16 @@ class MonitorDumper(BaseDumper): if dump_dir: self.dump_dir = dump_dir for cmd in self.cmds: + cmd_name = cmd.split()[0] try: - output = self.runner.run_monitor(cmd) - self._write_dump(cmd, output) - except: - print("Failed to dump QMP CMD: %s" % (cmd)) + if len(cmd.split()) > 1: + cmd_args = cmd.split()[1] + if "%s" in cmd_args: + filename = self._construct_filename(cmd_name) + cmd_data = json.loads(cmd_args % (filename)) + output = self.runner.run_monitor(cmd_name, cmd_data) + else: + output = self.runner.run_monitor(cmd_name) + self._write_dump(cmd_name, output) + except Exception as e: + print("Failed to dump QMP CMD: %s with\nExecption: %s" % (cmd_name, e)) diff --git a/poky/meta/lib/oeqa/utils/qemurunner.py b/poky/meta/lib/oeqa/utils/qemurunner.py index abbc7f7d1..5c9d2b24a 100644 --- a/poky/meta/lib/oeqa/utils/qemurunner.py +++ b/poky/meta/lib/oeqa/utils/qemurunner.py @@ -236,6 +236,7 @@ class QemuRunner: # to be a proper fix but this will suffice for now. self.runqemu = subprocess.Popen(launch_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, preexec_fn=os.setpgrp, env=env, cwd=self.tmpdir) output = self.runqemu.stdout + launch_time = time.time() # # We need the preexec_fn above so that all runqemu processes can easily be killed @@ -339,6 +340,10 @@ class QemuRunner: try: self.qmp.connect() + connect_time = time.time() + self.logger.info("QMP connected to QEMU at %s and took %s seconds" % + (time.strftime("%D %H:%M:%S"), + time.time() - launch_time)) except OSError as msg: self.logger.warning("Failed to connect qemu monitor socket: %s File: %s" % (msg, msg.filename)) return False @@ -354,19 +359,25 @@ class QemuRunner: mapdir = "/proc/" + str(self.qemupid) + "/map_files/" try: for f in os.listdir(mapdir): - linktarget = os.readlink(os.path.join(mapdir, f)) - if not linktarget.startswith("/") or linktarget.startswith("/dev") or "deleted" in linktarget: + try: + linktarget = os.readlink(os.path.join(mapdir, f)) + if not linktarget.startswith("/") or linktarget.startswith("/dev") or "deleted" in linktarget: + continue + with open(linktarget, "rb") as readf: + data = True + while data: + data = readf.read(4096) + except FileNotFoundError: continue - with open(linktarget, "rb") as readf: - data = True - while data: - data = readf.read(4096) # Centos7 doesn't allow us to read /map_files/ except PermissionError: pass # Release the qemu process to continue running self.run_monitor('cont') + self.logger.info("QMP released QEMU at %s and took %s seconds from connect" % + (time.strftime("%D %H:%M:%S"), + time.time() - connect_time)) # We are alive: qemu is running out = self.getOutput(output) @@ -594,8 +605,12 @@ class QemuRunner: return True return False - def run_monitor(self, command, timeout=60): - return self.qmp.cmd(command) + def run_monitor(self, command, args=None, timeout=60): + if hasattr(self, 'qmp') and self.qmp: + if args is not None: + return self.qmp.cmd(command, args) + else: + return self.qmp.cmd(command) def run_serial(self, command, raw=False, timeout=60): # We assume target system have echo to get command status diff --git a/poky/meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb b/poky/meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb index 2cf87c794..306296922 100644 --- a/poky/meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb +++ b/poky/meta/recipes-bsp/u-boot/libubootenv_0.3.2.bb @@ -15,7 +15,7 @@ SRCREV = "ba7564f5006d09bec51058cf4f5ac90d4dc18b3c" S = "${WORKDIR}/git" -inherit uboot-config cmake lib_package +inherit cmake lib_package EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release" diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc index dbbb9ff14..6b9253806 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -12,7 +12,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "b46dd116ce03e235f2a7d4843c6278e1da44b5e1" +SRCREV = "840658b093976390e9537724f802281c9c8439f5" SRC_URI = "git://git.denx.de/u-boot.git \ " diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.04.bb b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb index 4e9008191..4e9008191 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.04.bb +++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2021.07.bb diff --git a/poky/meta/recipes-bsp/u-boot/u-boot_2021.04.bb b/poky/meta/recipes-bsp/u-boot/u-boot_2021.07.bb index bbbc99bf8..bbbc99bf8 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot_2021.04.bb +++ b/poky/meta/recipes-bsp/u-boot/u-boot_2021.07.bb diff --git a/poky/meta/recipes-connectivity/avahi/avahi_0.8.bb b/poky/meta/recipes-connectivity/avahi/avahi_0.8.bb index 430231088..79ce669a3 100644 --- a/poky/meta/recipes-connectivity/avahi/avahi_0.8.bb +++ b/poky/meta/recipes-connectivity/avahi/avahi_0.8.bb @@ -25,6 +25,7 @@ SRC_URI = "https://github.com/lathiat/avahi/releases/download/v${PV}/avahi-${PV} file://initscript.patch \ file://0001-Fix-opening-etc-resolv.conf-error.patch \ file://handle-hup.patch \ + file://local-ping.patch \ " UPSTREAM_CHECK_URI = "https://github.com/lathiat/avahi/releases/" diff --git a/poky/meta/recipes-connectivity/avahi/files/local-ping.patch b/poky/meta/recipes-connectivity/avahi/files/local-ping.patch new file mode 100644 index 000000000..94116ad1f --- /dev/null +++ b/poky/meta/recipes-connectivity/avahi/files/local-ping.patch @@ -0,0 +1,152 @@ +CVE: CVE-2021-36217 +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From 9d31939e55280a733d930b15ac9e4dda4497680c Mon Sep 17 00:00:00 2001 +From: Tommi Rantala <tommi.t.rantala@nokia.com> +Date: Mon, 8 Feb 2021 11:04:43 +0200 +Subject: [PATCH] Fix NULL pointer crashes from #175 + +avahi-daemon is crashing when running "ping .local". +The crash is due to failing assertion from NULL pointer. +Add missing NULL pointer checks to fix it. + +Introduced in #175 - merge commit 8f75a045709a780c8cf92a6a21e9d35b593bdecd +--- + avahi-core/browse-dns-server.c | 5 ++++- + avahi-core/browse-domain.c | 5 ++++- + avahi-core/browse-service-type.c | 3 +++ + avahi-core/browse-service.c | 3 +++ + avahi-core/browse.c | 3 +++ + avahi-core/resolve-address.c | 5 ++++- + avahi-core/resolve-host-name.c | 5 ++++- + avahi-core/resolve-service.c | 5 ++++- + 8 files changed, 29 insertions(+), 5 deletions(-) + +diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c +index 049752e9..c2d914fa 100644 +--- a/avahi-core/browse-dns-server.c ++++ b/avahi-core/browse-dns-server.c +@@ -343,7 +343,10 @@ AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new( + AvahiSDNSServerBrowser* b; + + b = avahi_s_dns_server_browser_prepare(server, interface, protocol, domain, type, aprotocol, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_dns_server_browser_start(b); + + return b; +-} +\ No newline at end of file ++} +diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c +index f145d56a..06fa70c0 100644 +--- a/avahi-core/browse-domain.c ++++ b/avahi-core/browse-domain.c +@@ -253,7 +253,10 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new( + AvahiSDomainBrowser *b; + + b = avahi_s_domain_browser_prepare(server, interface, protocol, domain, type, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_domain_browser_start(b); + + return b; +-} +\ No newline at end of file ++} +diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c +index fdd22dcd..b1fc7af8 100644 +--- a/avahi-core/browse-service-type.c ++++ b/avahi-core/browse-service-type.c +@@ -171,6 +171,9 @@ AvahiSServiceTypeBrowser *avahi_s_service_type_browser_new( + AvahiSServiceTypeBrowser *b; + + b = avahi_s_service_type_browser_prepare(server, interface, protocol, domain, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_service_type_browser_start(b); + + return b; +diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c +index 5531360c..63e0275a 100644 +--- a/avahi-core/browse-service.c ++++ b/avahi-core/browse-service.c +@@ -184,6 +184,9 @@ AvahiSServiceBrowser *avahi_s_service_browser_new( + AvahiSServiceBrowser *b; + + b = avahi_s_service_browser_prepare(server, interface, protocol, service_type, domain, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_service_browser_start(b); + + return b; +diff --git a/avahi-core/browse.c b/avahi-core/browse.c +index 2941e579..e8a915e9 100644 +--- a/avahi-core/browse.c ++++ b/avahi-core/browse.c +@@ -634,6 +634,9 @@ AvahiSRecordBrowser *avahi_s_record_browser_new( + AvahiSRecordBrowser *b; + + b = avahi_s_record_browser_prepare(server, interface, protocol, key, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_record_browser_start_query(b); + + return b; +diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c +index ac0b29b1..e61dd242 100644 +--- a/avahi-core/resolve-address.c ++++ b/avahi-core/resolve-address.c +@@ -286,7 +286,10 @@ AvahiSAddressResolver *avahi_s_address_resolver_new( + AvahiSAddressResolver *b; + + b = avahi_s_address_resolver_prepare(server, interface, protocol, address, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_address_resolver_start(b); + + return b; +-} +\ No newline at end of file ++} +diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c +index 808b0e72..4e8e5973 100644 +--- a/avahi-core/resolve-host-name.c ++++ b/avahi-core/resolve-host-name.c +@@ -318,7 +318,10 @@ AvahiSHostNameResolver *avahi_s_host_name_resolver_new( + AvahiSHostNameResolver *b; + + b = avahi_s_host_name_resolver_prepare(server, interface, protocol, host_name, aprotocol, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_host_name_resolver_start(b); + + return b; +-} +\ No newline at end of file ++} +diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c +index 66bf3cae..43771763 100644 +--- a/avahi-core/resolve-service.c ++++ b/avahi-core/resolve-service.c +@@ -519,7 +519,10 @@ AvahiSServiceResolver *avahi_s_service_resolver_new( + AvahiSServiceResolver *b; + + b = avahi_s_service_resolver_prepare(server, interface, protocol, name, type, domain, aprotocol, flags, callback, userdata); ++ if (!b) ++ return NULL; ++ + avahi_s_service_resolver_start(b); + + return b; +-} +\ No newline at end of file ++} diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.16/0001-avoid-start-failure-with-bind-user.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.18/0001-avoid-start-failure-with-bind-user.patch index 8db96ec04..8db96ec04 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.16/0001-avoid-start-failure-with-bind-user.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.18/0001-avoid-start-failure-with-bind-user.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.16/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.18/0001-named-lwresd-V-and-start-log-hide-build-options.patch index 5bcc16c9b..5bcc16c9b 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.16/0001-named-lwresd-V-and-start-log-hide-build-options.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.18/0001-named-lwresd-V-and-start-log-hide-build-options.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.16/bind-ensure-searching-for-json-headers-searches-sysr.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.18/bind-ensure-searching-for-json-headers-searches-sysr.patch index f9cdc7ca4..f9cdc7ca4 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.16/bind-ensure-searching-for-json-headers-searches-sysr.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.18/bind-ensure-searching-for-json-headers-searches-sysr.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.16/bind9 b/poky/meta/recipes-connectivity/bind/bind-9.16.18/bind9 index 968679ff7..968679ff7 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.16/bind9 +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.18/bind9 diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.16/conf.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.18/conf.patch index aad345f9f..aad345f9f 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.16/conf.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.18/conf.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.16/generate-rndc-key.sh b/poky/meta/recipes-connectivity/bind/bind-9.16.18/generate-rndc-key.sh index 633e29c0e..633e29c0e 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.16/generate-rndc-key.sh +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.18/generate-rndc-key.sh diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.16/init.d-add-support-for-read-only-rootfs.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.18/init.d-add-support-for-read-only-rootfs.patch index 11db95ede..11db95ede 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.16/init.d-add-support-for-read-only-rootfs.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.18/init.d-add-support-for-read-only-rootfs.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.16/make-etc-initd-bind-stop-work.patch b/poky/meta/recipes-connectivity/bind/bind-9.16.18/make-etc-initd-bind-stop-work.patch index 146f3e35d..146f3e35d 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.16/make-etc-initd-bind-stop-work.patch +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.18/make-etc-initd-bind-stop-work.patch diff --git a/poky/meta/recipes-connectivity/bind/bind-9.16.16/named.service b/poky/meta/recipes-connectivity/bind/bind-9.16.18/named.service index cda56ef01..cda56ef01 100644 --- a/poky/meta/recipes-connectivity/bind/bind-9.16.16/named.service +++ b/poky/meta/recipes-connectivity/bind/bind-9.16.18/named.service diff --git a/poky/meta/recipes-connectivity/bind/bind_9.16.16.bb b/poky/meta/recipes-connectivity/bind/bind_9.16.18.bb index b15259840..e7a1c5d9e 100644 --- a/poky/meta/recipes-connectivity/bind/bind_9.16.16.bb +++ b/poky/meta/recipes-connectivity/bind/bind_9.16.18.bb @@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "6c913902adf878e7dc5e229cea94faefc9d40f44775a30213edd08860f761d7b" +SRC_URI[sha256sum] = "3c6263a4364eb5dce233f9f22b90acfa1ec2488d534f91d21663d0ac25ce5e65" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.16 follow the ESV versions divisible by 4 @@ -62,8 +62,6 @@ SYSTEMD_SERVICE_${PN} = "named.service" do_install_append() { - rmdir "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" install -d -o bind "${D}${localstatedir}/cache/bind" install -d "${D}${sysconfdir}/bind" install -d "${D}${sysconfdir}/init.d" diff --git a/poky/meta/recipes-connectivity/bluez5/bluez5.inc b/poky/meta/recipes-connectivity/bluez5/bluez5.inc index 635cad813..f2d9a4f93 100644 --- a/poky/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/poky/meta/recipes-connectivity/bluez5/bluez5.inc @@ -45,6 +45,7 @@ PACKAGECONFIG[deprecated] = "--enable-deprecated,--disable-deprecated" PACKAGECONFIG[mesh] = "--enable-mesh --enable-external-ell,--disable-mesh, json-c ell" PACKAGECONFIG[btpclient] = "--enable-btpclient --enable-external-ell,--disable-btpclient, ell" PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" +PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,python3-docutils-native" SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://init \ @@ -53,7 +54,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ file://0001-audio-Rename-pause-funciton-to-avoid-shadowing-glibc.patch \ - file://0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/poky/meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch b/poky/meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch deleted file mode 100644 index 03b42f73c..000000000 --- a/poky/meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-add-missing-mkdir-for-ell-shared.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d341ba650af1b7068d9ad034732b4f41b91bb2c1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Sun, 25 Apr 2021 18:56:41 +0200 -Subject: [PATCH] Makefile.am: add missing mkdir for ell/shared - -This addresses build errors out of source tree. - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index be5d5c7..72ad425 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -623,6 +623,7 @@ lib/bluetooth/%.h: lib/%.h - $(AM_V_GEN)$(LN_S) -f $(abspath $<) $@ - - ell/shared: Makefile -+ $(AM_V_at)$(MKDIR_P) ell - $(AM_V_GEN)for f in $(ell_shared) ; do \ - if [ ! -f $$f ] ; then \ - $(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \ diff --git a/poky/meta/recipes-connectivity/bluez5/bluez5_5.58.bb b/poky/meta/recipes-connectivity/bluez5/bluez5_5.60.bb index eb8475ec1..defa0c15c 100644 --- a/poky/meta/recipes-connectivity/bluez5/bluez5_5.58.bb +++ b/poky/meta/recipes-connectivity/bluez5/bluez5_5.60.bb @@ -1,6 +1,6 @@ require bluez5.inc -SRC_URI[sha256sum] = "c8065e75a5eb67236849ef68a354b1700540305a8c88ef0a0fd6288f19daf1f1" +SRC_URI[sha256sum] = "710999580d01ee59ec585e5e7c07fd94eddedc001aa26fe7464c546f9d945304" # These issues have kernel fixes rather than bluez fixes so exclude here CVE_CHECK_WHITELIST += "CVE-2020-12352 CVE-2020-24490" diff --git a/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb b/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb index 56fcf5cc0..5be480eb0 100644 --- a/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb +++ b/poky/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.0.bb @@ -13,6 +13,7 @@ UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/" SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ + file://0002-src-privsep-linux.c-add-support-for-arc-28.patch \ file://dhcpcd.service \ file://dhcpcd@.service \ " diff --git a/poky/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch b/poky/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch new file mode 100644 index 000000000..045f06a9a --- /dev/null +++ b/poky/meta/recipes-connectivity/dhcpcd/files/0002-src-privsep-linux.c-add-support-for-arc-28.patch @@ -0,0 +1,63 @@ +From 82386110e67cf75c224e9817fce55e6b0f143266 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Mon, 8 Feb 2021 07:23:54 +0100 +Subject: [PATCH] src/privsep-linux.c: add support for arc (#28) + +Fix the following build failure: + +privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" + # error "Platform does not support seccomp filter yet" + ^~~~~ +In file included from privsep-linux.c:36: +privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), + ^~~~~~~~~~~~~~~~~~ + +It should be noted that AUDIT_ARCH_{ARCOMPACT,ARCV2} is only defined +since kernel 5.2 and +https://github.com/torvalds/linux/commit/67f2a8a29311841ba6ab9b0e2d1b8f1e9978cd84 + +Detection of arc compact and arc v2 have been "copy/pasted" from +https://github.com/wbx-github/uclibc-ng/commit/afab56958f1cbb47b831ee3ebff231dfbae74af2 + +Fixes: + - http://autobuild.buildroot.org/results/d29083700a80dd647621eed06faeeae03f0587d3 + +Upstream-Status: Backport [https://github.com/NetworkConfiguration/dhcpcd/commit/82386110e67cf75c224e9817fce55e6b0f143266] + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> +--- + src/privsep-linux.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 402667af..21d41a9a 100644 +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c +@@ -149,6 +149,22 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386 + #elif defined(__x86_64__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64 ++#elif defined(__arc__) ++# if defined(__A7__) ++# if (BYTE_ORDER == LITTLE_ENDIAN) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACT ++# else ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACTBE ++# endif ++# elif defined(__HS__) ++# if (BYTE_ORDER == LITTLE_ENDIAN) ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2 ++# else ++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2BE ++# endif ++# else ++# error "Platform does not support seccomp filter yet" ++# endif + #elif defined(__arm__) + # ifndef EM_ARM + # define EM_ARM 40 +-- +2.16.2 + diff --git a/poky/meta/recipes-connectivity/iproute2/iproute2_5.12.0.bb b/poky/meta/recipes-connectivity/iproute2/iproute2_5.13.0.bb index 363112337..b117637e3 100644 --- a/poky/meta/recipes-connectivity/iproute2/iproute2_5.12.0.bb +++ b/poky/meta/recipes-connectivity/iproute2/iproute2_5.13.0.bb @@ -4,7 +4,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-libc-compat.h-add-musl-workaround.patch \ " -SRC_URI[sha256sum] = "9d268db98a36ee2a0e3ff3b92b2efff66fc1138a51e409bdef6ab3cfe15f326f" +SRC_URI[sha256sum] = "72a2e53774cac9e65f7b617deebb2059f87e8960d6e9713e4d788cea966f1b36" # CFLAGS are computed in Makefile and reference CCOPTS # diff --git a/poky/meta/recipes-connectivity/openssh/openssh/sshd_check_keys b/poky/meta/recipes-connectivity/openssh/openssh/sshd_check_keys index 1931dc715..ef117de89 100644 --- a/poky/meta/recipes-connectivity/openssh/openssh/sshd_check_keys +++ b/poky/meta/recipes-connectivity/openssh/openssh/sshd_check_keys @@ -6,6 +6,7 @@ generate_key() { local DIR="$(dirname "$FILE")" mkdir -p "$DIR" + rm -f ${FILE}.tmp ssh-keygen -q -f "${FILE}.tmp" -N '' -t $TYPE # Atomically rename file public key diff --git a/poky/meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch b/poky/meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch new file mode 100644 index 000000000..4a1960dff --- /dev/null +++ b/poky/meta/recipes-core/busybox/busybox/0001-mktemp-add-tmpdir-option.patch @@ -0,0 +1,81 @@ +From ceb378209f953ea745ed93a8645567196380ce3c Mon Sep 17 00:00:00 2001 +From: Andrej Valek <andrej.valek@siemens.com> +Date: Thu, 24 Jun 2021 19:13:22 +0200 +Subject: [PATCH] mktemp: add tmpdir option + +Make mktemp more compatible with coreutils. +- add "--tmpdir" option +- add long variants for "d,q,u" options + +Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2021-June/088932.html] + +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> +Signed-off-by: Peter Marko <peter.marko@siemens.com> +--- + coreutils/mktemp.c | 26 ++++++++++++++++++-------- + 1 file changed, 18 insertions(+), 8 deletions(-) + +diff --git a/coreutils/mktemp.c b/coreutils/mktemp.c +index 5393320a5..05c6d98c6 100644 +--- a/coreutils/mktemp.c ++++ b/coreutils/mktemp.c +@@ -39,16 +39,17 @@ + //kbuild:lib-$(CONFIG_MKTEMP) += mktemp.o + + //usage:#define mktemp_trivial_usage +-//usage: "[-dt] [-p DIR] [TEMPLATE]" ++//usage: "[-dt] [-p DIR, --tmpdir[=DIR]] [TEMPLATE]" + //usage:#define mktemp_full_usage "\n\n" + //usage: "Create a temporary file with name based on TEMPLATE and print its name.\n" + //usage: "TEMPLATE must end with XXXXXX (e.g. [/dir/]nameXXXXXX).\n" + //usage: "Without TEMPLATE, -t tmp.XXXXXX is assumed.\n" +-//usage: "\n -d Make directory, not file" +-//usage: "\n -q Fail silently on errors" +-//usage: "\n -t Prepend base directory name to TEMPLATE" +-//usage: "\n -p DIR Use DIR as a base directory (implies -t)" +-//usage: "\n -u Do not create anything; print a name" ++//usage: "\n -d Make directory, not file" ++//usage: "\n -q Fail silently on errors" ++//usage: "\n -t Prepend base directory name to TEMPLATE" ++//usage: "\n -p DIR, --tmpdir[=DIR] Use DIR as a base directory (implies -t)" ++//usage: "\n For --tmpdir is a optional one." ++//usage: "\n -u Do not create anything; print a name" + //usage: "\n" + //usage: "\nBase directory is: -p DIR, else $TMPDIR, else /tmp" + //usage: +@@ -72,13 +73,22 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) + OPT_t = 1 << 2, + OPT_p = 1 << 3, + OPT_u = 1 << 4, ++ OPT_td = 1 << 5, + }; + + path = getenv("TMPDIR"); + if (!path || path[0] == '\0') + path = "/tmp"; + +- opts = getopt32(argv, "^" "dqtp:u" "\0" "?1"/*1 arg max*/, &path); ++ opts = getopt32long(argv, "^" ++ "dqtp:u\0" ++ "?1" /* 1 arg max */, ++ "directory\0" No_argument "d" ++ "quiet\0" No_argument "q" ++ "dry-run\0" No_argument "u" ++ "tmpdir\0" Optional_argument "\xff" ++ , &path, &path ++ ); + + chp = argv[optind]; + if (!chp) { +@@ -95,7 +105,7 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv) + goto error; + } + #endif +- if (opts & (OPT_t|OPT_p)) ++ if (opts & (OPT_t|OPT_p|OPT_td)) + chp = concat_path_file(path, chp); + + if (opts & OPT_u) { +-- +2.11.0 + diff --git a/poky/meta/recipes-core/busybox/busybox/mount-via-label.cfg b/poky/meta/recipes-core/busybox/busybox/mount-via-label.cfg index 2fe7ab2e5..5a285de7c 100644 --- a/poky/meta/recipes-core/busybox/busybox/mount-via-label.cfg +++ b/poky/meta/recipes-core/busybox/busybox/mount-via-label.cfg @@ -1,9 +1,11 @@ CONFIG_BLKID=y CONFIG_FEATURE_BLKID_TYPE=y CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_SWAPONOFF_LABEL=y CONFIG_VOLUMEID=y CONFIG_FEATURE_VOLUMEID_BTRFS=y CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_F2FS=y CONFIG_FEATURE_VOLUMEID_FAT=y CONFIG_FEATURE_VOLUMEID_SQUASHFS=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y diff --git a/poky/meta/recipes-core/busybox/busybox_1.33.1.bb b/poky/meta/recipes-core/busybox/busybox_1.33.1.bb index a71ff530c..4c2bc1106 100644 --- a/poky/meta/recipes-core/busybox/busybox_1.33.1.bb +++ b/poky/meta/recipes-core/busybox/busybox_1.33.1.bb @@ -38,6 +38,8 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \ file://syslog.cfg \ file://unicode.cfg \ + file://rev.cfg \ + file://pgrep.cfg \ file://rcS \ file://rcK \ file://makefile-libbb-race.patch \ @@ -45,9 +47,8 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \ file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \ file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \ - file://rev.cfg \ - file://pgrep.cfg \ file://0001-gen_build_files-Use-C-locale-when-calling-sed-on-glo.patch \ + file://0001-mktemp-add-tmpdir-option.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " diff --git a/poky/meta/recipes-core/dbus/dbus_1.12.20.bb b/poky/meta/recipes-core/dbus/dbus_1.12.20.bb index 32e7d9cfa..2f6da6751 100644 --- a/poky/meta/recipes-core/dbus/dbus_1.12.20.bb +++ b/poky/meta/recipes-core/dbus/dbus_1.12.20.bb @@ -71,7 +71,7 @@ FILES_${PN}-tools = "${bindir}/dbus-uuidgen \ " FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" -FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${libdir}/cmake/DBus1 ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" +FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-test-tool ${datadir}/xml/dbus-1" PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','systemd-systemctl-native','',d)}" pkg_postinst_dbus() { diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch new file mode 100644 index 000000000..6ff25fc53 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-correctly-use-3-parameters-for-close_range.patch @@ -0,0 +1,29 @@ +From b71117d89434db83d34bc1b981ca03d4be299576 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 8 Jul 2021 17:26:43 -0700 +Subject: [PATCH] correctly use 3 parameters for close_range + +libc implementation has 3 parameter e.g. +https://www.freebsd.org/cgi/man.cgi?query=close_range&sektion=2&format=html + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2180] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + glib/gspawn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/gspawn.c b/glib/gspawn.c +index 899647c2f..3073a10a4 100644 +--- a/glib/gspawn.c ++++ b/glib/gspawn.c +@@ -1520,7 +1520,7 @@ safe_closefrom (int lowfd) + * + * Handle ENOSYS in case it’s supported in libc but not the kernel; if so, + * fall back to safe_fdwalk(). */ +- if (close_range (lowfd, G_MAXUINT) != 0 && errno == ENOSYS) ++ if (close_range (lowfd, G_MAXUINT, 0) != 0 && errno == ENOSYS) + #endif /* HAVE_CLOSE_RANGE */ + (void) safe_fdwalk (close_func, GINT_TO_POINTER (lowfd)); + #endif +-- +2.32.0 diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/time-test.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/time-test.patch new file mode 100644 index 000000000..4d7ef97bb --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/time-test.patch @@ -0,0 +1,40 @@ +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2177] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From 289f8be1b397a453cfcf35641455f3ae5fb4faeb Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 6 Jul 2021 19:26:03 +0100 +Subject: [PATCH] gio/tests/g-file-info: don't assume million-in-one events + don't happen + +The modification time test creates a file, gets the modification time in +seconds, then gets the modification time in microseconds and assumes +that the difference between the two has to be above 0. + +As rare as this may be, it can happen: + +$ stat g-file-info-test-50A450 -c %y +2021-07-06 18:24:56.000000767 +0100 + +Change the test to simply assert that the difference not negative to +handle this case. +--- + gio/tests/g-file-info.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/tests/g-file-info.c b/gio/tests/g-file-info.c +index c11c50462..fd0c64b55 100644 +--- a/gio/tests/g-file-info.c ++++ b/gio/tests/g-file-info.c +@@ -178,7 +178,7 @@ test_g_file_info_modification_time (void) + g_assert_nonnull (dt_usecs); + + ts = g_date_time_difference (dt_usecs, dt); +- g_assert_cmpint (ts, >, 0); ++ g_assert_cmpint (ts, >=, 0); + g_assert_cmpint (ts, <, G_USEC_PER_SEC); + + /* Try round-tripping the modification time. */ +-- +2.25.1 + diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb index 2a3a00fad..cbce6eae6 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.68.3.bb @@ -17,6 +17,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ file://0001-gio-tests-codegen.py-bump-timeout-to-100-seconds.patch \ + file://time-test.patch \ + file://0001-correctly-use-3-parameters-for-close_range.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" diff --git a/poky/meta/recipes-core/glibc/glibc-testsuite_2.33.bb b/poky/meta/recipes-core/glibc/glibc-testsuite_2.33.bb index d887aeff7..659d3132f 100644 --- a/poky/meta/recipes-core/glibc/glibc-testsuite_2.33.bb +++ b/poky/meta/recipes-core/glibc/glibc-testsuite_2.33.bb @@ -61,3 +61,4 @@ addtask do_check after do_compile inherit nopackages deltask do_stash_locale deltask do_install +deltask do_populate_sysroot diff --git a/poky/meta/recipes-core/glibc/glibc/mte-backports.patch b/poky/meta/recipes-core/glibc/glibc/mte-backports.patch new file mode 100644 index 000000000..d9604fdf4 --- /dev/null +++ b/poky/meta/recipes-core/glibc/glibc/mte-backports.patch @@ -0,0 +1,1238 @@ +Backport a number of patches from master to improve Arm MTE support. + +Upstream-Status: Backport [will be in 2.34] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From 2643466c2928a93de7b80a61f6a8f61a653862e1 Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <szabolcs.nagy@arm.com> +Date: Thu, 11 Mar 2021 14:09:56 +0000 +Subject: [PATCH 01/11] malloc: Fix a potential realloc issue with memory + tagging + +At an _int_free call site in realloc the wrong size was used for tag +clearing: the chunk header of the next chunk was also cleared which +in practice may work, but logically wrong. + +The tag clearing is moved before the memcpy to save a tag computation, +this avoids a chunk2mem. Another chunk2mem is removed because newmem +does not have to be recomputed. Whitespaces got fixed too. + +Reviewed-by: DJ Delorie <dj@redhat.com> +--- + malloc/malloc.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 8f8f12c276..51cec67e55 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -4851,14 +4851,14 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize, + } + else + { +- void *oldmem = chunk2mem (oldp); ++ void *oldmem = chunk2rawmem (oldp); ++ size_t sz = CHUNK_AVAILABLE_SIZE (oldp) - CHUNK_HDR_SZ; ++ (void) TAG_REGION (oldmem, sz); + newmem = TAG_NEW_USABLE (newmem); +- memcpy (newmem, oldmem, +- CHUNK_AVAILABLE_SIZE (oldp) - CHUNK_HDR_SZ); +- (void) TAG_REGION (chunk2rawmem (oldp), oldsize); +- _int_free (av, oldp, 1); +- check_inuse_chunk (av, newp); +- return chunk2mem (newp); ++ memcpy (newmem, oldmem, sz); ++ _int_free (av, oldp, 1); ++ check_inuse_chunk (av, newp); ++ return newmem; + } + } + } +-- +2.25.1 + + +From 32f3132be063e4b16a5cdb058980af354126e2f4 Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <szabolcs.nagy@arm.com> +Date: Thu, 28 Jan 2021 17:34:36 +0000 +Subject: [PATCH 02/11] malloc: Move MTAG_MMAP_FLAGS definition + +This is only used internally in malloc.c, the extern declaration +was wrong, __mtag_mmap_flags has internal linkage. + +Reviewed-by: DJ Delorie <dj@redhat.com> +--- + include/malloc.h | 7 ------- + malloc/malloc.c | 2 ++ + 2 files changed, 2 insertions(+), 7 deletions(-) + +diff --git a/include/malloc.h b/include/malloc.h +index 7ae08d53d3..b77761f74d 100644 +--- a/include/malloc.h ++++ b/include/malloc.h +@@ -16,11 +16,4 @@ typedef struct malloc_state *mstate; + + # endif /* !_ISOMAC */ + +-#ifdef USE_MTAG +-extern int __mtag_mmap_flags; +-#define MTAG_MMAP_FLAGS __mtag_mmap_flags +-#else +-#define MTAG_MMAP_FLAGS 0 +-#endif +- + #endif +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 51cec67e55..61c25d0f93 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -463,11 +463,13 @@ static void *(*__tag_region)(void *, size_t) = __default_tag_region; + static void *(*__tag_new_usable)(void *) = __default_tag_nop; + static void *(*__tag_at)(void *) = __default_tag_nop; + ++# define MTAG_MMAP_FLAGS __mtag_mmap_flags + # define TAG_NEW_MEMSET(ptr, val, size) __tag_new_memset (ptr, val, size) + # define TAG_REGION(ptr, size) __tag_region (ptr, size) + # define TAG_NEW_USABLE(ptr) __tag_new_usable (ptr) + # define TAG_AT(ptr) __tag_at (ptr) + #else ++# define MTAG_MMAP_FLAGS 0 + # define TAG_NEW_MEMSET(ptr, val, size) memset (ptr, val, size) + # define TAG_REGION(ptr, size) (ptr) + # define TAG_NEW_USABLE(ptr) (ptr) +-- +2.25.1 + + +From 4b13f77fb97f9618a7868ab767d05e0c2d7c6f6f Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <szabolcs.nagy@arm.com> +Date: Thu, 4 Feb 2021 11:38:23 +0000 +Subject: [PATCH 03/11] malloc: Simplify __mtag_tag_new_usable + +The chunk cannot be a dumped one here. The only non-obvious cases +are free and realloc which may be called on a dumped area chunk, +but in both cases it can be verified that tagging is already +avoided for dumped area chunks. + +Reviewed-by: DJ Delorie <dj@redhat.com> +--- + malloc/arena.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/malloc/arena.c b/malloc/arena.c +index bf17be27d4..0777dc70c6 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -298,11 +298,6 @@ __mtag_tag_new_usable (void *ptr) + if (ptr) + { + mchunkptr cp = mem2chunk(ptr); +- /* This likely will never happen, but we can't handle retagging +- chunks from the dumped main arena. So just return the +- existing pointer. */ +- if (DUMPED_MAIN_ARENA_CHUNK (cp)) +- return ptr; + ptr = __libc_mtag_tag_region (__libc_mtag_new_tag (ptr), + CHUNK_AVAILABLE_SIZE (cp) - CHUNK_HDR_SZ); + } +-- +2.25.1 + + +From 4f05837ba6934c5b8bbc6738f8883890493f50b6 Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <szabolcs.nagy@arm.com> +Date: Thu, 4 Feb 2021 11:52:14 +0000 +Subject: [PATCH 04/11] malloc: Avoid taggig mmaped memory on free + +Either the memory belongs to the dumped area, in which case we don't +want to tag (the dumped area has the same tag as malloc internal data +so tagging is unnecessary, but chunks there may not have the right +alignment for the tag granule), or the memory will be unmapped +immediately (and thus tagging is not useful). + +Reviewed-by: DJ Delorie <dj@redhat.com> +--- + malloc/malloc.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 61c25d0f93..ecb87350b0 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -3284,9 +3284,6 @@ __libc_free (void *mem) + + p = mem2chunk (mem); + +- /* Mark the chunk as belonging to the library again. */ +- (void)TAG_REGION (chunk2rawmem (p), CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); +- + if (chunk_is_mmapped (p)) /* release mmapped memory. */ + { + /* See if the dynamic brk/mmap threshold needs adjusting. +@@ -3307,6 +3304,10 @@ __libc_free (void *mem) + { + MAYBE_INIT_TCACHE (); + ++ /* Mark the chunk as belonging to the library again. */ ++ (void)TAG_REGION (chunk2rawmem (p), ++ CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); ++ + ar_ptr = arena_for_chunk (p); + _int_free (ar_ptr, p, 0); + } +-- +2.25.1 + + +From 673fad3798846101b77a89595cfa17f334a1c898 Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <szabolcs.nagy@arm.com> +Date: Tue, 16 Feb 2021 14:12:25 +0000 +Subject: [PATCH 05/11] malloc: Refactor TAG_ macros to avoid indirection + +This does not change behaviour, just removes one layer of indirection +in the internal memory tagging logic. + +Use tag_ and mtag_ prefixes instead of __tag_ and __mtag_ since these +are all symbols with internal linkage, private to malloc.c, so there +is no user namespace pollution issue. + +Reviewed-by: DJ Delorie <dj@redhat.com> +--- + malloc/arena.c | 16 +++++----- + malloc/hooks.c | 10 +++--- + malloc/malloc.c | 81 +++++++++++++++++++++++-------------------------- + 3 files changed, 51 insertions(+), 56 deletions(-) + +diff --git a/malloc/arena.c b/malloc/arena.c +index 0777dc70c6..d0778fea92 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -332,12 +332,12 @@ ptmalloc_init (void) + if (__MTAG_SBRK_UNTAGGED) + __morecore = __failing_morecore; + +- __mtag_mmap_flags = __MTAG_MMAP_FLAGS; +- __tag_new_memset = __mtag_tag_new_memset; +- __tag_region = __libc_mtag_tag_region; +- __tag_new_usable = __mtag_tag_new_usable; +- __tag_at = __libc_mtag_address_get_tag; +- __mtag_granule_mask = ~(size_t)(__MTAG_GRANULE_SIZE - 1); ++ mtag_mmap_flags = __MTAG_MMAP_FLAGS; ++ tag_new_memset = __mtag_tag_new_memset; ++ tag_region = __libc_mtag_tag_region; ++ tag_new_usable = __mtag_tag_new_usable; ++ tag_at = __libc_mtag_address_get_tag; ++ mtag_granule_mask = ~(size_t)(__MTAG_GRANULE_SIZE - 1); + } + #endif + +@@ -557,7 +557,7 @@ new_heap (size_t size, size_t top_pad) + } + } + } +- if (__mprotect (p2, size, MTAG_MMAP_FLAGS | PROT_READ | PROT_WRITE) != 0) ++ if (__mprotect (p2, size, mtag_mmap_flags | PROT_READ | PROT_WRITE) != 0) + { + __munmap (p2, HEAP_MAX_SIZE); + return 0; +@@ -587,7 +587,7 @@ grow_heap (heap_info *h, long diff) + { + if (__mprotect ((char *) h + h->mprotect_size, + (unsigned long) new_size - h->mprotect_size, +- MTAG_MMAP_FLAGS | PROT_READ | PROT_WRITE) != 0) ++ mtag_mmap_flags | PROT_READ | PROT_WRITE) != 0) + return -2; + + h->mprotect_size = new_size; +diff --git a/malloc/hooks.c b/malloc/hooks.c +index efec05f0a8..d8e304c31c 100644 +--- a/malloc/hooks.c ++++ b/malloc/hooks.c +@@ -68,7 +68,7 @@ __malloc_check_init (void) + tags, so fetch the tag at each location before dereferencing + it. */ + #define SAFE_CHAR_OFFSET(p,offset) \ +- ((unsigned char *) TAG_AT (((unsigned char *) p) + offset)) ++ ((unsigned char *) tag_at (((unsigned char *) p) + offset)) + + /* A simple, standard set of debugging hooks. Overhead is `only' one + byte per chunk; still this will catch most cases of double frees or +@@ -249,7 +249,7 @@ malloc_check (size_t sz, const void *caller) + top_check (); + victim = _int_malloc (&main_arena, nb); + __libc_lock_unlock (main_arena.mutex); +- return mem2mem_check (TAG_NEW_USABLE (victim), sz); ++ return mem2mem_check (tag_new_usable (victim), sz); + } + + static void +@@ -280,7 +280,7 @@ free_check (void *mem, const void *caller) + else + { + /* Mark the chunk as belonging to the library again. */ +- (void)TAG_REGION (chunk2rawmem (p), CHUNK_AVAILABLE_SIZE (p) ++ (void)tag_region (chunk2rawmem (p), CHUNK_AVAILABLE_SIZE (p) + - CHUNK_HDR_SZ); + _int_free (&main_arena, p, 1); + __libc_lock_unlock (main_arena.mutex); +@@ -375,7 +375,7 @@ invert: + + __libc_lock_unlock (main_arena.mutex); + +- return mem2mem_check (TAG_NEW_USABLE (newmem), bytes); ++ return mem2mem_check (tag_new_usable (newmem), bytes); + } + + static void * +@@ -417,7 +417,7 @@ memalign_check (size_t alignment, size_t bytes, const void *caller) + top_check (); + mem = _int_memalign (&main_arena, alignment, bytes + 1); + __libc_lock_unlock (main_arena.mutex); +- return mem2mem_check (TAG_NEW_USABLE (mem), bytes); ++ return mem2mem_check (tag_new_usable (mem), bytes); + } + + #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_25) +diff --git a/malloc/malloc.c b/malloc/malloc.c +index ecb87350b0..62d00f54cc 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -413,26 +413,26 @@ void *(*__morecore)(ptrdiff_t) = __default_morecore; + operations can continue to be used. Support macros are used to do + this: + +- void *TAG_NEW_MEMSET (void *ptr, int, val, size_t size) ++ void *tag_new_memset (void *ptr, int, val, size_t size) + + Has the same interface as memset(), but additionally allocates a + new tag, colors the memory with that tag and returns a pointer that + is correctly colored for that location. The non-tagging version + will simply call memset. + +- void *TAG_REGION (void *ptr, size_t size) ++ void *tag_region (void *ptr, size_t size) + + Color the region of memory pointed to by PTR and size SIZE with + the color of PTR. Returns the original pointer. + +- void *TAG_NEW_USABLE (void *ptr) ++ void *tag_new_usable (void *ptr) + + Allocate a new random color and use it to color the user region of + a chunk; this may include data from the subsequent chunk's header + if tagging is sufficiently fine grained. Returns PTR suitably + recolored for accessing the memory there. + +- void *TAG_AT (void *ptr) ++ void *tag_at (void *ptr) + + Read the current color of the memory at the address pointed to by + PTR (ignoring it's current color) and return PTR recolored to that +@@ -455,25 +455,20 @@ __default_tag_nop (void *ptr) + return ptr; + } + +-static int __mtag_mmap_flags = 0; +-static size_t __mtag_granule_mask = ~(size_t)0; ++static int mtag_mmap_flags = 0; ++static size_t mtag_granule_mask = ~(size_t)0; + +-static void *(*__tag_new_memset)(void *, int, size_t) = memset; +-static void *(*__tag_region)(void *, size_t) = __default_tag_region; +-static void *(*__tag_new_usable)(void *) = __default_tag_nop; +-static void *(*__tag_at)(void *) = __default_tag_nop; ++static void *(*tag_new_memset)(void *, int, size_t) = memset; ++static void *(*tag_region)(void *, size_t) = __default_tag_region; ++static void *(*tag_new_usable)(void *) = __default_tag_nop; ++static void *(*tag_at)(void *) = __default_tag_nop; + +-# define MTAG_MMAP_FLAGS __mtag_mmap_flags +-# define TAG_NEW_MEMSET(ptr, val, size) __tag_new_memset (ptr, val, size) +-# define TAG_REGION(ptr, size) __tag_region (ptr, size) +-# define TAG_NEW_USABLE(ptr) __tag_new_usable (ptr) +-# define TAG_AT(ptr) __tag_at (ptr) + #else +-# define MTAG_MMAP_FLAGS 0 +-# define TAG_NEW_MEMSET(ptr, val, size) memset (ptr, val, size) +-# define TAG_REGION(ptr, size) (ptr) +-# define TAG_NEW_USABLE(ptr) (ptr) +-# define TAG_AT(ptr) (ptr) ++# define mtag_mmap_flags 0 ++# define tag_new_memset(ptr, val, size) memset (ptr, val, size) ++# define tag_region(ptr, size) (ptr) ++# define tag_new_usable(ptr) (ptr) ++# define tag_at(ptr) (ptr) + #endif + + #include <string.h> +@@ -1305,8 +1300,8 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + /* Convert between user mem pointers and chunk pointers, updating any + memory tags on the pointer to respect the tag value at that + location. */ +-#define chunk2mem(p) ((void*)TAG_AT (((char*)(p) + CHUNK_HDR_SZ))) +-#define mem2chunk(mem) ((mchunkptr)TAG_AT (((char*)(mem) - CHUNK_HDR_SZ))) ++#define chunk2mem(p) ((void *)tag_at (((char*)(p) + CHUNK_HDR_SZ))) ++#define mem2chunk(mem) ((mchunkptr)tag_at (((char*)(mem) - CHUNK_HDR_SZ))) + + /* The smallest possible chunk */ + #define MIN_CHUNK_SIZE (offsetof(struct malloc_chunk, fd_nextsize)) +@@ -1337,7 +1332,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + #ifdef USE_MTAG + #define CHUNK_AVAILABLE_SIZE(p) \ + ((chunksize (p) + (chunk_is_mmapped (p) ? 0 : SIZE_SZ)) \ +- & __mtag_granule_mask) ++ & mtag_granule_mask) + #else + #define CHUNK_AVAILABLE_SIZE(p) \ + (chunksize (p) + (chunk_is_mmapped (p) ? 0 : SIZE_SZ)) +@@ -1361,7 +1356,7 @@ checked_request2size (size_t req, size_t *sz) __nonnull (1) + number. Ideally, this would be part of request2size(), but that + must be a macro that produces a compile time constant if passed + a constant literal. */ +- req = (req + ~__mtag_granule_mask) & __mtag_granule_mask; ++ req = (req + ~mtag_granule_mask) & mtag_granule_mask; + #endif + + *sz = request2size (req); +@@ -2467,7 +2462,7 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av) + if ((unsigned long) (size) > (unsigned long) (nb)) + { + mm = (char *) (MMAP (0, size, +- MTAG_MMAP_FLAGS | PROT_READ | PROT_WRITE, 0)); ++ mtag_mmap_flags | PROT_READ | PROT_WRITE, 0)); + + if (mm != MAP_FAILED) + { +@@ -2665,7 +2660,7 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av) + if ((unsigned long) (size) > (unsigned long) (nb)) + { + char *mbrk = (char *) (MMAP (0, size, +- MTAG_MMAP_FLAGS | PROT_READ | PROT_WRITE, ++ mtag_mmap_flags | PROT_READ | PROT_WRITE, + 0)); + + if (mbrk != MAP_FAILED) +@@ -3221,14 +3216,14 @@ __libc_malloc (size_t bytes) + && tcache->counts[tc_idx] > 0) + { + victim = tcache_get (tc_idx); +- return TAG_NEW_USABLE (victim); ++ return tag_new_usable (victim); + } + DIAG_POP_NEEDS_COMMENT; + #endif + + if (SINGLE_THREAD_P) + { +- victim = TAG_NEW_USABLE (_int_malloc (&main_arena, bytes)); ++ victim = tag_new_usable (_int_malloc (&main_arena, bytes)); + assert (!victim || chunk_is_mmapped (mem2chunk (victim)) || + &main_arena == arena_for_chunk (mem2chunk (victim))); + return victim; +@@ -3249,7 +3244,7 @@ __libc_malloc (size_t bytes) + if (ar_ptr != NULL) + __libc_lock_unlock (ar_ptr->mutex); + +- victim = TAG_NEW_USABLE (victim); ++ victim = tag_new_usable (victim); + + assert (!victim || chunk_is_mmapped (mem2chunk (victim)) || + ar_ptr == arena_for_chunk (mem2chunk (victim))); +@@ -3305,7 +3300,7 @@ __libc_free (void *mem) + MAYBE_INIT_TCACHE (); + + /* Mark the chunk as belonging to the library again. */ +- (void)TAG_REGION (chunk2rawmem (p), ++ (void)tag_region (chunk2rawmem (p), + CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); + + ar_ptr = arena_for_chunk (p); +@@ -3408,7 +3403,7 @@ __libc_realloc (void *oldmem, size_t bytes) + reused. There's a performance hit for both us and the + caller for doing this, so we might want to + reconsider. */ +- return TAG_NEW_USABLE (newmem); ++ return tag_new_usable (newmem); + } + #endif + /* Note the extra SIZE_SZ overhead. */ +@@ -3451,7 +3446,7 @@ __libc_realloc (void *oldmem, size_t bytes) + { + size_t sz = CHUNK_AVAILABLE_SIZE (oldp) - CHUNK_HDR_SZ; + memcpy (newp, oldmem, sz); +- (void) TAG_REGION (chunk2rawmem (oldp), sz); ++ (void) tag_region (chunk2rawmem (oldp), sz); + _int_free (ar_ptr, oldp, 0); + } + } +@@ -3509,7 +3504,7 @@ _mid_memalign (size_t alignment, size_t bytes, void *address) + p = _int_memalign (&main_arena, alignment, bytes); + assert (!p || chunk_is_mmapped (mem2chunk (p)) || + &main_arena == arena_for_chunk (mem2chunk (p))); +- return TAG_NEW_USABLE (p); ++ return tag_new_usable (p); + } + + arena_get (ar_ptr, bytes + alignment + MINSIZE); +@@ -3527,7 +3522,7 @@ _mid_memalign (size_t alignment, size_t bytes, void *address) + + assert (!p || chunk_is_mmapped (mem2chunk (p)) || + ar_ptr == arena_for_chunk (mem2chunk (p))); +- return TAG_NEW_USABLE (p); ++ return tag_new_usable (p); + } + /* For ISO C11. */ + weak_alias (__libc_memalign, aligned_alloc) +@@ -3544,7 +3539,7 @@ __libc_valloc (size_t bytes) + void *address = RETURN_ADDRESS (0); + size_t pagesize = GLRO (dl_pagesize); + p = _mid_memalign (pagesize, bytes, address); +- return TAG_NEW_USABLE (p); ++ return tag_new_usable (p); + } + + void * +@@ -3569,7 +3564,7 @@ __libc_pvalloc (size_t bytes) + rounded_bytes = rounded_bytes & -(pagesize - 1); + + p = _mid_memalign (pagesize, rounded_bytes, address); +- return TAG_NEW_USABLE (p); ++ return tag_new_usable (p); + } + + void * +@@ -3666,7 +3661,7 @@ __libc_calloc (size_t n, size_t elem_size) + regardless of MORECORE_CLEARS, so we zero the whole block while + doing so. */ + #ifdef USE_MTAG +- return TAG_NEW_MEMSET (mem, 0, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); ++ return tag_new_memset (mem, 0, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); + #else + INTERNAL_SIZE_T csz = chunksize (p); + +@@ -4821,7 +4816,7 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize, + av->top = chunk_at_offset (oldp, nb); + set_head (av->top, (newsize - nb) | PREV_INUSE); + check_inuse_chunk (av, oldp); +- return TAG_NEW_USABLE (chunk2rawmem (oldp)); ++ return tag_new_usable (chunk2rawmem (oldp)); + } + + /* Try to expand forward into next chunk; split off remainder below */ +@@ -4856,8 +4851,8 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize, + { + void *oldmem = chunk2rawmem (oldp); + size_t sz = CHUNK_AVAILABLE_SIZE (oldp) - CHUNK_HDR_SZ; +- (void) TAG_REGION (oldmem, sz); +- newmem = TAG_NEW_USABLE (newmem); ++ (void) tag_region (oldmem, sz); ++ newmem = tag_new_usable (newmem); + memcpy (newmem, oldmem, sz); + _int_free (av, oldp, 1); + check_inuse_chunk (av, newp); +@@ -4881,7 +4876,7 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize, + { + remainder = chunk_at_offset (newp, nb); + /* Clear any user-space tags before writing the header. */ +- remainder = TAG_REGION (remainder, remainder_size); ++ remainder = tag_region (remainder, remainder_size); + set_head_size (newp, nb | (av != &main_arena ? NON_MAIN_ARENA : 0)); + set_head (remainder, remainder_size | PREV_INUSE | + (av != &main_arena ? NON_MAIN_ARENA : 0)); +@@ -4891,7 +4886,7 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize, + } + + check_inuse_chunk (av, newp); +- return TAG_NEW_USABLE (chunk2rawmem (newp)); ++ return tag_new_usable (chunk2rawmem (newp)); + } + + /* +@@ -5108,7 +5103,7 @@ musable (void *mem) + /* The usable space may be reduced if memory tagging is needed, + since we cannot share the user-space data with malloc's internal + data structure. */ +- result &= __mtag_granule_mask; ++ result &= mtag_granule_mask; + #endif + return result; + } +-- +2.25.1 + + +From f0ea41e819f40aacedf25431bedd95da9c5db534 Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <szabolcs.nagy@arm.com> +Date: Wed, 27 Jan 2021 15:45:43 +0000 +Subject: [PATCH 06/11] malloc: Use global flag instead of function pointer + dispatch for mtag + +A flag check can be faster than function pointers because of how +branch prediction and speculation works and it can also remove a layer +of indirection when there is a mismatch between the malloc internal +tag_* api and __libc_mtag_* target hooks. + +Memory tagging wrapper functions are moved to malloc.c from arena.c and +the logic now checks mmap_enabled. The definition of tag_new_usable is +moved after chunk related definitions. + +This refactoring also allows using mtag_enabled checks instead of +USE_MTAG ifdefs when memory tagging support only changes code logic +when memory tagging is enabled at runtime. Note: an "if (false)" code +block is optimized away even at -O0 by gcc. + +Reviewed-by: DJ Delorie <dj@redhat.com> +--- + malloc/arena.c | 33 +--------------------------- + malloc/malloc.c | 58 ++++++++++++++++++++++++++++++++----------------- + 2 files changed, 39 insertions(+), 52 deletions(-) + +diff --git a/malloc/arena.c b/malloc/arena.c +index d0778fea92..1e83bb66bd 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -287,34 +287,6 @@ extern struct dl_open_hook *_dl_open_hook; + libc_hidden_proto (_dl_open_hook); + #endif + +-#ifdef USE_MTAG +- +-/* Generate a new (random) tag value for PTR and tag the memory it +- points to upto the end of the usable size for the chunk containing +- it. Return the newly tagged pointer. */ +-static void * +-__mtag_tag_new_usable (void *ptr) +-{ +- if (ptr) +- { +- mchunkptr cp = mem2chunk(ptr); +- ptr = __libc_mtag_tag_region (__libc_mtag_new_tag (ptr), +- CHUNK_AVAILABLE_SIZE (cp) - CHUNK_HDR_SZ); +- } +- return ptr; +-} +- +-/* Generate a new (random) tag value for PTR, set the tags for the +- memory to the new tag and initialize the memory contents to VAL. +- In practice this function will only be called with VAL=0, but we +- keep this parameter to maintain the same prototype as memset. */ +-static void * +-__mtag_tag_new_memset (void *ptr, int val, size_t size) +-{ +- return __libc_mtag_memset_with_tag (__libc_mtag_new_tag (ptr), val, size); +-} +-#endif +- + static void + ptmalloc_init (void) + { +@@ -332,11 +304,8 @@ ptmalloc_init (void) + if (__MTAG_SBRK_UNTAGGED) + __morecore = __failing_morecore; + ++ mtag_enabled = true; + mtag_mmap_flags = __MTAG_MMAP_FLAGS; +- tag_new_memset = __mtag_tag_new_memset; +- tag_region = __libc_mtag_tag_region; +- tag_new_usable = __mtag_tag_new_usable; +- tag_at = __libc_mtag_address_get_tag; + mtag_granule_mask = ~(size_t)(__MTAG_GRANULE_SIZE - 1); + } + #endif +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 62d00f54cc..253a919ec5 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -441,35 +441,41 @@ void *(*__morecore)(ptrdiff_t) = __default_morecore; + */ + + #ifdef USE_MTAG ++static bool mtag_enabled = false; ++static int mtag_mmap_flags = 0; ++static size_t mtag_granule_mask = ~(size_t)0; ++#else ++# define mtag_enabled false ++# define mtag_mmap_flags 0 ++#endif + +-/* Default implementaions when memory tagging is supported, but disabled. */ +-static void * +-__default_tag_region (void *ptr, size_t size) ++static __always_inline void * ++tag_region (void *ptr, size_t size) + { ++ if (__glibc_unlikely (mtag_enabled)) ++ return __libc_mtag_tag_region (ptr, size); + return ptr; + } + +-static void * +-__default_tag_nop (void *ptr) ++static __always_inline void * ++tag_new_memset (void *ptr, int val, size_t size) + { +- return ptr; ++ if (__glibc_unlikely (mtag_enabled)) ++ return __libc_mtag_memset_with_tag (__libc_mtag_new_tag (ptr), val, size); ++ return memset (ptr, val, size); + } + +-static int mtag_mmap_flags = 0; +-static size_t mtag_granule_mask = ~(size_t)0; +- +-static void *(*tag_new_memset)(void *, int, size_t) = memset; +-static void *(*tag_region)(void *, size_t) = __default_tag_region; +-static void *(*tag_new_usable)(void *) = __default_tag_nop; +-static void *(*tag_at)(void *) = __default_tag_nop; ++/* Defined later. */ ++static void * ++tag_new_usable (void *ptr); + +-#else +-# define mtag_mmap_flags 0 +-# define tag_new_memset(ptr, val, size) memset (ptr, val, size) +-# define tag_region(ptr, size) (ptr) +-# define tag_new_usable(ptr) (ptr) +-# define tag_at(ptr) (ptr) +-#endif ++static __always_inline void * ++tag_at (void *ptr) ++{ ++ if (__glibc_unlikely (mtag_enabled)) ++ return __libc_mtag_address_get_tag (ptr); ++ return ptr; ++} + + #include <string.h> + +@@ -1460,6 +1466,18 @@ checked_request2size (size_t req, size_t *sz) __nonnull (1) + #pragma GCC poison mchunk_size + #pragma GCC poison mchunk_prev_size + ++static __always_inline void * ++tag_new_usable (void *ptr) ++{ ++ if (__glibc_unlikely (mtag_enabled) && ptr) ++ { ++ mchunkptr cp = mem2chunk(ptr); ++ ptr = __libc_mtag_tag_region (__libc_mtag_new_tag (ptr), ++ CHUNK_AVAILABLE_SIZE (cp) - CHUNK_HDR_SZ); ++ } ++ return ptr; ++} ++ + /* + -------------------- Internal data structures -------------------- + +-- +2.25.1 + + +From 8597244d5c3edbd672b285eea5f6dea833256f9d Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <szabolcs.nagy@arm.com> +Date: Wed, 17 Feb 2021 10:39:37 +0000 +Subject: [PATCH 07/11] malloc: Ensure the generic mtag hooks are not used + +Use inline functions instead of macros, because macros can cause unused +variable warnings and type conversion issues. We assume these functions +may appear in the code but only in dead code paths (hidden by a runtime +check), so it's important that they can compile with correct types, but +if they are actually used that should be an error. + +Currently the hooks are only used when USE_MTAG is true which only +happens on aarch64 and then the aarch64 specific code is used not this +generic header. However followup refactoring will allow the hooks to +be used with !USE_MTAG. + +Note: the const qualifier in the comment was wrong: changing tags is a +write operation. + +Reviewed-by: DJ Delorie <dj@redhat.com> +--- + sysdeps/generic/libc-mtag.h | 41 ++++++++++++++++++++++++++++--------- + 1 file changed, 31 insertions(+), 10 deletions(-) + +diff --git a/sysdeps/generic/libc-mtag.h b/sysdeps/generic/libc-mtag.h +index 1a866cdc0c..e8fc236b6c 100644 +--- a/sysdeps/generic/libc-mtag.h ++++ b/sysdeps/generic/libc-mtag.h +@@ -31,22 +31,43 @@ + /* Extra flags to pass to mmap() to request a tagged region of memory. */ + #define __MTAG_MMAP_FLAGS 0 + ++/* Memory tagging target hooks are only called when memory tagging is ++ enabled at runtime. The generic definitions here must not be used. */ ++void __libc_mtag_link_error (void); ++ + /* Set the tags for a region of memory, which must have size and alignment +- that are multiples of __MTAG_GRANULE_SIZE. Size cannot be zero. +- void *__libc_mtag_tag_region (const void *, size_t) */ +-#define __libc_mtag_tag_region(p, s) (p) ++ that are multiples of __MTAG_GRANULE_SIZE. Size cannot be zero. */ ++static inline void * ++__libc_mtag_tag_region (void *p, size_t n) ++{ ++ __libc_mtag_link_error (); ++ return p; ++} + + /* Optimized equivalent to __libc_mtag_tag_region followed by memset. */ +-#define __libc_mtag_memset_with_tag memset ++static inline void * ++__libc_mtag_memset_with_tag (void *p, int c, size_t n) ++{ ++ __libc_mtag_link_error (); ++ return memset (p, c, n); ++} + + /* Convert address P to a pointer that is tagged correctly for that +- location. +- void *__libc_mtag_address_get_tag (void*) */ +-#define __libc_mtag_address_get_tag(p) (p) ++ location. */ ++static inline void * ++__libc_mtag_address_get_tag (void *p) ++{ ++ __libc_mtag_link_error (); ++ return p; ++} + + /* Assign a new (random) tag to a pointer P (does not adjust the tag on +- the memory addressed). +- void *__libc_mtag_new_tag (void*) */ +-#define __libc_mtag_new_tag(p) (p) ++ the memory addressed). */ ++static inline void * ++__libc_mtag_new_tag (void *p) ++{ ++ __libc_mtag_link_error (); ++ return p; ++} + + #endif /* _GENERIC_LIBC_MTAG_H */ +-- +2.25.1 + + +From 3d9e16280ad881d038aedba0b6fcbd9e78b29072 Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <szabolcs.nagy@arm.com> +Date: Fri, 29 Jan 2021 17:07:28 +0000 +Subject: [PATCH 08/11] malloc: Only support zeroing and not arbitrary memset + with mtag + +The memset api is suboptimal and does not provide much benefit. Memory +tagging only needs a zeroing memset (and only for memory that's sized +and aligned to multiples of the tag granule), so change the internal +api and the target hooks accordingly. This is to simplify the +implementation of the target hook. + +Reviewed-by: DJ Delorie <dj@redhat.com> +--- + malloc/malloc.c | 17 ++++++++--------- + sysdeps/aarch64/Makefile | 2 +- + ...g_memset_tag.S => __mtag_tag_zero_region.S} | 18 +++++++----------- + sysdeps/aarch64/libc-mtag.h | 4 ++-- + sysdeps/generic/libc-mtag.h | 6 +++--- + 5 files changed, 21 insertions(+), 26 deletions(-) + rename sysdeps/aarch64/{__mtag_memset_tag.S => __mtag_tag_zero_region.S} (82%) + +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 253a919ec5..01cf6e9325 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -413,12 +413,11 @@ void *(*__morecore)(ptrdiff_t) = __default_morecore; + operations can continue to be used. Support macros are used to do + this: + +- void *tag_new_memset (void *ptr, int, val, size_t size) ++ void *tag_new_zero_region (void *ptr, size_t size) + +- Has the same interface as memset(), but additionally allocates a +- new tag, colors the memory with that tag and returns a pointer that +- is correctly colored for that location. The non-tagging version +- will simply call memset. ++ Allocates a new tag, colors the memory with that tag, zeros the ++ memory and returns a pointer that is correctly colored for that ++ location. The non-tagging version will simply call memset with 0. + + void *tag_region (void *ptr, size_t size) + +@@ -458,11 +457,11 @@ tag_region (void *ptr, size_t size) + } + + static __always_inline void * +-tag_new_memset (void *ptr, int val, size_t size) ++tag_new_zero_region (void *ptr, size_t size) + { + if (__glibc_unlikely (mtag_enabled)) +- return __libc_mtag_memset_with_tag (__libc_mtag_new_tag (ptr), val, size); +- return memset (ptr, val, size); ++ return __libc_mtag_tag_zero_region (__libc_mtag_new_tag (ptr), size); ++ return memset (ptr, 0, size); + } + + /* Defined later. */ +@@ -3679,7 +3678,7 @@ __libc_calloc (size_t n, size_t elem_size) + regardless of MORECORE_CLEARS, so we zero the whole block while + doing so. */ + #ifdef USE_MTAG +- return tag_new_memset (mem, 0, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); ++ return tag_new_zero_region (mem, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); + #else + INTERNAL_SIZE_T csz = chunksize (p); + +diff --git a/sysdeps/aarch64/Makefile b/sysdeps/aarch64/Makefile +index d3ab37a40a..259070cfad 100644 +--- a/sysdeps/aarch64/Makefile ++++ b/sysdeps/aarch64/Makefile +@@ -41,7 +41,7 @@ endif + ifeq ($(subdir),misc) + sysdep_headers += sys/ifunc.h + sysdep_routines += __mtag_address_get_tag \ +- __mtag_memset_tag \ ++ __mtag_tag_zero_region \ + __mtag_new_tag \ + __mtag_tag_region + +diff --git a/sysdeps/aarch64/__mtag_memset_tag.S b/sysdeps/aarch64/__mtag_tag_zero_region.S +similarity index 82% +rename from sysdeps/aarch64/__mtag_memset_tag.S +rename to sysdeps/aarch64/__mtag_tag_zero_region.S +index 3c202888a4..74d398bba5 100644 +--- a/sysdeps/aarch64/__mtag_memset_tag.S ++++ b/sysdeps/aarch64/__mtag_tag_zero_region.S +@@ -20,9 +20,6 @@ + + #ifdef USE_MTAG + +-/* Use the same register names and assignments as memset. */ +-#include "memset-reg.h" +- + .arch armv8.5-a + .arch_extension memtag + +@@ -31,16 +28,15 @@ + /* FIXME: This is a minimal implementation. We could do much better than + this for large values of COUNT. */ + +-ENTRY(__libc_mtag_memset_with_tag) ++#define dstin x0 ++#define count x1 ++#define dst x2 + +- and valw, valw, 255 +- orr valw, valw, valw, lsl 8 +- orr valw, valw, valw, lsl 16 +- orr val, val, val, lsl 32 +- mov dst, dstin ++ENTRY(__libc_mtag_tag_zero_region) + ++ mov dst, dstin + L(loop): +- stgp val, val, [dst], #16 ++ stzg dst, [dst], #16 + subs count, count, 16 + bne L(loop) + #if 0 +@@ -49,5 +45,5 @@ L(loop): + ldg dstin, [dstin] // Recover the tag created (might be untagged). + #endif + ret +-END (__libc_mtag_memset_with_tag) ++END (__libc_mtag_tag_zero_region) + #endif /* USE_MTAG */ +diff --git a/sysdeps/aarch64/libc-mtag.h b/sysdeps/aarch64/libc-mtag.h +index 979cbb743e..f58402ccf9 100644 +--- a/sysdeps/aarch64/libc-mtag.h ++++ b/sysdeps/aarch64/libc-mtag.h +@@ -39,8 +39,8 @@ + void *__libc_mtag_tag_region (const void *, size_t) */ + void *__libc_mtag_tag_region (void *, size_t); + +-/* Optimized equivalent to __libc_mtag_tag_region followed by memset. */ +-void *__libc_mtag_memset_with_tag (void *, int, size_t); ++/* Optimized equivalent to __libc_mtag_tag_region followed by memset to 0. */ ++void *__libc_mtag_tag_zero_region (void *, size_t); + + /* Convert address P to a pointer that is tagged correctly for that + location. +diff --git a/sysdeps/generic/libc-mtag.h b/sysdeps/generic/libc-mtag.h +index e8fc236b6c..4743e873f1 100644 +--- a/sysdeps/generic/libc-mtag.h ++++ b/sysdeps/generic/libc-mtag.h +@@ -44,12 +44,12 @@ __libc_mtag_tag_region (void *p, size_t n) + return p; + } + +-/* Optimized equivalent to __libc_mtag_tag_region followed by memset. */ ++/* Optimized equivalent to __libc_mtag_tag_region followed by memset to 0. */ + static inline void * +-__libc_mtag_memset_with_tag (void *p, int c, size_t n) ++__libc_mtag_tag_zero_region (void *p, size_t n) + { + __libc_mtag_link_error (); +- return memset (p, c, n); ++ return memset (p, 0, n); + } + + /* Convert address P to a pointer that is tagged correctly for that +-- +2.25.1 + + +From 4d596cb72342ba0734dc847653431e078a70edfc Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <szabolcs.nagy@arm.com> +Date: Tue, 16 Feb 2021 17:02:44 +0000 +Subject: [PATCH 09/11] malloc: Change calloc when tagging is disabled + +When glibc is built with memory tagging support (USE_MTAG) but it is not +enabled at runtime (mtag_enabled) then unconditional memset was used +even though that can be often avoided. + +This is for performance when tagging is supported but not enabled. +The extra check should have no overhead: tag_new_zero_region already +had a runtime check which the compiler can now optimize away. + +Reviewed-by: DJ Delorie <dj@redhat.com> +--- + malloc/malloc.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 01cf6e9325..0b2aff3768 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -3591,11 +3591,9 @@ __libc_calloc (size_t n, size_t elem_size) + mchunkptr oldtop; + INTERNAL_SIZE_T sz, oldtopsize; + void *mem; +-#ifndef USE_MTAG + unsigned long clearsize; + unsigned long nclears; + INTERNAL_SIZE_T *d; +-#endif + ptrdiff_t bytes; + + if (__glibc_unlikely (__builtin_mul_overflow (n, elem_size, &bytes))) +@@ -3674,12 +3672,13 @@ __libc_calloc (size_t n, size_t elem_size) + return 0; + + mchunkptr p = mem2chunk (mem); ++ + /* If we are using memory tagging, then we need to set the tags + regardless of MORECORE_CLEARS, so we zero the whole block while + doing so. */ +-#ifdef USE_MTAG +- return tag_new_zero_region (mem, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); +-#else ++ if (__glibc_unlikely (mtag_enabled)) ++ return tag_new_zero_region (mem, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); ++ + INTERNAL_SIZE_T csz = chunksize (p); + + /* Two optional cases in which clearing not necessary */ +@@ -3733,7 +3732,6 @@ __libc_calloc (size_t n, size_t elem_size) + } + + return mem; +-#endif + } + + /* +-- +2.25.1 + + +From 287a35fba55a0a817db7af71ee966a37b7642bf0 Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <szabolcs.nagy@arm.com> +Date: Mon, 8 Feb 2021 12:39:01 +0000 +Subject: [PATCH 10/11] malloc: Use branches instead of mtag_granule_mask + +The branches may be better optimized since mtag_enabled is widely used. + +Granule size larger than a chunk header is not supported since then we +cannot have both the chunk header and user area granule aligned. To +fix that for targets with large granule, the chunk layout has to change. + +So code that attempted to handle the granule mask generally was changed. +This simplified CHUNK_AVAILABLE_SIZE and the logic in malloc_usable_size. + +Reviewed-by: DJ Delorie <dj@redhat.com> +--- + malloc/arena.c | 1 - + malloc/malloc.c | 34 ++++++++++++++-------------------- + 2 files changed, 14 insertions(+), 21 deletions(-) + +diff --git a/malloc/arena.c b/malloc/arena.c +index 1e83bb66bd..9fbbb38a15 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -306,7 +306,6 @@ ptmalloc_init (void) + + mtag_enabled = true; + mtag_mmap_flags = __MTAG_MMAP_FLAGS; +- mtag_granule_mask = ~(size_t)(__MTAG_GRANULE_SIZE - 1); + } + #endif + +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 0b2aff3768..849bd8e2c9 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -442,7 +442,6 @@ void *(*__morecore)(ptrdiff_t) = __default_morecore; + #ifdef USE_MTAG + static bool mtag_enabled = false; + static int mtag_mmap_flags = 0; +-static size_t mtag_granule_mask = ~(size_t)0; + #else + # define mtag_enabled false + # define mtag_mmap_flags 0 +@@ -1333,15 +1332,16 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + ((req) + SIZE_SZ + MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK) + + /* Available size of chunk. This is the size of the real usable data +- in the chunk, plus the chunk header. */ +-#ifdef USE_MTAG +-#define CHUNK_AVAILABLE_SIZE(p) \ +- ((chunksize (p) + (chunk_is_mmapped (p) ? 0 : SIZE_SZ)) \ +- & mtag_granule_mask) +-#else +-#define CHUNK_AVAILABLE_SIZE(p) \ +- (chunksize (p) + (chunk_is_mmapped (p) ? 0 : SIZE_SZ)) +-#endif ++ in the chunk, plus the chunk header. Note: If memory tagging is ++ enabled the layout changes to accomodate the granule size, this is ++ wasteful for small allocations so not done by default. The logic ++ does not work if chunk headers are not granule aligned. */ ++_Static_assert (__MTAG_GRANULE_SIZE <= CHUNK_HDR_SZ, ++ "memory tagging is not supported with large granule."); ++#define CHUNK_AVAILABLE_SIZE(p) \ ++ (__MTAG_GRANULE_SIZE > SIZE_SZ && __glibc_unlikely (mtag_enabled) ? \ ++ chunksize (p) : \ ++ chunksize (p) + (chunk_is_mmapped (p) ? 0 : SIZE_SZ)) + + /* Check if REQ overflows when padded and aligned and if the resulting value + is less than PTRDIFF_T. Returns TRUE and the requested size or MINSIZE in +@@ -1353,7 +1353,6 @@ checked_request2size (size_t req, size_t *sz) __nonnull (1) + if (__glibc_unlikely (req > PTRDIFF_MAX)) + return false; + +-#ifdef USE_MTAG + /* When using tagged memory, we cannot share the end of the user + block with the header for the next chunk, so ensure that we + allocate blocks that are rounded up to the granule size. Take +@@ -1361,8 +1360,9 @@ checked_request2size (size_t req, size_t *sz) __nonnull (1) + number. Ideally, this would be part of request2size(), but that + must be a macro that produces a compile time constant if passed + a constant literal. */ +- req = (req + ~mtag_granule_mask) & mtag_granule_mask; +-#endif ++ if (__glibc_unlikely (mtag_enabled)) ++ req = (req + (__MTAG_GRANULE_SIZE - 1)) & ++ ~(size_t)(__MTAG_GRANULE_SIZE - 1); + + *sz = request2size (req); + return true; +@@ -5112,14 +5112,8 @@ musable (void *mem) + result = chunksize (p) - CHUNK_HDR_SZ; + } + else if (inuse (p)) +- result = chunksize (p) - SIZE_SZ; ++ result = CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ; + +-#ifdef USE_MTAG +- /* The usable space may be reduced if memory tagging is needed, +- since we cannot share the user-space data with malloc's internal +- data structure. */ +- result &= mtag_granule_mask; +-#endif + return result; + } + return 0; +-- +2.25.1 + + +From 66de173bf919e601e408dc78772c6841ad6388ab Mon Sep 17 00:00:00 2001 +From: Szabolcs Nagy <szabolcs.nagy@arm.com> +Date: Wed, 17 Feb 2021 10:15:18 +0000 +Subject: [PATCH 11/11] malloc: Use mtag_enabled instead of USE_MTAG + +Use the runtime check where possible: it should not cause slow down in +the !USE_MTAG case since then mtag_enabled is constant false, but it +allows compiling the tagging logic so it's less likely to break or +diverge when developers only test the !USE_MTAG case. + +Reviewed-by: DJ Delorie <dj@redhat.com> +--- + malloc/hooks.c | 10 ++++------ + malloc/malloc.c | 10 ++++------ + 2 files changed, 8 insertions(+), 12 deletions(-) + +diff --git a/malloc/hooks.c b/malloc/hooks.c +index d8e304c31c..9474e199c3 100644 +--- a/malloc/hooks.c ++++ b/malloc/hooks.c +@@ -262,11 +262,10 @@ free_check (void *mem, const void *caller) + + int err = errno; + +-#ifdef USE_MTAG + /* Quickly check that the freed pointer matches the tag for the memory. + This gives a useful double-free detection. */ +- *(volatile char *)mem; +-#endif ++ if (__glibc_unlikely (mtag_enabled)) ++ *(volatile char *)mem; + + __libc_lock_lock (main_arena.mutex); + p = mem2chunk_check (mem, NULL); +@@ -310,11 +309,10 @@ realloc_check (void *oldmem, size_t bytes, const void *caller) + return NULL; + } + +-#ifdef USE_MTAG + /* Quickly check that the freed pointer matches the tag for the memory. + This gives a useful double-free detection. */ +- *(volatile char *)oldmem; +-#endif ++ if (__glibc_unlikely (mtag_enabled)) ++ *(volatile char *)oldmem; + + __libc_lock_lock (main_arena.mutex); + const mchunkptr oldp = mem2chunk_check (oldmem, &magic_p); +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 849bd8e2c9..36583120ce 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -3286,11 +3286,10 @@ __libc_free (void *mem) + if (mem == 0) /* free(0) has no effect */ + return; + +-#ifdef USE_MTAG + /* Quickly check that the freed pointer matches the tag for the memory. + This gives a useful double-free detection. */ +- *(volatile char *)mem; +-#endif ++ if (__glibc_unlikely (mtag_enabled)) ++ *(volatile char *)mem; + + int err = errno; + +@@ -3352,11 +3351,10 @@ __libc_realloc (void *oldmem, size_t bytes) + if (oldmem == 0) + return __libc_malloc (bytes); + +-#ifdef USE_MTAG + /* Perform a quick check to ensure that the pointer's tag matches the + memory's tag. */ +- *(volatile char*) oldmem; +-#endif ++ if (__glibc_unlikely (mtag_enabled)) ++ *(volatile char*) oldmem; + + /* chunk corresponding to oldmem */ + const mchunkptr oldp = mem2chunk (oldmem); +-- +2.25.1 + diff --git a/poky/meta/recipes-core/glibc/glibc_2.33.bb b/poky/meta/recipes-core/glibc/glibc_2.33.bb index caa2e2ae1..925efe8cc 100644 --- a/poky/meta/recipes-core/glibc/glibc_2.33.bb +++ b/poky/meta/recipes-core/glibc/glibc_2.33.bb @@ -56,6 +56,7 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0028-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch \ file://0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch \ file://0030-powerpc-Do-not-ask-compiler-for-finding-arch.patch \ + file://mte-backports.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build-${TARGET_SYS}" @@ -91,7 +92,7 @@ EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" EXTRA_OECONF_append_x86 = " --enable-cet" EXTRA_OECONF_append_x86-64 = " --enable-cet" -PACKAGECONFIG ??= "nscd" +PACKAGECONFIG ??= "nscd memory-tagging" PACKAGECONFIG[nscd] = "--enable-nscd,--disable-nscd" PACKAGECONFIG[memory-tagging] = "--enable-memory-tagging,--disable-memory-tagging" diff --git a/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-riscv-support.patch b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-riscv-support.patch new file mode 100644 index 000000000..fc41aee26 --- /dev/null +++ b/poky/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-riscv-support.patch @@ -0,0 +1,79 @@ +From fd50228cc213d2d87f5e3cf1f123acb3fda9b04e Mon Sep 17 00:00:00 2001 +From: Christoph Muellner <cmuellner@linux.com> +Date: Mon, 28 Jun 2021 00:34:12 +0200 +Subject: [PATCH] ldconfig: Add RISC-V support + +ldconfig-native does not support RISC-V at the moment. +Let's pull the reqired constants from upstream and add +the required parsing code. + +Upstream-Status: Backport + +Signed-off-by: Christoph Muellner <cmuellner@linux.com> +--- + cache.c | 6 ++++++ + ldconfig.h | 2 ++ + readelflib.c | 10 ++++++++++ + 3 files changed, 18 insertions(+) + +diff --git a/cache.c b/cache.c +index c4f5411..a3b9e70 100644 +--- a/cache.c ++++ b/cache.c +@@ -125,6 +125,12 @@ print_entry (const char *lib, int flag, unsigned int osversion, + case FLAG_AARCH64_LIB64: + fputs (",AArch64", stdout); + break; ++ case FLAG_RISCV_FLOAT_ABI_SOFT: ++ fputs (",soft-float", stdout); ++ break; ++ case FLAG_RISCV_FLOAT_ABI_DOUBLE: ++ fputs (",double-float", stdout); ++ break; + case 0: + break; + default: +diff --git a/ldconfig.h b/ldconfig.h +index 6a8a750..2e5e379 100644 +--- a/ldconfig.h ++++ b/ldconfig.h +@@ -38,6 +38,8 @@ + #define FLAG_ARM_LIBHF 0x0900 + #define FLAG_AARCH64_LIB64 0x0a00 + #define FLAG_ARM_LIBSF 0x0b00 ++#define FLAG_RISCV_FLOAT_ABI_SOFT 0x0f00 ++#define FLAG_RISCV_FLOAT_ABI_DOUBLE 0x1000 + + /* Name of auxiliary cache. */ + #define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache" +diff --git a/readelflib.c b/readelflib.c +index 9ec0a54..a01e1ce 100644 +--- a/readelflib.c ++++ b/readelflib.c +@@ -33,6 +33,10 @@ + #define EM_AARCH64 183 /* ARM AARCH64 */ + #endif + ++#ifndef EM_RISCV ++#define EM_RISCV 243 /* RISC-V */ ++#endif ++ + #undef check_ptr + #define check_ptr(ptr) \ + do \ +@@ -331,6 +335,12 @@ process_elf_file64 (const char *file_name, const char *lib, int *flag, + /* see sysdeps/unix/sysv/linux/arm/readelflib.c */ + *flag |= FLAG_AARCH64_LIB64|FLAG_ELF_LIBC6; + break; ++ case EM_RISCV: ++ /* RISC-V libraries are always libc.so.6+. */ ++ /* NOTE: This does not correctly handle soft-float binaries */ ++ /* see sysdeps/unix/sysv/linux/riscv/readelflib.c */ ++ *flag |= FLAG_RISCV_FLOAT_ABI_DOUBLE|FLAG_ELF_LIBC6; ++ break; + default: + error(0, 0, "%s is a 64-bit ELF for unknown machine %lx\n", + file_name, (long)elf_header->e_machine); +-- +2.25.1 + diff --git a/poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb b/poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb index 919d11417..fd1630b73 100644 --- a/poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb +++ b/poky/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb @@ -15,6 +15,7 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \ file://endian-ness_handling_fix.patch \ file://add-64-bit-flag-for-ELF64-entries.patch \ file://no-aux-cache.patch \ + file://add-riscv-support.patch \ " PR = "r2" diff --git a/poky/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch b/poky/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch new file mode 100644 index 000000000..c751e4fab --- /dev/null +++ b/poky/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch @@ -0,0 +1,32 @@ +From 98243deface88614e3f332c4a85d04a9abce55ff Mon Sep 17 00:00:00 2001 +From: Zqiang <qiang.zhang@windriver.com> +Date: Mon, 19 Apr 2021 14:15:45 +0800 +Subject: [PATCH] ifupdown: skip wrong test case + +The test parameters of testcase(12-15) file is not right, +it triggers a test failure, these test items are invalid +and are skipped directly. + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Zqiang <qiang.zhang@windriver.com> +--- + tests/testbuild-linux | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/testbuild-linux b/tests/testbuild-linux +index 1181ea0..5f148eb 100755 +--- a/tests/testbuild-linux ++++ b/tests/testbuild-linux +@@ -3,7 +3,7 @@ + dir=tests/linux + + result=true +-for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do ++for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do + if [ -e $dir/testcase.$test ]; then + args="$(cat $dir/testcase.$test | sed -n 's/^# RUN: //p')" + else +-- +2.17.1 + diff --git a/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch index d7600cf24..ea88a9086 100644 --- a/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch +++ b/poky/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch @@ -3,9 +3,12 @@ Tweak tests of ifupdown to make it work with oe-core ptest framework. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + tests/testbuild-linux | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/testbuild-linux b/tests/testbuild-linux -index 1181ea0..d5c1814 100755 +index 5f148eb..d9b1698 100755 --- a/tests/testbuild-linux +++ b/tests/testbuild-linux @@ -1,6 +1,7 @@ @@ -16,8 +19,8 @@ index 1181ea0..d5c1814 100755 +dir=$curdir/linux result=true - for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do -@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do + for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do echo "Testcase $test: $args" exitcode=0 @@ -26,7 +29,7 @@ index 1181ea0..d5c1814 100755 >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$? (echo "exit code: $exitcode"; -@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test exitcode=0 @@ -35,7 +38,7 @@ index 1181ea0..d5c1814 100755 >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$? (echo "exit code: $exitcode"; -@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then @@ -47,3 +50,5 @@ index 1181ea0..d5c1814 100755 result=false fi echo "==========" +-- +2.17.1 diff --git a/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb b/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb index c0a90a397..0daf50aca 100644 --- a/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb +++ b/poky/meta/recipes-core/ifupdown/ifupdown_0.8.36.bb @@ -13,6 +13,7 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ file://0001-Define-FNM_EXTMATCH-for-musl.patch \ file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \ file://run-ptest \ + file://0001-ifupdown-skip-wrong-test-case.patch \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ " SRCREV = "c73226073e2b13970ca613b20a13b9c0253bf9da" diff --git a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb index 32f8d16a4..1176311ff 100644 --- a/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/poky/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -24,7 +24,7 @@ IMAGE_FSTYPES = "wic.vmdk wic.vhd wic.vhdx" inherit core-image setuptools3 -SRCREV ?= "b44849c32c87fbb8c5a465ecc29a6182e6781d78" +SRCREV ?= "75f491e5e20bd0aade764ea5bd15f547fafb7684" SRC_URI = "git://git.yoctoproject.org/poky \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.22.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.23.bb index ba74eb1f9..ba74eb1f9 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.22.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.23.bb diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt.inc b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc index e4505a666..79a2aa49d 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSING;md5=afed27a72ae2a8075978299eebaa1f5d \ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}" -SRCREV = "3df9620d08db207367c0c5152148665b5ce422e1" +SRCREV = "5dcc36aeeb053654659e898fd3de7f365c1c4df5" SRCBRANCH ?= "develop" SRC_URI += "file://fix_cflags_handling.patch" diff --git a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.22.bb b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.23.bb index 79dba2f6d..79dba2f6d 100644 --- a/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.22.bb +++ b/poky/meta/recipes-core/libxcrypt/libxcrypt_4.4.23.bb diff --git a/poky/meta/recipes-core/libxml/libxml2_2.9.12.bb b/poky/meta/recipes-core/libxml/libxml2_2.9.12.bb index 955d934d7..2d1e92966 100644 --- a/poky/meta/recipes-core/libxml/libxml2_2.9.12.bb +++ b/poky/meta/recipes-core/libxml/libxml2_2.9.12.bb @@ -67,7 +67,7 @@ PACKAGE_BEFORE_PN += "${PN}-utils" PACKAGES += "${PN}-python" FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" -FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*" +FILES_${PN}-dev += "${libdir}/xml2Conf.sh" FILES_${PN}-utils = "${bindir}/*" FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" diff --git a/poky/meta/recipes-core/meta/buildtools-tarball.bb b/poky/meta/recipes-core/meta/buildtools-tarball.bb index 9da81d552..b5dae176b 100644 --- a/poky/meta/recipes-core/meta/buildtools-tarball.bb +++ b/poky/meta/recipes-core/meta/buildtools-tarball.bb @@ -29,6 +29,8 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-rpcsvc-proto \ nativesdk-patch \ nativesdk-mtools \ + nativesdk-zstd \ + nativesdk-lz4 \ " MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" diff --git a/poky/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch b/poky/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch new file mode 100644 index 000000000..0ba5fa254 --- /dev/null +++ b/poky/meta/recipes-core/systemd/systemd/0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch @@ -0,0 +1,39 @@ +From 027ac2ad0695bb506460f9dd7e57149b71055887 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 8 Jun 2021 23:21:01 -0700 +Subject: [PATCH] test-seccomp: Check for __NR_ppoll before use + +some newer architectures like riscv32 do not have __NR_ppoll from get go + +Upstream-Status: Submitted [https://github.com/systemd/systemd/pull/19858] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/test/test-seccomp.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c +index b1f917eb54..daac0fcea8 100644 +--- a/src/test/test-seccomp.c ++++ b/src/test/test-seccomp.c +@@ -832,7 +832,7 @@ static void test_load_syscall_filter_set_raw(void) { + assert_se(s = hashmap_new(NULL)); + #if defined __NR_poll && __NR_poll >= 0 + assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(-1)) >= 0); +-#else ++#elif defined __NR_ppoll + assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); + #endif + +@@ -849,7 +849,8 @@ static void test_load_syscall_filter_set_raw(void) { + assert_se(s = hashmap_new(NULL)); + #if defined __NR_poll && __NR_poll >= 0 + assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_poll + 1), INT_TO_PTR(EILSEQ)) >= 0); +-#else ++#elif defined __NR_ppoll ++ assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(-1)) >= 0); + assert_se(hashmap_put(s, UINT32_TO_PTR(__NR_ppoll + 1), INT_TO_PTR(EILSEQ)) >= 0); + #endif + +-- +2.32.0 + diff --git a/poky/meta/recipes-core/systemd/systemd_248.3.bb b/poky/meta/recipes-core/systemd/systemd_248.3.bb index 37607708f..f5022a99c 100644 --- a/poky/meta/recipes-core/systemd/systemd_248.3.bb +++ b/poky/meta/recipes-core/systemd/systemd_248.3.bb @@ -26,6 +26,7 @@ SRC_URI += " \ file://0003-implment-systemd-sysv-install-for-OE.patch \ file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \ file://0001-test-parse-argument-Include-signal.h.patch \ + file://0001-test-seccomp-Check-for-__NR_ppoll-before-use.patch \ " # patches needed by musl diff --git a/poky/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb b/poky/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb index 75632d943..da716674c 100644 --- a/poky/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb +++ b/poky/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb @@ -7,7 +7,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=d40a07c27f535425934bb5001f2037d9" SRC_URI = "git://git.yoctoproject.org/update-rc.d" -SRCREV = "4b150b25b38de688d25cde2b2d22c268ed65a748" +SRCREV = "8636cf478d426b568c1be11dbd9346f67e03adac" UPSTREAM_CHECK_COMMITS = "1" diff --git a/poky/meta/recipes-core/util-linux/util-linux.inc b/poky/meta/recipes-core/util-linux/util-linux.inc index 9d7d8a23a..0648366ba 100644 --- a/poky/meta/recipes-core/util-linux/util-linux.inc +++ b/poky/meta/recipes-core/util-linux/util-linux.inc @@ -36,5 +36,12 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ file://8a3a74160b96498d672e3652827aa7e6d7f3a120.patch \ + file://tests-kill.patch \ + file://tests-blkdiscard.patch \ + file://tests-ul.patch \ + file://tests-eject.patch \ + file://tests-lscpu.patch \ + file://0001-login-fix-close_range-use.patch \ " + SRC_URI[sha256sum] = "bd07b7e98839e0359842110525a3032fdb8eaf3a90bedde3dd1652d32d15cce5" diff --git a/poky/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch b/poky/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch new file mode 100644 index 000000000..7a47597bd --- /dev/null +++ b/poky/meta/recipes-core/util-linux/util-linux/0001-login-fix-close_range-use.patch @@ -0,0 +1,62 @@ +From 76ae0badd3fd7c8653fa4d3c78d2dcfcec51d23d Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Wed, 14 Jul 2021 17:25:57 +0200 +Subject: [PATCH] login: fix close_range() use + +This new syscall comes with three arguments (see kernel commit +278a5fbaed89dacd04e9d052f4594ffd0e0585de). Not sure why util-linux +assume only two. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/b8d99a618baffb4fc03cda4c40e29778b6d77ad4] +Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1981729 +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + include/fileutils.h | 4 ++-- + lib/fileutils.c | 2 +- + login-utils/login.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/fileutils.h b/include/fileutils.h +index ad54b95..f86426b 100644 +--- a/include/fileutils.h ++++ b/include/fileutils.h +@@ -82,9 +82,9 @@ static inline struct dirent *xreaddir(DIR *dp) + # if defined(SYS_close_range) + # include <sys/types.h> + # ifndef HAVE_CLOSE_RANGE +-static inline int close_range(unsigned int first, unsigned int last) ++static inline int close_range(unsigned int first, unsigned int last, int flags) + { +- return syscall(SYS_close_range, first, last); ++ return syscall(SYS_close_range, first, last, flags); + } + # endif + # define HAVE_CLOSE_RANGE 1 +diff --git a/lib/fileutils.c b/lib/fileutils.c +index 846b718..a979b03 100644 +--- a/lib/fileutils.c ++++ b/lib/fileutils.c +@@ -189,7 +189,7 @@ int main(int argc, char *argv[]) + ignore_result( dup(STDIN_FILENO) ); + + # ifdef HAVE_CLOSE_RANGE +- close_range(STDERR_FILENO + 1, ~0U); ++ close_range(STDERR_FILENO + 1, ~0U, 0); + # else + ul_close_all_fds(STDERR_FILENO + 1, ~0U); + # endif +diff --git a/login-utils/login.c b/login-utils/login.c +index 7fefd05..94a042d 100644 +--- a/login-utils/login.c ++++ b/login-utils/login.c +@@ -1358,7 +1358,7 @@ static void initialize(int argc, char **argv, struct login_context *cxt) + #endif + } + #ifdef HAVE_CLOSE_RANGE +- close_range(STDERR_FILENO + 1, ~0U); ++ close_range(STDERR_FILENO + 1, ~0U, 0); + #else + ul_close_all_fds(STDERR_FILENO + 1, ~0U); + #endif +-- +2.32.0 diff --git a/poky/meta/recipes-core/util-linux/util-linux/run-ptest b/poky/meta/recipes-core/util-linux/util-linux/run-ptest index e135ee583..3a910be12 100644 --- a/poky/meta/recipes-core/util-linux/util-linux/run-ptest +++ b/poky/meta/recipes-core/util-linux/util-linux/run-ptest @@ -13,31 +13,12 @@ current_path=$(readlink -f $0) export bindir=$(dirname $current_path) export PATH=$bindir/bin:$PATH -cd tests || exit 1 - -comps=$(find ts/ -type f -perm -111 -regex ".*/[^\.~]*" | sort) - - -echo -echo "-------------------- util-linux regression tests --------------------" -echo -echo " For development purpose only. " -echo " Don't execute on production system! " -echo - -res=0 -count=0 -for ts in $comps; -do - $ts | sed -u '{ +./tests/run.sh --use-system-commands --parsable --show-diff | sed -u '{ s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/ s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/ s/^\(.*\):\(.*\) \.\.\. SKIPPED \(.*\)$/SKIP: \1:\2 \3/ - }' -done - + }' if [ "x$UDEV_PID" != "x" ]; then /etc/init.d/udev start fi - diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-blkdiscard.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-blkdiscard.patch new file mode 100644 index 000000000..34b07a4b2 --- /dev/null +++ b/poky/meta/recipes-core/util-linux/util-linux/tests-blkdiscard.patch @@ -0,0 +1,31 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From 45fe65d934df2c938701f1c3cd3e0a6f3bdf25e6 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 29 Jun 2021 18:10:40 +0100 +Subject: [PATCH] tests/blkdiscard: check correct log file for errors + +When checking if the discard ioctl is supported, look in stderr not stdout. + +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + tests/ts/blkdiscard/offsets | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/ts/blkdiscard/offsets b/tests/ts/blkdiscard/offsets +index 9dddc35e2..5e724d51b 100755 +--- a/tests/ts/blkdiscard/offsets ++++ b/tests/ts/blkdiscard/offsets +@@ -48,7 +48,7 @@ ts_log "testing offsets with full block size" + run_tscmd $TS_CMD_BLKDISCARD -v $DEVICE + if [ "$?" != "0" ]; then + # Skip the rest? For example loop backing files on NFS seem unsupported. +- grep -q "BLKDISCARD ioctl failed: Operation not supported" "$TS_OUTPUT" \ ++ grep -q "BLKDISCARD ioctl failed: Operation not supported" "$TS_ERRLOG" \ + && ts_skip "BLKDISCARD not supported" + fi + run_tscmd $TS_CMD_BLKDISCARD -v -o 1 $DEVICE +-- +2.25.1 + diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-eject.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-eject.patch new file mode 100644 index 000000000..51e914d56 --- /dev/null +++ b/poky/meta/recipes-core/util-linux/util-linux/tests-eject.patch @@ -0,0 +1,56 @@ +Upstream-Status: Submitted [https://github.com/karelzak/util-linux/pull/1375] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From dd956268ba89fc1caf83c45c3c495f34d261e0e2 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Thu, 1 Jul 2021 20:44:31 +0100 +Subject: [PATCH] test/eject: guard asan LD_PRELOAD with use-system-commands + check + +This test tries to add asan to LD_PRELOAD because the just-built eject +will call the host /bin/umount, and apparently asan doesn't like this. + +However, if ldd isn't present, this fails as the path to asan is the +error message saying that ldd isn't present. + +As the asan workaround is only needed when executing the binaries that +have just been built and not the system binaries, only use it if the +test is on the built binaries. + +Closes #1373. + +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + tests/ts/eject/umount | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount +index a829d46c0..2be281ee3 100755 +--- a/tests/ts/eject/umount ++++ b/tests/ts/eject/umount +@@ -60,13 +60,15 @@ function deinit_device { + ts_scsi_debug_rmmod + } + +-# As the eject binary execl()s an uninstrumented /bin/umount binary, we need +-# to explicitly $LD_PRELOAD the ASan's runtime DSO, otherwise ASan will complain. +-# Since all three utilities used by this test (eject, fdisk, mount) are just +-# libtool wrappers, let's check the kill binary instead, which should have +-# the needed DSO information. +-ASAN_RT_PATH="$(ts_get_asan_rt_path "$TS_CMD_KILL")" +-[ -n "$ASAN_RT_PATH" ] && export LD_PRELOAD="$ASAN_RT_PATH:$LD_PRELOAD" ++if [ "$TS_USE_SYSTEM_COMMANDS" != "yes" ]; then ++ # As the eject binary execl()s an uninstrumented /bin/umount binary, we need ++ # to explicitly $LD_PRELOAD the ASan's runtime DSO, otherwise ASan will complain. ++ # Since all three utilities used by this test (eject, fdisk, mount) are just ++ # libtool wrappers, let's check the kill binary instead, which should have ++ # the needed DSO information. ++ ASAN_RT_PATH="$(ts_get_asan_rt_path "$TS_CMD_KILL")" ++ [ -n "$ASAN_RT_PATH" ] && export LD_PRELOAD="$ASAN_RT_PATH:$LD_PRELOAD" ++fi + + ts_init_subtest "by-disk" + init_device +-- +2.25.1 + diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-kill.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-kill.patch new file mode 100644 index 000000000..fa49fd414 --- /dev/null +++ b/poky/meta/recipes-core/util-linux/util-linux/tests-kill.patch @@ -0,0 +1,88 @@ +Don't hardcode the use of /bin/kill, as this could be kill.procps. Instead ask +the shell what kill binary to use, which will be the symlink in +/usr/lib/util-linux/ptest/bin/. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/pull/1367] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From e3f8a88cf688dffacb5f6033a8d24e2db40f75f6 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 29 Jun 2021 16:34:20 +0100 +Subject: [PATCH] Don't hardcode /bin + +--- + tests/ts/kill/all_processes | 2 +- + tests/ts/kill/name_to_number | 2 +- + tests/ts/kill/options | 2 +- + tests/ts/kill/print_pid | 2 +- + tests/ts/kill/queue | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/tests/ts/kill/all_processes b/tests/ts/kill/all_processes +index 0b137574d..b2280777f 100755 +--- a/tests/ts/kill/all_processes ++++ b/tests/ts/kill/all_processes +@@ -22,7 +22,7 @@ ts_skip_nonroot + + # make sure we do not use shell built-in command + if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then +- TS_CMD_KILL="/bin/kill" ++ TS_CMD_KILL="$(which kill)" + fi + + ts_check_test_command "$TS_CMD_KILL" +diff --git a/tests/ts/kill/name_to_number b/tests/ts/kill/name_to_number +index 9f4881cb7..8a7f4bef0 100755 +--- a/tests/ts/kill/name_to_number ++++ b/tests/ts/kill/name_to_number +@@ -20,7 +20,7 @@ ts_init "$*" + + # make sure we do not use shell built-in command + if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then +- TS_CMD_KILL="/bin/kill" ++ TS_CMD_KILL="$(which kill)" + fi + + ts_check_test_command "$TS_CMD_KILL" +diff --git a/tests/ts/kill/options b/tests/ts/kill/options +index 2788c70a2..10653a543 100755 +--- a/tests/ts/kill/options ++++ b/tests/ts/kill/options +@@ -20,7 +20,7 @@ ts_init "$*" + + # make sure we do not use shell built-in command + if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then +- TS_CMD_KILL="/bin/kill" ++ TS_CMD_KILL="$(which kill)" + fi + + ts_check_test_command "$TS_CMD_KILL" +diff --git a/tests/ts/kill/print_pid b/tests/ts/kill/print_pid +index 6926a3714..6e2db3711 100755 +--- a/tests/ts/kill/print_pid ++++ b/tests/ts/kill/print_pid +@@ -20,7 +20,7 @@ ts_init "$*" + + # make sure we do not use shell built-in command + if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then +- TS_CMD_KILL="/bin/kill" ++ TS_CMD_KILL="$(which kill)" + fi + + ts_check_test_command "$TS_CMD_KILL" +diff --git a/tests/ts/kill/queue b/tests/ts/kill/queue +index 18f10e8c2..6c9e9efc9 100755 +--- a/tests/ts/kill/queue ++++ b/tests/ts/kill/queue +@@ -20,7 +20,7 @@ ts_init "$*" + + # make sure we do not use shell built-in command + if [ "$TS_USE_SYSTEM_COMMANDS" == "yes" ]; then +- TS_CMD_KILL="/bin/kill" ++ TS_CMD_KILL="$(which kill)" + fi + + ts_check_test_command "$TS_CMD_KILL" +-- +2.25.1 + diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-lscpu.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-lscpu.patch new file mode 100644 index 000000000..36a19bd5a --- /dev/null +++ b/poky/meta/recipes-core/util-linux/util-linux/tests-lscpu.patch @@ -0,0 +1,42 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From c2ca2837a27a3f1344904037ea691bfdbb288f02 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Fri, 2 Jul 2021 13:12:13 +0200 +Subject: [PATCH] lscpu: don't use DMI if executed with --sysroot + +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/lscpu-arm.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/sys-utils/lscpu-arm.c b/sys-utils/lscpu-arm.c +index d52765f9d..c7128094c 100644 +--- a/sys-utils/lscpu-arm.c ++++ b/sys-utils/lscpu-arm.c +@@ -322,7 +322,8 @@ static void arm_decode(struct lscpu_cxt *cxt, struct lscpu_cputype *ct) + + arm_ids_decode(ct); + arm_rXpY_decode(ct); +- if (cxt->is_cluster) ++ ++ if (!cxt->noalive && cxt->is_cluster) + ct->nr_socket_on_cluster = get_number_of_physical_sockets_from_dmi(); + } + +@@ -330,8 +331,9 @@ static int is_cluster_arm(struct lscpu_cxt *cxt) + { + struct stat st; + +- if (!(strcmp(cxt->arch->name, "aarch64")) && +- (stat(_PATH_ACPI_PPTT, &st) < 0) && (cxt->ncputypes == 1)) ++ if (!cxt->noalive ++ && strcmp(cxt->arch->name, "aarch64") == 0 ++ && stat(_PATH_ACPI_PPTT, &st) < 0 && cxt->ncputypes == 1) + return 1; + else + return 0; +-- +2.25.1 + diff --git a/poky/meta/recipes-core/util-linux/util-linux/tests-ul.patch b/poky/meta/recipes-core/util-linux/util-linux/tests-ul.patch new file mode 100644 index 000000000..689639310 --- /dev/null +++ b/poky/meta/recipes-core/util-linux/util-linux/tests-ul.patch @@ -0,0 +1,35 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From b1c71f19ea404e74d36ca5b8fbb0484043cdaef3 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Wed, 30 Jun 2021 11:25:01 +0100 +Subject: [PATCH] tests: mark ul/ul as a known failure + +As with ul/basic, this test produces different output when ran under +different terminals, which isn't very useful. + +Set TS_KNOWN_FAIL so that these problems don't cause the test to fail. + +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + tests/ts/ul/ul | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/ts/ul/ul b/tests/ts/ul/ul +index b856e33db..c707658ac 100755 +--- a/tests/ts/ul/ul ++++ b/tests/ts/ul/ul +@@ -20,6 +20,9 @@ ts_init "$*" + + ts_check_test_command "$TS_CMD_UL" + ++# This test provides different result on some terminals and virtual machines ++TS_KNOWN_FAIL="yes" ++ + printf "a\x08ab\x5F\x08c\\n\\ttab\\f\\b\\r" | + $TS_CMD_UL -t xterm >> $TS_OUTPUT 2>> $TS_ERRLOG + +-- +2.25.1 + diff --git a/poky/meta/recipes-core/util-linux/util-linux_2.37.bb b/poky/meta/recipes-core/util-linux/util-linux_2.37.bb index 9a50c75e7..2548b7210 100644 --- a/poky/meta/recipes-core/util-linux/util-linux_2.37.bb +++ b/poky/meta/recipes-core/util-linux/util-linux_2.37.bb @@ -71,7 +71,7 @@ EXTRA_OECONF = "\ --enable-mount --enable-partx --enable-raw --enable-rfkill \ --enable-unshare --enable-write \ \ - --disable-bfs --disable-chfn-chsh --disable-login \ + --disable-bfs --disable-login \ --disable-makeinstall-chown --disable-minix --disable-newgrp \ --disable-use-tty-group --disable-vipw \ \ @@ -91,7 +91,7 @@ EXTRA_OECONF_append = " --disable-hwclock-gplv3" # build host versions during development # PACKAGECONFIG ?= "pcre2" -PACKAGECONFIG_class-target ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'chfn-chsh pam', '', d)}" PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," # Respect the systemd feature for uuidd PACKAGECONFIG[systemd] = "--with-systemd --with-systemdsystemunitdir=${systemd_system_unitdir}, --without-systemd --without-systemdsystemunitdir,systemd" @@ -102,6 +102,7 @@ PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" # PCRE support in hardlink PACKAGECONFIG[pcre2] = ",,libpcre2" PACKAGECONFIG[cryptsetup] = "--with-cryptsetup,--without-cryptsetup,cryptsetup" +PACKAGECONFIG[chfn-chsh] = "--enable-chfn-chsh,--disable-chfn-chsh," EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'" @@ -132,8 +133,8 @@ RDEPENDS_${PN}-dev += " util-linux-libuuid-dev" RPROVIDES_${PN}-dev = "${PN}-libblkid-dev ${PN}-libmount-dev" RDEPENDS_${PN}-bash-completion += "${PN}-lsblk" -RDEPENDS_${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs grep iproute2 kmod mdadm procps sed socat which xz" -RRECOMMENDS_${PN}-ptest += "kernel-module-scsi-debug" +RDEPENDS_${PN}-ptest += "bash bc btrfs-tools coreutils e2fsprogs findutils grep iproute2 kmod mdadm procps sed socat which xz" +RRECOMMENDS_${PN}-ptest += "kernel-module-scsi-debug kernel-module-sd-mod kernel-module-loop" RDEPENDS_${PN}-swaponoff = "${PN}-swapon ${PN}-swapoff" ALLOW_EMPTY_${PN}-swaponoff = "1" @@ -209,6 +210,8 @@ ALTERNATIVE_PRIORITY = "80" ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" ALTERNATIVE_LINK_NAME[cal] = "${bindir}/cal" +ALTERNATIVE_LINK_NAME[chfn] = "${bindir}/chfn" +ALTERNATIVE_LINK_NAME[chsh] = "${bindir}/chsh" ALTERNATIVE_LINK_NAME[chrt] = "${bindir}/chrt" ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" @@ -278,25 +281,10 @@ do_install_ptest() { cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/ cp ${WORKDIR}/build/config.h ${D}${PTEST_PATH} - # The original paths of executables to be tested point to a local folder containing - # the executables. We want to test the installed executables, not the local copies. - # So strip the paths, the executables will be located via "which" - sed -i \ - -e '/^TS_CMD/ s|$top_builddir/||g' \ - -e '/^TS_HELPER/ s|$top_builddir|${PTEST_PATH}|g' \ - ${D}${PTEST_PATH}/tests/commands.sh - - # Change 'if [ ! -x "$1" ]' to 'if [ ! -x "`which $1 2>/dev/null`"]' - sed -i -e \ - '/^\tif[[:space:]]\[[[:space:]]![[:space:]]-x[[:space:]]"$1"/s|$1|`which $1 2>/dev/null`|g' \ - ${D}${PTEST_PATH}/tests/functions.sh - - # Running "kill" without the the complete path would use the shell's built-in kill - sed -i -e \ - '/^TS_CMD_KILL/ s|kill|${PTEST_PATH}/bin/kill|g' \ - ${D}${PTEST_PATH}/tests/commands.sh - - - sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest + sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest + # chfn needs PAM + if ! ${@bb.utils.contains('PACKAGECONFIG', 'pam', 'true', 'false', d)}; then + rm -rf ${D}${PTEST_PATH}/tests/ts/chfn + fi } diff --git a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-fix-error-for-undeclared-macro-on-musl.patch b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-fix-error-for-undeclared-macro-on-musl.patch new file mode 100644 index 000000000..251f5d2b0 --- /dev/null +++ b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-fix-error-for-undeclared-macro-on-musl.patch @@ -0,0 +1,28 @@ +From a9802902d37b83c2c992cfe34179312f7209a962 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Mon, 19 Jul 2021 10:12:12 +0900 +Subject: [PATCH] fix error for undeclared macro on musl + +Fixes the following compilation errors with musl that does not have +NAME_MAX declared: +'NAME_MAX' undeclared (first use in this function) + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + cmds/filesystem-usage.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c +index 50d8995e..856e9d7b 100644 +--- a/cmds/filesystem-usage.c ++++ b/cmds/filesystem-usage.c +@@ -24,6 +24,7 @@ + #include <stdarg.h> + #include <getopt.h> + #include <fcntl.h> ++#include <limits.h> + + #include "common/utils.h" + #include "kerncompat.h" diff --git a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb index d0c9cf2a9..fa33cad7b 100644 --- a/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb +++ b/poky/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb @@ -19,8 +19,9 @@ DEPENDS_append_class-target = " udev" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \ + file://0001-fix-error-for-undeclared-macro-on-musl.patch \ " -SRCREV = "96d77fcefdd3b9fd297b5aabbce6dc43e2315ee2" +SRCREV = "de4914dbfd7e419d1c534b3d2ec8728e702114bf" S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ diff --git a/poky/meta/recipes-devtools/cmake/cmake-native_3.20.3.bb b/poky/meta/recipes-devtools/cmake/cmake-native_3.20.5.bb index 335097d38..335097d38 100644 --- a/poky/meta/recipes-devtools/cmake/cmake-native_3.20.3.bb +++ b/poky/meta/recipes-devtools/cmake/cmake-native_3.20.5.bb diff --git a/poky/meta/recipes-devtools/cmake/cmake.inc b/poky/meta/recipes-devtools/cmake/cmake.inc index 0987c01c8..c557a5552 100644 --- a/poky/meta/recipes-devtools/cmake/cmake.inc +++ b/poky/meta/recipes-devtools/cmake/cmake.inc @@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "4d008ac3461e271fcfac26a05936f77fc7ab64402156fb371d41284851a651b8" +SRC_URI[sha256sum] = "12c8040ef5c6f1bc5b8868cede16bb7926c18980f59779e299ab52cbc6f15bb0" UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/cmake/cmake_3.20.3.bb b/poky/meta/recipes-devtools/cmake/cmake_3.20.5.bb index 64c92b89f..64c92b89f 100644 --- a/poky/meta/recipes-devtools/cmake/cmake_3.20.3.bb +++ b/poky/meta/recipes-devtools/cmake/cmake_3.20.5.bb diff --git a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.3.bb b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb index 481c4bff2..206c27c04 100644 --- a/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.3.bb +++ b/poky/meta/recipes-devtools/createrepo-c/createrepo-c_0.17.4.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "8196982f0974c268898a5550d61b374bd58103e2" +SRCREV = "cb74969736bdea86465e85feeceb895ff7a42610" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb b/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.3.bb index ce242c359..ce35b806b 100644 --- a/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.2.bb +++ b/poky/meta/recipes-devtools/dejagnu/dejagnu_1.6.3.bb @@ -13,7 +13,6 @@ inherit autotools SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "e1b07516533f351b3aba3423fafeffd6" -SRC_URI[sha256sum] = "0d0671e1b45189c5fc8ade4b3b01635fb9eeab45cf54f57db23e4c4c1a17d261" +SRC_URI[sha256sum] = "87daefacd7958b4a69f88c6856dbd1634261963c414079d0c371f589cd66a2e3" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-devtools/dnf/dnf/0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch b/poky/meta/recipes-devtools/dnf/dnf/0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch deleted file mode 100644 index 99afe0984..000000000 --- a/poky/meta/recipes-devtools/dnf/dnf/0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 2729c00f0060beab8537a9bebc796b170949093d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 4 May 2021 22:03:30 +0200 -Subject: [PATCH 1/2] dnf/rpm/miscutils.py: fix usage of _() - -Specifically: -- an import of _ was missing -- _ was reused for a different purpose - -Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/1762] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - dnf/rpm/miscutils.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/dnf/rpm/miscutils.py b/dnf/rpm/miscutils.py -index 235aaf28f..7e33d4c42 100644 ---- a/dnf/rpm/miscutils.py -+++ b/dnf/rpm/miscutils.py -@@ -22,6 +22,7 @@ import subprocess - import logging - - from dnf.i18n import ucd -+from dnf.i18n import _ - from shutil import which - - -@@ -46,7 +47,7 @@ def _verifyPkgUsingRpmkeys(package, installroot): - env={'LC_ALL': 'C'}, - stdout=subprocess.PIPE, - cwd='/') as p: -- data, _ = p.communicate() -+ data, err = p.communicate() - if p.returncode != 0 or data != (package.encode('ascii', 'strict') + b': digests signatures OK\n'): - return 0 - else: --- -2.31.1 - diff --git a/poky/meta/recipes-devtools/dnf/dnf/0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch b/poky/meta/recipes-devtools/dnf/dnf/0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch deleted file mode 100644 index b4c9e074d..000000000 --- a/poky/meta/recipes-devtools/dnf/dnf/0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch +++ /dev/null @@ -1,37 +0,0 @@ -From dc14022a99dc017c52c484efb32729729baf854c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 4 May 2021 22:07:32 +0200 -Subject: [PATCH 2/2] dnf/rpm/miscutils.py: do not hardcode /usr/bin/rpmkeys - -Some build systems (e.g. Yocto) place a specially configured -rpmkeys executable elsewhere and set up PATH accordingly; -it's better to always take it from there. - -Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/1763] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - dnf/rpm/miscutils.py | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/dnf/rpm/miscutils.py b/dnf/rpm/miscutils.py -index 7e33d4c42..fcd956db9 100644 ---- a/dnf/rpm/miscutils.py -+++ b/dnf/rpm/miscutils.py -@@ -30,11 +30,9 @@ logger = logging.getLogger('dnf') - - - def _verifyPkgUsingRpmkeys(package, installroot): -- rpmkeys_binary = '/usr/bin/rpmkeys' -- if not os.path.isfile(rpmkeys_binary): -- rpmkeys_binary = which("rpmkeys") -- logger.info(_('Using rpmkeys executable from {path} to verify signature for package: {package}.').format( -- path=rpmkeys_binary, package=package)) -+ rpmkeys_binary = which("rpmkeys") -+ logger.info(_('Using rpmkeys executable from {path} to verify signature for package: {package}.').format( -+ path=rpmkeys_binary, package=package)) - - if not os.path.isfile(rpmkeys_binary): - logger.critical(_('Cannot find rpmkeys executable to verify signatures.')) --- -2.31.1 - diff --git a/poky/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/poky/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index 0ed9afc58..5cffc9dce 100644 --- a/poky/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/poky/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -1,4 +1,4 @@ -From 6be13143a54c79085d400d5bd4c7a6e1cb6ffaf5 Mon Sep 17 00:00:00 2001 +From ceb1043c4f3de095e36908232320b74a4128a94e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 30 Dec 2016 18:29:07 +0200 Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python @@ -11,15 +11,15 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 38cf4fbf..6c5debd8 100644 +index 9e2e9e9e..2056089d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ ELSE () MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED}) ENDIF() --EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) -+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") ADD_SUBDIRECTORY (dnf) diff --git a/poky/meta/recipes-devtools/dnf/dnf_4.7.0.bb b/poky/meta/recipes-devtools/dnf/dnf_4.8.0.bb index 7314eaf7b..44c440593 100644 --- a/poky/meta/recipes-devtools/dnf/dnf_4.7.0.bb +++ b/poky/meta/recipes-devtools/dnf/dnf_4.8.0.bb @@ -16,11 +16,9 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0030-Run-python-scripts-using-env.patch \ file://0001-set-python-path-for-completion_helper.patch \ file://0001-dnf-write-the-log-lock-to-root.patch \ - file://0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch \ - file://0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch \ " -SRCREV = "395541fbf8f87f81cdca7567f22be1182e55bea7" +SRCREV = "e7b29753dce94769d30f92e671f55863985d24f0" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch b/poky/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch new file mode 100644 index 000000000..ece18a33a --- /dev/null +++ b/poky/meta/recipes-devtools/dpkg/dpkg/0014-arch-Add-support-for-ARCv2-CPU.patch @@ -0,0 +1,68 @@ +From c6acfba64b470c7e919fd5bd29124d7228492537 Mon Sep 17 00:00:00 2001 +From: Guillem Jover <guillem@debian.org> +Date: Fri, 28 May 2021 04:07:49 +0200 +Subject: [PATCH] arch: Add support for ARCv2 CPU + +This is based on the ARCv2 32-bit little-endian hard-float ISA. + +Closes: #980963 + +Upstream-Status: Backport [https://salsa.debian.org/dpkg-team/dpkg/-/commit/0d134cdcb0dcc6b21fa7926964c1426a5821181d] + +Based-on-patch-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com> +Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com> +--- + data/cputable | 1 + + scripts/Dpkg/Shlibs/Objdump.pm | 1 + + scripts/t/Dpkg_Arch.t | 4 ++-- + 3 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/data/cputable b/data/cputable +index 9f2a8e0e4..277bed88f 100644 +--- a/data/cputable ++++ b/data/cputable +@@ -20,6 +20,7 @@ i386 i686 (i[34567]86|pentium) 32 little + ia64 ia64 ia64 64 little + alpha alpha alpha.* 64 little + amd64 x86_64 (amd64|x86_64) 64 little ++arc arc arc 32 little + armeb armeb arm.*b 32 big + arm arm arm.* 32 little + arm64 aarch64 aarch64 64 little +diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm +index 4cee866e7..93319d1eb 100644 +--- a/scripts/Dpkg/Shlibs/Objdump.pm ++++ b/scripts/Dpkg/Shlibs/Objdump.pm +@@ -100,6 +100,7 @@ use constant { + ELF_MACH_OR1K => 92, + ELF_MACH_XTENSA => 94, + ELF_MACH_MICROBLAZE => 189, ++ ELF_MACH_ARCV2 => 195, + ELF_MACH_AVR_OLD => 0x1057, + ELF_MACH_OR1K_OLD => 0x8472, + ELF_MACH_ALPHA => 0x9026, +diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t +index a3a9e6fee..f0bba272a 100644 +--- a/scripts/t/Dpkg_Arch.t ++++ b/scripts/t/Dpkg_Arch.t +@@ -16,7 +16,7 @@ + use strict; + use warnings; + +-use Test::More tests => 16836; ++use Test::More tests => 18407; + + use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch + debarch_eq debarch_is debarch_is_wildcard +@@ -174,7 +174,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet'); + is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown gnutriplet'); + is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet'); + +-is(scalar get_valid_arches(), 539, 'expected amount of known architectures'); ++is(scalar get_valid_arches(), 554, 'expected amount of known architectures'); + + { + local $ENV{CC} = 'false'; +-- +2.16.2 + diff --git a/poky/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb b/poky/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb index 60ae3ff73..18ca0e310 100644 --- a/poky/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb +++ b/poky/meta/recipes-devtools/dpkg/dpkg_1.20.9.bb @@ -15,6 +15,7 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=1.20. file://pager.patch \ file://0001-Add-support-for-riscv32-CPU.patch \ file://0013-scripts-dpkg-fsys-usrunmess.pl-correct-shebang.patch \ + file://0014-arch-Add-support-for-ARCv2-CPU.patch \ " SRC_URI_append_class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch" diff --git a/poky/meta/recipes-devtools/dwarfsrcfiles/files/dwarfsrcfiles.c b/poky/meta/recipes-devtools/dwarfsrcfiles/files/dwarfsrcfiles.c index af7af524e..9eb5ca807 100644 --- a/poky/meta/recipes-devtools/dwarfsrcfiles/files/dwarfsrcfiles.c +++ b/poky/meta/recipes-devtools/dwarfsrcfiles/files/dwarfsrcfiles.c @@ -9,6 +9,7 @@ #include <argp.h> #include <stdio.h> +#include <stdlib.h> #include <dwarf.h> #include <elfutils/libdw.h> @@ -83,13 +84,15 @@ process_cu (Dwarf_Die *cu_die) int main (int argc, char **argv) { - char* args[3]; + char* args[5]; int res = 0; Dwfl *dwfl; Dwarf_Addr bias; - if (argc != 2) + if (argc != 2) { fprintf(stderr, "Usage %s <file>", argv[0]); + exit(EXIT_FAILURE); + } // Pretend "dwarfsrcfiles -e <file>" was given, so we can use standard // dwfl argp parser to open the file for us and get our Dwfl. Useful @@ -98,8 +101,12 @@ main (int argc, char **argv) args[0] = argv[0]; args[1] = "-e"; args[2] = argv[1]; + // We don't want to follow debug linked files due to the way OE processes + // files, could race against changes in the linked binary (e.g. objcopy on it) + args[3] = "--debuginfo-path"; + args[4] = "/not/exist"; - argp_parse (dwfl_standard_argp (), 3, args, 0, NULL, &dwfl); + argp_parse (dwfl_standard_argp (), 5, args, 0, NULL, &dwfl); Dwarf_Die *cu = NULL; while ((cu = dwfl_nextcu (dwfl, cu, &bias)) != NULL) diff --git a/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 8d7d6ac3e..420363415 100644 --- a/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/poky/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -9,8 +9,8 @@ DEPENDS_class-native = "hostperl-runtime-native" INHIBIT_DEFAULT_DEPS = "1" -SRCREV = "92fac9b5ceb9f111a04d7f8f98831570e77886c6" -PV = "20210522+git${SRCPV}" +SRCREV = "4550d2f15b3a7ce2451c1f29500b9339430c877f" +PV = "20210620+git${SRCPV}" SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in" diff --git a/poky/meta/recipes-devtools/libdnf/libdnf_0.63.0.bb b/poky/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb index a26ee55cb..6ffeb945b 100644 --- a/poky/meta/recipes-devtools/libdnf/libdnf_0.63.0.bb +++ b/poky/meta/recipes-devtools/libdnf/libdnf_0.63.1.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master \ file://0001-drop-FindPythonInstDir.cmake.patch \ " -SRCREV = "669a5c691acba91693d238d6262ac99a440aa9b3" +SRCREV = "8e451380bf84bd76e3925cbae2a06bb0e56f5cd9" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch b/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch deleted file mode 100644 index d5c87a115..000000000 --- a/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a04fd2c8ac9e0f7a6fc17f02b2a95227b3d0aae4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 31 Mar 2020 16:06:39 +0200 -Subject: [PATCH] modulemd: generate the manpage only if the feature is enabled - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - modulemd/meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/modulemd/meson.build b/modulemd/meson.build -index 9ef1902..9f71e72 100644 ---- a/modulemd/meson.build -+++ b/modulemd/meson.build -@@ -494,6 +494,7 @@ if with_docs - ) - endif - -+if with_manpages == 'enabled' - help2man_opts = [ - '--no-info', - '--section=1', -@@ -506,3 +507,4 @@ custom_target( - ], - install: true, - install_dir: join_paths(get_option('mandir'), 'man1')) -+endif diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb index 771b2c094..963e881d6 100644 --- a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb +++ b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb @@ -4,25 +4,21 @@ DESCRIPTION = "${SUMMARY}" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" -SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main \ - file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \ - " +SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main" -PV = "2.12.1" -SRCREV = "c0897fa0e9d7d1305fd4813b1010c1d4cca42346" +PV = "2.13.0" +SRCREV = "1a032da198333ee77bdbe4be65e60eb4115ea73f" S = "${WORKDIR}/git" -inherit meson gobject-introspection python3-dir +inherit meson gobject-introspection -EXTRA_OEMESON = "-Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" +EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" -DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" +DEPENDS += "glib-2.0 libyaml glib-2.0-native" BBCLASSEXTEND = "native nativesdk" GIR_MESON_OPTION = 'skip_introspection' GIR_MESON_ENABLE_FLAG = 'false' GIR_MESON_DISABLE_FLAG = 'true' - -FILES_${PN} += "${libdir}/${PYTHON_DIR}/*" diff --git a/poky/meta/recipes-devtools/llvm/llvm_git.bb b/poky/meta/recipes-devtools/llvm/llvm_git.bb index 8a5d3dc9b..de79adc41 100644 --- a/poky/meta/recipes-devtools/llvm/llvm_git.bb +++ b/poky/meta/recipes-devtools/llvm/llvm_git.bb @@ -19,11 +19,9 @@ inherit cmake pkgconfig PROVIDES += "llvm${PV}" -MAJOR_VERSION = "12" -MINOR_VERSION = "0" -PATCH_VERSION = "0" +PV = "12.0.0" -PV = "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}" +MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" @@ -178,7 +176,7 @@ FILES_${PN}-llvmhello = "\ FILES_${PN}-dev += " \ ${libdir}/${LLVM_DIR}/llvm-config \ ${libdir}/${LLVM_DIR}/libRemarks.so \ - ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.so \ + ${libdir}/${LLVM_DIR}/libLLVM-${PV}.so \ " FILES_${PN}-staticdev += "\ diff --git a/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch b/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch index f18748709..81d76d060 100644 --- a/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch +++ b/poky/meta/recipes-devtools/mtools/mtools/disable-hardcoded-configs.patch @@ -1,4 +1,4 @@ -From 9590860ba35cbd524cec51bdd009f0c63a7dd417 Mon Sep 17 00:00:00 2001 +From 630dbcabc408cf5d73edaa7cf64a48194976b290 Mon Sep 17 00:00:00 2001 From: Ed Bartosh <ed.bartosh@linux.intel.com> Date: Tue, 13 Jun 2017 14:55:52 +0300 Subject: [PATCH] Disabled reading host configs. @@ -12,10 +12,10 @@ Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> 1 file changed, 8 deletions(-) diff --git a/config.c b/config.c -index 415755f..b61a49d 100644 +index bb13682..9186c77 100644 --- a/config.c +++ b/config.c -@@ -774,14 +774,6 @@ void read_config(void) +@@ -836,14 +836,6 @@ void read_config(void) memcpy(devices, const_devices, nr_const_devices*sizeof(struct device)); diff --git a/poky/meta/recipes-devtools/mtools/mtools_4.0.29.bb b/poky/meta/recipes-devtools/mtools/mtools_4.0.32.bb index 38de1dd92..501875037 100644 --- a/poky/meta/recipes-devtools/mtools/mtools_4.0.29.bb +++ b/poky/meta/recipes-devtools/mtools/mtools_4.0.32.bb @@ -24,7 +24,7 @@ RRECOMMENDS_${PN}_libc-glibc = "\ glibc-gconv-ibm866 \ glibc-gconv-ibm869 \ " -SRC_URI[sha256sum] = "c6b50b4603e7afe54ba0109094669373028db9af743f5c541bca4b7664aefec7" +SRC_URI[sha256sum] = "62498cd51ae7c79a27c879a45f0d2a8c44e1404cbb901372d09b02735ef5ad89" SRC_URI = "${GNU_MIRROR}/mtools/mtools-${PV}.tar.bz2 \ file://mtools-makeinfo.patch \ diff --git a/poky/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch b/poky/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch new file mode 100644 index 000000000..8c8f3b717 --- /dev/null +++ b/poky/meta/recipes-devtools/perl-cross/files/0001-Makefile-check-the-file-if-patched-or-not.patch @@ -0,0 +1,31 @@ +From 24a3e0c48f9ebe473b5f1078663e275c27d0537f Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Fri, 2 Jul 2021 09:08:21 +0000 +Subject: [PATCH] Makefile: check the file if patched or not + +Check the file if patched or not to avoid patched more than +one time. + +Upstream-Status: Inappropriate (OE-specific) + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index f4a26f5..7bc748e 100644 +--- a/Makefile ++++ b/Makefile +@@ -61,7 +61,7 @@ miniperlmain$O: $(CROSSPATCHED) + # Original versions are not saved anymore; patch generally takes care of this, + # and if that fails, reaching for the source tarball is the safest option. + $(CROSSPATCHED): %.applied: %.patch +- patch -p1 -i $< && touch $@ ++ test ! -f $@ && (patch -p1 -i $< && touch $@) || echo "$@ exist" + + # ---[ common ]----------------------------------------------------------------- + +-- +2.29.2 + diff --git a/poky/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb b/poky/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb index b77bbd1fd..b19692b2f 100644 --- a/poky/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb +++ b/poky/meta/recipes-devtools/perl-cross/perlcross_1.3.6.bb @@ -17,6 +17,7 @@ SRC_URI = "https://github.com/arsv/perl-cross/releases/download/${PV}/perl-cross file://0001-configure_path.sh-do-not-hardcode-prefix-lib-as-libr.patch \ file://determinism.patch \ file://0001-cnf-configure_func_sel.sh-disable-thread_safe_nl_lan.patch \ + file://0001-Makefile-check-the-file-if-patched-or-not.patch \ " UPSTREAM_CHECK_URI = "https://github.com/arsv/perl-cross/releases/" diff --git a/poky/meta/recipes-devtools/perl/perl_5.34.0.bb b/poky/meta/recipes-devtools/perl/perl_5.34.0.bb index 7935a5872..434535c5e 100644 --- a/poky/meta/recipes-devtools/perl/perl_5.34.0.bb +++ b/poky/meta/recipes-devtools/perl/perl_5.34.0.bb @@ -53,6 +53,8 @@ do_configure_class-target() { -Dsoname=libperl.so.5 \ -Dvendorprefix=${prefix} \ -Darchlibexp=${STAGING_LIBDIR}/perl5/${PV}/${TARGET_ARCH}-linux \ + -Dlibpth='${libdir} ${base_libdir}' \ + -Dglibpth='${libdir} ${base_libdir}' \ ${PACKAGECONFIG_CONFARGS} #perl.c uses an ARCHLIB_EXP define to generate compile-time code that diff --git a/poky/meta/recipes-devtools/pseudo/pseudo.inc b/poky/meta/recipes-devtools/pseudo/pseudo.inc index 65d6e5068..e6512bc6e 100644 --- a/poky/meta/recipes-devtools/pseudo/pseudo.inc +++ b/poky/meta/recipes-devtools/pseudo/pseudo.inc @@ -112,6 +112,19 @@ do_compile_prepend_class-nativesdk () { fi } +do_compile_append_class-native () { + if [ '${@bb.data.inherits_class('uninative', d)}' = 'True' ]; then + for i in PSEUDO_PORT_UNIX_SYNCFS PSEUDO_PORT_UIDS_GENERIC PSEUDO_PORT_LINUX_NEWCLONE PSEUDO_PORT_LINUX_XATTR PSEUDO_PORT_LINUX_STATVFS; do + grep $i.1 ${S}/pseudo_ports.h + if [ $? != 0 ]; then + echo "$i not enabled in pseudo which is incompatible with uninative" + exit 1 + fi + done + fi +} + + do_install () { oe_runmake 'DESTDIR=${D}' ${MAKEOPTS} 'LIB=lib/pseudo/lib$(MARK64)' install } diff --git a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb index 4eab13312..0ba460f3e 100644 --- a/poky/meta/recipes-devtools/pseudo/pseudo_git.bb +++ b/poky/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -6,7 +6,7 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \ file://fallback-group \ " -SRCREV = "ee24ebec9e5a11dd5208c9be2870f35eab3b9e20" +SRCREV = "b988b0a6b8afd8d459bc9a2528e834f63a3d59b2" S = "${WORKDIR}/git" PV = "1.9.0+git${SRCPV}" diff --git a/poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index cdb6a473d..9f5f25f9b 100644 --- a/poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +++ b/poky/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch @@ -8,16 +8,15 @@ Subject: [PATCH] Don't search /usr and so on for libraries by default to Upstream-Status: Inappropriate (As the code stands, this is a hack) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- - numpy/distutils/system_info.py | 42 ++++------------------------------ - 1 file changed, 5 insertions(+), 37 deletions(-) + numpy/distutils/system_info.py | 42 +++++----------------------------- + 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index 3a6a7b2..6c2c3da 100644 +index 82e864a..135246d 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -309,45 +309,13 @@ if sys.platform == 'win32': +@@ -323,44 +323,14 @@ if sys.platform == 'win32': add_system_root(os.path.join(conda_dir, 'Library')) else: @@ -25,7 +24,7 @@ index 3a6a7b2..6c2c3da 100644 - '/opt/local/lib', '/sw/lib'], platform_bits) default_runtime_dirs = [] - default_include_dirs = ['/usr/local/include', -- '/opt/include', '/usr/include', +- '/opt/include', - # path of umfpack under macports - '/opt/local/include/ufsparse', - '/opt/local/include', '/sw/include', @@ -34,8 +33,7 @@ index 3a6a7b2..6c2c3da 100644 - - default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib', - '/usr/lib'], platform_bits) -- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include', -- '/usr/include'] +- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include'] - - if os.path.exists('/usr/lib/X11'): - globbed_x11_dir = glob('/usr/lib/*/libX11.so') @@ -59,15 +57,16 @@ index 3a6a7b2..6c2c3da 100644 - # gcc supports the "-print-multiarch" option - default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] - default_lib_dirs += [os.path.join("/usr/lib/", triplet)] + + default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) + default_include_dirs = ['/deaddir/include'] + default_src_dirs = ['.', '/deaddir/src'] - ++ + default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) + default_x11_include_dirs = ['/deaddir/include'] if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) -- -2.17.1 +2.25.1 diff --git a/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.20.3.bb b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.21.0.bb index d160fd655..7ad2f061b 100644 --- a/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.20.3.bb +++ b/poky/meta/recipes-devtools/python-numpy/python3-numpy_1.21.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://numpy.org/" DESCRIPTION = "NumPy is the fundamental package needed for scientific computing with Python." SECTION = "devel/python" LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=aa1ecaef18152f75bfae546b29c49d3c" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b076ad374a7d311ba3126a22b2d52596" SRCNAME = "numpy" @@ -12,7 +12,7 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S file://0001-numpy-core-Define-RISCV-32-support.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "b7340f0628ce1823c151e3d2a2a8cba2a3ff1357fba4475a24b1816e75c21f90" +SRC_URI[sha256sum] = "b662c841b29848c04d9134f31dbaa7d4c8e673f45bb3a5f28d02f49c424d558a" UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/python/python3-git_3.1.17.bb b/poky/meta/recipes-devtools/python/python3-git_3.1.18.bb index 009cac660..955418c0e 100644 --- a/poky/meta/recipes-devtools/python/python3-git_3.1.17.bb +++ b/poky/meta/recipes-devtools/python/python3-git_3.1.18.bb @@ -12,7 +12,7 @@ PYPI_PACKAGE = "GitPython" inherit pypi setuptools3 -SRC_URI[sha256sum] = "ee24bdc93dce357630764db659edaf6b8d664d4ff5447ccfeedd2dc5c253f41e" +SRC_URI[sha256sum] = "b838a895977b45ab6f0cc926a9045c8d1c44e2b653c1fcc39fe91f42c6e8f05b" DEPENDS += " ${PYTHON_PN}-gitdb" diff --git a/poky/meta/recipes-devtools/python/python3-hypothesis_6.14.0.bb b/poky/meta/recipes-devtools/python/python3-hypothesis_6.14.3.bb index 89071b2a9..83c9917a0 100644 --- a/poky/meta/recipes-devtools/python/python3-hypothesis_6.14.0.bb +++ b/poky/meta/recipes-devtools/python/python3-hypothesis_6.14.3.bb @@ -7,7 +7,7 @@ PYPI_PACKAGE = "hypothesis" inherit pypi setuptools3 -SRC_URI[sha256sum] = "9bdee01ae260329b16117e9b0229a839b4a77747a985922653f595bd2a6a541a" +SRC_URI[sha256sum] = "1c8776d9fc8c598cf1b93b99bd87976f9d9b589fc58843d85a30090700f14a8a" RDEPENDS_${PN} += " \ python3-attrs \ diff --git a/poky/meta/recipes-devtools/python/python3-importlib-metadata_4.5.0.bb b/poky/meta/recipes-devtools/python/python3-importlib-metadata_4.6.1.bb index 7c156787a..7e9604aaf 100644 --- a/poky/meta/recipes-devtools/python/python3-importlib-metadata_4.5.0.bb +++ b/poky/meta/recipes-devtools/python/python3-importlib-metadata_4.6.1.bb @@ -8,7 +8,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "importlib_metadata" UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/" -SRC_URI[sha256sum] = "b142cc1dd1342f31ff04bb7d022492b09920cb64fed867cd3ea6f80fe3ebd139" +SRC_URI[sha256sum] = "079ada16b7fc30dfbb5d13399a5113110dab1aa7c2bc62f66af75f0b717c8cac" S = "${WORKDIR}/importlib_metadata-${PV}" diff --git a/poky/meta/recipes-devtools/python/python3-iniparse/0001-Add-python-3-compatibility.patch b/poky/meta/recipes-devtools/python/python3-iniparse/0001-Add-python-3-compatibility.patch deleted file mode 100644 index 44090a20d..000000000 --- a/poky/meta/recipes-devtools/python/python3-iniparse/0001-Add-python-3-compatibility.patch +++ /dev/null @@ -1,552 +0,0 @@ -From 8a98e4d44a5e59439a4b6bd95368cc362412c995 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 24 Mar 2017 18:06:08 +0200 -Subject: [PATCH] Add python 3 compatibility. - -Taken from -http://pkgs.fedoraproject.org/cgit/rpms/python-iniparse.git/tree/python-iniparse-python3-compat.patch - -Upstream-Status: Inappropriate [upstream is defunct] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - iniparse/__init__.py | 20 ++++++++++---------- - iniparse/compat.py | 30 ++++++++++++++++-------------- - iniparse/config.py | 16 ++++++++-------- - iniparse/configparser.py | 7 +++++++ - iniparse/ini.py | 20 ++++++++++++-------- - iniparse/utils.py | 4 ++-- - tests/__init__.py | 14 +++++++------- - tests/test_compat.py | 23 +++++++++++++++-------- - tests/test_fuzz.py | 18 +++++++++--------- - tests/test_ini.py | 8 ++++---- - tests/test_misc.py | 4 ++-- - tests/test_tidy.py | 2 +- - tests/test_unicode.py | 10 +++++----- - 13 files changed, 98 insertions(+), 78 deletions(-) - create mode 100644 iniparse/configparser.py - -diff --git a/iniparse/__init__.py b/iniparse/__init__.py -index 8de756f..7193f92 100644 ---- a/iniparse/__init__.py -+++ b/iniparse/__init__.py -@@ -3,17 +3,17 @@ - # Copyright (c) 2007 Tim Lauridsen <tla@rasmil.dk> - # All Rights Reserved. See LICENSE-PSF & LICENSE for details. - --from ini import INIConfig, change_comment_syntax --from config import BasicConfig, ConfigNamespace --from compat import RawConfigParser, ConfigParser, SafeConfigParser --from utils import tidy -+from .ini import INIConfig, change_comment_syntax -+from .config import BasicConfig, ConfigNamespace -+from .compat import RawConfigParser, ConfigParser, SafeConfigParser -+from .utils import tidy - --from ConfigParser import DuplicateSectionError, \ -- NoSectionError, NoOptionError, \ -- InterpolationMissingOptionError, \ -- InterpolationDepthError, \ -- InterpolationSyntaxError, \ -- DEFAULTSECT, MAX_INTERPOLATION_DEPTH -+from .configparser import DuplicateSectionError, \ -+ NoSectionError, NoOptionError, \ -+ InterpolationMissingOptionError, \ -+ InterpolationDepthError, \ -+ InterpolationSyntaxError, \ -+ DEFAULTSECT, MAX_INTERPOLATION_DEPTH - - __all__ = [ - 'BasicConfig', 'ConfigNamespace', -diff --git a/iniparse/compat.py b/iniparse/compat.py -index db89ed8..f95c25c 100644 ---- a/iniparse/compat.py -+++ b/iniparse/compat.py -@@ -12,19 +12,21 @@ The underlying INIConfig object can be accessed as cfg.data - """ - - import re --from ConfigParser import DuplicateSectionError, \ -- NoSectionError, NoOptionError, \ -- InterpolationMissingOptionError, \ -- InterpolationDepthError, \ -- InterpolationSyntaxError, \ -- DEFAULTSECT, MAX_INTERPOLATION_DEPTH -+from .configparser import DuplicateSectionError, \ -+ NoSectionError, NoOptionError, \ -+ InterpolationMissingOptionError, \ -+ InterpolationDepthError, \ -+ InterpolationSyntaxError, \ -+ DEFAULTSECT, MAX_INTERPOLATION_DEPTH - - # These are imported only for compatiability. - # The code below does not reference them directly. --from ConfigParser import Error, InterpolationError, \ -- MissingSectionHeaderError, ParsingError -+from .configparser import Error, InterpolationError, \ -+ MissingSectionHeaderError, ParsingError - --import ini -+import six -+ -+from . import ini - - class RawConfigParser(object): - def __init__(self, defaults=None, dict_type=dict): -@@ -56,7 +58,7 @@ class RawConfigParser(object): - # The default section is the only one that gets the case-insensitive - # treatment - so it is special-cased here. - if section.lower() == "default": -- raise ValueError, 'Invalid section name: %s' % section -+ raise ValueError('Invalid section name: %s' % section) - - if self.has_section(section): - raise DuplicateSectionError(section) -@@ -88,7 +90,7 @@ class RawConfigParser(object): - filename may also be given. - """ - files_read = [] -- if isinstance(filenames, basestring): -+ if isinstance(filenames, six.string_types): - filenames = [filenames] - for filename in filenames: - try: -@@ -143,7 +145,7 @@ class RawConfigParser(object): - def getboolean(self, section, option): - v = self.get(section, option) - if v.lower() not in self._boolean_states: -- raise ValueError, 'Not a boolean: %s' % v -+ raise ValueError('Not a boolean: %s' % v) - return self._boolean_states[v.lower()] - - def has_option(self, section, option): -@@ -234,7 +236,7 @@ class ConfigParser(RawConfigParser): - if "%(" in value: - try: - value = value % vars -- except KeyError, e: -+ except KeyError as e: - raise InterpolationMissingOptionError( - option, section, rawval, e.args[0]) - else: -@@ -283,7 +285,7 @@ class SafeConfigParser(ConfigParser): - _badpercent_re = re.compile(r"%[^%]|%$") - - def set(self, section, option, value): -- if not isinstance(value, basestring): -+ if not isinstance(value, six.string_types): - raise TypeError("option values must be strings") - # check for bad percent signs: - # first, replace all "good" interpolations -diff --git a/iniparse/config.py b/iniparse/config.py -index 5cfa2ea..3b28549 100644 ---- a/iniparse/config.py -+++ b/iniparse/config.py -@@ -143,7 +143,7 @@ class BasicConfig(ConfigNamespace): - - >>> n.aaa = 42 - >>> del n.x -- >>> print n -+ >>> print(n) - aaa = 42 - name.first = paramjit - name.last = oberoi -@@ -152,7 +152,7 @@ class BasicConfig(ConfigNamespace): - - >>> isinstance(n.name, ConfigNamespace) - True -- >>> print n.name -+ >>> print(n.name) - first = paramjit - last = oberoi - >>> sorted(list(n.name)) -@@ -160,7 +160,7 @@ class BasicConfig(ConfigNamespace): - - Finally, values can be read from a file as follows: - -- >>> from StringIO import StringIO -+ >>> from six import StringIO - >>> sio = StringIO(''' - ... # comment - ... ui.height = 100 -@@ -171,7 +171,7 @@ class BasicConfig(ConfigNamespace): - ... ''') - >>> n = BasicConfig() - >>> n._readfp(sio) -- >>> print n -+ >>> print(n) - complexity = medium - data.secret.password = goodness=gracious me - have_python -@@ -199,7 +199,7 @@ class BasicConfig(ConfigNamespace): - - def __str__(self, prefix=''): - lines = [] -- keys = self._data.keys() -+ keys = list(self._data.keys()) - keys.sort() - for name in keys: - value = self._data[name] -@@ -258,7 +258,7 @@ def update_config(target, source): - >>> n.ui.display_clock = True - >>> n.ui.display_qlength = True - >>> n.ui.width = 150 -- >>> print n -+ >>> print(n) - playlist.expand_playlist = True - ui.display_clock = True - ui.display_qlength = True -@@ -267,7 +267,7 @@ def update_config(target, source): - >>> from iniparse import ini - >>> i = ini.INIConfig() - >>> update_config(i, n) -- >>> print i -+ >>> print(i) - [playlist] - expand_playlist = True - <BLANKLINE> -@@ -277,7 +277,7 @@ def update_config(target, source): - width = 150 - - """ -- for name in source: -+ for name in sorted(source): - value = source[name] - if isinstance(value, ConfigNamespace): - if name in target: -diff --git a/iniparse/configparser.py b/iniparse/configparser.py -new file mode 100644 -index 0000000..c543d50 ---- /dev/null -+++ b/iniparse/configparser.py -@@ -0,0 +1,7 @@ -+try: -+ from ConfigParser import * -+ # not all objects get imported with __all__ -+ from ConfigParser import Error, InterpolationMissingOptionError -+except ImportError: -+ from configparser import * -+ from configparser import Error, InterpolationMissingOptionError -diff --git a/iniparse/ini.py b/iniparse/ini.py -index 408354d..052d9e9 100644 ---- a/iniparse/ini.py -+++ b/iniparse/ini.py -@@ -7,7 +7,7 @@ - - Example: - -- >>> from StringIO import StringIO -+ >>> from six import StringIO - >>> sio = StringIO('''# configure foo-application - ... [foo] - ... bar1 = qualia -@@ -16,14 +16,14 @@ Example: - ... special = 1''') - - >>> cfg = INIConfig(sio) -- >>> print cfg.foo.bar1 -+ >>> print(cfg.foo.bar1) - qualia -- >>> print cfg['foo-ext'].special -+ >>> print(cfg['foo-ext'].special) - 1 - >>> cfg.foo.newopt = 'hi!' - >>> cfg.baz.enabled = 0 - -- >>> print cfg -+ >>> print(cfg) - # configure foo-application - [foo] - bar1 = qualia -@@ -42,9 +42,11 @@ Example: - # Backward-compatiable with ConfigParser - - import re --from ConfigParser import DEFAULTSECT, ParsingError, MissingSectionHeaderError -+from .configparser import DEFAULTSECT, ParsingError, MissingSectionHeaderError - --import config -+import six -+ -+from . import config - - class LineType(object): - line = None -@@ -278,6 +280,8 @@ class LineContainer(object): - value = property(get_value, set_value) - - def __str__(self): -+ for c in self.contents: -+ pass#print(c.__str__()) - s = [x.__str__() for x in self.contents] - return '\n'.join(s) - -@@ -465,7 +469,7 @@ class INIConfig(config.ConfigNamespace): - self._sections = {} - if defaults is None: defaults = {} - self._defaults = INISection(LineContainer(), optionxformsource=self) -- for name, value in defaults.iteritems(): -+ for name, value in defaults.items(): - self._defaults[name] = value - if fp is not None: - self._readfp(fp) -@@ -551,7 +555,7 @@ class INIConfig(config.ConfigNamespace): - - for line in readline_iterator(fp): - # Check for BOM on first line -- if linecount == 0 and isinstance(line, unicode): -+ if linecount == 0 and isinstance(line, six.text_type): - if line[0] == u'\ufeff': - line = line[1:] - self._bom = True -diff --git a/iniparse/utils.py b/iniparse/utils.py -index 829fc28..f8b773a 100644 ---- a/iniparse/utils.py -+++ b/iniparse/utils.py -@@ -1,5 +1,5 @@ --import compat --from ini import LineContainer, EmptyLine -+from . import compat -+from .ini import LineContainer, EmptyLine - - def tidy(cfg): - """Clean up blank lines. -diff --git a/tests/__init__.py b/tests/__init__.py -index f1fa321..88689fb 100644 ---- a/tests/__init__.py -+++ b/tests/__init__.py -@@ -1,12 +1,12 @@ - import unittest, doctest - --import test_ini --import test_misc --import test_fuzz --import test_compat --import test_unicode --import test_tidy --import test_multiprocessing -+from . import test_ini -+from . import test_misc -+from . import test_fuzz -+from . import test_compat -+from . import test_unicode -+from . import test_tidy -+from . import test_multiprocessing - from iniparse import config - from iniparse import ini - -diff --git a/tests/test_compat.py b/tests/test_compat.py -index b8da3d5..b6dfb5c 100644 ---- a/tests/test_compat.py -+++ b/tests/test_compat.py -@@ -1,9 +1,16 @@ - from iniparse import compat as ConfigParser --import StringIO -+from six import StringIO -+try: -+ import UserDict -+except ImportError: -+ import collections as UserDict - import unittest --import UserDict - --from test import test_support -+import sys -+if sys.version_info[0] < 3: -+ from test import test_support -+else: -+ from test import support as test_support - - class SortedDict(UserDict.UserDict): - def items(self): -@@ -35,7 +42,7 @@ class TestCaseBase(unittest.TestCase): - - def fromstring(self, string, defaults=None): - cf = self.newconfig(defaults) -- sio = StringIO.StringIO(string) -+ sio = StringIO(string) - cf.readfp(sio) - return cf - -@@ -161,7 +168,7 @@ class TestCaseBase(unittest.TestCase): - "No Section!\n") - - def parse_error(self, exc, src): -- sio = StringIO.StringIO(src) -+ sio = StringIO(src) - self.assertRaises(exc, self.cf.readfp, sio) - - def test_query_errors(self): -@@ -181,7 +188,7 @@ class TestCaseBase(unittest.TestCase): - def get_error(self, exc, section, option): - try: - self.cf.get(section, option) -- except exc, e: -+ except exc as e: - return e - else: - self.fail("expected exception type %s.%s" -@@ -227,7 +234,7 @@ class TestCaseBase(unittest.TestCase): - "foo: another very\n" - " long line" - ) -- output = StringIO.StringIO() -+ output = StringIO() - cf.write(output) - self.assertEqual( - output.getvalue(), -@@ -465,7 +472,7 @@ class SortedTestCase(RawConfigParserTestCase): - "o1=4\n" - "[a]\n" - "k=v\n") -- output = StringIO.StringIO() -+ output = StringIO() - self.cf.write(output) - self.assertEquals(output.getvalue(), - "[a]\n" -diff --git a/tests/test_fuzz.py b/tests/test_fuzz.py -index 5420dcc..b219500 100644 ---- a/tests/test_fuzz.py -+++ b/tests/test_fuzz.py -@@ -1,9 +1,10 @@ - import re - import os - import random -+import sys - import unittest --import ConfigParser --from StringIO import StringIO -+from six import StringIO -+from six.moves import configparser - from iniparse import compat, ini, tidy - - # TODO: -@@ -96,24 +97,25 @@ class test_fuzz(unittest.TestCase): - s = '\n'.join(good_lines) - cc = compat.RawConfigParser() - cc.readfp(StringIO(s)) -- cc_py = ConfigParser.RawConfigParser() -+ cc_py = configparser.RawConfigParser() - cc_py.readfp(StringIO(s)) - # compare the two configparsers - self.assertEqualConfig(cc_py, cc) - # check that tidy does not change semantics - tidy(cc) -- cc_tidy = ConfigParser.RawConfigParser() -+ cc_tidy = configparser.RawConfigParser() - cc_tidy.readfp(StringIO(str(cc.data))) - self.assertEqualConfig(cc_py, cc_tidy) - except AssertionError: - fname = 'fuzz-test-iter-%d.ini' % fuzz_iter -- print 'Fuzz test failed at iteration', fuzz_iter -- print 'Writing out failing INI file as', fname -+ print('Fuzz test failed at iteration', fuzz_iter) -+ print('Writing out failing INI file as', fname) - f = open(fname, 'w') - f.write(s) - f.close() - raise - -+ @unittest.skipIf(sys.version_info[0] > 2, 'http://code.google.com/p/iniparse/issues/detail?id=22#c9') - def assertEqualConfig(self, c1, c2): - self.assertEqualSorted(c1.sections(), c2.sections()) - self.assertEqualSorted(c1.defaults().items(), c2.defaults().items()) -@@ -123,9 +125,7 @@ class test_fuzz(unittest.TestCase): - self.assertEqual(c1.get(sec, opt), c2.get(sec, opt)) - - def assertEqualSorted(self, l1, l2): -- l1.sort() -- l2.sort() -- self.assertEqual(l1, l2) -+ self.assertEqual(sorted(l1), sorted(l2)) - - class suite(unittest.TestSuite): - def __init__(self): -diff --git a/tests/test_ini.py b/tests/test_ini.py -index 6a76edb..07d4f4e 100644 ---- a/tests/test_ini.py -+++ b/tests/test_ini.py -@@ -1,5 +1,5 @@ - import unittest --from StringIO import StringIO -+from six import StringIO - - from iniparse import ini - from iniparse import compat -@@ -196,13 +196,13 @@ but = also me - self.assertEqual(p._data.find('section2').find('just').value, 'kidding') - - itr = p._data.finditer('section1') -- v = itr.next() -+ v = next(itr) - self.assertEqual(v.find('help').value, 'yourself') - self.assertEqual(v.find('but').value, 'also me') -- v = itr.next() -+ v = next(itr) - self.assertEqual(v.find('help').value, 'me') - self.assertEqual(v.find('I\'m').value, 'desperate') -- self.assertRaises(StopIteration, itr.next) -+ self.assertRaises(StopIteration, next, itr) - - self.assertRaises(KeyError, p._data.find, 'section') - self.assertRaises(KeyError, p._data.find('section2').find, 'ahem') -diff --git a/tests/test_misc.py b/tests/test_misc.py -index 31cf4da..96ef035 100644 ---- a/tests/test_misc.py -+++ b/tests/test_misc.py -@@ -1,9 +1,9 @@ - import re - import unittest - import pickle --import ConfigParser -+from six.moves import configparser -+from six import StringIO - from textwrap import dedent --from StringIO import StringIO - from iniparse import compat, ini - - class CaseSensitiveConfigParser(compat.ConfigParser): -diff --git a/tests/test_tidy.py b/tests/test_tidy.py -index 7304747..26b6cde 100644 ---- a/tests/test_tidy.py -+++ b/tests/test_tidy.py -@@ -1,6 +1,6 @@ - import unittest - from textwrap import dedent --from StringIO import StringIO -+from six import StringIO - - from iniparse import tidy,INIConfig - from iniparse.ini import EmptyLine -diff --git a/tests/test_unicode.py b/tests/test_unicode.py -index a56fcab..14d4fbd 100644 ---- a/tests/test_unicode.py -+++ b/tests/test_unicode.py -@@ -1,5 +1,5 @@ - import unittest --from StringIO import StringIO -+import six - from iniparse import compat, ini - - class test_unicode(unittest.TestCase): -@@ -17,14 +17,14 @@ baz = Marc-Andr\202 - """ - - def basic_tests(self, s, strable): -- f = StringIO(s) -+ f = six.StringIO(s) - i = ini.INIConfig(f) -- self.assertEqual(unicode(i), s) -- self.assertEqual(type(i.foo.bar), unicode) -+ self.assertEqual(six.text_type(i), s) -+ self.assertEqual(type(i.foo.bar), six.text_type) - if strable: - self.assertEqual(str(i), str(s)) - else: -- self.assertRaises(UnicodeEncodeError, lambda: str(i)) -+ self.assertRaises(UnicodeEncodeError, lambda: six.text_type(i).encode('ascii')) - return i - - def test_ascii(self): --- -2.11.0 - diff --git a/poky/meta/recipes-devtools/python/python3-iniparse_0.4.bb b/poky/meta/recipes-devtools/python/python3-iniparse_0.5.bb index 47cd6598c..4ed82eab2 100644 --- a/poky/meta/recipes-devtools/python/python3-iniparse_0.4.bb +++ b/poky/meta/recipes-devtools/python/python3-iniparse_0.5.bb @@ -4,12 +4,9 @@ LICENSE = "MIT & PSF" LIC_FILES_CHKSUM = "file://LICENSE-PSF;md5=1c78a5bb3584b353496d5f6f34edb4b2 \ file://LICENSE;md5=52f28065af11d69382693b45b5a8eb54" -SRC_URI = "file://0001-Add-python-3-compatibility.patch " +SRC_URI[sha256sum] = "932e5239d526e7acb504017bb707be67019ac428a6932368e6851691093aa842" -SRC_URI[md5sum] = "5e573e9e9733d97623881ce9bbe5eca6" -SRC_URI[sha256sum] = "abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054" - -inherit pypi distutils3 +inherit pypi setuptools3 RDEPENDS_${PN} += "python3-core python3-six" DEPENDS += "python3-six" diff --git a/poky/meta/recipes-devtools/python/python3-packaging_20.9.bb b/poky/meta/recipes-devtools/python/python3-packaging_21.0.bb index 92cf6a25f..23ecd9df5 100644 --- a/poky/meta/recipes-devtools/python/python3-packaging_20.9.bb +++ b/poky/meta/recipes-devtools/python/python3-packaging_21.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pypa/packaging" LICENSE = "Apache-2.0 & BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" -SRC_URI[sha256sum] = "5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5" +SRC_URI[sha256sum] = "7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-pathlib2_2.3.5.bb b/poky/meta/recipes-devtools/python/python3-pathlib2_2.3.6.bb index a022701ad..8516bbe4d 100644 --- a/poky/meta/recipes-devtools/python/python3-pathlib2_2.3.5.bb +++ b/poky/meta/recipes-devtools/python/python3-pathlib2_2.3.6.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Object-oriented filesystem paths" HOMEPAGE = "https://github.com/mcmtroffaes/pathlib2" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=042856c23a3e903b33bf361ea1cbe29a" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2dc08586cce3ab91bfa091b655c0e440" -SRC_URI[md5sum] = "f2bd0a363eb0f8fa0556f35c1d9e66fb" -SRC_URI[sha256sum] = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868" +SRC_URI[sha256sum] = "7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f" inherit pypi setuptools3 diff --git a/poky/meta/recipes-devtools/python/python3-pbr_5.4.4.bb b/poky/meta/recipes-devtools/python/python3-pbr_5.4.4.bb deleted file mode 100644 index 6f335ea34..000000000 --- a/poky/meta/recipes-devtools/python/python3-pbr_5.4.4.bb +++ /dev/null @@ -1,5 +0,0 @@ -inherit setuptools3 -require python-pbr.inc - -SRC_URI[md5sum] = "65cdc32e1a1ff56d481fc15aa8caf988" -SRC_URI[sha256sum] = "139d2625547dbfa5fb0b81daebb39601c478c21956dc57e2e07b74450a8c506b" diff --git a/poky/meta/recipes-devtools/python/python3-pbr_5.6.0.bb b/poky/meta/recipes-devtools/python/python3-pbr_5.6.0.bb new file mode 100644 index 000000000..132e6e52b --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3-pbr_5.6.0.bb @@ -0,0 +1,4 @@ +inherit setuptools3 +require python-pbr.inc + +SRC_URI[sha256sum] = "42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd" diff --git a/poky/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch b/poky/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch index 00cffe169..018700116 100644 --- a/poky/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch +++ b/poky/meta/recipes-devtools/python/python3-pip/0001-change-shebang-to-python3.patch @@ -1,32 +1,30 @@ -From e7a00e9b5104ae2fbcea32a35c85760b77fae7e5 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 23 Apr 2020 09:42:10 +0000 +From baa85a4dab2e8d64eb25d1181b6420db25ce919a Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <trevor.gamblin@windriver.com> +Date: Tue, 22 Jun 2021 12:31:46 -0400 Subject: [PATCH] change shebang to python3 -Upstream-Status: Pending +Upstream-Status: Inappropriate (OE-specific) -pip will drop support of python2 from 21.0 +Despite no longer supporting python2, some files in the pip source refer +to "python" instead of "python3", so patch them as needed to ensure that +they correctly reference the python3 binary. -Signed-off-by: Changqing Li <changqing.li@windriver.com> +Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> --- - src/pip/_internal/__init__.py | 2 +- - src/pip/_vendor/appdirs.py | 2 +- - src/pip/_vendor/chardet/cli/chardetect.py | 2 +- - src/pip/_vendor/requests/certs.py | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + src/pip/_vendor/appdirs.py | 2 +- + src/pip/_vendor/chardet/langbulgarianmodel.py | 2 +- + src/pip/_vendor/chardet/langgreekmodel.py | 2 +- + src/pip/_vendor/chardet/langhebrewmodel.py | 2 +- + src/pip/_vendor/chardet/langhungarianmodel.py | 2 +- + src/pip/_vendor/chardet/langrussianmodel.py | 2 +- + src/pip/_vendor/chardet/langthaimodel.py | 2 +- + src/pip/_vendor/chardet/langturkishmodel.py | 2 +- + src/pip/_vendor/chardet/metadata/languages.py | 2 +- + src/pip/_vendor/requests/certs.py | 2 +- + 10 files changed, 10 insertions(+), 10 deletions(-) -diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py -index 3aa8a46..e1ad179 100755 ---- a/src/pip/_internal/__init__.py -+++ b/src/pip/_internal/__init__.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - import pip._internal.utils.inject_securetransport # noqa - from pip._internal.utils.typing import MYPY_CHECK_RUNNING - diff --git a/src/pip/_vendor/appdirs.py b/src/pip/_vendor/appdirs.py -index 3a52b75..ad3f81d 100644 +index 33a3b7741..60b9ef5f7 100644 --- a/src/pip/_vendor/appdirs.py +++ b/src/pip/_vendor/appdirs.py @@ -1,4 +1,4 @@ @@ -35,18 +33,88 @@ index 3a52b75..ad3f81d 100644 # -*- coding: utf-8 -*- # Copyright (c) 2005-2010 ActiveState Software Inc. # Copyright (c) 2013 Eddy Petrișor -diff --git a/src/pip/_vendor/chardet/cli/chardetect.py b/src/pip/_vendor/chardet/cli/chardetect.py -index c61136b..a497e98 100644 ---- a/src/pip/_vendor/chardet/cli/chardetect.py -+++ b/src/pip/_vendor/chardet/cli/chardetect.py +diff --git a/src/pip/_vendor/chardet/langbulgarianmodel.py b/src/pip/_vendor/chardet/langbulgarianmodel.py +index e963a5097..97ea6cea8 100644 +--- a/src/pip/_vendor/chardet/langbulgarianmodel.py ++++ b/src/pip/_vendor/chardet/langbulgarianmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langgreekmodel.py b/src/pip/_vendor/chardet/langgreekmodel.py +index d99528ede..4a127ea83 100644 +--- a/src/pip/_vendor/chardet/langgreekmodel.py ++++ b/src/pip/_vendor/chardet/langgreekmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langhebrewmodel.py b/src/pip/_vendor/chardet/langhebrewmodel.py +index 484c652a4..676c1a711 100644 +--- a/src/pip/_vendor/chardet/langhebrewmodel.py ++++ b/src/pip/_vendor/chardet/langhebrewmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langhungarianmodel.py b/src/pip/_vendor/chardet/langhungarianmodel.py +index bbc5cda64..042eae70a 100644 +--- a/src/pip/_vendor/chardet/langhungarianmodel.py ++++ b/src/pip/_vendor/chardet/langhungarianmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langrussianmodel.py b/src/pip/_vendor/chardet/langrussianmodel.py +index 5594452b5..564b02e58 100644 +--- a/src/pip/_vendor/chardet/langrussianmodel.py ++++ b/src/pip/_vendor/chardet/langrussianmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langthaimodel.py b/src/pip/_vendor/chardet/langthaimodel.py +index 9a37db573..c97487959 100644 +--- a/src/pip/_vendor/chardet/langthaimodel.py ++++ b/src/pip/_vendor/chardet/langthaimodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/langturkishmodel.py b/src/pip/_vendor/chardet/langturkishmodel.py +index 43f4230ae..7e710c371 100644 +--- a/src/pip/_vendor/chardet/langturkishmodel.py ++++ b/src/pip/_vendor/chardet/langturkishmodel.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # -*- coding: utf-8 -*- + + from pip._vendor.chardet.sbcharsetprober import SingleByteCharSetModel +diff --git a/src/pip/_vendor/chardet/metadata/languages.py b/src/pip/_vendor/chardet/metadata/languages.py +index 3237d5abf..aa2ec7c35 100644 +--- a/src/pip/_vendor/chardet/metadata/languages.py ++++ b/src/pip/_vendor/chardet/metadata/languages.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 + # -*- coding: utf-8 -*- """ - Script which takes one or more file paths and reports on their detected - encodings + Metadata about languages used by our model training code for our diff --git a/src/pip/_vendor/requests/certs.py b/src/pip/_vendor/requests/certs.py -index 06a594e..bfa7839 100644 +index 06a594e58..bfa7839a4 100644 --- a/src/pip/_vendor/requests/certs.py +++ b/src/pip/_vendor/requests/certs.py @@ -1,4 +1,4 @@ @@ -56,5 +124,5 @@ index 06a594e..bfa7839 100644 """ -- -2.24.1 +2.31.1 diff --git a/poky/meta/recipes-devtools/python/python3-pip_20.0.2.bb b/poky/meta/recipes-devtools/python/python3-pip_21.1.3.bb index 99eeea2ed..0f105c239 100644 --- a/poky/meta/recipes-devtools/python/python3-pip_20.0.2.bb +++ b/poky/meta/recipes-devtools/python/python3-pip_21.1.3.bb @@ -2,16 +2,15 @@ SUMMARY = "The PyPA recommended tool for installing Python packages" HOMEPAGE = "https://pypi.org/project/pip" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c4fa2b50f55649f43060fa04b0919b9b" DEPENDS += "python3 python3-setuptools-native" -SRC_URI += "file://0001-change-shebang-to-python3.patch" +inherit pypi distutils3 -SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" -SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" +SRC_URI += "file://0001-change-shebang-to-python3.patch" -inherit pypi distutils3 +SRC_URI[sha256sum] = "b5b1eb91b36894bd01b8e5a56a422c2f3838573da0b0a1c63a096bb454e3b23f" do_install_append() { # Install as pip3 and leave pip2 as default @@ -23,6 +22,7 @@ RDEPENDS_${PN} = "\ python3-io \ python3-html \ python3-json \ + python3-multiprocessing \ python3-netserver \ python3-setuptools \ python3-unixadmin \ diff --git a/poky/meta/recipes-devtools/python/python3-setuptools/reproducibility.patch b/poky/meta/recipes-devtools/python/python3-setuptools/reproducibility.patch deleted file mode 100644 index 149d8ad5c..000000000 --- a/poky/meta/recipes-devtools/python/python3-setuptools/reproducibility.patch +++ /dev/null @@ -1,40 +0,0 @@ -The License-File lines in PKG-INFO change ordering depending on the order on disk, -for example for python-packaging, one build shows: - -License-File: LICENSE -License-File: LICENSE.APACHE -License-File: LICENSE.BSD - -and the other shows: - -License-File: LICENSE -License-File: LICENSE.BSD -License-File: LICENSE.APACHE - -This is because glob uses os.listdir() which is unsorted. Sort the result to avoid this. - -Upstream-Status: Submitted [https://github.com/pypa/setuptools/issues/2691] -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Index: setuptools-57.0.0/setuptools/dist.py -=================================================================== ---- setuptools-57.0.0.orig/setuptools/dist.py -+++ setuptools-57.0.0/setuptools/dist.py -@@ -15,7 +15,7 @@ import distutils.command - from distutils.util import strtobool - from distutils.debug import DEBUG - from distutils.fancy_getopt import translate_longopt --from glob import iglob -+from glob import glob - import itertools - import textwrap - from typing import List, Optional, TYPE_CHECKING -@@ -603,7 +603,7 @@ class Distribution(_Distribution): - return ( - path - for pattern in patterns -- for path in iglob(pattern) -+ for path in sorted(glob(pattern)) - if not path.endswith('~') - and os.path.isfile(path) - ) diff --git a/poky/meta/recipes-devtools/python/python3-setuptools_57.0.0.bb b/poky/meta/recipes-devtools/python/python3-setuptools_57.1.0.bb index a15b51e31..c066d8209 100644 --- a/poky/meta/recipes-devtools/python/python3-setuptools_57.0.0.bb +++ b/poky/meta/recipes-devtools/python/python3-setuptools_57.1.0.bb @@ -8,10 +8,9 @@ inherit pypi setuptools3 SRC_URI_append_class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI += "file://0001-change-shebang-to-python3.patch \ - file://reproducibility.patch" +SRC_URI += "file://0001-change-shebang-to-python3.patch" -SRC_URI[sha256sum] = "401cbf33a7bf817d08014d51560fc003b895c4cdc1a5b521ad2969e928a07535" +SRC_URI[sha256sum] = "cfca9c97e7eebbc8abe18d5e5e962a08dcad55bb63afddd82d681de4d22a597b" DEPENDS += "${PYTHON_PN}" diff --git a/poky/meta/recipes-devtools/python/python3-zipp_3.4.1.bb b/poky/meta/recipes-devtools/python/python3-zipp_3.5.0.bb index 191d3b38a..ab12601e4 100644 --- a/poky/meta/recipes-devtools/python/python3-zipp_3.4.1.bb +++ b/poky/meta/recipes-devtools/python/python3-zipp_3.5.0.bb @@ -3,8 +3,7 @@ HOMEPAGE = "https://github.com/jaraco/zipp" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" -SRC_URI[md5sum] = "3d91c7ab73b62ac3674210df94df600a" -SRC_URI[sha256sum] = "3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76" +SRC_URI[sha256sum] = "f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" diff --git a/poky/meta/recipes-devtools/python/python3/0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch b/poky/meta/recipes-devtools/python/python3/0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch deleted file mode 100644 index 9ed03858d..000000000 --- a/poky/meta/recipes-devtools/python/python3/0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 840fda32c82550259d02a7a56a78a9c05162b1a1 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Wed, 8 May 2019 16:10:29 +0800 -Subject: [PATCH] Makefile: fix Issue36464 (parallel build race problem) - -When using make -j with the 'install' target, it's possible for altbininstall -(which normally creates BINDIR) and libainstall (which doesn't, though it -installs python-config there) to race, resulting in a failure due to -attempting to install python-config into a nonexistent BINDIR. Ensure it also -exists in the libainstall target. - -Upstream-Status: Backport [https://github.com/python/cpython/commit/a25c46bd7dd47a2f95b32d17ee2f66de214892c6] -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - Makefile.pre.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 15f3687..7e9f173 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1456,7 +1456,7 @@ LIBPL= @LIBPL@ - LIBPC= $(LIBDIR)/pkgconfig - - libainstall: @DEF_MAKE_RULE@ python-config -- @for i in $(LIBDIR) $(LIBPL) $(LIBPC); \ -+ @for i in $(LIBDIR) $(LIBPL) $(LIBPC) $(BINDIR); \ - do \ - if test ! -d $(DESTDIR)$$i; then \ - echo "Creating directory $$i"; \ --- -2.7.4 - diff --git a/poky/meta/recipes-devtools/python/python3/makerace.patch b/poky/meta/recipes-devtools/python/python3/makerace.patch new file mode 100644 index 000000000..96744cb55 --- /dev/null +++ b/poky/meta/recipes-devtools/python/python3/makerace.patch @@ -0,0 +1,23 @@ +libainstall installs python-config.py but the .pyc cache files are generated +by the libinstall target. This means some builds may not generate the pyc files +for python-config.py depending on the order things happen in. This means builds +are not always reproducible. + +Add a dependency to avoid the race. + +Upstream-Status: Pending +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: Python-3.9.6/Makefile.pre.in +=================================================================== +--- Python-3.9.6.orig/Makefile.pre.in ++++ Python-3.9.6/Makefile.pre.in +@@ -1486,7 +1486,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter + venv venv/scripts venv/scripts/common venv/scripts/posix \ + curses pydoc_data \ + zoneinfo +-libinstall: build_all $(srcdir)/Modules/xxmodule.c ++libinstall: build_all $(srcdir)/Modules/xxmodule.c libainstall + @for i in $(SCRIPTDIR) $(LIBDEST); \ + do \ + if test ! -d $(DESTDIR)$$i; then \ diff --git a/poky/meta/recipes-devtools/python/python3_3.9.5.bb b/poky/meta/recipes-devtools/python/python3_3.9.6.bb index 1717ff737..986dfda83 100644 --- a/poky/meta/recipes-devtools/python/python3_3.9.5.bb +++ b/poky/meta/recipes-devtools/python/python3_3.9.6.bb @@ -20,7 +20,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://python-config.patch \ file://0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch \ file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \ - file://0001-Makefile-fix-Issue36464-parallel-build-race-problem.patch \ file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \ file://crosspythonpath.patch \ file://0001-Use-FLAG_REF-always-for-interned-strings.patch \ @@ -31,7 +30,8 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch \ file://0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch \ - ${@bb.utils.contains('IMAGE_FEATURES', 'tools-sdk', '', 'file://0001-test_ctypes.test_find-skip-without-tools-sdk.patch', d)} \ + file://0001-test_ctypes.test_find-skip-without-tools-sdk.patch \ + file://makerace.patch \ " SRC_URI_append_class-native = " \ @@ -39,7 +39,7 @@ SRC_URI_append_class-native = " \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://0001-Don-t-search-system-for-headers-libraries.patch \ " -SRC_URI[sha256sum] = "0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83" +SRC_URI[sha256sum] = "397920af33efc5b97f2e0b57e91923512ef89fc5b3c1d21dbfc8c4828ce0108a" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" diff --git a/poky/meta/recipes-devtools/qemu/qemu.inc b/poky/meta/recipes-devtools/qemu/qemu.inc index 6674936fe..33a8baea7 100644 --- a/poky/meta/recipes-devtools/qemu/qemu.inc +++ b/poky/meta/recipes-devtools/qemu/qemu.inc @@ -37,6 +37,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0006-vhost-user-gpu-fix-memory-leak-in-virgl_resource_att.patch \ file://0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch \ file://0001-linux-user-Tag-vsx-with-ieee128-fpbits.patch \ + file://CVE-2021-3527-1.patch \ + file://CVE-2021-3527-2.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3527-1.patch b/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3527-1.patch new file mode 100644 index 000000000..77a538569 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3527-1.patch @@ -0,0 +1,42 @@ +From 05a40b172e4d691371534828078be47e7fff524c Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann <kraxel@redhat.com> +Date: Mon, 3 May 2021 15:29:15 +0200 +Subject: [PATCH] usb: limit combined packets to 1 MiB (CVE-2021-3527) + +usb-host and usb-redirect try to batch bulk transfers by combining many +small usb packets into a single, large transfer request, to reduce the +overhead and improve performance. + +This patch adds a size limit of 1 MiB for those combined packets to +restrict the host resources the guest can bind that way. + +Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> +Message-Id: <20210503132915.2335822-6-kraxel@redhat.com> + +Upstream-Status: Backport +https://gitlab.com/qemu-project/qemu/-/commit/05a40b172e4d691371534828078be47e7fff524c +CVE: CVE-2021-3527 +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> + +--- + hw/usb/combined-packet.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/hw/usb/combined-packet.c b/hw/usb/combined-packet.c +index 5d57e883dc..e56802f89a 100644 +--- a/hw/usb/combined-packet.c ++++ b/hw/usb/combined-packet.c +@@ -171,7 +171,9 @@ void usb_ep_combine_input_packets(USBEndpoint *ep) + if ((p->iov.size % ep->max_packet_size) != 0 || !p->short_not_ok || + next == NULL || + /* Work around for Linux usbfs bulk splitting + migration */ +- (totalsize == (16 * KiB - 36) && p->int_req)) { ++ (totalsize == (16 * KiB - 36) && p->int_req) || ++ /* Next package may grow combined package over 1MiB */ ++ totalsize > 1 * MiB - ep->max_packet_size) { + usb_device_handle_data(ep->dev, first); + assert(first->status == USB_RET_ASYNC); + if (first->combined) { +-- +GitLab + diff --git a/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3527-2.patch b/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3527-2.patch new file mode 100644 index 000000000..6371aced1 --- /dev/null +++ b/poky/meta/recipes-devtools/qemu/qemu/CVE-2021-3527-2.patch @@ -0,0 +1,59 @@ +From 7ec54f9eb62b5d177e30eb8b1cad795a5f8d8986 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann <kraxel@redhat.com> +Date: Mon, 3 May 2021 15:29:12 +0200 +Subject: [PATCH] usb/redir: avoid dynamic stack allocation (CVE-2021-3527) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use autofree heap allocation instead. + +Fixes: 4f4321c11ff ("usb: use iovecs in USBPacket") +Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> +Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> +Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> +Message-Id: <20210503132915.2335822-3-kraxel@redhat.com> + +Upstream-Status: Backport +https://gitlab.com/qemu-project/qemu/-/commit/7ec54f9eb62b5d177e30eb8b1cad795a5f8d8986 +CVE: CVE-2021-3527 +Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> + +--- + hw/usb/redirect.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c +index 17f06f3417..6a75b0dc4a 100644 +--- a/hw/usb/redirect.c ++++ b/hw/usb/redirect.c +@@ -620,7 +620,7 @@ static void usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p, + .endpoint = ep, + .length = p->iov.size + }; +- uint8_t buf[p->iov.size]; ++ g_autofree uint8_t *buf = g_malloc(p->iov.size); + /* No id, we look at the ep when receiving a status back */ + usb_packet_copy(p, buf, p->iov.size); + usbredirparser_send_iso_packet(dev->parser, 0, &iso_packet, +@@ -818,7 +818,7 @@ static void usbredir_handle_bulk_data(USBRedirDevice *dev, USBPacket *p, + usbredirparser_send_bulk_packet(dev->parser, p->id, + &bulk_packet, NULL, 0); + } else { +- uint8_t buf[size]; ++ g_autofree uint8_t *buf = g_malloc(size); + usb_packet_copy(p, buf, size); + usbredir_log_data(dev, "bulk data out:", buf, size); + usbredirparser_send_bulk_packet(dev->parser, p->id, +@@ -923,7 +923,7 @@ static void usbredir_handle_interrupt_out_data(USBRedirDevice *dev, + USBPacket *p, uint8_t ep) + { + struct usb_redir_interrupt_packet_header interrupt_packet; +- uint8_t buf[p->iov.size]; ++ g_autofree uint8_t *buf = g_malloc(p->iov.size); + + DPRINTF("interrupt-out ep %02X len %zd id %"PRIu64"\n", ep, + p->iov.size, p->id); +-- +GitLab + diff --git a/poky/meta/recipes-devtools/ruby/ruby_3.0.1.bb b/poky/meta/recipes-devtools/ruby/ruby_3.0.2.bb index 944cb81c1..f88e874c7 100644 --- a/poky/meta/recipes-devtools/ruby/ruby_3.0.1.bb +++ b/poky/meta/recipes-devtools/ruby/ruby_3.0.2.bb @@ -8,7 +8,7 @@ SRC_URI += " \ file://0001-template-Makefile.in-do-not-write-host-cross-cc-item.patch \ " -SRC_URI[sha256sum] = "369825db2199f6aeef16b408df6a04ebaddb664fb9af0ec8c686b0ce7ab77727" +SRC_URI[sha256sum] = "5085dee0ad9f06996a8acec7ebea4a8735e6fac22f22e2d98c3f2bc3bef7e6f1" PACKAGECONFIG ??= "" PACKAGECONFIG += "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" diff --git a/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch index 66c395d40..5b25af2c0 100644 --- a/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +++ b/poky/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch @@ -18,8 +18,8 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> diff --git a/Makefile.in b/Makefile.in index 0370491..daa569a 100644 ---- a/Makefile.in -+++ b/Makefile.in +--- a/unix/Makefile.in ++++ b/unix/Makefile.in @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8 @@ -29,32 +29,10 @@ index 0370491..daa569a 100644 # Path to the private tcl header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -diff --git a/configure b/configure -index 181b9b3..f4cc225 100755 ---- a/configure -+++ b/configure -@@ -10166,7 +10166,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" - eval "TCL_LIB_FILE=${TCL_LIB_FILE}" - - test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' --PRIVATE_INCLUDE_DIR='$(includedir)' -+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' - HTML_DIR='$(DISTDIR)/html' - - # Note: in the following variable, it's important to use the absolute -@@ -10323,7 +10323,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" - TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" - - # Install time header dir can be set via --includedir --eval "TCL_INCLUDE_SPEC=\"-I${includedir}\"" -+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\"" - - #------------------------------------------------------------------------ - # tclConfig.sh refers to this by a different name diff --git a/configure.in b/configure.in index 9f96e2b..e323e02 100644 ---- a/configure.in -+++ b/configure.in +--- a/unix/configure.in ++++ b/unix/configure.in @@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" eval "TCL_LIB_FILE=${TCL_LIB_FILE}" diff --git a/poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch b/poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch index 72a0fa452..2c31cec8e 100644 --- a/poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch +++ b/poky/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch @@ -17,8 +17,8 @@ Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Index: unix/Makefile.in =================================================================== ---- unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800 -+++ unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800 +--- a/unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800 ++++ b/unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800 @@ -686,7 +686,7 @@ # tcltest executable gets the build directory burned into its ld search path. # This keeps tcltest from picking up an already installed version of the Tcl diff --git a/poky/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch b/poky/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch index c60eb7537..44b2ce0a3 100644 --- a/poky/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch +++ b/poky/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch @@ -2,8 +2,8 @@ Upstream-Status: Pending Index: unix/Makefile.in =================================================================== ---- unix.orig/Makefile.in 2013-11-10 23:37:34.243424934 -0800 -+++ unix/Makefile.in 2013-11-10 23:37:34.243424934 -0800 +--- a/unix.orig/Makefile.in 2013-11-10 23:37:34.243424934 -0800 ++++ b/unix/Makefile.in 2013-11-10 23:37:34.243424934 -0800 @@ -709,23 +709,23 @@ test: test-tcl test-packages diff --git a/poky/meta/recipes-devtools/tcltk/tcl/interp.patch b/poky/meta/recipes-devtools/tcltk/tcl/interp.patch new file mode 100644 index 000000000..95d6318f6 --- /dev/null +++ b/poky/meta/recipes-devtools/tcltk/tcl/interp.patch @@ -0,0 +1,32 @@ +The interp-36.7 patch has race conditions and is missing cleanup. This patch by +a Tcl maintainer should improve matters. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/tests/interp.test b/tests/interp.test +index d7424847f..fc90990f3 100644 +--- a/tests/interp.test ++++ b/tests/interp.test +@@ -3595,17 +3595,18 @@ test interp-36.7 {ChildBgerror sets error handler of child [1999035]} -setup { + variable result + set result [lindex $args 0] + } ++ set tout [after 5000 {set result timeout}] + } -body { + child eval { + variable done {} + after 0 error foo +- after 10 [list ::set [namespace which -variable done] {}] +- vwait [namespace which -variable done] + } ++ vwait result + set result + } -cleanup { ++ after cancel $tout + variable result {} +- unset -nocomplain result ++ unset -nocomplain result tout + interp delete child + } -result foo + diff --git a/poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch b/poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch deleted file mode 100644 index 5c622a236..000000000 --- a/poky/meta/recipes-devtools/tcltk/tcl/no_packages.patch +++ /dev/null @@ -1,53 +0,0 @@ -tcl 8.6.0 builds by default a number of packages that are not needed in Yocto. -This patch changes the makefile so that these packages are not built by default. - -Upstream-Status:Inappropriate [embedded specific] - -Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> - -diff --git a/Makefile.in b/Makefile.in -index b729ffd..2c2e824 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -612,7 +612,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \ - # Start of rules - #-------------------------------------------------------------------------- - --all: binaries libraries doc packages -+all: binaries libraries doc - - binaries: ${LIB_FILE} ${TCL_EXE} - -@@ -656,12 +656,12 @@ Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in - #tclConfig.h: $(UNIX_DIR)/tclConfig.h.in - # $(SHELL) config.status - --clean: clean-packages -+clean: - rm -rf *.a *.o libtcl* core errs *~ \#* TAGS *.E a.out \ - errors ${TCL_EXE} ${TCLTEST_EXE} lib.exp Tcl @DTRACE_HDR@ - cd dltest ; $(MAKE) clean - --distclean: distclean-packages clean -+distclean: clean - rm -rf Makefile config.status config.cache config.log tclConfig.sh \ - tclConfig.h *.plist Tcl.framework tcl.pc - cd dltest ; $(MAKE) distclean -@@ -709,7 +709,7 @@ tcltest-real: - # tcltest, ie: - # % make test TESTFLAGS="-verbose bps -file fileName.test" - --test: test-tcl test-packages -+test: test-tcl - - test-tcl: ${TCLTEST_EXE} - $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -@@ -774,7 +774,7 @@ INSTALL_PACKAGE_TARGETS = install-packages - INSTALL_DEV_TARGETS = install-headers - INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@ - INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \ -- $(INSTALL_PACKAGE_TARGETS) $(INSTALL_EXTRA_TARGETS) -+ $(INSTALL_EXTRA_TARGETS) - - install: $(INSTALL_TARGETS) - diff --git a/poky/meta/recipes-devtools/tcltk/tcl/run-ptest b/poky/meta/recipes-devtools/tcltk/tcl/run-ptest index 22bb69ae0..a62b70308 100644 --- a/poky/meta/recipes-devtools/tcltk/tcl/run-ptest +++ b/poky/meta/recipes-devtools/tcltk/tcl/run-ptest @@ -1,8 +1,12 @@ #!/bin/sh +# clock.test needs a timezone to be set +export TZ="Europe/London" +export TCL_LIBRARY=library + for i in `ls tests/*.test | awk -F/ '{print $2}'`; do - TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i >$i.log 2>&1 - grep -q "^Files with failing tests:" $i.log + ./tcltest tests/all.tcl -file $i >$i.log 2>&1 + grep -q -F -e "Files with failing tests:" -e "Test files exiting with errors:" $i.log if [ $? -eq 0 ]; then echo "FAIL: $i" cat $i.log diff --git a/poky/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/poky/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch index d1fc9b92e..c4283c4f3 100644 --- a/poky/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch +++ b/poky/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch @@ -1,23 +1,9 @@ Upstream-Status: Pending -Index: unix/configure -=================================================================== ---- unix.orig/configure 2013-09-19 13:17:13.000000000 -0700 -+++ unix/configure 2013-11-11 00:20:51.519490342 -0800 -@@ -7599,6 +7599,9 @@ - # get rid of the warnings. - #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" - -+ # following line added by CW for Debian GNU/Linux -+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0" -+ - SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' - DL_OBJS="tclLoadDl.o" - DL_LIBS="-ldl" Index: unix/tcl.m4 =================================================================== ---- unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700 -+++ unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800 +--- a/unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700 ++++ b/unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800 @@ -1415,6 +1415,9 @@ # get rid of the warnings. #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" @@ -30,8 +16,8 @@ Index: unix/tcl.m4 DL_LIBS="-ldl" Index: unix/Makefile.in =================================================================== ---- unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700 -+++ unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800 +--- a/unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700 ++++ b/unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800 @@ -796,7 +796,10 @@ done; @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" diff --git a/poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch b/poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch index 17d251d55..99c5faf02 100644 --- a/poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch +++ b/poky/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch @@ -7,10 +7,7 @@ Remove hardcoded library install path. Change $(prefix)/lib/ to ${libdir}. [YOCTO #2876] -This is not a bug, but libraries should be installed into directory .../lib/. -On 64bit target that should be lib64/. - -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Pending Signed-off-by: Song.Li <Song.Li@windriver.com> Signed-off-by: Kai Kang <kai.kang@windriver.com> @@ -20,23 +17,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: unix/configure -=================================================================== ---- unix.orig/configure 2013-11-10 23:38:33.643426430 -0800 -+++ unix/configure 2013-11-10 23:39:51.347428387 -0800 -@@ -19134,7 +19134,7 @@ - - eval "TCL_LIB_FILE=${TCL_LIB_FILE}" - --test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' -+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' - PRIVATE_INCLUDE_DIR='$(includedir)' - HTML_DIR='$(DISTDIR)/html' - Index: unix/configure.in =================================================================== ---- unix.orig/configure.in 2013-11-10 23:20:50.000000000 -0800 -+++ unix/configure.in 2013-11-10 23:39:41.199428131 -0800 +--- a/unix.orig/configure.in 2013-11-10 23:20:50.000000000 -0800 ++++ b/unix/configure.in 2013-11-10 23:39:41.199428131 -0800 @@ -790,7 +790,7 @@ eval "TCL_LIB_FILE=${TCL_LIB_FILE}" diff --git a/poky/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/poky/meta/recipes-devtools/tcltk/tcl_8.6.11.bb index efb36b32d..8d58fafeb 100644 --- a/poky/meta/recipes-devtools/tcltk/tcl_8.6.11.bb +++ b/poky/meta/recipes-devtools/tcltk/tcl_8.6.11.bb @@ -5,42 +5,40 @@ SECTION = "devel/tcltk" # http://www.tcl.tk/software/tcltk/license.html LICENSE = "tcl & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://../license.terms;md5=058f6229798281bbcac4239c788cfa38 \ - file://../compat/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ - file://../library/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ - file://../macosx/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ - file://../tests/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ - file://../win/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ +LIC_FILES_CHKSUM = "file://license.terms;md5=058f6229798281bbcac4239c788cfa38 \ + file://compat/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ + file://library/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ + file://macosx/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ + file://tests/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ + file://win/license.terms;md5=058f6229798281bbcac4239c788cfa38 \ " DEPENDS = "tcl-native zlib" -BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ +BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl-core${PV}-src.tar.gz \ file://tcl-add-soname.patch" SRC_URI = "${BASE_SRC_URI} \ file://fix_non_native_build_issue.patch \ file://fix_issue_with_old_distro_glibc.patch \ - file://no_packages.patch \ file://tcl-remove-hardcoded-install-path.patch \ file://alter-includedir.patch \ + file://interp.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258" +SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469024cfa" SRC_URI_class-native = "${BASE_SRC_URI}" -S = "${WORKDIR}/${BPN}${PV}/unix" +UPSTREAM_CHECK_REGEX = "tcl(?P<pver>\d+(\.\d+)+)-src" -PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}" -VER = "${PV}" +S = "${WORKDIR}/${BPN}${PV}" -inherit autotools ptest binconfig update-alternatives +VER = "${PV}" -EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}" +inherit autotools ptest binconfig -do_compile_prepend() { - echo > ${S}/../compat/fixstrtod.c -} +AUTOTOOLS_SCRIPT_PATH = "${S}/unix" +EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix" do_install() { autotools_do_install @@ -54,7 +52,7 @@ do_install() { install -m 0755 tclConfig.sh ${D}${libdir} for dir in compat generic unix; do install -d ${D}${includedir}/${BPN}${VER}/$dir - install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/ + install -m 0644 ${S}/$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/ done } @@ -65,9 +63,6 @@ FILES_tcl-lib = "${libdir}/libtcl8.6.so.*" FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8" FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" -ALTERNATIVE_${PN}-doc = "Thread.3" -ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3" - # isn't getting picked up by shlibs code RDEPENDS_${PN} += "tcl-lib" RDEPENDS_${PN}-ptest += "libgcc" @@ -80,8 +75,8 @@ do_compile_ptest() { do_install_ptest() { cp ${B}/tcltest ${D}${PTEST_PATH} - cp -r ${S}/../library ${D}${PTEST_PATH} - cp -r ${S}/../tests ${D}${PTEST_PATH} + cp -r ${S}/library ${D}${PTEST_PATH} + cp -r ${S}/tests ${D}${PTEST_PATH} } # Fix some paths that might be used by Tcl extensions diff --git a/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all index e69de29bb..c3fc63906 100644 --- a/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all +++ b/poky/meta/recipes-devtools/valgrind/valgrind/remove-for-all @@ -0,0 +1 @@ +none/tests/amd64/fb_test_amd64 diff --git a/poky/meta/recipes-extended/bash/bash/makerace2.patch b/poky/meta/recipes-extended/bash/bash/makerace2.patch new file mode 100644 index 000000000..43cdd0415 --- /dev/null +++ b/poky/meta/recipes-extended/bash/bash/makerace2.patch @@ -0,0 +1,98 @@ +The main makefile can call mkbuiltins from multiple different codepaths in parallel. +When called, it moves the existing files out the way and creates new ones, then +compares which will break the build if timing is unlucky. + +The root of the problem is mkbuiltins.c creating a file but also referencing that +file under the same name. By modifing it to allow the final name and the temp name +to be specified, we can avoid the original reason for the moving of files around. +This allows them to be created under a new name and then replaced if changed, +removing any race windows around accessing the files whilst they've been +moved or are being rewritten. + +See [YOCTO #14227] + +Upstream-Status: Pending +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> + +Index: bash-5.1.8/builtins/Makefile.in +=================================================================== +--- bash-5.1.8.orig/builtins/Makefile.in ++++ bash-5.1.8/builtins/Makefile.in +@@ -185,19 +185,17 @@ gen-helpfiles: tmpbuiltins.o gen-helpfil + $(CC_FOR_BUILD) ${CCFLAGS_FOR_BUILD} $(LDFLAGS_FOR_BUILD) -o $@ gen-helpfiles.o tmpbuiltins.o $(LIBS_FOR_BUILD) + + builtext.h builtins.c: $(MKBUILTINS) $(DEFSRC) +- @-if test -f builtins.c; then mv -f builtins.c old-builtins.c; fi +- @-if test -f builtext.h; then mv -f builtext.h old-builtext.h; fi +- ./$(MKBUILTINS) -externfile builtext.h -structfile builtins.c \ ++ ./$(MKBUILTINS) -externfile builtext-new.h -externfinalfile builtext.h -structfile builtins-new.c \ + -noproduction $(DIRECTDEFINE) $(HELPDIRDEFINE) $(HELPSTRINGS) $(DEFSRC) +- @-if cmp -s old-builtext.h builtext.h 2>/dev/null; then \ +- mv old-builtext.h builtext.h; \ ++ @-if ! cmp -s builtext.h builtext-new.h 2>/dev/null; then \ ++ mv builtext-new.h builtext.h; \ + else \ +- $(RM) old-builtext.h; \ ++ $(RM) builtext-new.h; \ + fi +- @-if cmp -s old-builtins.c builtins.c 2>/dev/null; then \ +- mv old-builtins.c builtins.c; \ ++ @-if ! cmp -s builtins.c builtins-new.c 2>/dev/null; then \ ++ mv builtins-new.c builtins.c; \ + else \ +- $(RM) old-builtins.c; \ ++ $(RM) builtins-new.c; \ + fi + + helpdoc: gen-helpfiles +Index: bash-5.1.8/builtins/mkbuiltins.c +=================================================================== +--- bash-5.1.8.orig/builtins/mkbuiltins.c ++++ bash-5.1.8/builtins/mkbuiltins.c +@@ -113,6 +113,9 @@ char *struct_filename = (char *)NULL; + /* The name of the external declaration file. */ + char *extern_filename = (char *)NULL; + ++/* The final name of the external declaration file. */ ++char *extern_final_filename = (char *)NULL; ++ + /* Here is a structure for manipulating arrays of data. */ + typedef struct { + int size; /* Number of slots allocated to array. */ +@@ -230,6 +233,8 @@ main (argc, argv) + + if (strcmp (arg, "-externfile") == 0) + extern_filename = argv[arg_index++]; ++ else if (strcmp (arg, "-externfinalfile") == 0) ++ extern_final_filename = argv[arg_index++]; + else if (strcmp (arg, "-structfile") == 0) + struct_filename = argv[arg_index++]; + else if (strcmp (arg, "-noproduction") == 0) +@@ -273,6 +278,9 @@ main (argc, argv) + } + } + ++ if (!extern_final_filename) ++ extern_final_filename = extern_filename; ++ + /* If there are no files to process, just quit now. */ + if (arg_index == argc) + exit (0); +@@ -1174,7 +1182,7 @@ write_file_headers (structfile, externfi + fprintf (structfile, "%s\n", structfile_header[i]); + + fprintf (structfile, "#include \"%s\"\n", +- extern_filename ? extern_filename : "builtext.h"); ++ extern_final_filename ? extern_final_filename : "builtext.h"); + + fprintf (structfile, "#include \"bashintl.h\"\n"); + +@@ -1184,7 +1192,7 @@ write_file_headers (structfile, externfi + if (externfile) + fprintf (externfile, + "/* %s - The list of builtins found in libbuiltins.a. */\n", +- extern_filename ? extern_filename : "builtext.h"); ++ extern_final_filename ? extern_final_filename : "builtext.h"); + } + + /* Write out any necessary closing information for diff --git a/poky/meta/recipes-extended/bash/bash_5.1.8.bb b/poky/meta/recipes-extended/bash/bash_5.1.8.bb new file mode 100644 index 000000000..5d7704af1 --- /dev/null +++ b/poky/meta/recipes-extended/bash/bash_5.1.8.bb @@ -0,0 +1,25 @@ +require bash.inc + +# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ + file://execute_cmd.patch \ + file://mkbuiltins_have_stringize.patch \ + file://build-tests.patch \ + file://test-output.patch \ + file://run-ptest \ + file://run-bash-ptests \ + file://fix-run-builtins.patch \ + file://use_aclocal.patch \ + file://makerace.patch \ + file://makerace2.patch \ + " + +SRC_URI[tarball.sha256sum] = "0cfb5c9bb1a29f800a97bd242d19511c997a1013815b805e0fdd32214113d6be" + +DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" +DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" + +BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-extended/bash/bash_5.1.bb b/poky/meta/recipes-extended/bash/bash_5.1.bb deleted file mode 100644 index e5e013b73..000000000 --- a/poky/meta/recipes-extended/bash/bash_5.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -require bash.inc - -# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-001;apply=yes;striplevel=0;name=patch001 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-002;apply=yes;striplevel=0;name=patch002 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-003;apply=yes;striplevel=0;name=patch003 \ - ${GNU_MIRROR}/bash/bash-${PV}-patches/bash51-004;apply=yes;striplevel=0;name=patch004 \ - file://execute_cmd.patch \ - file://mkbuiltins_have_stringize.patch \ - file://build-tests.patch \ - file://test-output.patch \ - file://run-ptest \ - file://run-bash-ptests \ - file://fix-run-builtins.patch \ - file://use_aclocal.patch \ - file://makerace.patch \ - " - -SRC_URI[tarball.sha256sum] = "cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa" -SRC_URI[patch001.sha256sum] = "ebb07b3dbadd98598f078125d0ae0d699295978a5cdaef6282fe19adef45b5fa" -SRC_URI[patch002.sha256sum] = "15ea6121a801e48e658ceee712ea9b88d4ded022046a6147550790caf04f5dbe" -SRC_URI[patch003.sha256sum] = "22f2cc262f056b22966281babf4b0a2f84cb7dd2223422e5dcd013c3dcbab6b1" -SRC_URI[patch004.sha256sum] = "9aaeb65664ef0d28c0067e47ba5652b518298b3b92d33327d84b98b28d873c86" - -DEBUG_OPTIMIZATION_append_armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" -DEBUG_OPTIMIZATION_append_armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" - -BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-extended/cups/cups.inc b/poky/meta/recipes-extended/cups/cups.inc index be5a11c94..df2382546 100644 --- a/poky/meta/recipes-extended/cups/cups.inc +++ b/poky/meta/recipes-extended/cups/cups.inc @@ -8,18 +8,17 @@ SECTION = "console/utils" LICENSE = "Apache-2.0" DEPENDS = "libpng jpeg dbus zlib libusb1" -SRC_URI = "https://github.com/apple/cups/releases/download/v${PV}/${BP}-source.tar.gz \ +SRC_URI = "https://github.com/OpenPrinting/cups/releases/download/v${PV}/cups-${PV}-source.tar.gz \ file://0001-use-echo-only-in-init.patch \ file://0002-don-t-try-to-run-generated-binaries.patch \ - file://0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch \ + file://libexecdir.patch \ file://0004-cups-fix-multilib-install-file-conflicts.patch \ file://volatiles.99_cups \ file://cups-volatiles.conf \ - file://CVE-2020-10001.patch \ " -UPSTREAM_CHECK_URI = "https://github.com/apple/cups/releases" -UPSTREAM_CHECK_REGEX = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar" +UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups/releases" +UPSTREAM_CHECK_REGEX = "cups-(?P<pver>.+)-source.tar" # Issue only applies to MacOS CVE_CHECK_WHITELIST += "CVE-2008-1033" @@ -37,7 +36,7 @@ inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system lpadmin" -SYSTEMD_SERVICE_${PN} = "org.cups.cupsd.socket org.cups.cupsd.path org.cups.cupsd.service org.cups.cups-lpd.socket" +SYSTEMD_SERVICE_${PN} = "cups.socket cups.path cups.service cups-lpd.socket" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}" @@ -63,20 +62,8 @@ EXTRA_OECONF = " \ EXTRA_AUTORECONF += "--exclude=autoheader" -do_compile () { - echo "all:" > man/Makefile - echo "libs:" >> man/Makefile - echo "install:" >> man/Makefile - echo "install-data:" >> man/Makefile - echo "install-exec:" >> man/Makefile - echo "install-headers:" >> man/Makefile - echo "install-libs:" >> man/Makefile - - oe_runmake -} - do_install () { - oe_runmake "DSTROOT=${D}" install + oe_runmake "DESTDIR=${D}" install # Remove /var/run from package as cupsd will populate it on startup rm -fr ${D}/${localstatedir}/run @@ -105,8 +92,7 @@ do_install () { PACKAGES =+ "${PN}-lib ${PN}-libimage" RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'procps', '', d)}" -FILES_${PN} += "${libexecdir}/cups/ \ - " +FILES_${PN} += "${libexecdir}/cups/" FILES_${PN}-lib = "${libdir}/libcups.so.*" diff --git a/poky/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch b/poky/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch index ea248e471..2bc26edbf 100644 --- a/poky/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch +++ b/poky/meta/recipes-extended/cups/cups/0002-don-t-try-to-run-generated-binaries.patch @@ -26,48 +26,6 @@ index 32e2e0b..f1478d4 100644 # -@@ -205,9 +205,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po - $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ - $(LINKCUPSSTATIC) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ -- echo Testing PPD compiler... -- ./ppdc-static -l en,fr -I ../data foo.drv -- ./ppdc-static -l en,fr -z -I ../data foo.drv -+# echo Testing PPD compiler... -+# ./ppdc-static -l en,fr -I ../data foo.drv -+# ./ppdc-static -l en,fr -z -I ../data foo.drv - - - # -@@ -235,17 +235,17 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) - $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ - $(LINKCUPSSTATIC) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ -- echo Testing PPD importer... -- $(RM) -r ppd ppd2 sample-import.drv -- ./ppdc-static -l en -I ../data sample.drv -- ./ppdi-static -I ../data -o sample-import.drv ppd/* -- ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv -- if diff -r ppd ppd2 >/dev/null; then \ -- echo PPD import OK; \ -- else \ -- echo PPD import FAILED; \ -- exit 1; \ -- fi -+# echo Testing PPD importer... -+# $(RM) -r ppd ppd2 sample-import.drv -+# ./ppdc-static -l en -I ../data sample.drv -+# ./ppdi-static -I ../data -o sample-import.drv ppd/* -+# ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv -+# if diff -r ppd ppd2 >/dev/null; then \ -+# echo PPD import OK; \ -+# else \ -+# echo PPD import FAILED; \ -+# exit 1; \ -+# fi - - - # -- 2.17.1 diff --git a/poky/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch b/poky/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch deleted file mode 100644 index b48c7a9ad..000000000 --- a/poky/meta/recipes-extended/cups/cups/0003-cups_1.4.6.bb-Fix-build-on-ppc64.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 66c2079ae91389ee0f9d704bf0d2cccd53b2c603 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 22 Jul 2012 16:54:17 -0700 -Subject: [PATCH 3/4] cups_1.4.6.bb: Fix build on ppc64 - -Make CUPS_SERVERBIN relative to libdir otherwise on 64bit arches -e.g. ppc64 where base libdir is lib64 this does not go well - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Inappropriate [OE config specific] - -Update on 20190904: -Redefine CUPS_SERVERBIN to "$libexecdir/cups" which solves file confliction -when multilib is enabled. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - ---- - config-scripts/cups-directories.m4 | 2 +- - configure | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 -index b74083a..9a5abb2 100644 ---- a/config-scripts/cups-directories.m4 -+++ b/config-scripts/cups-directories.m4 -@@ -270,7 +270,7 @@ case "$host_os_name" in - *) - # All others - INSTALL_SYSV="install-sysv" -- CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libexecdir/cups" - ;; - esac - -diff --git a/configure b/configure -index d3df145..bc68a6c 100755 ---- a/configure -+++ b/configure -@@ -6420,7 +6420,7 @@ case "$host_os_name" in - *) - # All others - INSTALL_SYSV="install-sysv" -- CUPS_SERVERBIN="$exec_prefix/lib/cups" -+ CUPS_SERVERBIN="$libexecdir/cups" - ;; - esac - --- -2.17.1 - diff --git a/poky/meta/recipes-extended/cups/cups/CVE-2020-10001.patch b/poky/meta/recipes-extended/cups/cups/CVE-2020-10001.patch deleted file mode 100644 index 09a0a5765..000000000 --- a/poky/meta/recipes-extended/cups/cups/CVE-2020-10001.patch +++ /dev/null @@ -1,74 +0,0 @@ -From efbea1742bd30f842fbbfb87a473e5c84f4162f9 Mon Sep 17 00:00:00 2001 -From: Michael R Sweet <msweet@msweet.org> -Date: Mon, 1 Feb 2021 15:02:32 -0500 -Subject: [PATCH] Fix a buffer (read) overflow in ippReadIO (CVE-2020-10001) - -Upstream-Status: Backport -CVE: CVE-2020-10001 - -Reference to upstream patch: -[https://github.com/OpenPrinting/cups/commit/efbea1742bd30f842fbbfb87a473e5c84f4162f9] - -[SG: Addapted for version 2.3.3] -Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com> ---- - CHANGES.md | 2 ++ - cups/ipp.c | 8 +++++--- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/CHANGES.md b/CHANGES.md -index df72892..5ca12da 100644 ---- a/CHANGES.md -+++ b/CHANGES.md -@@ -4,6 +4,8 @@ CHANGES - 2.3.3 - 2020-04-24 - Changes in CUPS v2.3.3 - ---------------------- - -+- Security: Fixed a buffer (read) overflow in the `ippReadIO` function -+ (CVE-2020-10001) - - CVE-2020-3898: The `ppdOpen` function did not handle invalid UI - constraint. `ppdcSource::get_resolution` function did not handle - invalid resolution strings. -diff --git a/cups/ipp.c b/cups/ipp.c -index 3d52934..adbb26f 100644 ---- a/cups/ipp.c -+++ b/cups/ipp.c -@@ -2866,7 +2866,8 @@ ippReadIO(void *src, /* I - Data source */ - unsigned char *buffer, /* Data buffer */ - string[IPP_MAX_TEXT], - /* Small string buffer */ -- *bufptr; /* Pointer into buffer */ -+ *bufptr, /* Pointer into buffer */ -+ *bufend; /* End of buffer */ - ipp_attribute_t *attr; /* Current attribute */ - ipp_tag_t tag; /* Current tag */ - ipp_tag_t value_tag; /* Current value tag */ -@@ -3441,6 +3442,7 @@ ippReadIO(void *src, /* I - Data source */ - } - - bufptr = buffer; -+ bufend = buffer + n; - - /* - * text-with-language and name-with-language are composite -@@ -3454,7 +3456,7 @@ ippReadIO(void *src, /* I - Data source */ - - n = (bufptr[0] << 8) | bufptr[1]; - -- if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE) || n >= (int)sizeof(string)) -+ if ((bufptr + 2 + n + 2) > bufend || n >= (int)sizeof(string)) - { - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, - _("IPP language length overflows value."), 1); -@@ -3481,7 +3483,7 @@ ippReadIO(void *src, /* I - Data source */ - bufptr += 2 + n; - n = (bufptr[0] << 8) | bufptr[1]; - -- if ((bufptr + 2 + n) >= (buffer + IPP_BUF_SIZE)) -+ if ((bufptr + 2 + n) > bufend) - { - _cupsSetError(IPP_STATUS_ERROR_INTERNAL, - _("IPP string length overflows value."), 1); --- -2.17.1 - diff --git a/poky/meta/recipes-extended/cups/cups/libexecdir.patch b/poky/meta/recipes-extended/cups/cups/libexecdir.patch new file mode 100644 index 000000000..2e15841b0 --- /dev/null +++ b/poky/meta/recipes-extended/cups/cups/libexecdir.patch @@ -0,0 +1,27 @@ +Use $libexecdir instead of hardcoding $prefix/lib as this breaks multilib builds. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 +index 1430af3a6..6efedc604 100644 +--- a/config-scripts/cups-directories.m4 ++++ b/config-scripts/cups-directories.m4 +@@ -265,7 +265,7 @@ case "$host_os_name" in + *-gnu) + # GNUs + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ;; + *bsd* | darwin*) + # *BSD and Darwin (macOS) +@@ -275,7 +275,7 @@ case "$host_os_name" in + *) + # All others + INSTALL_SYSV="install-sysv" +- CUPS_SERVERBIN="$exec_prefix/lib/cups" ++ CUPS_SERVERBIN="$libexecdir/cups" + ;; + esac +
\ No newline at end of file diff --git a/poky/meta/recipes-extended/cups/cups_2.3.3.bb b/poky/meta/recipes-extended/cups/cups_2.3.3.bb deleted file mode 100644 index 5caeb6f58..000000000 --- a/poky/meta/recipes-extended/cups/cups_2.3.3.bb +++ /dev/null @@ -1,6 +0,0 @@ -require cups.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI[md5sum] = "412434ceefbdf3ec71bc9188a035f589" -SRC_URI[sha256sum] = "261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee" diff --git a/poky/meta/recipes-extended/cups/cups_2.3.3op2.bb b/poky/meta/recipes-extended/cups/cups_2.3.3op2.bb new file mode 100644 index 000000000..fc2aa702f --- /dev/null +++ b/poky/meta/recipes-extended/cups/cups_2.3.3op2.bb @@ -0,0 +1,5 @@ +require cups.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[sha256sum] = "deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df" diff --git a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index b3f3de4a1..3b639ebb6 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/poky/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -1,4 +1,4 @@ -From b493e2fb472307997576eef33cce784594070f44 Mon Sep 17 00:00:00 2001 +From e652ccd8965895087887c270fc0d380b61f96b11 Mon Sep 17 00:00:00 2001 From: Tudor Florea <tudor.florea@enea.com> Date: Wed, 28 May 2014 18:59:54 +0200 Subject: [PATCH] ethtool: use serial-tests config needed by ptest. @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 13c2bc0..0b6ca1d 100644 +index 6b620bf..ff62b2a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 5.12, netdev@vger.kernel.org) + AC_INIT(ethtool, 5.13, netdev@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu subdir-objects]) diff --git a/poky/meta/recipes-extended/ethtool/ethtool_5.12.bb b/poky/meta/recipes-extended/ethtool/ethtool_5.13.bb index df7dd4774..8f6a7904a 100644 --- a/poky/meta/recipes-extended/ethtool/ethtool_5.12.bb +++ b/poky/meta/recipes-extended/ethtool/ethtool_5.13.bb @@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[sha256sum] = "7ca623cc1dd25ba66531573da6a11f1ecde9b62b00742d9ba54f9ba983439bfa" +SRC_URI[sha256sum] = "e66ab0d74d2a888fd64a0053290dbea66ddc9b75b3d21d117b7edd9576b9db60" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/software/network/ethtool/" diff --git a/poky/meta/recipes-extended/iputils/iputils_s20200821.bb b/poky/meta/recipes-extended/iputils/iputils_20210202.bb index e43abf262..02a303782 100644 --- a/poky/meta/recipes-extended/iputils/iputils_s20200821.bb +++ b/poky/meta/recipes-extended/iputils/iputils_20210202.bb @@ -13,11 +13,11 @@ DEPENDS = "gnutls" SRC_URI = "git://github.com/iputils/iputils \ file://0001-rarpd-rdisc-Drop-PrivateUsers.patch \ " -SRCREV = "23c3782ae0c7f9c6ae59dbed8ad9204f8758542b" +SRCREV = "cc16da6b574ce6637f3e6e9ab3c1a728663006ff" S = "${WORKDIR}/git" -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>s\d+)" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>20\d+)" # Fixed in 2000-10-10, but the versioning of iputils # breaks the version order. diff --git a/poky/meta/recipes-extended/man-pages/man-pages_5.11.bb b/poky/meta/recipes-extended/man-pages/man-pages_5.12.bb index 3cd0bc525..a5b2c3030 100644 --- a/poky/meta/recipes-extended/man-pages/man-pages_5.11.bb +++ b/poky/meta/recipes-extended/man-pages/man-pages_5.12.bb @@ -4,10 +4,10 @@ SECTION = "console/utils" HOMEPAGE = "http://www.kernel.org/pub/linux/docs/man-pages" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://README;md5=207f70f56526417514ac46b6680e314f" +LIC_FILES_CHKSUM = "file://README;md5=92cd5ee2e0b35d782817e7e277b6ce4b" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "3759aee7cd4a229173d3cb651fbba438777bee6206da8d75ea04caaa7c8662b0" +SRC_URI[sha256sum] = "2684d42ab53184d7607105834e277577daa7e854cdce0d4aacf9f7ad8437c7ce" inherit manpages @@ -20,7 +20,7 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install prefix=${prefix} DESTDIR=${D} } # Only deliveres man-pages so FILES_${PN} gets everything diff --git a/poky/meta/recipes-extended/parted/files/check-vfat.patch b/poky/meta/recipes-extended/parted/files/check-vfat.patch new file mode 100644 index 000000000..c64130a4e --- /dev/null +++ b/poky/meta/recipes-extended/parted/files/check-vfat.patch @@ -0,0 +1,51 @@ +Add checks for both mkfs.vfat and the vfat file system in the kernel before +running tests. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/tests/t-lib-helpers.sh b/tests/t-lib-helpers.sh +index 4c6c75f..2cc7577 100644 +--- a/tests/t-lib-helpers.sh ++++ b/tests/t-lib-helpers.sh +@@ -418,3 +418,13 @@ require_64bit_() + ;; + esac + } ++ ++# Check if the specified filesystem is either built into the kernel, or can be loaded ++# as a module ++# Usage: has_filesystem vfat ++# Ruturns 0 if the filesystem is available, otherwise skips the test ++require_filesystem_() ++{ ++ grep -q $1 /proc/filesystems && return 0 ++ modprobe --quiet --dry-run $1 || skip_ "this test requires kernel support for $1" ++} +diff --git a/tests/t1100-busy-label.sh b/tests/t1100-busy-label.sh +index f1a13df..0f47b08 100755 +--- a/tests/t1100-busy-label.sh ++++ b/tests/t1100-busy-label.sh +@@ -19,6 +19,9 @@ + . "${srcdir=.}/init.sh"; path_prepend_ ../parted + require_root_ + require_scsi_debug_module_ ++require_fat_ ++require_filesystem_ vfat ++ + ss=$sector_size_ + + scsi_debug_setup_ sector_size=$ss dev_size_mb=90 > dev-name || +diff --git a/tests/t1101-busy-partition.sh b/tests/t1101-busy-partition.sh +index e35e6f0..c813848 100755 +--- a/tests/t1101-busy-partition.sh ++++ b/tests/t1101-busy-partition.sh +@@ -22,6 +22,8 @@ test "$VERBOSE" = yes && parted --version + + require_root_ + require_scsi_debug_module_ ++require_fat_ ++require_filesystem_ vfat + + # create memory-backed device + scsi_debug_setup_ dev_size_mb=80 > dev-name || diff --git a/poky/meta/recipes-extended/parted/files/no_check.patch b/poky/meta/recipes-extended/parted/files/no_check.patch deleted file mode 100644 index e6a26d11a..000000000 --- a/poky/meta/recipes-extended/parted/files/no_check.patch +++ /dev/null @@ -1,20 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -If check is detected, it makes the builds non-determinstic so just force -it to be disabled. - -RP - 4/11/08 - -Index: parted-3.2/configure.ac -=================================================================== ---- parted-3.2.orig/configure.ac -+++ parted-3.2/configure.ac -@@ -555,7 +555,7 @@ AC_CHECK_HEADER([execinfo.h], [ - AM_CONDITIONAL([COMPILE_FOR_S390], [test "$host_cpu" = s390 || test "$host_cpu" = s390x]) - - dnl check for "check", unit testing library/header --PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no) -+have_check=no - if test "$have_check" != "yes"; then - AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building]) - fi diff --git a/poky/meta/recipes-extended/parted/files/run-ptest b/poky/meta/recipes-extended/parted/files/run-ptest index 374f1bfbc..c3d6fca33 100644 --- a/poky/meta/recipes-extended/parted/files/run-ptest +++ b/poky/meta/recipes-extended/parted/files/run-ptest @@ -2,6 +2,6 @@ mkdir -p /etc/udev/mount.blacklist.d echo /dev/sda1 >> /etc/udev/mount.blacklist.d/parted-tmp -rm -f *.log +rm -f tests/*.log make -C tests test-suite.log rm /etc/udev/mount.blacklist.d/parted-tmp diff --git a/poky/meta/recipes-extended/parted/parted_3.4.bb b/poky/meta/recipes-extended/parted/parted_3.4.bb index fb583489f..d9b3ffb85 100644 --- a/poky/meta/recipes-extended/parted/parted_3.4.bb +++ b/poky/meta/recipes-extended/parted/parted_3.4.bb @@ -7,20 +7,19 @@ SECTION = "console/tools" DEPENDS = "ncurses util-linux virtual/libiconv" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ - file://no_check.patch \ file://fix-doc-mandir.patch \ file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \ file://run-ptest \ + file://check-vfat.patch \ " SRC_URI[md5sum] = "357d19387c6e7bc4a8a90fe2d015fe80" SRC_URI[sha256sum] = "e1298022472da5589b7f2be1d5ee3c1b66ec3d96dfbad03dc642afd009da5342" -EXTRA_OECONF = "--disable-device-mapper" - inherit autotools pkgconfig gettext texinfo ptest PACKAGECONFIG ?= "readline" +PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,libdevmapper lvm2" PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" BBCLASSEXTEND = "native nativesdk" @@ -35,10 +34,13 @@ do_install_ptest() { cp ${S}/build-aux/test-driver $t/build-aux/ cp -r ${S}/tests $t cp ${B}/tests/Makefile $t/tests/ + mkdir $t/lib + cp ${B}/lib/config.h $t/lib sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile - sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" $t/tests/Makefile + sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" $t/tests/Makefile + sed -i "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" $t/tests/Makefile sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \ @@ -47,8 +49,8 @@ do_install_ptest() { sed -e 's| ../parted||' -i $t/tests/*.sh } -RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup python3 make gawk e2fsprogs-mke2fs python3-core dosfstools" -RRECOMMENDS_${PN}-ptest = "kernel-module-scsi-debug" +RDEPENDS_${PN}-ptest = "bash coreutils perl util-linux-losetup util-linux-mkswap python3 make gawk e2fsprogs-mke2fs e2fsprogs-tune2fs python3-core dosfstools" +RRECOMMENDS_${PN}-ptest += "kernel-module-scsi-debug kernel-module-loop kernel-module-vfat" RDEPENDS_${PN}-ptest_append_libc-glibc = "\ glibc-utils \ locale-base-en-us \ diff --git a/poky/meta/recipes-extended/shadow/shadow.inc b/poky/meta/recipes-extended/shadow/shadow.inc index 2278541f6..2cbdfbc1c 100644 --- a/poky/meta/recipes-extended/shadow/shadow.inc +++ b/poky/meta/recipes-extended/shadow/shadow.inc @@ -173,6 +173,8 @@ inherit update-alternatives ALTERNATIVE_PRIORITY = "200" ALTERNATIVE_${PN} = "passwd chfn chsh chpasswd vipw vigr nologin" +ALTERNATIVE_LINK_NAME[chfn] = "${bindir}/chfn" +ALTERNATIVE_LINK_NAME[chsh] = "${bindir}/chsh" ALTERNATIVE_LINK_NAME[chpasswd] = "${sbindir}/chpasswd" ALTERNATIVE_LINK_NAME[vipw] = "${base_sbindir}/vipw" ALTERNATIVE_LINK_NAME[vigr] = "${base_sbindir}/vigr" diff --git a/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.10.bb b/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.12.bb index 7b06f0061..97eaa75d1 100644 --- a/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.10.bb +++ b/poky/meta/recipes-extended/stress-ng/stress-ng_0.12.12.bb @@ -9,7 +9,7 @@ SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ file://no_daddr_t.patch \ " -SRC_URI[sha256sum] = "bd167b6559fa8a28680371b1defd3ffe2344eb550129d58dd7d5e2d568f2786e" +SRC_URI[sha256sum] = "f27af50f6f2308e707fef927674bdd209a046b116734281b792aeca35a4e4499" DEPENDS = "coreutils-native" diff --git a/poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch b/poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted file mode 100644 index f72097e63..000000000 --- a/poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch +++ /dev/null @@ -1,254 +0,0 @@ -From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 Mon Sep 17 00:00:00 2001 -From: Edwin Plauchu <edwin.plauchu.camacho@intel.com> -Date: Tue, 29 Nov 2016 12:27:17 -0600 -Subject: [PATCH] texinfo-4.12-zlib - -Upstream-Status: Pending - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> - ---- - install-info/Makefile.in | 2 +- - install-info/install-info.c | 79 ++++++++++++++++++++++--------------- - 2 files changed, 48 insertions(+), 33 deletions(-) - -diff --git a/install-info/Makefile.in b/install-info/Makefile.in -index c924509..746df05 100644 ---- a/install-info/Makefile.in -+++ b/install-info/Makefile.in -@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) - am_ginstall_info_OBJECTS = install-info.$(OBJEXT) - ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) --ginstall_info_LDADD = $(LDADD) -+ginstall_info_LDADD = $(LDADD) -lz - am__DEPENDENCIES_1 = - ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -diff --git a/install-info/install-info.c b/install-info/install-info.c -index 21f4fe3..a7aba82 100644 ---- a/install-info/install-info.c -+++ b/install-info/install-info.c -@@ -19,6 +19,7 @@ - #include <getopt.h> - #include <regex.h> - #include <argz.h> -+#include <zlib.h> - - #define TAB_WIDTH 8 - -@@ -681,15 +682,15 @@ The first time you invoke Info you start off looking at this node.\n\ - - Return either stdin reading the file, or a non-stdin pipe reading - the output of the compression program. */ --FILE * -+void * - open_possibly_compressed_file (char *filename, - void (*create_callback) (char *), -- char **opened_filename, char **compression_program) -+ char **opened_filename, char **compression_program, int *is_pipe) - { - char *local_opened_filename, *local_compression_program; - int nread; - char data[13]; -- FILE *f; -+ gzFile *f; - - /* We let them pass NULL if they don't want this info, but it's easier - to always determine it. */ -@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *filename, - opened_filename = &local_opened_filename; - - *opened_filename = filename; -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - { - *opened_filename = concat (filename, ".gz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".xz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".bz2", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".lzma", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #ifdef __MSDOS__ - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".igz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - if (!f) - { - free (*opened_filename); - *opened_filename = concat (filename, ".inz", ""); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - } - #endif /* __MSDOS__ */ - if (!f) -@@ -754,7 +755,7 @@ open_possibly_compressed_file (char *filename, - (*create_callback) (filename); - - /* And try opening it again. */ -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; - } -@@ -764,26 +765,26 @@ open_possibly_compressed_file (char *filename, - - /* Read first few bytes of file rather than relying on the filename. - If the file is shorter than this it can't be usable anyway. */ -- nread = fread (data, sizeof (data), 1, f); -- if (nread != 1) -+ nread = gzread (f, data, sizeof (data)); -+ if (nread != sizeof (data)) - { -- if (nread == 0) -+ if (nread >= 0) - { - /* Try to create the file if its empty. */ -- if (feof (f) && create_callback) -+ if (gzeof(f) && create_callback) - { -- if (fclose (f) != 0) -+ if (gzclose(f) != 0) - return 0; /* unknown error closing file */ - -- if (remove (filename) != 0) -+ if (remove(filename) != 0) - return 0; /* unknown error deleting file */ - - (*create_callback) (filename); -- f = fopen (*opened_filename, FOPEN_RBIN); -+ f = gzopen (*opened_filename, FOPEN_RBIN); - if (!f) - return 0; -- nread = fread (data, sizeof (data), 1, f); -- if (nread == 0) -+ nread = gzread(f, data, sizeof (data)); -+ if (nread >= 0) - return 0; - goto determine_file_type; /* success */ - } -@@ -854,35 +855,40 @@ determine_file_type: - *compression_program = NULL; - - /* Seek back over the magic bytes. */ -- if (fseek (f, 0, 0) < 0) -+ if (gzseek (f, 0, SEEK_SET) == -1) - return 0; - - if (*compression_program) - { /* It's compressed, so open a pipe. */ -+ FILE *p; - char *command = concat (*compression_program, " -d", ""); - -- if (fclose (f) < 0) -+ if (gzclose (f) < 0) - return 0; -- f = freopen (*opened_filename, FOPEN_RBIN, stdin); -- if (!f) -+ p = freopen (*opened_filename, FOPEN_RBIN, stdin); -+ if (!p) - return 0; -- f = popen (command, "r"); -- if (!f) -+ p = popen (command, "r"); -+ if (!p) - { - /* Used for error message in calling code. */ - *opened_filename = command; - return 0; - } -+ else -+ *is_pipe = 1; -+ return p; - } - else - { --#if O_BINARY -+#if 0 && O_BINARY - /* Since this is a text file, and we opened it in binary mode, - switch back to text mode. */ - f = freopen (*opened_filename, "r", f); - if (! f) - return 0; - #endif -+ *is_pipe = 0; - } - - return f; -@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep, - void (*create_callback) (char *), char **opened_filename, - char **compression_program) - { -- FILE *f; -+ void *f; -+ int pipe_p; - int filled = 0; - int data_size = 8192; - char *data = xmalloc (data_size); -@@ -909,14 +916,20 @@ readfile (char *filename, int *sizep, - /* If they passed the space for the file name to return, use it. */ - f = open_possibly_compressed_file (filename, create_callback, - opened_filename, -- compression_program); -+ compression_program, -+ &pipe_p); - - if (!f) - return 0; - - for (;;) - { -- int nread = fread (data + filled, 1, data_size - filled, f); -+ int nread; -+ -+ if (pipe_p) -+ nread = fread (data + filled, 1, data_size - filled, f); -+ else -+ nread = gzread (f, data + filled, data_size - filled); - if (nread < 0) - return 0; - if (nread == 0) -@@ -935,8 +948,10 @@ readfile (char *filename, int *sizep, - /* We need to close the stream, since on some systems the pipe created - by popen is simulated by a temporary file which only gets removed - inside pclose. */ -- if (f != stdin) -+ if (pipe_p) - pclose (f); -+ else -+ gzclose (f); - - *sizep = filled; - return data; diff --git a/poky/meta/recipes-extended/texinfo/texinfo_6.7.bb b/poky/meta/recipes-extended/texinfo/texinfo_6.8.bb index d421b79a0..e5046ffbe 100644 --- a/poky/meta/recipes-extended/texinfo/texinfo_6.7.bb +++ b/poky/meta/recipes-extended/texinfo/texinfo_6.8.bb @@ -29,15 +29,13 @@ TARGET_PATCH = "file://use_host_makedoc.patch" TARGET_PATCH_class-native = "" SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ - file://texinfo-4.12-zlib.patch \ file://disable-native-tools.patch \ file://link-zip.patch \ file://dont-depend-on-help2man.patch \ ${TARGET_PATCH} \ " -SRC_URI[md5sum] = "f0c1782f68ef73738d74bd1e9e30793a" -SRC_URI[sha256sum] = "a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e" +SRC_URI[sha256sum] = "8e09cf753ad1833695d2bac0f57dc3bd6bcbbfbf279450e1ba3bc2d7fb297d08" tex_texinfo = "texmf/tex/texinfo" diff --git a/poky/meta/recipes-extended/timezone/tzdata.bb b/poky/meta/recipes-extended/timezone/tzdata.bb index f8443110d..09145e1ed 100644 --- a/poky/meta/recipes-extended/timezone/tzdata.bb +++ b/poky/meta/recipes-extended/timezone/tzdata.bb @@ -19,13 +19,17 @@ TZONES= "africa antarctica asia australasia europe northamerica southamerica \ " # pacificnew +# "slim" is the default since 2020b +# "fat" is needed by e.g. MariaDB's mysql_tzinfo_to_sql +ZIC_FMT ?= "slim" + do_compile () { for zone in ${TZONES}; do \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ + ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo -L /dev/null \ ${S}/${zone} ; \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ + ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/posix -L /dev/null \ ${S}/${zone} ; \ - ${STAGING_BINDIR_NATIVE}/zic -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ + ${STAGING_BINDIR_NATIVE}/zic -b ${ZIC_FMT} -d ${WORKDIR}${datadir}/zoneinfo/right -L ${S}/leapseconds \ ${S}/${zone} ; \ done } diff --git a/poky/meta/recipes-extended/zstd/zstd_1.5.0.bb b/poky/meta/recipes-extended/zstd/zstd_1.5.0.bb index 806edb63c..378605873 100644 --- a/poky/meta/recipes-extended/zstd/zstd_1.5.0.bb +++ b/poky/meta/recipes-extended/zstd/zstd_1.5.0.bb @@ -29,10 +29,12 @@ ZSTD_LEGACY_SUPPORT ??= "4" do_compile () { oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} + oe_runmake ${PACKAGECONFIG_CONFARGS} ZSTD_LEGACY_SUPPORT=${ZSTD_LEGACY_SUPPORT} -C contrib/pzstd } do_install () { oe_runmake install 'DESTDIR=${D}' + oe_runmake install 'DESTDIR=${D}' PREFIX=${prefix} -C contrib/pzstd } BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb index 4c986a574..048deabe6 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb @@ -6,7 +6,7 @@ generation for bindings, API verification and documentation generation." HOMEPAGE = "https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" BUGTRACKER = "https://gitlab.gnome.org/GNOME/gobject-introspection/issues" SECTION = "libs" -LICENSE = "LGPLv2+ & GPLv2+" +LICENSE = "LGPLv2+ & GPLv2+ & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ file://tools/compiler.c;endline=20;md5=fc5007fc20022720e6c0b0cdde41fabd \ file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \ diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3.inc b/poky/meta/recipes-gnome/gtk+/gtk+3.inc index 8d5edb7ee..1445c406d 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/poky/meta/recipes-gnome/gtk+/gtk+3.inc @@ -63,7 +63,6 @@ PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy" PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl" PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" -PACKAGECONFIG[cloudprint] = "--enable-cloudprint,--disable-cloudprint,rest json-glib" PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" prepare_gtk_scripts() { diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch index 398c9bc36..35cbab876 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +++ b/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch @@ -1,4 +1,4 @@ -From f83fcf1991afad6d9c15546b2ccd775dad4e314c Mon Sep 17 00:00:00 2001 +From eef50c94587fc30cd624adb5eb213eb9fa663dc1 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 21 Jun 2016 15:11:39 +0300 Subject: [PATCH] Add --disable-opengl configure option @@ -47,7 +47,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> create mode 100644 gdk/x11/gdkx-without-gl-context.h diff --git a/configure.ac b/configure.ac -index bd651bb..b4c061f 100644 +index 851bcbf..6cbf6a2 100644 --- a/configure.ac +++ b/configure.ac @@ -346,6 +346,15 @@ AC_ARG_ENABLE(cloudproviders, @@ -210,7 +210,7 @@ index 932daf1..54239d6 100644 return info; diff --git a/gdk/Makefile.am b/gdk/Makefile.am -index 479d6a1..7edbee8 100644 +index 710a548..b45f631 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -274,7 +274,6 @@ x11_introspection_files = \ @@ -243,10 +243,10 @@ index 479d6a1..7edbee8 100644 GdkX11_3_0_gir_SCANNERFLAGS = \ --identifier-prefix=Gdk \ diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c -index 240c99f..9eb49bf 100644 +index 748f548..911ab2a 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c -@@ -2419,7 +2419,9 @@ gboolean +@@ -2420,7 +2420,9 @@ gboolean gdk_display_make_gl_context_current (GdkDisplay *display, GdkGLContext *context) { @@ -258,7 +258,7 @@ index 240c99f..9eb49bf 100644 GdkRenderingMode diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c -index 933e204..1767508 100644 +index 9690077..55f85ef 100644 --- a/gdk/gdkgl.c +++ b/gdk/gdkgl.c @@ -26,7 +26,9 @@ @@ -334,7 +334,7 @@ index 933e204..1767508 100644 +#endif } diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c -index dfbed63..556f0a3 100644 +index 3b23639..1f04f8e 100644 --- a/gdk/gdkglcontext.c +++ b/gdk/gdkglcontext.c @@ -85,7 +85,9 @@ @@ -380,7 +380,7 @@ index dfbed63..556f0a3 100644 /** diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c -index 6ae0f86..4e48a2a 100644 +index 2de8ba4..1883a79 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -45,7 +45,9 @@ @@ -513,7 +513,7 @@ index 32b1f24..6352313 100644 + -include $(top_srcdir)/git.mk diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c -index 817944e..e7a2947 100644 +index 7e08f47..30fd7b6 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -37,7 +37,9 @@ @@ -526,7 +526,7 @@ index 817944e..e7a2947 100644 #include "gdk-private.h" #include "gdkprofilerprivate.h" -@@ -3188,7 +3190,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) +@@ -3191,7 +3193,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list; display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target; @@ -538,10 +538,10 @@ index 817944e..e7a2947 100644 display_class->get_default_seat = gdk_x11_display_get_default_seat; diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c -index 8939ae9..931bff9 100644 +index bb4df05..46f5349 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c -@@ -1723,3 +1723,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) +@@ -1827,3 +1827,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen) { return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP"); } @@ -551,7 +551,7 @@ index 8939ae9..931bff9 100644 +void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {} +#endif diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c -index 1fe7b90..d23a347 100644 +index 721d9bb..8e87acc 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -36,7 +36,9 @@ @@ -564,7 +564,7 @@ index 1fe7b90..d23a347 100644 #include "gdkprivate-x11.h" #include "gdk-private.h" -@@ -5861,7 +5863,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) +@@ -5881,7 +5883,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; impl_class->show_window_menu = gdk_x11_window_show_window_menu; @@ -668,10 +668,10 @@ index 0000000..c9e2617 + +#endif /* __GDK_X_H__ */ diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index eaca473..99352d1 100644 +index 074fb35..4fa9eb6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am -@@ -1449,7 +1449,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s +@@ -1457,7 +1457,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \ $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \ sort | uniq | \ @@ -681,7 +681,7 @@ index eaca473..99352d1 100644 $(srcdir)/gtktestutils.c: gtktypefuncs.inc diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c -index 9a56443..7de0db2 100644 +index 802303e..33001cf 100644 --- a/gtk/gtkglarea.c +++ b/gtk/gtkglarea.c @@ -29,7 +29,9 @@ @@ -724,8 +724,8 @@ index 9a56443..7de0db2 100644 g_return_if_fail (GTK_IS_GL_AREA (area)); @@ -533,11 +540,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area) - glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, - GL_RENDERBUFFER_EXT, priv->depth_stencil_buffer); + glFramebufferRenderbuffer (GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, + GL_RENDERBUFFER, priv->depth_stencil_buffer); } +#endif } @@ -738,7 +738,7 @@ index 9a56443..7de0db2 100644 if (priv->context == NULL) @@ -569,6 +578,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area) - glDeleteFramebuffersEXT (1, &priv->frame_buffer); + glDeleteFramebuffers (1, &priv->frame_buffer); priv->frame_buffer = 0; } +#endif @@ -777,7 +777,7 @@ index 9a56443..7de0db2 100644 static gboolean diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c -index c241ec8..24576dd 100644 +index 48237d1..1f9b9be 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -33,8 +33,10 @@ @@ -824,7 +824,7 @@ index c241ec8..24576dd 100644 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) { diff --git a/tests/Makefile.am b/tests/Makefile.am -index ee1e8b5..e6c6502 100644 +index f283e89..5e7180e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -80,8 +80,6 @@ noinst_PROGRAMS = $(TEST_PROGS) \ diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.29.bb b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.30.bb index 031fbb6d6..7e7566f9a 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.29.bb +++ b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.30.bb @@ -8,7 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar file://0003-Add-disable-opengl-configure-option.patch \ file://link_fribidi.patch \ " -SRC_URI[sha256sum] = "f57ec4ade8f15cab0c23a80dcaee85b876e70a8823d9105f067ce335a8268caa" +SRC_URI[sha256sum] = "ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9" S = "${WORKDIR}/gtk+-${PV}" diff --git a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb index 3b308318b..23cd25986 100644 --- a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb +++ b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb @@ -48,7 +48,6 @@ do_install_append () { } FILES_${PN} += "${datadir}/sgml" -FILES_${PN}-dev += "${libdir}/cmake" FILES_${PN}-doc = "" SYSROOT_PREPROCESS_FUNCS_append_class-native = " gtkdoc_makefiles_sysroot_preprocess" diff --git a/poky/meta/recipes-gnome/libgudev/libgudev_236.bb b/poky/meta/recipes-gnome/libgudev/libgudev_236.bb index daa578ddb..5d1d2d782 100644 --- a/poky/meta/recipes-gnome/libgudev/libgudev_236.bb +++ b/poky/meta/recipes-gnome/libgudev/libgudev_236.bb @@ -26,3 +26,8 @@ GTKDOC_MESON_OPTION = "gtk_doc" UPSTREAM_CHECK_URI = "http://ftp.gnome.org/pub/GNOME/sources/libgudev/" UPSTREAM_CHECK_REGEX = "(?P<pver>(\d+))" + +# This isn't a GNOME-style version do gnome_verdir fails. Just return the +# version as that is how the directory is structured. +def gnome_verdir(v): + return v diff --git a/poky/meta/recipes-gnome/libhandy/libhandy_1.2.2.bb b/poky/meta/recipes-gnome/libhandy/libhandy_1.2.3.bb index 9652948a3..acb6e53b7 100644 --- a/poky/meta/recipes-gnome/libhandy/libhandy_1.2.2.bb +++ b/poky/meta/recipes-gnome/libhandy/libhandy_1.2.3.bb @@ -9,8 +9,8 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https" -SRCREV = "09f36006b26f41a2bb383b0c853e954c5792cfe1" +SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-2" +SRCREV = "e9ca4ac4b134bbd6ab91b6f916a915192fd3a465" S = "${WORKDIR}/git" GIR_MESON_ENABLE_FLAG = 'enabled' diff --git a/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb b/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb index 8dc4ceb39..b0ce56127 100644 --- a/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb +++ b/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb @@ -20,3 +20,8 @@ HASHEQUIV_HASH_VERSION .= ".2" EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false" FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" + +# This isn't a GNOME-style version do gnome_verdir fails. Just return the +# version as that is how the directory is structured. +def gnome_verdir(v): + return v diff --git a/poky/meta/recipes-graphics/drm/libdrm_2.4.106.bb b/poky/meta/recipes-graphics/drm/libdrm_2.4.107.bb index 2f6348902..1dd07046f 100644 --- a/poky/meta/recipes-graphics/drm/libdrm_2.4.106.bb +++ b/poky/meta/recipes-graphics/drm/libdrm_2.4.107.bb @@ -13,7 +13,7 @@ DEPENDS = "libpthread-stubs" SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz \ " -SRC_URI[sha256sum] = "92d8ac54429b171e087e61c2894dc5399fe6a549b1fbba09fa6a3cb9d4e57bd4" +SRC_URI[sha256sum] = "c554cef03b033636a975543eab363cc19081cb464595d3da1ec129f87370f888" inherit meson pkgconfig manpages diff --git a/poky/meta/recipes-graphics/glslang/glslang_11.4.0.bb b/poky/meta/recipes-graphics/glslang/glslang_11.5.0.bb index fd4cf6d53..e3eaa2ac6 100644 --- a/poky/meta/recipes-graphics/glslang/glslang_11.4.0.bb +++ b/poky/meta/recipes-graphics/glslang/glslang_11.5.0.bb @@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229" -SRCREV = "18eef33bd7a4bf5ad8c69f99cb72022608cf6e73" +SRCREV = "ae2a562936cc8504c9ef2757cceaff163147834f" SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https \ file://0001-generate-glslang-pkg-config.patch" UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$" diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch b/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch deleted file mode 100644 index c1d4df42a..000000000 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f96b2b653c605679b83a820b38f49a0a0f4baf42 Mon Sep 17 00:00:00 2001 -From: Andi-Bogdan Postelnicu <abpostelnicu@me.com> -Date: Wed, 2 Jun 2021 14:08:11 +0300 -Subject: [PATCH] Removed unused variable `supp_size` from - plan_subset_encoding(...). - -Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/243d056ff1c2af583ceb67e5dfbfaac51dc96e63] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/hb-subset-cff1.cc | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc -index df322f8..35dae7b 100644 ---- a/src/hb-subset-cff1.cc -+++ b/src/hb-subset-cff1.cc -@@ -402,7 +402,7 @@ struct cff_subset_plan { - void plan_subset_encoding (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan) - { - const Encoding *encoding = acc.encoding; -- unsigned int size0, size1, supp_size; -+ unsigned int size0, size1; - hb_codepoint_t code, last_code = CFF_UNDEF_CODE; - hb_vector_t<hb_codepoint_t> supp_codes; - -@@ -412,7 +412,6 @@ struct cff_subset_plan { - return; - } - -- supp_size = 0; - supp_codes.init (); - - subset_enc_num_codes = plan->num_output_glyphs () - 1; -@@ -448,7 +447,6 @@ struct cff_subset_plan { - code_pair_t pair = { supp_codes[i], sid }; - subset_enc_supp_codes.push (pair); - } -- supp_size += SuppEncoding::static_size * supp_codes.length; - } - } - supp_codes.fini (); --- -2.31.1 - diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb index 1a0e651f6..6da76ad0a 100644 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb +++ b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb @@ -4,16 +4,15 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=8f787620b7d3866d9552fd1924c07572 \ - file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \ + file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \ + " UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ - file://0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch \ - " -SRC_URI[sha256sum] = "4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300" +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7" inherit meson pkgconfig lib_package gtk-doc gobject-introspection diff --git a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb index 54556abb2..3aac32159 100644 --- a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb +++ b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb @@ -76,6 +76,4 @@ do_configure_prepend() { export SYSROOT=$PKG_CONFIG_SYSROOT_DIR } -FILES_${PN}-dev += "${libdir}/cmake" - BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/libva/libva-initial_2.11.0.bb b/poky/meta/recipes-graphics/libva/libva-initial_2.12.0.bb index 5c6abeafe..5c6abeafe 100644 --- a/poky/meta/recipes-graphics/libva/libva-initial_2.11.0.bb +++ b/poky/meta/recipes-graphics/libva/libva-initial_2.12.0.bb diff --git a/poky/meta/recipes-graphics/libva/libva-utils_2.11.1.bb b/poky/meta/recipes-graphics/libva/libva-utils_2.12.0.bb index 096d80b68..096d80b68 100644 --- a/poky/meta/recipes-graphics/libva/libva-utils_2.11.1.bb +++ b/poky/meta/recipes-graphics/libva/libva-utils_2.12.0.bb diff --git a/poky/meta/recipes-graphics/libva/libva.inc b/poky/meta/recipes-graphics/libva/libva.inc index 43d916cd1..3d65ac501 100644 --- a/poky/meta/recipes-graphics/libva/libva.inc +++ b/poky/meta/recipes-graphics/libva/libva.inc @@ -18,7 +18,7 @@ LICENSE = "MIT" SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" -SRC_URI[sha256sum] = "6e361117038b571ad4741d38c9280db8c140b17e76e8c01fc7a4d608d3ed7d5d" +SRC_URI[sha256sum] = "d3f4873715077a8c969c9bfe4ba8455a133353176be0ffe0c41ffd4155c9a8c8" S = "${WORKDIR}/libva-${PV}" diff --git a/poky/meta/recipes-graphics/libva/libva_2.11.0.bb b/poky/meta/recipes-graphics/libva/libva_2.12.0.bb index 4d3fa5096..4d3fa5096 100644 --- a/poky/meta/recipes-graphics/libva/libva_2.11.0.bb +++ b/poky/meta/recipes-graphics/libva/libva_2.12.0.bb diff --git a/poky/meta/recipes-graphics/mesa/libglu_9.0.1.bb b/poky/meta/recipes-graphics/mesa/libglu_9.0.2.bb index 703f131f7..ae18f8653 100644 --- a/poky/meta/recipes-graphics/mesa/libglu_9.0.1.bb +++ b/poky/meta/recipes-graphics/mesa/libglu_9.0.2.bb @@ -10,12 +10,10 @@ LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b35645 # Epoch as this used to be part of mesa PE = "2" -PR = "0" SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.gz" -SRC_URI[md5sum] = "5599a0e0a97335e10239d9165aced60d" -SRC_URI[sha256sum] = "f6f484cfcd51e489afe88031afdea1e173aa652697e4c19ddbcb8260579a10f7" +SRC_URI[sha256sum] = "24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65" S = "${WORKDIR}/glu-${PV}" diff --git a/poky/meta/recipes-graphics/mesa/mesa-gl_21.1.3.bb b/poky/meta/recipes-graphics/mesa/mesa-gl_21.1.5.bb index dff79f0be..dff79f0be 100644 --- a/poky/meta/recipes-graphics/mesa/mesa-gl_21.1.3.bb +++ b/poky/meta/recipes-graphics/mesa/mesa-gl_21.1.5.bb diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index b7e42a9d7..6a0df4fa2 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -21,7 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ " -SRC_URI[sha256sum] = "cbe221282670875ffd762247b6a2c95dcee91d0a34c29802c75ef761fc891e69" +SRC_URI[sha256sum] = "022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/mesa/mesa_21.1.3.bb b/poky/meta/recipes-graphics/mesa/mesa_21.1.5.bb index 28abc91a8..28abc91a8 100644 --- a/poky/meta/recipes-graphics/mesa/mesa_21.1.3.bb +++ b/poky/meta/recipes-graphics/mesa/mesa_21.1.5.bb diff --git a/poky/meta/recipes-graphics/pango/pango_1.48.5.bb b/poky/meta/recipes-graphics/pango/pango_1.48.7.bb index b29c3c2d9..963fd5d01 100644 --- a/poky/meta/recipes-graphics/pango/pango_1.48.5.bb +++ b/poky/meta/recipes-graphics/pango/pango_1.48.7.bb @@ -20,7 +20,7 @@ GIR_MESON_DISABLE_FLAG = "disabled" SRC_URI += "file://run-ptest" -SRC_URI[archive.sha256sum] = "501e74496173c02dcd024ded7fbb3f09efd37e2a488e248aa40799424dbb3b2a" +SRC_URI[archive.sha256sum] = "28a82f6a6cab60aa3b75a90f04197ead2d311fa8fe8b7bfdf8666e2781d506dc" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" diff --git a/poky/meta/recipes-graphics/shaderc/shaderc_2021.0.bb b/poky/meta/recipes-graphics/shaderc/shaderc_2021.1.bb index 3d59e0c38..e15b5794e 100644 --- a/poky/meta/recipes-graphics/shaderc/shaderc_2021.0.bb +++ b/poky/meta/recipes-graphics/shaderc/shaderc_2021.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "1a3e2aaab191f44644e899e29ab7bac50bebdeb8" +SRCREV = "031a8c9715df5d7c69dcc1ee9d53cbfa35c7b026" SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ file://0001-cmake-disable-building-external-dependencies.patch \ file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ diff --git a/poky/meta/recipes-graphics/spir/spirv-tools_2021.1.bb b/poky/meta/recipes-graphics/spir/spirv-tools_2021.2.bb index 5795d93e5..6b5ad1ec0 100644 --- a/poky/meta/recipes-graphics/spir/spirv-tools_2021.1.bb +++ b/poky/meta/recipes-graphics/spir/spirv-tools_2021.2.bb @@ -7,7 +7,7 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "4b3707b788c84449a55f67257ae6aab3ca3552cb" +SRCREV = "e198c6a785d388db68eb9166b43ac5e5208fd5cc" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git \ file://0001-fix-strncpy-bound-error.patch \ " diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.176.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.182.0.bb index cff654a06..736af7b9e 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.176.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.182.0.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master" -SRCREV = "074fa3055cfee530992bcbfa0fcb23106a82c1ab" +SRCREV = "37164a5726f7e6113810f9557903a117498421cf" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.176.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb index e241a2f15..ec09fd0f7 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.176.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \ " -SRCREV = "eb6d6f95dff809d66e95b903105da6424e75862f" +SRCREV = "1896143df69d439b0933c1bb485f5a4587bdf2dc" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index a177d9a39..972173ef5 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -11,7 +11,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "04278ed5f0f9847ae6897509eb56d7b21b4e8cde" +SRCREV = "47c5237be21209afc945e43d03ae409fa80a0155" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.176.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.182.0.bb index 10fa0fdb3..d0a298ecf 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.176.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.182.0.bb @@ -6,8 +6,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.176" -SRCREV = "eb3d67bd17ee433e2b0a8e56a7249bd83908812e" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.182" +SRCREV = "9d3305731c3be8de05c9f223a79959d448506a37" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.0.1.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb index 1777492ed..5688eb476 100644 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.0.1.bb +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a22925127bd3c827c384cedd23ed2309" DEPENDS += "libinput" -SRC_URI[sha256sum] = "fddec49c115591918475155bf16aaf23017d7f814cee7823a0c11f867aca245b" +SRC_URI[sha256sum] = "e11d2a41419124a6e9b148f1df181bf7819fc7398c8ee9a1b6390b0742c68d16" FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.10.bb b/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.99.2.bb index 5a08e0736..8afa9aa52 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.10.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.99.2.bb @@ -17,7 +17,6 @@ PE = "1" XORG_PN = "libXi" -SRC_URI[md5sum] = "62c4af0839072024b4b1c8cbe84216c7" -SRC_URI[sha256sum] = "36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061" +SRC_URI[sha256sum] = "2ce90ebcb7fa0c3ed671924f1268b8f4c500fff62e1284699fc413e182a7896b" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index da025171d..8b0cc2748 100644 --- a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -15,7 +15,9 @@ PROVIDES += "virtual/xserver" PE = "2" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.xz" + +UPSTREAM_CHECK_REGEX = "xorg-server-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" CVE_PRODUCT = "xorg-server" diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.12.bb index 1eb2056b8..8f86bea87 100644 --- a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb +++ b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.12.bb @@ -8,7 +8,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ " -SRC_URI[sha256sum] = "914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49" +SRC_URI[sha256sum] = "336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. diff --git a/poky/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb b/poky/meta/recipes-graphics/xwayland/xwayland_21.1.2.bb index 8b1c96fc4..794a7bd98 100644 --- a/poky/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb +++ b/poky/meta/recipes-graphics/xwayland/xwayland_21.1.2.bb @@ -10,13 +10,31 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" -SRC_URI[sha256sum] = "31f261ce51bbee76a6ca3ec02aa367ffa2b5efa2b98412df57ccefd7a19003ce" +SRC_URI[sha256sum] = "b81cbdd5ad60b8b7ad8c3ecc7ec2a28c9bf021448670735cebb501f08bebd18b" + +UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar" inherit meson features_check REQUIRED_DISTRO_FEATURES = "x11 opengl" DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" +OPENGL_PKGCONFIGS = "glx glamor dri3" +PACKAGECONFIG ??= "${XORG_CRYPTO} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ +" +PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false" +PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" +PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" +PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" +PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" + +# Xorg requires a SHA1 implementation, pick one +XORG_CRYPTO ??= "openssl" +PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" +PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" +PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" + do_install_append() { # remove files not needed and clashing with xserver-xorg rm -rf ${D}/${libdir}/xorg/ diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch index b5c4e1750..b0e701413 100644 --- a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch +++ b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch @@ -13,17 +13,17 @@ Upstream-Status: Submitted include/uapi/linux/kernel.h | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-4.8-rc4/include/uapi/linux/kernel.h +Index: linux-5.12.11/include/uapi/linux/kernel.h =================================================================== ---- linux-4.8-rc4.orig/include/uapi/linux/kernel.h -+++ linux-4.8-rc4/include/uapi/linux/kernel.h -@@ -1,7 +1,9 @@ +--- linux-5.12.11.orig/include/uapi/linux/kernel.h ++++ linux-5.12.11/include/uapi/linux/kernel.h +@@ -2,7 +2,9 @@ #ifndef _UAPI_LINUX_KERNEL_H #define _UAPI_LINUX_KERNEL_H +#ifdef __GLIBC__ #include <linux/sysinfo.h> + #include <linux/const.h> +#endif - /* - * 'kernel.h' contains some often-used function prototypes etc + #endif /* _UAPI_LINUX_KERNEL_H */ diff --git a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb index d6a4d5aa6..251d00440 100644 --- a/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.10.bb +++ b/poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb @@ -14,6 +14,5 @@ SRC_URI_append = "\ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -SRC_URI[md5sum] = "753adc474bf799d569dec4f165ed92c3" -SRC_URI[sha256sum] = "dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43" - +SRC_URI[md5sum] = "76c60fb304510a7bbd9c838790bc5fe4" +SRC_URI[sha256sum] = "3f6baa97f37518439f51df2e4f3d65a822ca5ff016aa8e60d2cc53b95a6c89d9" diff --git a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb index 84e99233e..21b42833b 100644 --- a/poky/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/poky/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -112,6 +112,10 @@ do_install() { if [ "${ARCH}" = "arm64" ]; then cp -a --parents arch/arm64/kernel/vdso/vdso.lds $kerneldir/build/ fi + if [ "${ARCH}" = "powerpc" ]; then + cp -a --parents arch/powerpc/kernel/vdso32/vdso32.lds $kerneldir/build 2>/dev/null || : + cp -a --parents arch/powerpc/kernel/vdso64/vdso64.lds $kerneldir/build 2>/dev/null || : + fi cp -a include $kerneldir/build/include @@ -163,6 +167,14 @@ do_install() { cp -a --parents arch/arm64/kernel/vdso/gen_vdso_offsets.sh $kerneldir/build/ cp -a --parents arch/arm64/kernel/module.lds $kerneldir/build/ 2>/dev/null || : + + # 5.13+ needs these tools + cp -a --parents arch/arm64/tools/gen-cpucaps.awk $kerneldir/build/ 2>/dev/null || : + cp -a --parents arch/arm64/tools/cpucaps $kerneldir/build/ 2>/dev/null || : + + if [ -e $kerneldir/build/arch/arm64/tools/gen-cpucaps.awk ]; then + sed -i -e "s,#!.*awk.*,#!${USRBINPATH}/env awk," $kerneldir/build/arch/arm64/tools/gen-cpucaps.awk + fi fi if [ "${ARCH}" = "powerpc" ]; then @@ -170,6 +182,8 @@ do_install() { cp -a --parents arch/${ARCH}/kernel/syscalls/syscall.tbl $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/${ARCH}/kernel/syscalls/syscalltbl.sh $kerneldir/build/ 2>/dev/null || : cp -a --parents arch/${ARCH}/kernel/syscalls/syscallhdr.sh $kerneldir/build/ 2>/dev/null || : + cp -a --parents arch/${ARCH}/kernel/vdso32/* $kerneldir/build/ 2>/dev/null || : + cp -a --parents arch/${ARCH}/kernel/vdso64/* $kerneldir/build/ 2>/dev/null || : fi # include the machine specific headers for ARM variants, if available. @@ -273,7 +287,11 @@ do_install() { sed -i 's/ifneq "$(LD)" ".*-linux-.*ld.bfd.*$/ifneq "$(LD)" "ld"/' "$kerneldir/build/include/config/auto.conf.cmd" sed -i 's/ifneq "$(AR)" ".*-linux-.*ar.*$/ifneq "$(AR)" "ar"/' "$kerneldir/build/include/config/auto.conf.cmd" sed -i 's/ifneq "$(OBJCOPY)" ".*-linux-.*objcopy.*$/ifneq "$(OBJCOPY)" "objcopy"/' "$kerneldir/build/include/config/auto.conf.cmd" - sed -i 's/ifneq "$(NM)" ".*-linux-.*nm.*$/ifneq "$(NM)" "nm"/' "$kerneldir/build/include/config/auto.conf.cmd" + if [ "${ARCH}" = "powerpc" ]; then + sed -i 's/ifneq "$(NM)" ".*-linux-.*nm.*$/ifneq "$(NM)" "nm --synthetic"/' "$kerneldir/build/include/config/auto.conf.cmd" + else + sed -i 's/ifneq "$(NM)" ".*-linux-.*nm.*$/ifneq "$(NM)" "nm"/' "$kerneldir/build/include/config/auto.conf.cmd" + fi sed -i 's/ifneq "$(HOSTCXX)" ".*$/ifneq "$(HOSTCXX)" "g++"/' "$kerneldir/build/include/config/auto.conf.cmd" sed -i 's/ifneq "$(HOSTCC)" ".*$/ifneq "$(HOSTCC)" "gcc"/' "$kerneldir/build/include/config/auto.conf.cmd" sed -i 's/ifneq "$(CC_VERSION_TEXT)".*\(gcc.*\)"/ifneq "$(CC_VERSION_TEXT)" "\1"/' "$kerneldir/build/include/config/auto.conf.cmd" @@ -307,3 +325,7 @@ RDEPENDS_${PN} += "openssl-dev util-linux" RDEPENDS_${PN} += "${@bb.utils.contains('ARCH', 'x86', 'elfutils', '', d)}" # 5.8+ needs gcc-plugins libmpc-dev RDEPENDS_${PN} += "gcc-plugins libmpc-dev" +# 5.13+ needs awk for arm64 +RDEPENDS_${PN}_append_aarch64 = " gawk" +# 5.13+ needs grep for powerpc +RDEPENDS_${PN}_append_powerpc = " grep" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 877e8d294..133b1f6fe 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "6186341e981ad4fd3941c7c9af509923bbe2a2a5" -SRCREV_meta ?= "67dad5ca86bd47dbbaa2194b9854c228055dfd37" +SRCREV_machine ?= "dad5434fab65cdd316f940c5e9bd46e0d0607b5a" +SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.43" +LINUX_VERSION ?= "5.10.52" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb new file mode 100644 index 000000000..adcc84bd4 --- /dev/null +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb @@ -0,0 +1,45 @@ +KBRANCH ?= "v5.13/standard/preempt-rt/base" + +require recipes-kernel/linux/linux-yocto.inc + +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying +# to build multiple virtual/kernel providers, e.g. as dependency of +# core-image-rt-sdk, core-image-rt. +python () { + if d.getVar("KERNEL_PACKAGE_NAME") == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-yocto-rt": + raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") +} + +SRCREV_machine ?= "10eba41eae2548d854c5d1908db77e8235336191" +SRCREV_meta ?= "ab5f1940535350791d2e111e0e16b08be277568d" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.13;destsuffix=${KMETA}" + +LINUX_VERSION ?= "5.13.4" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "1" + +LINUX_KERNEL_TYPE = "preempt-rt" + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 432289292..a975004d7 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "08b154b1c1f1c85db88295a4169dff6826c2e383" -SRCREV_meta ?= "656383210d369bbd49a7a278c6c7c7313f0df825" +SRCREV_machine ?= "849a67646d942d3a6d706f456df39954367ac7bf" +SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.125" +LINUX_VERSION ?= "5.4.134" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index b44deb6f3..238123a42 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.43" +LINUX_VERSION ?= "5.10.52" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "9c63dda7dd5834bf731747d6ae03ae13d48e20e3" -SRCREV_machine ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" -SRCREV_meta ?= "67dad5ca86bd47dbbaa2194b9854c228055dfd37" +SRCREV_machine_qemuarm ?= "faa3b7802d0ee1fe0217283ecaf2c54c9503fa20" +SRCREV_machine ?= "240422889570d39c3f7d63808159c8e743117a1d" +SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb new file mode 100644 index 000000000..6598684bb --- /dev/null +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb @@ -0,0 +1,32 @@ +KBRANCH ?= "v5.13/standard/tiny/base" +KBRANCH_qemuarm ?= "v5.13/standard/tiny/arm-versatile-926ejs" + +LINUX_KERNEL_TYPE = "tiny" +KCONFIG_MODE = "--allnoconfig" + +require recipes-kernel/linux/linux-yocto.inc + +LINUX_VERSION ?= "5.13.4" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +SRCREV_machine_qemuarm ?= "e394a72e8bc77484bf7bae8c842c75b23cc3dd63" +SRCREV_machine ?= "7275d462cec720120d1767e277a2525d88901c80" +SRCREV_meta ?= "ab5f1940535350791d2e111e0e16b08be277568d" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.13;destsuffix=${KMETA}" + +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" + +# Functionality flags +KERNEL_FEATURES = "" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 6c93e2b16..95ead533d 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.125" +LINUX_VERSION ?= "5.4.134" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "35f9751972b9fba920b1666228a35e5ce0b04440" -SRCREV_machine ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee" -SRCREV_meta ?= "656383210d369bbd49a7a278c6c7c7313f0df825" +SRCREV_machine_qemuarm ?= "86c31c51c87557af60e4d4dbee73f18618bc4c92" +SRCREV_machine ?= "bf89a54b3f77fbac15dd0194870db288aee5c8b7" +SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto.inc b/poky/meta/recipes-kernel/linux/linux-yocto.inc index a85280990..eb3081ee3 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto.inc +++ b/poky/meta/recipes-kernel/linux/linux-yocto.inc @@ -34,6 +34,7 @@ KERNEL_LD_append_arc = " ${TOOLCHAIN_OPTIONS}" KERNEL_FEATURES_append_qemuall=" features/debug/printk.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'features/numa/numa.scc', '', d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vfat', 'cfg/fs/vfat.scc', '', d)}" # A KMACHINE is the mapping of a yocto $MACHINE to what is built # by the kernel. This is typically the branch that should be built, diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb index f99782c1b..40a2a5e3b 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "2fc3409cf8c2a6d684929576fd409949060a0bd9" -SRCREV_machine_qemuarm64 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" -SRCREV_machine_qemumips ?= "5cec6d1ab35feb99f023b233871cafa29e3c3682" -SRCREV_machine_qemuppc ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" -SRCREV_machine_qemuriscv64 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" -SRCREV_machine_qemuriscv32 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" -SRCREV_machine_qemux86 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" -SRCREV_machine_qemux86-64 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" -SRCREV_machine_qemumips64 ?= "769a7118662a2256e20df60be9c9727f9c5878b0" -SRCREV_machine ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" -SRCREV_meta ?= "67dad5ca86bd47dbbaa2194b9854c228055dfd37" +SRCREV_machine_qemuarm ?= "96a6083817785461bcabad63f3872d0a08b21c29" +SRCREV_machine_qemuarm64 ?= "c8d8b20a749f476020d0844d76f63cd9e4cca644" +SRCREV_machine_qemumips ?= "acdebd5080a846f3906ba1d5343d5af5c4b76522" +SRCREV_machine_qemuppc ?= "afd31d567447f4693b7c9af35f09bb37cc0c0fa4" +SRCREV_machine_qemuriscv64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" +SRCREV_machine_qemuriscv32 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" +SRCREV_machine_qemux86 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" +SRCREV_machine_qemux86-64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" +SRCREV_machine_qemumips64 ?= "efad0ca4150cddffa6d052ffb53fec0553de4da8" +SRCREV_machine ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" +SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -32,7 +32,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.43" +LINUX_VERSION ?= "5.10.52" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.13.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.13.bb new file mode 100644 index 000000000..497c3307d --- /dev/null +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.13.bb @@ -0,0 +1,68 @@ +KBRANCH ?= "v5.13/standard/base" + +require recipes-kernel/linux/linux-yocto.inc + +# board specific branches +KBRANCH_qemuarm ?= "v5.13/standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "v5.13/standard/qemuarm64" +KBRANCH_qemumips ?= "v5.13/standard/mti-malta32" +KBRANCH_qemuppc ?= "v5.13/standard/qemuppc" +KBRANCH_qemuriscv64 ?= "v5.13/standard/base" +KBRANCH_qemuriscv32 ?= "v5.13/standard/base" +KBRANCH_qemux86 ?= "v5.13/standard/base" +KBRANCH_qemux86-64 ?= "v5.13/standard/base" +KBRANCH_qemumips64 ?= "v5.13/standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "dc19ba17f4d43a220ae8129312703add02d03d1e" +SRCREV_machine_qemuarm64 ?= "1e086c08b65e8bd1f45f01fd8026599a62deb6c0" +SRCREV_machine_qemumips ?= "4dd19bc8178a6100a2cb9ffd8364e359230253c8" +SRCREV_machine_qemuppc ?= "73c8e406db9beb3a99a5dd3ea67824f0e3c0d7a8" +SRCREV_machine_qemuriscv64 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" +SRCREV_machine_qemuriscv32 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" +SRCREV_machine_qemux86 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" +SRCREV_machine_qemux86-64 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" +SRCREV_machine_qemumips64 ?= "0632623fd488acc7c78a4f48d4630caba5e6044e" +SRCREV_machine ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" +SRCREV_meta ?= "ab5f1940535350791d2e111e0e16b08be277568d" + +# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll +# get the <version>/base branch, which is pure upstream -stable, and the same +# meta SRCREV as the linux-yocto-standard builds. Select your version using the +# normal PREFERRED_VERSION settings. +BBCLASSEXTEND = "devupstream:target" +DEFAULT_PREFERENCE_class-devupstream = "-1" +SRCREV_machine_class-devupstream ?= "64376a981a0e2e57c46efa63197c2ebb7dab35df" +PN_class-devupstream = "linux-yocto-upstream" +KBRANCH_class-devupstream = "v5.13/base" + +# remap qemuarm to qemuarma15 for the 5.8 kernel +# KMACHINE_qemuarm ?= "qemuarma15" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.13;destsuffix=${KMETA}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +LINUX_VERSION ?= "5.13.4" + +DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" +DEPENDS += "openssl-native util-linux-native" +DEPENDS += "gmp-native" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "1" + +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" + +COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 7edab4931..90a557bb6 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "b523a950c926e2d7475768b504e46fa618a3b891" -SRCREV_machine_qemuarm64 ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee" -SRCREV_machine_qemumips ?= "bff59892e827bc85e85fef518305007a787812aa" -SRCREV_machine_qemuppc ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee" -SRCREV_machine_qemuriscv64 ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee" -SRCREV_machine_qemux86 ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee" -SRCREV_machine_qemux86-64 ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee" -SRCREV_machine_qemumips64 ?= "e25b97140f5d46ac437cd8a1d9ecc235cbf462b5" -SRCREV_machine ?= "bcd119e358de95fb4b8ff6d560e5dab8b8a5ecee" -SRCREV_meta ?= "656383210d369bbd49a7a278c6c7c7313f0df825" +SRCREV_machine_qemuarm ?= "bea52ab7529ef152f99a0f6ebd97cc7e904e5360" +SRCREV_machine_qemuarm64 ?= "8a29c9de0fc366bd89ce6954685dce0e330dbabe" +SRCREV_machine_qemumips ?= "b15816ccad0762d27c78c269e7a1986504e60c63" +SRCREV_machine_qemuppc ?= "906f9509a8d2f842ec8766bf81287f8939ff1fa8" +SRCREV_machine_qemuriscv64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" +SRCREV_machine_qemux86 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" +SRCREV_machine_qemux86-64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" +SRCREV_machine_qemumips64 ?= "152e33a0782920e9707c36ccacf53585a8911e9f" +SRCREV_machine ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" +SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.125" +LINUX_VERSION ?= "5.4.134" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc index dba96e0f6..cb1c9aaec 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc @@ -45,6 +45,3 @@ EXTRA_OEMESON += " \ GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" - -# Dynamically generate packages for all enabled plugins -PACKAGES_DYNAMIC = "^${PN}-.*" diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc index 9a7a1b6af..5b80a46b4 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc @@ -6,6 +6,9 @@ # This is mainly used by the gstreamer1.0-plugins-* plugin set recipes, # but can be used in any recipe that produces GStreamer plugins. +# Dynamically generate packages for all enabled plugins +PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*" + PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages " PACKAGESPLITFUNCS_append = " set_gstreamer10_metapkg_rdepends " diff --git a/poky/meta/recipes-multimedia/mpg123/mpg123_1.28.0.bb b/poky/meta/recipes-multimedia/mpg123/mpg123_1.28.2.bb index 143a59ba6..ebe11d413 100644 --- a/poky/meta/recipes-multimedia/mpg123/mpg123_1.28.0.bb +++ b/poky/meta/recipes-multimedia/mpg123/mpg123_1.28.2.bb @@ -10,7 +10,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169" SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" -SRC_URI[sha256sum] = "e49466853685026da5d113dc7ff026b1b2ad0b57d78df693a446add9db88a7d5" +SRC_URI[sha256sum] = "7eefd4b68fdac7e138d04c37efe12155a8ebf25a5bccf0fb7e775af22d21db00" UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 005cb36b8..4e226c616 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -182,8 +182,7 @@ FILES_libpulse = "${libdir}/libpulse.so.* ${sysconfdir}/pulse/client.conf" FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*" FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*" -FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake" -FILES_${PN}-conf = "${sysconfdir}" +FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala" FILES_${PN}-bin += "${sysconfdir}/default/volatiles/04_pulse" FILES_${PN}-pa-info = "${bindir}/pa-info" FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*" diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch new file mode 100644 index 000000000..5d9370fb1 --- /dev/null +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch @@ -0,0 +1,71 @@ +From 09f846fbdeb19193e778ce51baa77bd03c38372e Mon Sep 17 00:00:00 2001 +From: garrison <garrison@qemu15.qemu-network> +Date: Fri, 4 Jun 2021 22:13:02 +0000 +Subject: [PATCH] build-sys: meson: check if NEON code can be compiled on arm + +When Meson SIMD module returns HAVE_NEON=1 on arm host, do extra compile check +to verify compiler can actually handle NEON code. + +Related Meson issue #6361 https://github.com/mesonbuild/meson/issues/6361 + +Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/574> + +Upstream-Status: Backport[https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/6d2a49a6a1eacc2096d0d9473a074421c181ab56] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + src/pulsecore/meson.build | 41 +++++++++++++++++++++++++++++---------- + 1 file changed, 31 insertions(+), 10 deletions(-) + +diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build +index 99a702e..d0b7990 100644 +--- a/src/pulsecore/meson.build ++++ b/src/pulsecore/meson.build +@@ -172,16 +172,37 @@ endif + + # FIXME: SIMD support (ORC) + simd = import('unstable-simd') +-libpulsecore_simd = simd.check('libpulsecore_simd', +- mmx : ['remap_mmx.c', 'svolume_mmx.c'], +- sse : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'], +- neon : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'], +- c_args : [pa_c_args], +- include_directories : [configinc, topinc], +- implicit_include_directories : false, +- compiler : cc) +-libpulsecore_simd_lib = libpulsecore_simd[0] +-cdata.merge_from(libpulsecore_simd[1]) ++simd_variants = [ ++ { 'mmx' : ['remap_mmx.c', 'svolume_mmx.c'] }, ++ { 'sse' : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'] }, ++ { 'neon' : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'] }, ++] ++ ++libpulsecore_simd_lib = [] ++ ++foreach simd_kwargs : simd_variants ++ ++ if host_machine.cpu_family() == 'arm' and 'neon' in simd_kwargs ++ if not cc.compiles(''' ++ #include <arm_neon.h> ++ int main() { ++ return sizeof(uint8x8_t) + sizeof(int32x4_t) + sizeof(float32x4_t); ++ } ++ ''', name : 'neon code') ++ continue ++ endif ++ endif ++ ++ libpulsecore_simd = simd.check('libpulsecore_simd', ++ kwargs : simd_kwargs, ++ c_args : [pa_c_args], ++ include_directories : [configinc, topinc], ++ implicit_include_directories : false, ++ compiler : cc) ++ ++ libpulsecore_simd_lib += libpulsecore_simd[0] ++ cdata.merge_from(libpulsecore_simd[1]) ++endforeach + + # FIXME: Implement Windows support + #'mutex-win32.c', diff --git a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb index 9b8338a66..a7ea8cacc 100644 --- a/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb +++ b/poky/meta/recipes-multimedia/pulseaudio/pulseaudio_14.2.bb @@ -7,6 +7,7 @@ SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/${BP}.tar.xz \ file://0001-meson-Check-for-__get_cpuid.patch \ file://volatiles.04_pulse \ file://0001-doxygen-meson.build-remove-dependency-on-doxygen-bin.patch \ + file://0001-build-sys-meson-check-if-NEON-code-can-be-compiled-o.patch \ " SRC_URI[md5sum] = "1efc916251910f1e9d4df7810e3e69f8" SRC_URI[sha256sum] = "75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1" diff --git a/poky/meta/recipes-multimedia/x264/x264_git.bb b/poky/meta/recipes-multimedia/x264/x264_git.bb index 81354a8fd..902396e4b 100644 --- a/poky/meta/recipes-multimedia/x264/x264_git.bb +++ b/poky/meta/recipes-multimedia/x264/x264_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "55d517bc4569272a2c9a367a4106c234aba2ffbc" +SRCREV = "5db6aa6cab1b146e07b60cc1736a01f21da01154" PV = "r3039+git${SRCPV}" diff --git a/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch index b177ff7c5..56556dfe6 100644 --- a/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch +++ b/poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch @@ -1,4 +1,4 @@ -From b608a817df2b652cd5fa1b5a7cf14b7d2d8afd5f Mon Sep 17 00:00:00 2001 +From 7b0ab10370cad38e26c5ffaaa55a1fd77fff0f18 Mon Sep 17 00:00:00 2001 From: Randy Witt <randy.e.witt@intel.com> Date: Fri, 16 Oct 2020 16:54:30 -0700 Subject: [PATCH] Makefile: Allow for CC and AR to be overridden @@ -9,16 +9,17 @@ commit 7763cf316d7896fa05b816a46998f0827ab6e6eb. Signed-off-by: Randy Witt <randy.e.witt@intel.com> Upstream-Status: Inappropriate [other] + --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 636f191..9f57d2c 100644 +index 63cd77c..495d6bb 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ - VERSION = 1.10 + VERSION = 2.1 -CC = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar +CC ?= $(CROSS_COMPILE)gcc @@ -26,6 +27,3 @@ index 636f191..9f57d2c 100644 OBJDIR = bld --- -2.29.2 - diff --git a/poky/meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb b/poky/meta/recipes-rt/rt-tests/hwlatdetect_git.bb index 5f61c4ecd..5f61c4ecd 100644 --- a/poky/meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb +++ b/poky/meta/recipes-rt/rt-tests/hwlatdetect_git.bb diff --git a/poky/meta/recipes-rt/rt-tests/rt-tests.inc b/poky/meta/recipes-rt/rt-tests/rt-tests.inc index e97140add..5ce4d298b 100644 --- a/poky/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/poky/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,7 +1,7 @@ -SRCREV = "c9051a36d934503b4673ca5615f631bae36dead0" -PV = "1.10+git${SRCPV}" +SRCREV = "667e1aae896f8448615b062d27c818b32cb960ff" +PV = "2.1" PE = "1" -SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=unstable/devel/latest" +SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-rt/rt-tests/rt-tests_1.10.bb b/poky/meta/recipes-rt/rt-tests/rt-tests_git.bb index 89e3323b6..89e3323b6 100644 --- a/poky/meta/recipes-rt/rt-tests/rt-tests_1.10.bb +++ b/poky/meta/recipes-rt/rt-tests/rt-tests_git.bb diff --git a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch index efe286ed6..21828a7ec 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch +++ b/poky/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch @@ -1,4 +1,4 @@ -From af90ae1f128626e8d57a8bcbc432596bfc2987af Mon Sep 17 00:00:00 2001 +From 1a7becde0e508d7fac488bae6c08c1a4a0ac6b73 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 3 Feb 2020 17:06:27 -0800 Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG @@ -20,11 +20,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 2 files changed, 2 insertions(+) diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index af6c0fac..f393d741 100644 +index 1f500299..0771af9c 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN() - SET_PROJECT_VERSION(2 32 1) + SET_PROJECT_VERSION(2 32 2) set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") +set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/poky/meta/recipes-sato/webkit/webkitgtk_2.32.1.bb b/poky/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb index 7abf96c25..96b6cab49 100644 --- a/poky/meta/recipes-sato/webkit/webkitgtk_2.32.1.bb +++ b/poky/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb @@ -22,7 +22,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch \ " -SRC_URI[sha256sum] = "136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917" +SRC_URI[sha256sum] = "1790f86975bdef957ba9a12fc09202de8f55c885ee38467afc50d2bdb7a6c5cd" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc diff --git a/poky/meta/recipes-support/atk/at-spi2-core_2.40.2.bb b/poky/meta/recipes-support/atk/at-spi2-core_2.40.3.bb index ebd3ed49c..b1a7b51b9 100644 --- a/poky/meta/recipes-support/atk/at-spi2-core_2.40.2.bb +++ b/poky/meta/recipes-support/atk/at-spi2-core_2.40.3.bb @@ -11,7 +11,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "44dc17af943b0fd196c61c1e03b6c166960385cae96ccb5e95bdefffb6849f98" +SRC_URI[sha256sum] = "e49837c2ad30d71e1f29ca8e0968a54b95030272f7ff40b89b48968653f37a5c" X11DEPENDS = "virtual/libx11 libxi libxtst" diff --git a/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb b/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb index 407653590..67738c3c8 100644 --- a/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb +++ b/poky/meta/recipes-support/bash-completion/bash-completion_2.11.bb @@ -37,6 +37,4 @@ PACKAGES =+ "${PN}-extra" FILES_${PN}-extra = "${datadir}/${BPN}/completions/ \ ${datadir}/${BPN}/helpers/" -FILES_${PN}-dev += "${datadir}/cmake" - BBCLASSEXTEND = "nativesdk" diff --git a/poky/meta/recipes-support/boost/boost-build-native_4.4.1.bb b/poky/meta/recipes-support/boost/boost-build-native_4.4.1.bb index ad675ce73..d4df5b5cf 100644 --- a/poky/meta/recipes-support/boost/boost-build-native_4.4.1.bb +++ b/poky/meta/recipes-support/boost/boost-build-native_4.4.1.bb @@ -20,7 +20,7 @@ do_compile() { } do_install() { - ./b2 install --prefix=${prefix} staging-prefix=${D}${prefix} + HOME=/var/run ./b2 install --prefix=${prefix} staging-prefix=${D}${prefix} } # The build is either release mode (pre-stripped) or debug (-O0). diff --git a/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-fix-non-literal-format-string-issue-with-clang.patch b/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-fix-non-literal-format-string-issue-with-clang.patch new file mode 100644 index 000000000..39efa4a46 --- /dev/null +++ b/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing/0001-fix-non-literal-format-string-issue-with-clang.patch @@ -0,0 +1,31 @@ +From df625a36be8e0c7afa68b3dd23907dc7d658c59a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 8 Jul 2021 23:13:30 -0700 +Subject: [PATCH] fix non-literal format string issue with clang + +clang errors out when using -Werror=format-nonliteral +since the definition of g_strdup_vprintf() from glib-2.0 +is using va_list and clang seems to still warn where as +gcc doesn't do that for va_list arguments + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/merge_requests/9] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/gnome-desktop-testing-runner.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gnome-desktop-testing-runner.c b/src/gnome-desktop-testing-runner.c +index d75b71c..da49e14 100644 +--- a/src/gnome-desktop-testing-runner.c ++++ b/src/gnome-desktop-testing-runner.c +@@ -74,7 +74,7 @@ static const char * const test_log_message_ids[] = { + static gboolean opt_quiet = FALSE; + static gboolean opt_tap = FALSE; + +-static void ++static void G_GNUC_PRINTF (3, 0) + test_log (TestLog what, + const char *test_name, + const char *format, +-- +2.32.0 diff --git a/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb b/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb index e5c69c0c4..10200f539 100644 --- a/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2018.1.bb +++ b/poky/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb @@ -9,8 +9,10 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://src/gnome-desktop-testing-runner.c;beginline=1;endline=20;md5=7ef3ad9da2ffcf7707dc11151fe007f4" -SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http" -SRCREV = "4decade67b29ad170fcf3de148e41695fc459f48" +SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;protocol=http \ + file://0001-fix-non-literal-format-string-issue-with-clang.patch \ + " +SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7" DEPENDS = "glib-2.0" diff --git a/poky/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch b/poky/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch new file mode 100644 index 000000000..1c46684c6 --- /dev/null +++ b/poky/meta/recipes-support/gpgme/gpgme/0001-use-closefrom-on-linux-and-glibc-2.34.patch @@ -0,0 +1,24 @@ +From adb1d4e5498a19e9d591ac8f42f9ddfdb23a1354 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 15 Jul 2021 12:33:13 -0700 +Subject: [PATCH] use closefrom() on linux and glibc 2.34+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/posix-io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/posix-io.c b/src/posix-io.c +index e712ef2..ab8ded9 100644 +--- a/src/posix-io.c ++++ b/src/posix-io.c +@@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags, + if (fd_list[i].fd > fd) + fd = fd_list[i].fd; + fd++; +-#if defined(__sun) || defined(__FreeBSD__) ++#if defined(__sun) || defined(__FreeBSD__) || (defined(__GLIBC__) && __GNUC_PREREQ(2, 34)) + closefrom (fd); + max_fds = fd; + #else /*!__sun */ diff --git a/poky/meta/recipes-support/gpgme/gpgme_1.15.1.bb b/poky/meta/recipes-support/gpgme/gpgme_1.16.0.bb index dc38aa8e3..13f456fcf 100644 --- a/poky/meta/recipes-support/gpgme/gpgme_1.15.1.bb +++ b/poky/meta/recipes-support/gpgme/gpgme_1.16.0.bb @@ -20,9 +20,10 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ file://0006-fix-build-path-issue.patch \ file://0007-python-Add-variables-to-tests.patch \ file://0008-do-not-auto-check-var-PYTHON.patch \ - " + file://0001-use-closefrom-on-linux-and-glibc-2.34.patch \ + " -SRC_URI[sha256sum] = "eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad" +SRC_URI[sha256sum] = "6c8cc4aedb10d5d4c905894ba1d850544619ee765606ac43df7405865de29ed0" DEPENDS = "libgpg-error libassuan" RDEPENDS_${PN}-cpp += "libstdc++" @@ -71,9 +72,7 @@ PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-gpg ', '' FILES_${PN}-cpp = "${libdir}/libgpgmepp.so.*" FILES_python2-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" FILES_python3-gpg = "${PYTHON_SITEPACKAGES_DIR}/*" -FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/* \ - ${libdir}/cmake/* \ -" +FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" CFLAGS_append_libc-musl = " -D__error_t_defined " do_configure_prepend () { diff --git a/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch b/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch index 414e45a6f..55872aa8f 100644 --- a/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch +++ b/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch @@ -7,14 +7,13 @@ This fails on e.g. centos 7 Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- progs/Makefile | 2 +- tests/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/progs/Makefile b/progs/Makefile -index 289186e..071a285 100644 +index 3e82862..48533f3 100644 --- a/progs/Makefile +++ b/progs/Makefile @@ -49,7 +49,7 @@ capsh: capsh.c capshdoc.h.cf $(DEPS) @@ -24,8 +23,8 @@ index 289186e..071a285 100644 - $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static + $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - sudotest: test tcapsh-static - sudo $(LDPATH) ./quicktest.sh + uns_test: ../tests/uns_test.c + $(MAKE) -C ../tests uns_test diff --git a/tests/Makefile b/tests/Makefile index 4a5f2f9..4266d86 100644 --- a/tests/Makefile @@ -48,3 +47,6 @@ index 4a5f2f9..4266d86 100644 clean: rm -f psx_test libcap_psx_test libcap_launch_test uns_test *~ +-- +2.25.1 + diff --git a/poky/meta/recipes-support/libcap/libcap_2.50.bb b/poky/meta/recipes-support/libcap/libcap_2.51.bb index 15137f0ac..a43dca9f1 100644 --- a/poky/meta/recipes-support/libcap/libcap_2.50.bb +++ b/poky/meta/recipes-support/libcap/libcap_2.51.bb @@ -14,7 +14,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ file://0002-tests-do-not-run-target-executables.patch \ file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[sha256sum] = "47a57b8bd238b84c93c921a9b4ff82337551dbcb0cca071316aadf3e23b19261" +SRC_URI[sha256sum] = "6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" diff --git a/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128-part2.patch b/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128-part2.patch deleted file mode 100644 index 6b5b7d474..000000000 --- a/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128-part2.patch +++ /dev/null @@ -1,34 +0,0 @@ -Address platforms with no __int128. - -Fixes remaining pieces from -https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/src/powerpc/ffi_linux64.c.org 2019-12-05 14:48:33.140579431 -0800 -+++ a/src/powerpc/ffi_linux64.c 2019-12-05 14:53:58.827244495 -0800 -@@ -680,9 +680,9 @@ ffi_prep_args64 (extended_cif *ecif, uns - { - if (vecarg_count < NUM_VEC_ARG_REGISTERS64 - && i < nfixedargs) -- *vec_base.f128++ = *arg.f128++; -+ memcpy (vec_base.f128++, arg.f128, sizeof (float128)); - else -- *next_arg.f128 = *arg.f128++; -+ memcpy (next_arg.f128, arg.f128++, sizeof (float128)); - if (++next_arg.f128 == gpr_end.f128) - next_arg.f128 = rest.f128; - vecarg_count++; -@@ -986,9 +986,9 @@ ffi_closure_helper_LINUX64 (ffi_cif *cif - do - { - if (pvec < end_pvec && i < nfixedargs) -- *to.f128 = *pvec++; -+ memcpy (to.f128, pvec++, sizeof (float128)); - else -- *to.f128 = *from.f128; -+ memcpy (to.f128, from.f128, sizeof (float128)); - to.f128++; - from.f128++; - } diff --git a/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128.patch b/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128.patch deleted file mode 100644 index 2e32a5029..000000000 --- a/poky/meta/recipes-support/libffi/libffi/0001-Address-platforms-with-no-__int128.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 68f45b9049dffb54f5a29a3a495ab3dfcf010634 Mon Sep 17 00:00:00 2001 -From: Anthony Green <green@moxielogic.com> -Date: Fri, 29 Nov 2019 07:00:35 -0500 -Subject: [PATCH] Address platforms with no __int128. - -Upstream-Status: Backport [https://github.com/libffi/libffi/commit/6663047f56c2932a6b10a790f4ac6666dd181326] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - src/powerpc/ffi_linux64.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/powerpc/ffi_linux64.c b/src/powerpc/ffi_linux64.c -index de0d033..7364770 100644 ---- a/src/powerpc/ffi_linux64.c -+++ b/src/powerpc/ffi_linux64.c -@@ -547,9 +547,9 @@ ffi_prep_args64 (extended_cif *ecif, unsigned long *const stack) - if (next_arg.ul == gpr_end.ul) - next_arg.ul = rest.ul; - if (vecarg_count < NUM_VEC_ARG_REGISTERS64 && i < nfixedargs) -- *vec_base.f128++ = **p_argv.f128; -+ memcpy (vec_base.f128++, *p_argv.f128, sizeof (float128)); - else -- *next_arg.f128 = **p_argv.f128; -+ memcpy (next_arg.f128, *p_argv.f128, sizeof (float128)); - if (++next_arg.f128 == gpr_end.f128) - next_arg.f128 = rest.f128; - vecarg_count++; diff --git a/poky/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch b/poky/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch deleted file mode 100644 index 397194bc9..000000000 --- a/poky/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 14e2e74682db3bfcf057688f738fdd842a02ff2d Mon Sep 17 00:00:00 2001 -From: Carl Hurd <carl@Carls-MacBook-Pro.local> -Date: Wed, 18 Jul 2018 09:04:32 -0400 -Subject: [PATCH] Fixed missed #ifndef for __mips_soft_float - -Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> -Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/442] ---- - src/mips/o32.S | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/mips/o32.S b/src/mips/o32.S -index 44e74cb..799139b 100644 ---- a/src/mips/o32.S -+++ b/src/mips/o32.S -@@ -282,9 +282,11 @@ $LCFI12: - li $13, 1 # FFI_O32 - bne $16, $13, 1f # Skip fp save if FFI_O32_SOFT_FLOAT - -+#ifndef __mips_soft_float - # Store all possible float/double registers. - s.d $f12, FA_0_0_OFF2($fp) - s.d $f14, FA_1_0_OFF2($fp) -+#endif - 1: - # prepare arguments for ffi_closure_mips_inner_O32 - REG_L a0, 4($15) # cif diff --git a/poky/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch b/poky/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch index 782dce70d..5e529d1ce 100644 --- a/poky/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch +++ b/poky/meta/recipes-support/libffi/libffi/0001-arm-sysv-reverted-clang-VFP-mitigation.patch @@ -4,9 +4,9 @@ Date: Fri, 27 Nov 2020 15:28:42 +0000 Subject: [PATCH] arm/sysv: reverted clang VFP mitigation Since commit e3d2812ce43940aacae5bab2d0e965278cb1e7ea, -seperate instructions were used when compiling under clang, +seperate instructions were used when compiling under clang, as clang didn't allow the directives at the time. This mitigation -now causes compilation to fail under clang 10, as described by +now causes compilation to fail under clang 10, as described by https://github.com/libffi/libffi/issues/607. Now that clang supports the LDC and SDC instructions, this mitigation has been reverted. @@ -18,25 +18,25 @@ Signed-off-by: Brett Warren <brett.warren@arm.com> 1 file changed, 33 deletions(-) diff --git a/src/arm/sysv.S b/src/arm/sysv.S -index 63180a4..e3ce526 100644 +index fb36213..e4272a1 100644 --- a/src/arm/sysv.S +++ b/src/arm/sysv.S -@@ -128,13 +128,8 @@ ARM_FUNC_START(ffi_call_VFP) - cfi_startproc +@@ -142,13 +142,8 @@ ARM_FUNC_START(ffi_call_VFP) cmp r3, #3 @ load only d0 if possible + ite le -#ifdef __clang__ -- vldrle d0, [sp] -- vldmgt sp, {d0-d7} +- vldrle d0, [r0] +- vldmgt r0, {d0-d7} -#else - ldcle p11, cr0, [r0] @ vldrle d0, [sp] - ldcgt p11, cr0, [r0], {16} @ vldmgt sp, {d0-d7} + ldcle p11, cr0, [r0] @ vldrle d0, [r0] + ldcgt p11, cr0, [r0], {16} @ vldmgt r0, {d0-d7} -#endif add r0, r0, #64 @ discard the vfp register args /* FALLTHRU */ ARM_FUNC_END(ffi_call_VFP) -@@ -172,25 +167,13 @@ ARM_FUNC_START(ffi_call_SYSV) - nop +@@ -193,25 +188,13 @@ ARM_FUNC_START(ffi_call_SYSV) + #endif 0: E(ARM_TYPE_VFP_S) -#ifdef __clang__ @@ -61,7 +61,7 @@ index 63180a4..e3ce526 100644 pop {fp,pc} E(ARM_TYPE_INT64) str r1, [r2, #4] -@@ -287,11 +270,7 @@ ARM_FUNC_START(ffi_closure_VFP) +@@ -320,11 +303,7 @@ ARM_FUNC_START(ffi_closure_VFP) add ip, sp, #16 sub sp, sp, #64+32 @ allocate frame cfi_adjust_cfa_offset(64+32) @@ -73,7 +73,7 @@ index 63180a4..e3ce526 100644 stmdb sp!, {ip,lr} /* See above. */ -@@ -320,25 +299,13 @@ ARM_FUNC_START_LOCAL(ffi_closure_ret) +@@ -358,25 +337,13 @@ ARM_FUNC_START_LOCAL(ffi_closure_ret) cfi_rel_offset(lr, 4) 0: E(ARM_TYPE_VFP_S) @@ -82,23 +82,23 @@ index 63180a4..e3ce526 100644 -#else ldc p10, cr0, [r2] @ vldr s0, [r2] -#endif - ldm sp, {sp,pc} + b call_epilogue E(ARM_TYPE_VFP_D) -#ifdef __clang__ - vldr d0, [r2] -#else ldc p11, cr0, [r2] @ vldr d0, [r2] -#endif - ldm sp, {sp,pc} + b call_epilogue E(ARM_TYPE_VFP_N) -#ifdef __clang__ - vldm r2, {d0-d3} -#else ldc p11, cr0, [r2], {8} @ vldm r2, {d0-d3} -#endif - ldm sp, {sp,pc} + b call_epilogue E(ARM_TYPE_INT64) ldr r1, [r2, #4] -- -2.17.1 +2.25.1 diff --git a/poky/meta/recipes-support/libffi/libffi/0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch b/poky/meta/recipes-support/libffi/libffi/0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch deleted file mode 100644 index 52e6e4536..000000000 --- a/poky/meta/recipes-support/libffi/libffi/0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch +++ /dev/null @@ -1,62 +0,0 @@ -From de93adfb6f48100946bba2c3abad2a77a0cfde0b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Date: Sun, 24 Nov 2019 09:52:01 +0100 -Subject: [PATCH] ffi_powerpc.h: fix build failure with powerpc7 - -This is a patch pulled down from the following: -https://github.com/buildroot/buildroot/blob/78926f610b1411b03464152472fd430012deb9ac/package/libffi/0004-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch - -This issue is being hit on OpenBMC code when pulling the latest -libffi tag and building on a P8 ppc64le machine. I verified this -patch fixes the issue we are seeing. - -Below is the original commit message: - -Sicne commit 73dd43afc8a447ba98ea02e9aad4c6898dc77fb0, build on powerpc7 -fails on: - -In file included from ../src/powerpc/ffi.c:33:0: -../src/powerpc/ffi_powerpc.h:61:9: error: '_Float128' is not supported on this target - typedef _Float128 float128; - ^~~~~~~~~ - -Fix this build failure by checking for __HAVE_FLOAT128 before using -_Float128, as _Float128 is enabled only on specific conditions, see -output/host/powerpc64-buildroot-linux-gnu/sysroot/usr/include/bits/floatn.h: - - /* Defined to 1 if the current compiler invocation provides a - floating-point type with the IEEE 754 binary128 format, and this glibc - includes corresponding *f128 interfaces for it. */ - #if defined _ARCH_PWR8 && defined __LITTLE_ENDIAN__ && (_CALL_ELF == 2) \ - && defined __FLOAT128__ && !defined __NO_LONG_DOUBLE_MATH - # define __HAVE_FLOAT128 1 - #else - # define __HAVE_FLOAT128 0 - #endif - -Fixes: - - http://autobuild.buildroot.org/results/5c9dd8fb3b6a128882b6250f197c80232d8a3b53 - -Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/561] -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> -Signed-off-by: Andrew Geissler <geissonator@yahoo.com> ---- - src/powerpc/ffi_powerpc.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h -index 8e2f2f0..960a5c4 100644 ---- a/src/powerpc/ffi_powerpc.h -+++ b/src/powerpc/ffi_powerpc.h -@@ -57,7 +57,7 @@ typedef union - double d; - } ffi_dblfl; - --#if defined(__FLOAT128_TYPE__) -+#if defined(__FLOAT128_TYPE__) && defined(__HAVE_FLOAT128) - typedef _Float128 float128; - #elif defined(__FLOAT128__) - typedef __float128 float128; --- -2.21.0 (Apple Git-122) - diff --git a/poky/meta/recipes-support/libffi/libffi/0001-powerpc-fix-build-failure-on-power7-and-older-532.patch b/poky/meta/recipes-support/libffi/libffi/0001-powerpc-fix-build-failure-on-power7-and-older-532.patch deleted file mode 100644 index 8a7aea431..000000000 --- a/poky/meta/recipes-support/libffi/libffi/0001-powerpc-fix-build-failure-on-power7-and-older-532.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4dc6cc961300b9deffb648b1237390a5bea1c6d6 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Thu, 28 Nov 2019 12:42:41 +0000 -Subject: [PATCH] powerpc: fix build failure on power7 and older (#532) - -Build failure looks as: -``` -libtool: compile: powerpc-unknown-linux-gnu-gcc \ - -O2 -mcpu=powerpc -mtune=powerpc -pipe ... -c src/powerpc/ffi.c ... -In file included from src/powerpc/ffi.c:33: -src/powerpc/ffi_powerpc.h:65:9: error: '__int128' is not supported on this target - 65 | typedef __int128 float128; - | ^~~~~~~~ -``` - -The fix avoids using __int128 in favour of aligned char[16]. - -Closes: https://github.com/libffi/libffi/issues/531 -Upstream-Status: Backport [https://github.com/libffi/libffi/commit/01a75ed76ea7e57f1b7a5c183e2b1e890e6aa0fd] -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - src/powerpc/ffi_powerpc.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/powerpc/ffi_powerpc.h b/src/powerpc/ffi_powerpc.h -index 5ee2a70..8e2f2f0 100644 ---- a/src/powerpc/ffi_powerpc.h -+++ b/src/powerpc/ffi_powerpc.h -@@ -62,7 +62,7 @@ typedef _Float128 float128; - #elif defined(__FLOAT128__) - typedef __float128 float128; - #else --typedef __int128 float128; -+typedef char float128[16] __attribute__((aligned(16))); - #endif - - void FFI_HIDDEN ffi_closure_SYSV (void); diff --git a/poky/meta/recipes-support/libffi/libffi_3.3.bb b/poky/meta/recipes-support/libffi/libffi_3.4.2.bb index 10ef00324..19b6ed3e5 100644 --- a/poky/meta/recipes-support/libffi/libffi_3.3.bb +++ b/poky/meta/recipes-support/libffi/libffi_3.4.2.bb @@ -8,23 +8,17 @@ library really only provides the lowest, machine dependent layer of a fully feat A layer must exist above `libffi' that handles type conversions for values passed between the two languages." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=492385fe22195952f5b9b197868ba268" +LIC_FILES_CHKSUM = "file://LICENSE;md5=679b5c9bdc79a2b93ee574e193e7a7bc" SRC_URI = "https://github.com/libffi/libffi/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ file://not-win32.patch \ - file://0001-Fixed-missed-ifndef-for-__mips_soft_float.patch \ file://0001-arm-sysv-reverted-clang-VFP-mitigation.patch \ - file://0001-powerpc-fix-build-failure-on-power7-and-older-532.patch \ - file://0001-Address-platforms-with-no-__int128.patch \ - file://0001-Address-platforms-with-no-__int128-part2.patch \ - file://0001-ffi_powerpc.h-fix-build-failure-with-powerpc7.patch \ " -SRC_URI[md5sum] = "6313289e32f1d38a9df4770b014a2ca7" -SRC_URI[sha256sum] = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056" +SRC_URI[sha256sum] = "540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620" UPSTREAM_CHECK_URI = "https://github.com/libffi/libffi/releases/" UPSTREAM_CHECK_REGEX = "libffi-(?P<pver>\d+(\.\d+)+)\.tar" -EXTRA_OECONF += "--disable-builddir" +EXTRA_OECONF += "--disable-builddir --disable-exec-static-tramp" EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'" inherit autotools texinfo multilib_header diff --git a/poky/meta/recipes-support/libgit2/libgit2_1.1.0.bb b/poky/meta/recipes-support/libgit2/libgit2_1.1.1.bb index 2bbf59ea7..ae30a7a10 100644 --- a/poky/meta/recipes-support/libgit2/libgit2_1.1.0.bb +++ b/poky/meta/recipes-support/libgit2/libgit2_1.1.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.1" -SRCREV = "7f4fa178629d559c037a1f72f79f79af9c1ef8ce" +SRCREV = "8a0dc6783c340e61a44c179c48f832165ad2053c" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-support/libpcre/libpcre_8.44.bb b/poky/meta/recipes-support/libpcre/libpcre_8.45.bb index cd80dc734..345c46e86 100644 --- a/poky/meta/recipes-support/libpcre/libpcre_8.44.bb +++ b/poky/meta/recipes-support/libpcre/libpcre_8.45.bb @@ -6,14 +6,13 @@ SUMMARY = "Perl Compatible Regular Expressions" HOMEPAGE = "http://www.pcre.org" SECTION = "devel" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e" +LIC_FILES_CHKSUM = "file://LICENCE;md5=b5d5d1a69a24ea2718263f1ff85a1c58" SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \ file://run-ptest \ file://Makefile \ " -SRC_URI[md5sum] = "cf7326204cc46c755b5b2608033d9d24" -SRC_URI[sha256sum] = "19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d" +SRC_URI[sha256sum] = "4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8" CVE_PRODUCT = "pcre" diff --git a/poky/meta/recipes-support/libseccomp/files/0001-arch-Add-riscv32-architecture-support.patch b/poky/meta/recipes-support/libseccomp/files/0001-arch-Add-riscv32-architecture-support.patch new file mode 100644 index 000000000..62bd61fb5 --- /dev/null +++ b/poky/meta/recipes-support/libseccomp/files/0001-arch-Add-riscv32-architecture-support.patch @@ -0,0 +1,734 @@ +From 6d127a0463ea2d7bb5021562678324e28e0407e5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 8 Jun 2021 19:45:34 -0700 +Subject: [PATCH 1/2] arch: Add riscv32 architecture support + +Support for rv32 was upstreamed into 5.4+ kernel + +Upstream-Status: Submitted [https://github.com/seccomp/libseccomp/pull/327] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CREDITS | 1 + + README.md | 1 + + doc/man/man1/scmp_sys_resolver.1 | 2 +- + doc/man/man3/seccomp_arch_add.3 | 1 + + include/seccomp-syscalls.h | 31 ++++++++++++++++++ + include/seccomp.h.in | 9 ++++++ + src/Makefile.am | 1 + + src/arch-riscv32.c | 31 ++++++++++++++++++ + src/arch-riscv32.h | 22 +++++++++++++ + src/arch-syscall-dump.c | 4 +++ + src/arch-syscall-validate | 51 +++++++++++++++++++++++++++++- + src/arch.c | 11 ++++++- + src/gen_pfc.c | 2 ++ + src/python/libseccomp.pxd | 1 + + src/python/seccomp.pyx | 2 ++ + src/syscalls.c | 1 + + src/syscalls.csv | 2 +- + src/syscalls.h | 2 ++ + src/system.c | 1 + + tests/15-basic-resolver.c | 1 + + tests/16-sim-arch_basic.c | 6 ++++ + tests/16-sim-arch_basic.py | 1 + + tests/23-sim-arch_all_le_basic.c | 3 ++ + tests/23-sim-arch_all_le_basic.py | 1 + + tests/56-basic-iterate_syscalls.c | 1 + + tests/56-basic-iterate_syscalls.py | 1 + + tests/regression | 5 +-- + tools/scmp_arch_detect.c | 3 ++ + tools/scmp_bpf_disasm.c | 2 ++ + tools/scmp_bpf_sim.c | 2 ++ + tools/util.c | 6 +++- + tools/util.h | 7 ++++ + 32 files changed, 208 insertions(+), 7 deletions(-) + create mode 100644 src/arch-riscv32.c + create mode 100644 src/arch-riscv32.h + +diff --git a/CREDITS b/CREDITS +index d6bbc2a..ad2f7e0 100644 +--- a/CREDITS ++++ b/CREDITS +@@ -33,6 +33,7 @@ John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> + Jonah Petri <jonah@petri.us> + Justin Cormack <justin.cormack@docker.com> + Kees Cook <keescook@chromium.org> ++Khem Raj <raj.khem@gmail.com> + Kyle R. Conway <kyle.r.conway@gmail.com> + Kenta Tada <Kenta.Tada@sony.com> + Luca Bruno <lucab@debian.org> +diff --git a/README.md b/README.md +index ba02186..2cd718f 100644 +--- a/README.md ++++ b/README.md +@@ -54,6 +54,7 @@ The libseccomp library currently supports the architectures listed below: + * 32-bit s390 (s390) + * 64-bit s390x (s390x) + * 64-bit RISC-V (riscv64) ++* 32-bit RISC-V (riscv32) + * 32-bit SuperH big endian (sheb) + * 32-bit SuperH (sh) + +diff --git a/doc/man/man1/scmp_sys_resolver.1 b/doc/man/man1/scmp_sys_resolver.1 +index 267187b..fc68d18 100644 +--- a/doc/man/man1/scmp_sys_resolver.1 ++++ b/doc/man/man1/scmp_sys_resolver.1 +@@ -36,7 +36,7 @@ The architecture to use for resolving the system call. Valid + .I ARCH + values are "x86", "x86_64", "x32", "arm", "aarch64", "mips", "mipsel", "mips64", + "mipsel64", "mips64n32", "mipsel64n32", "parisc", "parisc64", "ppc", "ppc64", +-"ppc64le", "s390", "s390x", "sheb" and "sh". ++"ppc64le", "riscv32", "s390", "s390x", "sheb" and "sh". + .TP + .B \-t + If necessary, translate the system call name to the proper system call number, +diff --git a/doc/man/man3/seccomp_arch_add.3 b/doc/man/man3/seccomp_arch_add.3 +index 7baa21e..8966b3a 100644 +--- a/doc/man/man3/seccomp_arch_add.3 ++++ b/doc/man/man3/seccomp_arch_add.3 +@@ -30,6 +30,7 @@ seccomp_arch_add, seccomp_arch_remove, seccomp_arch_exist, seccomp_arch_native \ + .B #define SCMP_ARCH_S390X + .B #define SCMP_ARCH_PARISC + .B #define SCMP_ARCH_PARISC64 ++.B #define SCMP_ARCH_RISCV32 + .B #define SCMP_ARCH_RISCV64 + .sp + .BI "uint32_t seccomp_arch_resolve_name(const char *" arch_name ");" +diff --git a/include/seccomp-syscalls.h b/include/seccomp-syscalls.h +index c694db1..c6ea5ca 100644 +--- a/include/seccomp-syscalls.h ++++ b/include/seccomp-syscalls.h +@@ -275,6 +275,13 @@ + #define __PNR_ppoll -10241 + #define __PNR_renameat -10242 + #define __PNR_riscv_flush_icache -10243 ++#define __PNR_fstat -10244 ++#define __PNR_futex -10245 ++#define __PNR_nanosleep -10246 ++#define __PNR_lseek -10247 ++#define __PNR_clock_gettime -10248 ++#define __PNR_clock_nanosleep -10249 ++#define __PNR_gettimeofday -10250 + + /* + * libseccomp syscall definitions +@@ -442,7 +449,11 @@ + #define __SNR_clock_getres_time64 __PNR_clock_getres_time64 + #endif + ++#ifdef __NR_clock_gettime + #define __SNR_clock_gettime __NR_clock_gettime ++#else ++#define __SNR_clock_gettime __PNR_clock_gettime ++#endif + + #ifdef __NR_clock_gettime64 + #define __SNR_clock_gettime64 __NR_clock_gettime64 +@@ -450,7 +461,11 @@ + #define __SNR_clock_gettime64 __PNR_clock_gettime64 + #endif + ++#ifdef __NR_clock_nanosleep + #define __SNR_clock_nanosleep __NR_clock_nanosleep ++#else ++#define __SNR_clock_nanosleep __PNR_clock_nanosleep ++#endif + + #ifdef __NR_clock_nanosleep_time64 + #define __SNR_clock_nanosleep_time64 __NR_clock_nanosleep_time64 +@@ -710,7 +725,11 @@ + #define __SNR_ftruncate64 __PNR_ftruncate64 + #endif + ++#ifdef __NR_futex + #define __SNR_futex __NR_futex ++#else ++#define __SNR_futex __PNR_futex ++#endif + + #ifdef __NR_futex_time64 + #define __SNR_futex_time64 __NR_futex_time64 +@@ -896,7 +915,11 @@ + + #define __SNR_gettid __NR_gettid + ++#ifdef __NR_gettimeofday + #define __SNR_gettimeofday __NR_gettimeofday ++#else ++#define __SNR_gettimeofday __PNR_gettimeofday ++#endif + + #ifdef __NR_getuid + #define __SNR_getuid __NR_getuid +@@ -1046,7 +1069,11 @@ + + #define __SNR_lremovexattr __NR_lremovexattr + ++#ifdef __NR_lseek + #define __SNR_lseek __NR_lseek ++#else ++#define __SNR_lseek __PNR_lseek ++#endif + + #define __SNR_lsetxattr __NR_lsetxattr + +@@ -1218,7 +1245,11 @@ + + #define __SNR_name_to_handle_at __NR_name_to_handle_at + ++#ifdef __NR_nanosleep + #define __SNR_nanosleep __NR_nanosleep ++#else ++#define __SNR_nanosleep __PNR_nanosleep ++#endif + + #ifdef __NR_newfstatat + #define __SNR_newfstatat __NR_newfstatat +diff --git a/include/seccomp.h.in b/include/seccomp.h.in +index 333a89c..2e911db 100644 +--- a/include/seccomp.h.in ++++ b/include/seccomp.h.in +@@ -214,7 +214,16 @@ struct scmp_arg_cmp { + #endif /* EM_RISCV */ + #define AUDIT_ARCH_RISCV64 (EM_RISCV|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) + #endif /* AUDIT_ARCH_RISCV64 */ ++ ++#ifndef AUDIT_ARCH_RISCV32 ++#ifndef EM_RISCV ++#define EM_RISCV 243 ++#endif /* EM_RISCV */ ++#define AUDIT_ARCH_RISCV32 (EM_RISCV|__AUDIT_ARCH_LE) ++#endif /* AUDIT_ARCH_RISCV32 */ ++ + #define SCMP_ARCH_RISCV64 AUDIT_ARCH_RISCV64 ++#define SCMP_ARCH_RISCV32 AUDIT_ARCH_RISCV32 + + /** + * The SuperH architecture tokens +diff --git a/src/Makefile.am b/src/Makefile.am +index 7b59810..7961925 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -44,6 +44,7 @@ SOURCES_ALL = \ + arch-ppc.h arch-ppc.c \ + arch-ppc64.h arch-ppc64.c \ + arch-riscv64.h arch-riscv64.c \ ++ arch-riscv32.h arch-riscv32.c \ + arch-s390.h arch-s390.c \ + arch-s390x.h arch-s390x.c \ + arch-sh.h arch-sh.c \ +diff --git a/src/arch-riscv32.c b/src/arch-riscv32.c +new file mode 100644 +index 0000000..53b3126 +--- /dev/null ++++ b/src/arch-riscv32.c +@@ -0,0 +1,31 @@ ++/* ++ * This library is free software; you can redistribute it and/or modify it ++ * under the terms of version 2.1 of the GNU Lesser General Public License as ++ * published by the Free Software Foundation. ++ * ++ * This library is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License ++ * for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, see <http://www.gnu.org/licenses>. ++ */ ++ ++#include <stdlib.h> ++#include <errno.h> ++#include <linux/audit.h> ++ ++#include "arch.h" ++#include "arch-riscv32.h" ++ ++const struct arch_def arch_def_riscv32 = { ++ .token = SCMP_ARCH_RISCV32, ++ .token_bpf = AUDIT_ARCH_RISCV32, ++ .size = ARCH_SIZE_32, ++ .endian = ARCH_ENDIAN_LITTLE, ++ .syscall_resolve_name = riscv32_syscall_resolve_name, ++ .syscall_resolve_num = riscv32_syscall_resolve_num, ++ .syscall_rewrite = NULL, ++ .rule_add = NULL, ++}; +diff --git a/src/arch-riscv32.h b/src/arch-riscv32.h +new file mode 100644 +index 0000000..082a77d +--- /dev/null ++++ b/src/arch-riscv32.h +@@ -0,0 +1,22 @@ ++/* ++ * This library is free software; you can redistribute it and/or modify it ++ * under the terms of version 2.1 of the GNU Lesser General Public License as ++ * published by the Free Software Foundation. ++ * ++ * This library is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License ++ * for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public License ++ * along with this library; if not, see <http://www.gnu.org/licenses>. ++ */ ++ ++#ifndef _ARCH_RISCV32_H ++#define _ARCH_RISCV32_H ++ ++#include "arch.h" ++ ++ARCH_DECL(riscv32) ++ ++#endif +diff --git a/src/arch-syscall-dump.c b/src/arch-syscall-dump.c +index 843483b..c6ab57d 100644 +--- a/src/arch-syscall-dump.c ++++ b/src/arch-syscall-dump.c +@@ -43,6 +43,7 @@ + #include "arch-ppc.h" + #include "arch-ppc64.h" + #include "arch-riscv64.h" ++#include "arch-riscv32.h" + #include "arch-s390.h" + #include "arch-s390x.h" + #include "arch-sh.h" +@@ -135,6 +136,9 @@ int main(int argc, char *argv[]) + case SCMP_ARCH_RISCV64: + sys = riscv64_syscall_iterate(iter); + break; ++ case SCMP_ARCH_RISCV32: ++ sys = riscv32_syscall_iterate(iter); ++ break; + case SCMP_ARCH_S390: + sys = s390_syscall_iterate(iter); + break; +diff --git a/src/arch-syscall-validate b/src/arch-syscall-validate +index 68bebef..85c7f3d 100755 +--- a/src/arch-syscall-validate ++++ b/src/arch-syscall-validate +@@ -519,6 +519,49 @@ function dump_lib_riscv64() { + dump_lib_arch riscv64 | mangle_lib_syscall riscv64 + } + ++# ++# Dump the riscv32 system syscall table ++# ++# Arguments: ++# 1 path to the kernel source ++# ++# Dump the architecture's syscall table to stdout. ++# ++function dump_sys_riscv32() { ++ local sed_filter="" ++ ++ sed_filter+='s/__NR3264_fadvise64/223/;' ++ sed_filter+='s/__NR3264_fcntl/25/;' ++ sed_filter+='s/__NR3264_fstatat/79/;' ++ sed_filter+='s/__NR3264_fstatfs/44/;' ++ sed_filter+='s/__NR3264_ftruncate/46/;' ++ sed_filter+='s/__NR3264_lseek/62/;' ++ sed_filter+='s/__NR3264_mmap/222/;' ++ sed_filter+='s/__NR3264_sendfile/71/;' ++ sed_filter+='s/__NR3264_statfs/43/;' ++ sed_filter+='s/__NR3264_truncate/45/;' ++ sed_filter+='s/__NR3264_fstat/80/;' ++ ++ gcc -E -dM -I$1/include/uapi \ ++ -D__BITS_PER_LONG=32 \ ++ $1/arch/riscv/include/uapi/asm/unistd.h | \ ++ grep "^#define __NR_" | \ ++ sed '/__NR_syscalls/d' | \ ++ sed 's/(__NR_arch_specific_syscall + 15)/259/' | \ ++ sed '/__NR_arch_specific_syscall/d' | \ ++ sed 's/#define[ \t]\+__NR_\([^ \t]\+\)[ \t]\+\(.*\)/\1,\2/' | \ ++ sed $sed_filter | sort ++} ++ ++# ++# Dump the riscv32 library syscall table ++# ++# Dump the library's syscall table to stdout. ++# ++function dump_lib_riscv32() { ++ dump_lib_arch riscv32 | mangle_lib_syscall riscv32 ++} ++ + # + # Dump the s390 system syscall table + # +@@ -639,6 +682,9 @@ function dump_sys() { + ppc64) + dump_sys_ppc64 "$2" + ;; ++ riscv32) ++ dump_sys_riscv32 "$2" ++ ;; + riscv64) + dump_sys_riscv64 "$2" + ;; +@@ -706,6 +752,9 @@ function dump_lib() { + ppc64) + dump_lib_ppc64 + ;; ++ riscv32) ++ dump_lib_riscv32 ++ ;; + riscv64) + dump_lib_riscv64 + ;; +@@ -751,7 +800,7 @@ function gen_csv() { + abi_list+=" mips mips64 mips64n32" + abi_list+=" parisc parisc64" + abi_list+=" ppc ppc64" +- abi_list+=" riscv64" ++ abi_list+=" riscv32 riscv64" + abi_list+=" s390 s390x" + abi_list+=" sh" + +diff --git a/src/arch.c b/src/arch.c +index 6ab922f..acf80af 100644 +--- a/src/arch.c ++++ b/src/arch.c +@@ -43,6 +43,7 @@ + #include "arch-ppc.h" + #include "arch-ppc64.h" + #include "arch-riscv64.h" ++#include "arch-riscv32.h" + #include "arch-s390.h" + #include "arch-s390x.h" + #include "arch-sh.h" +@@ -97,8 +98,12 @@ const struct arch_def *arch_def_native = &arch_def_ppc; + const struct arch_def *arch_def_native = &arch_def_s390x; + #elif __s390__ + const struct arch_def *arch_def_native = &arch_def_s390; +-#elif __riscv && __riscv_xlen == 64 ++#elif __riscv ++#if __riscv_xlen == 64 + const struct arch_def *arch_def_native = &arch_def_riscv64; ++#elif __riscv_xlen == 32 ++const struct arch_def *arch_def_native = &arch_def_riscv32; ++#endif + #elif __sh__ + #ifdef __BIG_ENDIAN__ + const struct arch_def *arch_def_native = &arch_def_sheb; +@@ -167,6 +172,8 @@ const struct arch_def *arch_def_lookup(uint32_t token) + return &arch_def_s390; + case SCMP_ARCH_S390X: + return &arch_def_s390x; ++ case SCMP_ARCH_RISCV32: ++ return &arch_def_riscv32; + case SCMP_ARCH_RISCV64: + return &arch_def_riscv64; + case SCMP_ARCH_SHEB: +@@ -223,6 +230,8 @@ const struct arch_def *arch_def_lookup_name(const char *arch_name) + return &arch_def_s390; + else if (strcmp(arch_name, "s390x") == 0) + return &arch_def_s390x; ++ else if (strcmp(arch_name, "riscv32") == 0) ++ return &arch_def_riscv32; + else if (strcmp(arch_name, "riscv64") == 0) + return &arch_def_riscv64; + else if (strcmp(arch_name, "sheb") == 0) +diff --git a/src/gen_pfc.c b/src/gen_pfc.c +index c7fb536..d45e181 100644 +--- a/src/gen_pfc.c ++++ b/src/gen_pfc.c +@@ -87,6 +87,8 @@ static const char *_pfc_arch(const struct arch_def *arch) + return "s390x"; + case SCMP_ARCH_S390: + return "s390"; ++ case SCMP_ARCH_RISCV32: ++ return "riscv32"; + case SCMP_ARCH_RISCV64: + return "riscv64"; + case SCMP_ARCH_SHEB: +diff --git a/src/python/libseccomp.pxd b/src/python/libseccomp.pxd +index 0629bf1..000d503 100644 +--- a/src/python/libseccomp.pxd ++++ b/src/python/libseccomp.pxd +@@ -51,6 +51,7 @@ cdef extern from "seccomp.h": + SCMP_ARCH_PPC64LE + SCMP_ARCH_S390 + SCMP_ARCH_S390X ++ SCMP_ARCH_RISCV32 + SCMP_ARCH_RISCV64 + + cdef enum scmp_filter_attr: +diff --git a/src/python/seccomp.pyx b/src/python/seccomp.pyx +index 1a9eb24..c94ad1d 100644 +--- a/src/python/seccomp.pyx ++++ b/src/python/seccomp.pyx +@@ -214,6 +214,7 @@ cdef class Arch: + PARISC64 - 64-bit PA-RISC + PPC64 - 64-bit PowerPC + PPC - 32-bit PowerPC ++ RISCV32 - 32-bit RISC-V + RISCV64 - 64-bit RISC-V + """ + +@@ -238,6 +239,7 @@ cdef class Arch: + PPC64LE = libseccomp.SCMP_ARCH_PPC64LE + S390 = libseccomp.SCMP_ARCH_S390 + S390X = libseccomp.SCMP_ARCH_S390X ++ RISCV32 = libseccomp.SCMP_ARCH_RISCV32 + RISCV64 = libseccomp.SCMP_ARCH_RISCV64 + + def __cinit__(self, arch=libseccomp.SCMP_ARCH_NATIVE): +diff --git a/src/syscalls.c b/src/syscalls.c +index ddb84fa..34e08d9 100644 +--- a/src/syscalls.c ++++ b/src/syscalls.c +@@ -55,3 +55,4 @@ ARCH_DEF(sh) + ARCH_DEF(x32) + ARCH_DEF(x86) + ARCH_DEF(riscv64) ++ARCH_DEF(riscv32) +diff --git a/src/syscalls.csv b/src/syscalls.csv +index fbd1058..0ee6c15 100644 +--- a/src/syscalls.csv ++++ b/src/syscalls.csv +@@ -1,4 +1,4 @@ +-#syscall (v5.12.0-rc7 2021-04-17),x86,x86_64,x32,arm,aarch64,mips,mips64,mips64n32,parisc,parisc64,ppc,ppc64,riscv64,s390,s390x,sh ++#syscall (v5.12.0-rc7 2021-04-17),x86,x86_64,x32,arm,aarch64,mips,mips64,mips64n32,parisc,parisc64,ppc,ppc64,riscv32,riscv64,s390,s390x,sh + accept,PNR,43,43,285,202,168,42,42,35,35,330,330,202,PNR,PNR,344 + accept4,364,288,288,366,242,334,293,297,320,320,344,344,242,364,364,358 + access,33,21,21,33,PNR,33,20,20,33,33,33,33,PNR,33,33,33 +diff --git a/src/syscalls.h b/src/syscalls.h +index 4f959af..49887ba 100644 +--- a/src/syscalls.h ++++ b/src/syscalls.h +@@ -28,6 +28,7 @@ + #include "arch-x86.h" + #include "arch-x86.h" + #include "arch-riscv64.h" ++#include "arch-riscv32.h" + + /* NOTE: changes to the arch_syscall_table layout may require changes to the + * generate_syscalls_perf.sh and arch-syscall-validate scripts */ +@@ -49,6 +50,7 @@ struct arch_syscall_table { + int parisc64; + int ppc; + int ppc64; ++ int riscv32; + int riscv64; + int s390; + int s390x; +diff --git a/src/system.c b/src/system.c +index ae445bf..063e6be 100644 +--- a/src/system.c ++++ b/src/system.c +@@ -130,6 +130,7 @@ int sys_chk_seccomp_syscall(void) + case SCMP_ARCH_PPC64LE: + case SCMP_ARCH_S390: + case SCMP_ARCH_S390X: ++ case SCMP_ARCH_RISCV32: + case SCMP_ARCH_RISCV64: + break; + default: +diff --git a/tests/15-basic-resolver.c b/tests/15-basic-resolver.c +index 2679270..57092f3 100644 +--- a/tests/15-basic-resolver.c ++++ b/tests/15-basic-resolver.c +@@ -45,6 +45,7 @@ unsigned int arch_list[] = { + SCMP_ARCH_S390X, + SCMP_ARCH_PARISC, + SCMP_ARCH_PARISC64, ++ SCMP_ARCH_RISCV32, + SCMP_ARCH_RISCV64, + -1 + }; +diff --git a/tests/16-sim-arch_basic.c b/tests/16-sim-arch_basic.c +index 4fcbb5c..662e081 100644 +--- a/tests/16-sim-arch_basic.c ++++ b/tests/16-sim-arch_basic.c +@@ -90,6 +90,9 @@ int main(int argc, char *argv[]) + if (rc != 0) + goto out; + rc = seccomp_arch_add(ctx, SCMP_ARCH_PPC64LE); ++ if (rc != 0) ++ goto out; ++ rc = seccomp_arch_add(ctx, SCMP_ARCH_RISCV32); + if (rc != 0) + goto out; + rc = seccomp_arch_add(ctx, SCMP_ARCH_RISCV64); +@@ -160,6 +163,9 @@ int main(int argc, char *argv[]) + if (rc != 0) + goto out; + rc = seccomp_arch_remove(ctx, SCMP_ARCH_PPC64LE); ++ if (rc != 0) ++ goto out; ++ rc = seccomp_arch_remove(ctx, SCMP_ARCH_RISCV32); + if (rc != 0) + goto out; + rc = seccomp_arch_remove(ctx, SCMP_ARCH_RISCV64); +diff --git a/tests/16-sim-arch_basic.py b/tests/16-sim-arch_basic.py +index f22c985..d5e93a2 100755 +--- a/tests/16-sim-arch_basic.py ++++ b/tests/16-sim-arch_basic.py +@@ -44,6 +44,7 @@ def test(args): + f.add_arch(Arch("mipsel64")) + f.add_arch(Arch("mipsel64n32")) + f.add_arch(Arch("ppc64le")) ++ f.add_arch(Arch("riscv32")) + f.add_arch(Arch("riscv64")) + f.add_arch(Arch("sh")) + f.add_rule(ALLOW, "read", Arg(0, EQ, sys.stdin.fileno())) +diff --git a/tests/23-sim-arch_all_le_basic.c b/tests/23-sim-arch_all_le_basic.c +index 08f030c..ec73224 100644 +--- a/tests/23-sim-arch_all_le_basic.c ++++ b/tests/23-sim-arch_all_le_basic.c +@@ -75,6 +75,9 @@ int main(int argc, char *argv[]) + if (rc != 0) + goto out; + rc = seccomp_arch_add(ctx, seccomp_arch_resolve_name("sh")); ++ if (rc != 0) ++ goto out; ++ rc = seccomp_arch_add(ctx, seccomp_arch_resolve_name("riscv32")); + if (rc != 0) + goto out; + +diff --git a/tests/23-sim-arch_all_le_basic.py b/tests/23-sim-arch_all_le_basic.py +index 12bb243..1eebc20 100755 +--- a/tests/23-sim-arch_all_le_basic.py ++++ b/tests/23-sim-arch_all_le_basic.py +@@ -40,6 +40,7 @@ def test(args): + f.add_arch(Arch("mipsel64")) + f.add_arch(Arch("mipsel64n32")) + f.add_arch(Arch("ppc64le")) ++ f.add_arch(Arch("riscv32")) + f.add_arch(Arch("riscv64")) + f.add_arch(Arch("sh")) + f.add_rule(ALLOW, "read", Arg(0, EQ, sys.stdin.fileno())) +diff --git a/tests/56-basic-iterate_syscalls.c b/tests/56-basic-iterate_syscalls.c +index 5e7ab67..c11ca8c 100644 +--- a/tests/56-basic-iterate_syscalls.c ++++ b/tests/56-basic-iterate_syscalls.c +@@ -46,6 +46,7 @@ unsigned int arch_list[] = { + SCMP_ARCH_S390X, + SCMP_ARCH_PARISC, + SCMP_ARCH_PARISC64, ++ SCMP_ARCH_RISCV32, + SCMP_ARCH_RISCV64, + -1 + }; +diff --git a/tests/56-basic-iterate_syscalls.py b/tests/56-basic-iterate_syscalls.py +index 77a5b89..2e860bf 100755 +--- a/tests/56-basic-iterate_syscalls.py ++++ b/tests/56-basic-iterate_syscalls.py +@@ -37,6 +37,7 @@ arch_list = ["x86", + "mipsel64", + "mipsel64n32", + "ppc64le", ++ "riscv32", + "riscv64"] + + def test_arch(arch, init): +diff --git a/tests/regression b/tests/regression +index 53dab75..2869629 100755 +--- a/tests/regression ++++ b/tests/regression +@@ -26,7 +26,7 @@ GLBL_ARCH_LE_SUPPORT=" \ + arm aarch64 \ + mipsel mipsel64 mipsel64n32 \ + ppc64le \ +- riscv64 \ ++ riscv32 riscv64 \ + sh" + GLBL_ARCH_BE_SUPPORT=" \ + mips mips64 mips64n32 \ +@@ -41,6 +41,7 @@ GLBL_ARCH_32B_SUPPORT=" \ + mips mipsel mips64n32 mipsel64n32 \ + parisc \ + ppc \ ++ riscv32 \ + s390 \ + sheb sh" + +@@ -785,7 +786,7 @@ function run_test_live() { + + # setup the arch specific return values + case "$arch" in +- x86|x86_64|x32|arm|aarch64|parisc|parisc64|ppc|ppc64|ppc64le|ppc|s390|s390x|riscv64|sh|sheb) ++ x86|x86_64|x32|arm|aarch64|parisc|parisc64|ppc|ppc64|ppc64le|ppc|s390|s390x|riscv32|riscv64|sh|sheb) + rc_kill_process=159 + rc_kill=159 + rc_allow=160 +diff --git a/tools/scmp_arch_detect.c b/tools/scmp_arch_detect.c +index b6bd2bb..7789970 100644 +--- a/tools/scmp_arch_detect.c ++++ b/tools/scmp_arch_detect.c +@@ -129,6 +129,9 @@ int main(int argc, char *argv[]) + case SCMP_ARCH_SH: + printf("sh\n"); + break; ++ case SCMP_ARCH_RISCV32: ++ printf("riscv32\n"); ++ break; + default: + printf("unknown\n"); + } +diff --git a/tools/scmp_bpf_disasm.c b/tools/scmp_bpf_disasm.c +index b95cdeb..49a89c7 100644 +--- a/tools/scmp_bpf_disasm.c ++++ b/tools/scmp_bpf_disasm.c +@@ -510,6 +510,8 @@ int main(int argc, char *argv[]) + arch = AUDIT_ARCH_S390X; + else if (strcmp(optarg, "riscv64") == 0) + arch = AUDIT_ARCH_RISCV64; ++ else if (strcmp(optarg, "riscv32") == 0) ++ arch = AUDIT_ARCH_RISCV32; + else + exit_usage(argv[0]); + break; +diff --git a/tools/scmp_bpf_sim.c b/tools/scmp_bpf_sim.c +index 04edfbc..53e6575 100644 +--- a/tools/scmp_bpf_sim.c ++++ b/tools/scmp_bpf_sim.c +@@ -285,6 +285,8 @@ int main(int argc, char *argv[]) + arch = AUDIT_ARCH_S390; + else if (strcmp(optarg, "s390x") == 0) + arch = AUDIT_ARCH_S390X; ++ else if (strcmp(optarg, "riscv32") == 0) ++ arch = AUDIT_ARCH_RISCV32; + else if (strcmp(optarg, "riscv64") == 0) + arch = AUDIT_ARCH_RISCV64; + else if (strcmp(optarg, "sheb") == 0) +diff --git a/tools/util.c b/tools/util.c +index afea6c9..1fc1f62 100644 +--- a/tools/util.c ++++ b/tools/util.c +@@ -78,8 +78,12 @@ + #define ARCH_NATIVE AUDIT_ARCH_S390X + #elif __s390__ + #define ARCH_NATIVE AUDIT_ARCH_S390 +-#elif __riscv && __riscv_xlen == 64 ++#elif __riscv ++#if __riscv_xlen == 64 + #define ARCH_NATIVE AUDIT_ARCH_RISCV64 ++#elif __riscv_xlen == 32 ++#define ARCH_NATIVE AUDIT_ARCH_RISCV32 ++#endif + #elif __sh__ + #ifdef __BIG_ENDIAN__ + #define ARCH_NATIVE AUDIT_ARCH_SH +diff --git a/tools/util.h b/tools/util.h +index 6c2ca33..4d16e38 100644 +--- a/tools/util.h ++++ b/tools/util.h +@@ -79,6 +79,13 @@ + #define AUDIT_ARCH_RISCV64 (EM_RISCV|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) + #endif /* AUDIT_ARCH_RISCV64 */ + ++#ifndef AUDIT_ARCH_RISCV32 ++#ifndef EM_RISCV ++#define EM_RISCV 243 ++#endif /* EM_RISCV */ ++#define AUDIT_ARCH_RISCV32 (EM_RISCV|__AUDIT_ARCH_LE) ++#endif /* AUDIT_ARCH_RISCV32 */ ++ + extern uint32_t arch; + + uint16_t ttoh16(uint32_t arch, uint16_t val); +-- +2.32.0 diff --git a/poky/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch b/poky/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch new file mode 100644 index 000000000..3fc285b6e --- /dev/null +++ b/poky/meta/recipes-support/libseccomp/files/0001-configure.ac-Bump-version-to-2.5.99.patch @@ -0,0 +1,26 @@ +From 00b6bc440a75443f9bea431bbb41df50469b5093 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 8 Jun 2021 23:13:20 -0700 +Subject: [PATCH] configure.ac: Bump version to 2.5.99 + +Upstream-Status: Inappropriate [Needed for git builds only] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3e87734..48e796f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,7 +19,7 @@ dnl # + dnl #### + dnl libseccomp defines + dnl #### +-AC_INIT([libseccomp], [0.0.0]) ++AC_INIT([libseccomp], [2.5.99]) + + dnl #### + dnl autoconf configuration +-- +2.32.0 diff --git a/poky/meta/recipes-support/libseccomp/files/0002-Regenerate-syscall-cvs-file-from-5.13-rc5-kernel.patch b/poky/meta/recipes-support/libseccomp/files/0002-Regenerate-syscall-cvs-file-from-5.13-rc5-kernel.patch new file mode 100644 index 000000000..7ca861a7b --- /dev/null +++ b/poky/meta/recipes-support/libseccomp/files/0002-Regenerate-syscall-cvs-file-from-5.13-rc5-kernel.patch @@ -0,0 +1,996 @@ +From ee4aba3f59b4bf52a74cb3917e64c704250de8ef Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 8 Jun 2021 20:42:19 -0700 +Subject: [PATCH 2/2] Regenerate syscall cvs file from 5.13-rc5 kernel + +Upstream-Status: Submitted [https://github.com/seccomp/libseccomp/pull/327] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/seccomp-syscalls.h | 7 + + src/syscalls.csv | 952 +++++++++++++++++++------------------ + 2 files changed, 485 insertions(+), 474 deletions(-) + +diff --git a/include/seccomp-syscalls.h b/include/seccomp-syscalls.h +index c6ea5ca..b7651bf 100644 +--- a/include/seccomp-syscalls.h ++++ b/include/seccomp-syscalls.h +@@ -282,6 +282,7 @@ + #define __PNR_clock_gettime -10248 + #define __PNR_clock_nanosleep -10249 + #define __PNR_gettimeofday -10250 ++#define __PNR_quotactl_path -10251 + + /* + * libseccomp syscall definitions +@@ -1547,6 +1548,12 @@ + #define __SNR_riscv_flush_icache __PNR_riscv_flush_icache + #endif + ++#ifdef __NR_quotactl_path ++#define __SNR_quotactl_path __NR_quotactl_path ++#else ++#define __SNR_quotactl_path __PNR_quotactl_path ++#endif ++ + #ifdef __NR_rmdir + #define __SNR_rmdir __NR_rmdir + #else +diff --git a/src/syscalls.csv b/src/syscalls.csv +index 0ee6c15..eec8d21 100644 +--- a/src/syscalls.csv ++++ b/src/syscalls.csv +@@ -1,474 +1,478 @@ +-#syscall (v5.12.0-rc7 2021-04-17),x86,x86_64,x32,arm,aarch64,mips,mips64,mips64n32,parisc,parisc64,ppc,ppc64,riscv32,riscv64,s390,s390x,sh +-accept,PNR,43,43,285,202,168,42,42,35,35,330,330,202,PNR,PNR,344 +-accept4,364,288,288,366,242,334,293,297,320,320,344,344,242,364,364,358 +-access,33,21,21,33,PNR,33,20,20,33,33,33,33,PNR,33,33,33 +-acct,51,163,163,51,89,51,158,158,51,51,51,51,89,51,51,51 +-add_key,286,248,248,309,217,280,239,243,264,264,269,269,217,278,278,285 +-adjtimex,124,159,159,124,171,124,154,154,124,124,124,124,171,124,124,124 +-afs_syscall,137,183,183,PNR,PNR,137,176,176,PNR,PNR,137,137,PNR,137,137,PNR +-alarm,27,37,37,PNR,PNR,27,37,37,27,27,27,27,PNR,27,27,27 +-arch_prctl,384,158,158,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-arm_fadvise64_64,PNR,PNR,PNR,270,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-arm_sync_file_range,PNR,PNR,PNR,341,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-bdflush,134,PNR,PNR,134,PNR,134,PNR,PNR,134,134,134,134,PNR,134,134,134 +-bind,361,49,49,282,200,169,48,48,22,22,327,327,200,361,361,341 +-bpf,357,321,321,386,280,355,315,319,341,341,361,361,280,351,351,375 +-break,17,PNR,PNR,PNR,PNR,17,PNR,PNR,PNR,PNR,17,17,PNR,PNR,PNR,PNR +-breakpoint,PNR,PNR,PNR,983041,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-brk,45,12,12,45,214,45,12,12,45,45,45,45,214,45,45,45 +-cachectl,PNR,PNR,PNR,PNR,PNR,148,198,198,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-cacheflush,PNR,PNR,PNR,983042,PNR,147,197,197,PNR,PNR,PNR,PNR,PNR,PNR,PNR,123 +-capget,184,125,125,184,90,204,123,123,106,106,183,183,90,184,184,184 +-capset,185,126,126,185,91,205,124,124,107,107,184,184,91,185,185,185 +-chdir,12,80,80,12,49,12,78,78,12,12,12,12,49,12,12,12 +-chmod,15,90,90,15,PNR,15,88,88,15,15,15,15,PNR,15,15,15 +-chown,182,92,92,182,PNR,202,90,90,180,180,181,181,PNR,182,212,182 +-chown32,212,PNR,PNR,212,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,212,PNR,212 +-chroot,61,161,161,61,51,61,156,156,61,61,61,61,51,61,61,61 +-clock_adjtime,343,305,305,372,266,341,300,305,324,324,347,347,266,337,337,361 +-clock_adjtime64,405,PNR,PNR,405,PNR,405,PNR,405,405,PNR,405,PNR,PNR,405,PNR,405 +-clock_getres,266,229,229,264,114,264,223,227,257,257,247,247,114,261,261,266 +-clock_getres_time64,406,PNR,PNR,406,PNR,406,PNR,406,406,PNR,406,PNR,PNR,406,PNR,406 +-clock_gettime,265,228,228,263,113,263,222,226,256,256,246,246,113,260,260,265 +-clock_gettime64,403,PNR,PNR,403,PNR,403,PNR,403,403,PNR,403,PNR,PNR,403,PNR,403 +-clock_nanosleep,267,230,230,265,115,265,224,228,258,258,248,248,115,262,262,267 +-clock_nanosleep_time64,407,PNR,PNR,407,PNR,407,PNR,407,407,PNR,407,PNR,PNR,407,PNR,407 +-clock_settime,264,227,227,262,112,262,221,225,255,255,245,245,112,259,259,264 +-clock_settime64,404,PNR,PNR,404,PNR,404,PNR,404,404,PNR,404,PNR,PNR,404,PNR,404 +-clone,120,56,56,120,220,120,55,55,120,120,120,120,220,120,120,120 +-clone3,435,435,435,435,435,435,435,435,435,435,435,435,435,435,435,PNR +-close,6,3,3,6,57,6,3,3,6,6,6,6,57,6,6,6 +-close_range,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436 +-connect,362,42,42,283,203,170,41,41,31,31,328,328,203,362,362,342 +-copy_file_range,377,326,326,391,285,360,320,324,346,346,379,379,285,375,375,380 +-creat,8,85,85,8,PNR,8,83,83,8,8,8,8,PNR,8,8,8 +-create_module,127,174,PNR,PNR,PNR,127,167,167,PNR,PNR,127,127,PNR,127,127,PNR +-delete_module,129,176,176,129,106,129,169,169,129,129,129,129,106,129,129,129 +-dup,41,32,32,41,23,41,31,31,41,41,41,41,23,41,41,41 +-dup2,63,33,33,63,PNR,63,32,32,63,63,63,63,PNR,63,63,63 +-dup3,330,292,292,358,24,327,286,290,312,312,316,316,24,326,326,330 +-epoll_create,254,213,213,250,PNR,248,207,207,224,224,236,236,PNR,249,249,254 +-epoll_create1,329,291,291,357,20,326,285,289,311,311,315,315,20,327,327,329 +-epoll_ctl,255,233,233,251,21,249,208,208,225,225,237,237,21,250,250,255 +-epoll_ctl_old,PNR,214,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-epoll_pwait,319,281,281,346,22,313,272,276,297,297,303,303,22,312,312,319 +-epoll_pwait2,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441 +-epoll_wait,256,232,232,252,PNR,250,209,209,226,226,238,238,PNR,251,251,256 +-epoll_wait_old,PNR,215,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-eventfd,323,284,284,351,PNR,319,278,282,304,304,307,307,PNR,318,318,323 +-eventfd2,328,290,290,356,19,325,284,288,310,310,314,314,19,323,323,328 +-execve,11,59,520,11,221,11,57,57,11,11,11,11,221,11,11,11 +-execveat,358,322,545,387,281,356,316,320,342,342,362,362,281,354,354,376 +-exit,1,60,60,1,93,1,58,58,1,1,1,1,93,1,1,1 +-exit_group,252,231,231,248,94,246,205,205,222,222,234,234,94,248,248,252 +-faccessat,307,269,269,334,48,300,259,263,287,287,298,298,48,300,300,307 +-faccessat2,439,439,439,439,439,439,439,439,439,439,439,439,439,439,439,439 +-fadvise64,250,221,221,PNR,223,254,215,216,PNR,PNR,233,233,223,253,253,250 +-fadvise64_64,272,PNR,PNR,PNR,PNR,PNR,PNR,PNR,236,236,254,PNR,PNR,264,PNR,272 +-fallocate,324,285,285,352,47,320,279,283,305,305,309,309,47,314,314,324 +-fanotify_init,338,300,300,367,262,336,295,300,322,322,323,323,262,332,332,337 +-fanotify_mark,339,301,301,368,263,337,296,301,323,323,324,324,263,333,333,338 +-fchdir,133,81,81,133,50,133,79,79,133,133,133,133,50,133,133,133 +-fchmod,94,91,91,94,52,94,89,89,94,94,94,94,52,94,94,94 +-fchmodat,306,268,268,333,53,299,258,262,286,286,297,297,53,299,299,306 +-fchown,95,93,93,95,55,95,91,91,95,95,95,95,55,95,207,95 +-fchown32,207,PNR,PNR,207,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,207,PNR,207 +-fchownat,298,260,260,325,54,291,250,254,278,278,289,289,54,291,291,298 +-fcntl,55,72,72,55,25,55,70,70,55,55,55,55,25,55,55,55 +-fcntl64,221,PNR,PNR,221,PNR,220,PNR,212,202,202,204,PNR,PNR,221,PNR,221 +-fdatasync,148,75,75,148,83,152,73,73,148,148,148,148,83,148,148,148 +-fgetxattr,231,193,193,231,10,229,185,185,243,243,214,214,10,229,229,231 +-finit_module,350,313,313,379,273,348,307,312,333,333,353,353,273,344,344,368 +-flistxattr,234,196,196,234,13,232,188,188,246,246,217,217,13,232,232,234 +-flock,143,73,73,143,32,143,71,71,143,143,143,143,32,143,143,143 +-fork,2,57,57,2,PNR,2,56,56,2,2,2,2,PNR,2,2,2 +-fremovexattr,237,199,199,237,16,235,191,191,249,249,220,220,16,235,235,237 +-fsconfig,431,431,431,431,431,431,431,431,431,431,431,431,431,431,431,431 +-fsetxattr,228,190,190,228,7,226,182,182,240,240,211,211,7,226,226,228 +-fsmount,432,432,432,432,432,432,432,432,432,432,432,432,432,432,432,432 +-fsopen,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430 +-fspick,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433 +-fstat,108,5,5,108,80,108,5,5,28,28,108,108,80,108,108,108 +-fstat64,197,PNR,PNR,197,PNR,215,PNR,PNR,112,112,197,PNR,PNR,197,PNR,197 +-fstatat64,300,PNR,PNR,327,PNR,293,PNR,PNR,280,280,291,PNR,PNR,293,PNR,300 +-fstatfs,100,138,138,100,44,100,135,135,100,100,100,100,44,100,100,100 +-fstatfs64,269,PNR,PNR,267,PNR,256,PNR,218,299,299,253,253,PNR,266,266,269 +-fsync,118,74,74,118,82,118,72,72,118,118,118,118,82,118,118,118 +-ftime,35,PNR,PNR,PNR,PNR,35,PNR,PNR,PNR,PNR,35,35,PNR,PNR,PNR,PNR +-ftruncate,93,77,77,93,46,93,75,75,93,93,93,93,46,93,93,93 +-ftruncate64,194,PNR,PNR,194,PNR,212,PNR,PNR,200,200,194,PNR,PNR,194,PNR,194 +-futex,240,202,202,240,98,238,194,194,210,210,221,221,98,238,238,240 +-futex_time64,422,PNR,PNR,422,PNR,422,PNR,422,422,PNR,422,PNR,PNR,422,PNR,422 +-futimesat,299,261,261,326,PNR,292,251,255,279,279,290,290,PNR,292,292,299 +-getcpu,318,309,309,345,168,312,271,275,296,296,302,302,168,311,311,318 +-getcwd,183,79,79,183,17,203,77,77,110,110,182,182,17,183,183,183 +-getdents,141,78,78,141,PNR,141,76,76,141,141,141,141,PNR,141,141,141 +-getdents64,220,217,217,217,61,219,308,299,201,201,202,202,61,220,220,220 +-getegid,50,108,108,50,177,50,106,106,50,50,50,50,177,50,202,50 +-getegid32,202,PNR,PNR,202,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,202,PNR,202 +-geteuid,49,107,107,49,175,49,105,105,49,49,49,49,175,49,201,49 +-geteuid32,201,PNR,PNR,201,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,201,PNR,201 +-getgid,47,104,104,47,176,47,102,102,47,47,47,47,176,47,200,47 +-getgid32,200,PNR,PNR,200,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,200,PNR,200 +-getgroups,80,115,115,80,158,80,113,113,80,80,80,80,158,80,205,80 +-getgroups32,205,PNR,PNR,205,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,205,PNR,205 +-getitimer,105,36,36,105,102,105,35,35,105,105,105,105,102,105,105,105 +-get_kernel_syms,130,177,PNR,PNR,PNR,130,170,170,PNR,PNR,130,130,PNR,130,130,PNR +-get_mempolicy,275,239,239,320,236,269,228,232,261,261,260,260,236,269,269,275 +-getpeername,368,52,52,287,205,171,51,51,53,53,332,332,205,368,368,346 +-getpgid,132,121,121,132,155,132,119,119,132,132,132,132,155,132,132,132 +-getpgrp,65,111,111,65,PNR,65,109,109,65,65,65,65,PNR,65,65,65 +-getpid,20,39,39,20,172,20,38,38,20,20,20,20,172,20,20,20 +-getpmsg,188,181,181,PNR,PNR,208,174,174,PNR,PNR,187,187,PNR,188,188,PNR +-getppid,64,110,110,64,173,64,108,108,64,64,64,64,173,64,64,64 +-getpriority,96,140,140,96,141,96,137,137,96,96,96,96,141,96,96,96 +-getrandom,355,318,318,384,278,353,313,317,339,339,359,359,278,349,349,373 +-getresgid,171,120,120,171,150,191,118,118,171,171,170,170,150,171,211,171 +-getresgid32,211,PNR,PNR,211,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,211,PNR,211 +-getresuid,165,118,118,165,148,186,116,116,165,165,165,165,148,165,209,165 +-getresuid32,209,PNR,PNR,209,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,209,PNR,209 +-getrlimit,76,97,97,PNR,163,76,95,95,76,76,76,76,163,76,191,76 +-get_robust_list,312,274,531,339,100,310,269,273,290,290,299,299,100,305,305,312 +-getrusage,77,98,98,77,165,77,96,96,77,77,77,77,165,77,77,77 +-getsid,147,124,124,147,156,151,122,122,147,147,147,147,156,147,147,147 +-getsockname,367,51,51,286,204,172,50,50,44,44,331,331,204,367,367,345 +-getsockopt,365,55,542,295,209,173,54,54,182,182,340,340,209,365,365,354 +-get_thread_area,244,211,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-gettid,224,186,186,224,178,222,178,178,206,206,207,207,178,236,236,224 +-gettimeofday,78,96,96,78,169,78,94,94,78,78,78,78,169,78,78,78 +-get_tls,PNR,PNR,PNR,983046,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-getuid,24,102,102,24,174,24,100,100,24,24,24,24,174,24,199,24 +-getuid32,199,PNR,PNR,199,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,199,PNR,199 +-getxattr,229,191,191,229,8,227,183,183,241,241,212,212,8,227,227,229 +-gtty,32,PNR,PNR,PNR,PNR,32,PNR,PNR,PNR,PNR,32,32,PNR,PNR,PNR,PNR +-idle,112,PNR,PNR,PNR,PNR,112,PNR,PNR,PNR,PNR,112,112,PNR,112,112,PNR +-init_module,128,175,175,128,105,128,168,168,128,128,128,128,105,128,128,128 +-inotify_add_watch,292,254,254,317,27,285,244,248,270,270,276,276,27,285,285,291 +-inotify_init,291,253,253,316,PNR,284,243,247,269,269,275,275,PNR,284,284,290 +-inotify_init1,332,294,294,360,26,329,288,292,314,314,318,318,26,324,324,332 +-inotify_rm_watch,293,255,255,318,28,286,245,249,271,271,277,277,28,286,286,292 +-io_cancel,249,210,210,247,3,245,204,204,219,219,231,231,3,247,247,249 +-ioctl,54,16,514,54,29,54,15,15,54,54,54,54,29,54,54,54 +-io_destroy,246,207,207,244,1,242,201,201,216,216,228,228,1,244,244,246 +-io_getevents,247,208,208,245,4,243,202,202,217,217,229,229,4,245,245,247 +-ioperm,101,173,173,PNR,PNR,101,PNR,PNR,PNR,PNR,101,101,PNR,101,PNR,PNR +-io_pgetevents,385,333,333,399,292,368,328,332,350,350,388,388,292,382,382,PNR +-io_pgetevents_time64,416,PNR,PNR,416,PNR,416,PNR,416,416,PNR,416,PNR,PNR,416,PNR,416 +-iopl,110,172,172,PNR,PNR,110,PNR,PNR,PNR,PNR,110,110,PNR,PNR,PNR,PNR +-ioprio_get,290,252,252,315,31,315,274,278,268,268,274,274,31,283,283,289 +-ioprio_set,289,251,251,314,30,314,273,277,267,267,273,273,30,282,282,288 +-io_setup,245,206,543,243,0,241,200,200,215,215,227,227,0,243,243,245 +-io_submit,248,209,544,246,2,244,203,203,218,218,230,230,2,246,246,248 +-io_uring_enter,426,426,426,426,426,426,426,426,426,426,426,426,426,426,426,426 +-io_uring_register,427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,427 +-io_uring_setup,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425 +-ipc,117,PNR,PNR,PNR,PNR,117,PNR,PNR,PNR,PNR,117,117,PNR,117,117,117 +-kcmp,349,312,312,378,272,347,306,311,332,332,354,354,272,343,343,367 +-kexec_file_load,PNR,320,320,401,294,PNR,PNR,PNR,355,355,382,382,294,381,381,PNR +-kexec_load,283,246,528,347,104,311,270,274,300,300,268,268,104,277,277,283 +-keyctl,288,250,250,311,219,282,241,245,266,266,271,271,219,280,280,287 +-kill,37,62,62,37,129,37,60,60,37,37,37,37,129,37,37,37 +-lchown,16,94,94,16,PNR,16,92,92,16,16,16,16,PNR,16,198,16 +-lchown32,198,PNR,PNR,198,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,198,PNR,198 +-lgetxattr,230,192,192,230,9,228,184,184,242,242,213,213,9,228,228,230 +-link,9,86,86,9,PNR,9,84,84,9,9,9,9,PNR,9,9,9 +-linkat,303,265,265,330,37,296,255,259,283,283,294,294,37,296,296,303 +-listen,363,50,50,284,201,174,49,49,32,32,329,329,201,363,363,343 +-listxattr,232,194,194,232,11,230,186,186,244,244,215,215,11,230,230,232 +-llistxattr,233,195,195,233,12,231,187,187,245,245,216,216,12,231,231,233 +-_llseek,140,PNR,PNR,140,PNR,140,PNR,PNR,140,140,140,140,PNR,140,PNR,140 +-lock,53,PNR,PNR,PNR,PNR,53,PNR,PNR,PNR,PNR,53,53,PNR,PNR,PNR,PNR +-lookup_dcookie,253,212,212,249,18,247,206,206,223,223,235,235,18,110,110,253 +-lremovexattr,236,198,198,236,15,234,190,190,248,248,219,219,15,234,234,236 +-lseek,19,8,8,19,62,19,8,8,19,19,19,19,62,19,19,19 +-lsetxattr,227,189,189,227,6,225,181,181,239,239,210,210,6,225,225,227 +-lstat,107,6,6,107,PNR,107,6,6,84,84,107,107,PNR,107,107,107 +-lstat64,196,PNR,PNR,196,PNR,214,PNR,PNR,198,198,196,PNR,PNR,196,PNR,196 +-madvise,219,28,28,220,233,218,27,27,119,119,205,205,233,219,219,219 +-mbind,274,237,237,319,235,268,227,231,260,260,259,259,235,268,268,274 +-membarrier,375,324,324,389,283,358,318,322,343,343,365,365,283,356,356,378 +-memfd_create,356,319,319,385,279,354,314,318,340,340,360,360,279,350,350,374 +-migrate_pages,294,256,256,400,238,287,246,250,272,272,258,258,238,287,287,294 +-mincore,218,27,27,219,232,217,26,26,72,72,206,206,232,218,218,218 +-mkdir,39,83,83,39,PNR,39,81,81,39,39,39,39,PNR,39,39,39 +-mkdirat,296,258,258,323,34,289,248,252,276,276,287,287,34,289,289,296 +-mknod,14,133,133,14,PNR,14,131,131,14,14,14,14,PNR,14,14,14 +-mknodat,297,259,259,324,33,290,249,253,277,277,288,288,33,290,290,297 +-mlock,150,149,149,150,228,154,146,146,150,150,150,150,228,150,150,150 +-mlock2,376,325,325,390,284,359,319,323,345,345,378,378,284,374,374,379 +-mlockall,152,151,151,152,230,156,148,148,152,152,152,152,230,152,152,152 +-mmap,90,9,9,PNR,222,90,9,9,90,90,90,90,222,90,90,90 +-mmap2,192,PNR,PNR,192,PNR,210,PNR,PNR,89,89,192,PNR,PNR,192,PNR,192 +-modify_ldt,123,154,154,PNR,PNR,123,PNR,PNR,PNR,PNR,123,123,PNR,PNR,PNR,PNR +-mount,21,165,165,21,40,21,160,160,21,21,21,21,40,21,21,21 +-mount_setattr,442,442,442,442,442,442,442,442,442,442,442,442,442,442,442,442 +-move_mount,429,429,429,429,429,429,429,429,429,429,429,429,429,429,429,429 +-move_pages,317,279,533,344,239,308,267,271,295,295,301,301,239,310,310,317 +-mprotect,125,10,10,125,226,125,10,10,125,125,125,125,226,125,125,125 +-mpx,56,PNR,PNR,PNR,PNR,56,PNR,PNR,PNR,PNR,56,56,PNR,PNR,PNR,PNR +-mq_getsetattr,282,245,245,279,185,276,235,239,234,234,267,267,185,276,276,282 +-mq_notify,281,244,527,278,184,275,234,238,233,233,266,266,184,275,275,281 +-mq_open,277,240,240,274,180,271,230,234,229,229,262,262,180,271,271,277 +-mq_timedreceive,280,243,243,277,183,274,233,237,232,232,265,265,183,274,274,280 +-mq_timedreceive_time64,419,PNR,PNR,419,PNR,419,PNR,419,419,PNR,419,PNR,PNR,419,PNR,419 +-mq_timedsend,279,242,242,276,182,273,232,236,231,231,264,264,182,273,273,279 +-mq_timedsend_time64,418,PNR,PNR,418,PNR,418,PNR,418,418,PNR,418,PNR,PNR,418,PNR,418 +-mq_unlink,278,241,241,275,181,272,231,235,230,230,263,263,181,272,272,278 +-mremap,163,25,25,163,216,167,24,24,163,163,163,163,216,163,163,163 +-msgctl,402,71,71,304,187,402,69,69,191,191,402,402,187,402,402,402 +-msgget,399,68,68,303,186,399,66,66,190,190,399,399,186,399,399,399 +-msgrcv,401,70,70,302,188,401,68,68,189,189,401,401,188,401,401,401 +-msgsnd,400,69,69,301,189,400,67,67,188,188,400,400,189,400,400,400 +-msync,144,26,26,144,227,144,25,25,144,144,144,144,227,144,144,144 +-multiplexer,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,201,201,PNR,PNR,PNR,PNR +-munlock,151,150,150,151,229,155,147,147,151,151,151,151,229,151,151,151 +-munlockall,153,152,152,153,231,157,149,149,153,153,153,153,231,153,153,153 +-munmap,91,11,11,91,215,91,11,11,91,91,91,91,215,91,91,91 +-name_to_handle_at,341,303,303,370,264,339,298,303,325,325,345,345,264,335,335,359 +-nanosleep,162,35,35,162,101,166,34,34,162,162,162,162,101,162,162,162 +-newfstatat,PNR,262,262,PNR,79,PNR,252,256,PNR,PNR,PNR,291,79,PNR,293,PNR +-_newselect,142,PNR,PNR,142,PNR,142,22,22,142,142,142,142,PNR,142,PNR,142 +-nfsservctl,169,180,PNR,169,42,189,173,173,PNR,PNR,168,168,42,169,169,169 +-nice,34,PNR,PNR,34,PNR,34,PNR,PNR,34,34,34,34,PNR,34,34,34 +-oldfstat,28,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,28,28,PNR,PNR,PNR,28 +-oldlstat,84,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,84,84,PNR,PNR,PNR,84 +-oldolduname,59,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,59,59,PNR,PNR,PNR,PNR +-oldstat,18,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,18,18,PNR,PNR,PNR,18 +-olduname,109,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,109,109,PNR,PNR,PNR,109 +-open,5,2,2,5,PNR,5,2,2,5,5,5,5,PNR,5,5,5 +-openat,295,257,257,322,56,288,247,251,275,275,286,286,56,288,288,295 +-openat2,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437 +-open_by_handle_at,342,304,304,371,265,340,299,304,326,326,346,346,265,336,336,360 +-open_tree,428,428,428,428,428,428,428,428,428,428,428,428,428,428,428,428 +-pause,29,34,34,29,PNR,29,33,33,29,29,29,29,PNR,29,29,29 +-pciconfig_iobase,PNR,PNR,PNR,271,PNR,PNR,PNR,PNR,PNR,PNR,200,200,PNR,PNR,PNR,PNR +-pciconfig_read,PNR,PNR,PNR,272,PNR,PNR,PNR,PNR,PNR,PNR,198,198,PNR,PNR,PNR,PNR +-pciconfig_write,PNR,PNR,PNR,273,PNR,PNR,PNR,PNR,PNR,PNR,199,199,PNR,PNR,PNR,PNR +-perf_event_open,336,298,298,364,241,333,292,296,318,318,319,319,241,331,331,336 +-personality,136,135,135,136,92,136,132,132,136,136,136,136,92,136,136,136 +-pidfd_getfd,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438 +-pidfd_open,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434 +-pidfd_send_signal,424,424,424,424,424,424,424,424,424,424,424,424,424,424,424,424 +-pipe,42,22,22,42,PNR,42,21,21,42,42,42,42,PNR,42,42,42 +-pipe2,331,293,293,359,59,328,287,291,313,313,317,317,59,325,325,331 +-pivot_root,217,155,155,218,41,216,151,151,67,67,203,203,41,217,217,217 +-pkey_alloc,381,330,330,395,289,364,324,328,352,352,384,384,289,385,385,385 +-pkey_free,382,331,331,396,290,365,325,329,353,353,385,385,290,386,386,386 +-pkey_mprotect,380,329,329,394,288,363,323,327,351,351,386,386,288,384,384,384 +-poll,168,7,7,168,PNR,188,7,7,168,168,167,167,PNR,168,168,168 +-ppoll,309,271,271,336,73,302,261,265,274,274,281,281,73,302,302,309 +-ppoll_time64,414,PNR,PNR,414,PNR,414,PNR,414,414,PNR,414,PNR,PNR,414,PNR,414 +-prctl,172,157,157,172,167,192,153,153,172,172,171,171,167,172,172,172 +-pread64,180,17,17,180,67,200,16,16,108,108,179,179,67,180,180,180 +-preadv,333,295,534,361,69,330,289,293,315,315,320,320,69,328,328,333 +-preadv2,378,327,546,392,286,361,321,325,347,347,380,380,286,376,376,381 +-prlimit64,340,302,302,369,261,338,297,302,321,321,325,325,261,334,334,339 +-process_madvise,440,440,440,440,440,440,440,440,440,440,440,440,440,440,440,440 +-process_vm_readv,347,310,539,376,270,345,304,309,330,330,351,351,270,340,340,365 +-process_vm_writev,348,311,540,377,271,346,305,310,331,331,352,352,271,341,341,366 +-prof,44,PNR,PNR,PNR,PNR,44,PNR,PNR,PNR,PNR,44,44,PNR,PNR,PNR,PNR +-profil,98,PNR,PNR,PNR,PNR,98,PNR,PNR,PNR,PNR,98,98,PNR,PNR,PNR,PNR +-pselect6,308,270,270,335,72,301,260,264,273,273,280,280,72,301,301,308 +-pselect6_time64,413,PNR,PNR,413,PNR,413,PNR,413,413,PNR,413,PNR,PNR,413,PNR,413 +-ptrace,26,101,521,26,117,26,99,99,26,26,26,26,117,26,26,26 +-putpmsg,189,182,182,PNR,PNR,209,175,175,PNR,PNR,188,188,PNR,189,189,PNR +-pwrite64,181,18,18,181,68,201,17,17,109,109,180,180,68,181,181,181 +-pwritev,334,296,535,362,70,331,290,294,316,316,321,321,70,329,329,334 +-pwritev2,379,328,547,393,287,362,322,326,348,348,381,381,287,377,377,382 +-query_module,167,178,PNR,PNR,PNR,187,171,171,PNR,PNR,166,166,PNR,167,167,PNR +-quotactl,131,179,179,131,60,131,172,172,131,131,131,131,60,131,131,131 +-read,3,0,0,3,63,3,0,0,3,3,3,3,63,3,3,3 +-readahead,225,187,187,225,213,223,179,179,207,207,191,191,213,222,222,225 +-readdir,89,PNR,PNR,PNR,PNR,89,PNR,PNR,PNR,PNR,89,89,PNR,89,89,89 +-readlink,85,89,89,85,PNR,85,87,87,85,85,85,85,PNR,85,85,85 +-readlinkat,305,267,267,332,78,298,257,261,285,285,296,296,78,298,298,305 +-readv,145,19,515,145,65,145,18,18,145,145,145,145,65,145,145,145 +-reboot,88,169,169,88,142,88,164,164,88,88,88,88,142,88,88,88 +-recv,PNR,PNR,PNR,291,PNR,175,PNR,PNR,98,98,336,336,PNR,PNR,PNR,350 +-recvfrom,371,45,517,292,207,176,44,44,123,123,337,337,207,371,371,351 +-recvmmsg,337,299,537,365,243,335,294,298,319,319,343,343,243,357,357,357 +-recvmmsg_time64,417,PNR,PNR,417,PNR,417,PNR,417,417,PNR,417,PNR,PNR,417,PNR,417 +-recvmsg,372,47,519,297,212,177,46,46,184,184,342,342,212,372,372,356 +-remap_file_pages,257,216,216,253,234,251,210,210,227,227,239,239,234,267,267,257 +-removexattr,235,197,197,235,14,233,189,189,247,247,218,218,14,233,233,235 +-rename,38,82,82,38,PNR,38,80,80,38,38,38,38,PNR,38,38,38 +-renameat,302,264,264,329,38,295,254,258,282,282,293,293,PNR,295,295,302 +-renameat2,353,316,316,382,276,351,311,315,337,337,357,357,276,347,347,371 +-request_key,287,249,249,310,218,281,240,244,265,265,270,270,218,279,279,286 +-restart_syscall,0,219,219,0,128,253,213,214,0,0,0,0,128,7,7,0 +-riscv_flush_icache,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,259,PNR,PNR,PNR +-rmdir,40,84,84,40,PNR,40,82,82,40,40,40,40,PNR,40,40,40 +-rseq,386,334,334,398,293,367,327,331,354,354,387,387,293,383,383,387 +-rtas,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,255,255,PNR,PNR,PNR,PNR +-rt_sigaction,174,13,512,174,134,194,13,13,174,174,173,173,134,174,174,174 +-rt_sigpending,176,127,522,176,136,196,125,125,176,176,175,175,136,176,176,176 +-rt_sigprocmask,175,14,14,175,135,195,14,14,175,175,174,174,135,175,175,175 +-rt_sigqueueinfo,178,129,524,178,138,198,127,127,178,178,177,177,138,178,178,178 +-rt_sigreturn,173,15,513,173,139,193,211,211,173,173,172,172,139,173,173,173 +-rt_sigsuspend,179,130,130,179,133,199,128,128,179,179,178,178,133,179,179,179 +-rt_sigtimedwait,177,128,523,177,137,197,126,126,177,177,176,176,137,177,177,177 +-rt_sigtimedwait_time64,421,PNR,PNR,421,PNR,421,PNR,421,421,PNR,421,PNR,PNR,421,PNR,421 +-rt_tgsigqueueinfo,335,297,536,363,240,332,291,295,317,317,322,322,240,330,330,335 +-s390_guarded_storage,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,378,378,PNR +-s390_pci_mmio_read,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,353,353,PNR +-s390_pci_mmio_write,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,352,352,PNR +-s390_runtime_instr,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,342,342,PNR +-s390_sthyi,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,380,380,PNR +-sched_getaffinity,242,204,204,242,123,240,196,196,212,212,223,223,123,240,240,242 +-sched_getattr,352,315,315,381,275,350,310,314,335,335,356,356,275,346,346,369 +-sched_getparam,155,143,143,155,121,159,140,140,155,155,155,155,121,155,155,155 +-sched_get_priority_max,159,146,146,159,125,163,143,143,159,159,159,159,125,159,159,159 +-sched_get_priority_min,160,147,147,160,126,164,144,144,160,160,160,160,126,160,160,160 +-sched_getscheduler,157,145,145,157,120,161,142,142,157,157,157,157,120,157,157,157 +-sched_rr_get_interval,161,148,148,161,127,165,145,145,161,161,161,161,127,161,161,161 +-sched_rr_get_interval_time64,423,PNR,PNR,423,PNR,423,PNR,423,423,PNR,423,PNR,PNR,423,PNR,423 +-sched_setaffinity,241,203,203,241,122,239,195,195,211,211,222,222,122,239,239,241 +-sched_setattr,351,314,314,380,274,349,309,313,334,334,355,355,274,345,345,370 +-sched_setparam,154,142,142,154,118,158,139,139,154,154,154,154,118,154,154,154 +-sched_setscheduler,156,144,144,156,119,160,141,141,156,156,156,156,119,156,156,156 +-sched_yield,158,24,24,158,124,162,23,23,158,158,158,158,124,158,158,158 +-seccomp,354,317,317,383,277,352,312,316,338,338,358,358,277,348,348,372 +-security,PNR,185,185,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-select,82,23,23,PNR,PNR,PNR,PNR,PNR,PNR,PNR,82,82,PNR,PNR,142,PNR +-semctl,394,66,66,300,191,394,64,64,187,187,394,394,191,394,394,394 +-semget,393,64,64,299,190,393,62,62,186,186,393,393,190,393,393,393 +-semop,PNR,65,65,298,193,PNR,63,63,185,185,PNR,PNR,193,PNR,PNR,PNR +-semtimedop,PNR,220,220,312,192,PNR,214,215,228,228,PNR,392,192,PNR,392,PNR +-semtimedop_time64,420,PNR,PNR,420,PNR,420,PNR,420,420,PNR,420,PNR,PNR,420,PNR,420 +-send,PNR,PNR,PNR,289,PNR,178,PNR,PNR,58,58,334,334,PNR,PNR,PNR,348 +-sendfile,187,40,40,187,71,207,39,39,122,122,186,186,71,187,187,187 +-sendfile64,239,PNR,PNR,239,PNR,237,PNR,219,209,209,226,PNR,PNR,223,PNR,239 +-sendmmsg,345,307,538,374,269,343,302,307,329,329,349,349,269,358,358,363 +-sendmsg,370,46,518,296,211,179,45,45,183,183,341,341,211,370,370,355 +-sendto,369,44,44,290,206,180,43,43,82,82,335,335,206,369,369,349 +-setdomainname,121,171,171,121,162,121,166,166,121,121,121,121,162,121,121,121 +-setfsgid,139,123,123,139,152,139,121,121,139,139,139,139,152,139,216,139 +-setfsgid32,216,PNR,PNR,216,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,216,PNR,216 +-setfsuid,138,122,122,138,151,138,120,120,138,138,138,138,151,138,215,138 +-setfsuid32,215,PNR,PNR,215,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,215,PNR,215 +-setgid,46,106,106,46,144,46,104,104,46,46,46,46,144,46,214,46 +-setgid32,214,PNR,PNR,214,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,214,PNR,214 +-setgroups,81,116,116,81,159,81,114,114,81,81,81,81,159,81,206,81 +-setgroups32,206,PNR,PNR,206,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,206,PNR,206 +-sethostname,74,170,170,74,161,74,165,165,74,74,74,74,161,74,74,74 +-setitimer,104,38,38,104,103,104,36,36,104,104,104,104,103,104,104,104 +-set_mempolicy,276,238,238,321,237,270,229,233,262,262,261,261,237,270,270,276 +-setns,346,308,308,375,268,344,303,308,328,328,350,350,268,339,339,364 +-setpgid,57,109,109,57,154,57,107,107,57,57,57,57,154,57,57,57 +-setpriority,97,141,141,97,140,97,138,138,97,97,97,97,140,97,97,97 +-setregid,71,114,114,71,143,71,112,112,71,71,71,71,143,71,204,71 +-setregid32,204,PNR,PNR,204,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,204,PNR,204 +-setresgid,170,119,119,170,149,190,117,117,170,170,169,169,149,170,210,170 +-setresgid32,210,PNR,PNR,210,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,210,PNR,210 +-setresuid,164,117,117,164,147,185,115,115,164,164,164,164,147,164,208,164 +-setresuid32,208,PNR,PNR,208,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,208,PNR,208 +-setreuid,70,113,113,70,145,70,111,111,70,70,70,70,145,70,203,70 +-setreuid32,203,PNR,PNR,203,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,203,PNR,203 +-setrlimit,75,160,160,75,164,75,155,155,75,75,75,75,164,75,75,75 +-set_robust_list,311,273,530,338,99,309,268,272,289,289,300,300,99,304,304,311 +-setsid,66,112,112,66,157,66,110,110,66,66,66,66,157,66,66,66 +-setsockopt,366,54,541,294,208,181,53,53,181,181,339,339,208,366,366,353 +-set_thread_area,243,205,PNR,PNR,PNR,283,242,246,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-set_tid_address,258,218,218,256,96,252,212,213,237,237,232,232,96,252,252,258 +-settimeofday,79,164,164,79,170,79,159,159,79,79,79,79,170,79,79,79 +-set_tls,PNR,PNR,PNR,983045,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-setuid,23,105,105,23,146,23,103,103,23,23,23,23,146,23,213,23 +-setuid32,213,PNR,PNR,213,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,213,PNR,213 +-setxattr,226,188,188,226,5,224,180,180,238,238,209,209,5,224,224,226 +-sgetmask,68,PNR,PNR,PNR,PNR,68,PNR,PNR,68,68,68,68,PNR,PNR,PNR,68 +-shmat,397,30,30,305,196,397,29,29,192,192,397,397,196,397,397,397 +-shmctl,396,31,31,308,195,396,30,30,195,195,396,396,195,396,396,396 +-shmdt,398,67,67,306,197,398,65,65,193,193,398,398,197,398,398,398 +-shmget,395,29,29,307,194,395,28,28,194,194,395,395,194,395,395,395 +-shutdown,373,48,48,293,210,182,47,47,117,117,338,338,210,373,373,352 +-sigaction,67,PNR,PNR,67,PNR,67,PNR,PNR,PNR,PNR,67,67,PNR,67,67,67 +-sigaltstack,186,131,525,186,132,206,129,129,166,166,185,185,132,186,186,186 +-signal,48,PNR,PNR,PNR,PNR,48,PNR,PNR,48,48,48,48,PNR,48,48,48 +-signalfd,321,282,282,349,PNR,317,276,280,302,302,305,305,PNR,316,316,321 +-signalfd4,327,289,289,355,74,324,283,287,309,309,313,313,74,322,322,327 +-sigpending,73,PNR,PNR,73,PNR,73,PNR,PNR,73,73,73,73,PNR,73,73,73 +-sigprocmask,126,PNR,PNR,126,PNR,126,PNR,PNR,126,126,126,126,PNR,126,126,126 +-sigreturn,119,PNR,PNR,119,PNR,119,PNR,PNR,PNR,PNR,119,119,PNR,119,119,119 +-sigsuspend,72,PNR,PNR,72,PNR,72,PNR,PNR,PNR,PNR,72,72,PNR,72,72,72 +-socket,359,41,41,281,198,183,40,40,17,17,326,326,198,359,359,340 +-socketcall,102,PNR,PNR,PNR,PNR,102,PNR,PNR,PNR,PNR,102,102,PNR,102,102,102 +-socketpair,360,53,53,288,199,184,52,52,56,56,333,333,199,360,360,347 +-splice,313,275,275,340,76,304,263,267,291,291,283,283,76,306,306,313 +-spu_create,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,279,279,PNR,PNR,PNR,PNR +-spu_run,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,278,278,PNR,PNR,PNR,PNR +-ssetmask,69,PNR,PNR,PNR,PNR,69,PNR,PNR,69,69,69,69,PNR,PNR,PNR,69 +-stat,106,4,4,106,PNR,106,4,4,18,18,106,106,PNR,106,106,106 +-stat64,195,PNR,PNR,195,PNR,213,PNR,PNR,101,101,195,PNR,PNR,195,PNR,195 +-statfs,99,137,137,99,43,99,134,134,99,99,99,99,43,99,99,99 +-statfs64,268,PNR,PNR,266,PNR,255,PNR,217,298,298,252,252,PNR,265,265,268 +-statx,383,332,332,397,291,366,326,330,349,349,383,383,291,379,379,383 +-stime,25,PNR,PNR,PNR,PNR,25,PNR,PNR,25,25,25,25,PNR,25,PNR,25 +-stty,31,PNR,PNR,PNR,PNR,31,PNR,PNR,PNR,PNR,31,31,PNR,PNR,PNR,PNR +-subpage_prot,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,310,310,PNR,PNR,PNR,PNR +-swapcontext,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,249,249,PNR,PNR,PNR,PNR +-swapoff,115,168,168,115,225,115,163,163,115,115,115,115,225,115,115,115 +-swapon,87,167,167,87,224,87,162,162,87,87,87,87,224,87,87,87 +-switch_endian,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,363,363,PNR,PNR,PNR,PNR +-symlink,83,88,88,83,PNR,83,86,86,83,83,83,83,PNR,83,83,83 +-symlinkat,304,266,266,331,36,297,256,260,284,284,295,295,36,297,297,304 +-sync,36,162,162,36,81,36,157,157,36,36,36,36,81,36,36,36 +-sync_file_range,314,277,277,PNR,84,305,264,268,292,292,PNR,PNR,84,307,307,314 +-sync_file_range2,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,308,308,PNR,PNR,PNR,PNR +-syncfs,344,306,306,373,267,342,301,306,327,327,348,348,267,338,338,362 +-syscall,PNR,PNR,PNR,PNR,PNR,0,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-_sysctl,149,156,PNR,149,PNR,153,152,152,149,149,149,149,PNR,149,149,149 +-sys_debug_setcontext,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,256,256,PNR,PNR,PNR,PNR +-sysfs,135,139,139,135,PNR,135,136,136,135,135,135,135,PNR,135,135,135 +-sysinfo,116,99,99,116,179,116,97,97,116,116,116,116,179,116,116,116 +-syslog,103,103,103,103,116,103,101,101,103,103,103,103,116,103,103,103 +-sysmips,PNR,PNR,PNR,PNR,PNR,149,199,199,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-tee,315,276,276,342,77,306,265,269,293,293,284,284,77,308,308,315 +-tgkill,270,234,234,268,131,266,225,229,259,259,250,250,131,241,241,270 +-time,13,201,201,PNR,PNR,13,PNR,PNR,13,13,13,13,PNR,13,PNR,13 +-timer_create,259,222,526,257,107,257,216,220,250,250,240,240,107,254,254,259 +-timer_delete,263,226,226,261,111,261,220,224,254,254,244,244,111,258,258,263 +-timerfd,PNR,PNR,PNR,PNR,PNR,318,277,281,PNR,PNR,PNR,PNR,PNR,317,317,PNR +-timerfd_create,322,283,283,350,85,321,280,284,306,306,306,306,85,319,319,322 +-timerfd_gettime,326,287,287,354,87,322,281,285,308,308,312,312,87,321,321,326 +-timerfd_gettime64,410,PNR,PNR,410,PNR,410,PNR,410,410,PNR,410,PNR,PNR,410,PNR,410 +-timerfd_settime,325,286,286,353,86,323,282,286,307,307,311,311,86,320,320,325 +-timerfd_settime64,411,PNR,PNR,411,PNR,411,PNR,411,411,PNR,411,PNR,PNR,411,PNR,411 +-timer_getoverrun,262,225,225,260,109,260,219,223,253,253,243,243,109,257,257,262 +-timer_gettime,261,224,224,259,108,259,218,222,252,252,242,242,108,256,256,261 +-timer_gettime64,408,PNR,PNR,408,PNR,408,PNR,408,408,PNR,408,PNR,PNR,408,PNR,408 +-timer_settime,260,223,223,258,110,258,217,221,251,251,241,241,110,255,255,260 +-timer_settime64,409,PNR,PNR,409,PNR,409,PNR,409,409,PNR,409,PNR,PNR,409,PNR,409 +-times,43,100,100,43,153,43,98,98,43,43,43,43,153,43,43,43 +-tkill,238,200,200,238,130,236,192,192,208,208,208,208,130,237,237,238 +-truncate,92,76,76,92,45,92,74,74,92,92,92,92,45,92,92,92 +-truncate64,193,PNR,PNR,193,PNR,211,PNR,PNR,199,199,193,PNR,PNR,193,PNR,193 +-tuxcall,PNR,184,184,PNR,PNR,PNR,PNR,PNR,PNR,PNR,225,225,PNR,PNR,PNR,PNR +-ugetrlimit,191,PNR,PNR,191,PNR,PNR,PNR,PNR,PNR,PNR,190,190,PNR,191,PNR,191 +-ulimit,58,PNR,PNR,PNR,PNR,58,PNR,PNR,PNR,PNR,58,58,PNR,PNR,PNR,PNR +-umask,60,95,95,60,166,60,93,93,60,60,60,60,166,60,60,60 +-umount,22,PNR,PNR,PNR,PNR,22,PNR,PNR,PNR,PNR,22,22,PNR,22,22,22 +-umount2,52,166,166,52,39,52,161,161,52,52,52,52,39,52,52,52 +-uname,122,63,63,122,160,122,61,61,59,59,122,122,160,122,122,122 +-unlink,10,87,87,10,PNR,10,85,85,10,10,10,10,PNR,10,10,10 +-unlinkat,301,263,263,328,35,294,253,257,281,281,292,292,35,294,294,301 +-unshare,310,272,272,337,97,303,262,266,288,288,282,282,97,303,303,310 +-uselib,86,134,PNR,86,PNR,86,PNR,PNR,86,86,86,86,PNR,86,86,86 +-userfaultfd,374,323,323,388,282,357,317,321,344,344,364,364,282,355,355,377 +-usr26,PNR,PNR,PNR,983043,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-usr32,PNR,PNR,PNR,983044,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-ustat,62,136,136,62,PNR,62,133,133,62,62,62,62,PNR,62,62,62 +-utime,30,132,132,PNR,PNR,30,130,130,30,30,30,30,PNR,30,30,30 +-utimensat,320,280,280,348,88,316,275,279,301,301,304,304,88,315,315,320 +-utimensat_time64,412,PNR,PNR,412,PNR,412,PNR,412,412,PNR,412,PNR,PNR,412,PNR,412 +-utimes,271,235,235,269,PNR,267,226,230,336,336,251,251,PNR,313,313,271 +-vfork,190,58,58,190,PNR,PNR,PNR,PNR,113,113,189,189,PNR,190,190,190 +-vhangup,111,153,153,111,58,111,150,150,111,111,111,111,58,111,111,111 +-vm86,166,PNR,PNR,PNR,PNR,113,PNR,PNR,PNR,PNR,113,113,PNR,PNR,PNR,PNR +-vm86old,113,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-vmsplice,316,278,532,343,75,307,266,270,294,294,285,285,75,309,309,316 +-vserver,273,236,PNR,313,PNR,277,236,240,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR +-wait4,114,61,61,114,260,114,59,59,114,114,114,114,260,114,114,114 +-waitid,284,247,529,280,95,278,237,241,235,235,272,272,95,281,281,284 +-waitpid,7,PNR,PNR,PNR,PNR,7,PNR,PNR,7,7,7,7,PNR,PNR,PNR,7 +-write,4,1,1,4,64,4,1,1,4,4,4,4,64,4,4,4 +-writev,146,20,516,146,66,146,19,19,146,146,146,146,66,146,146,146 ++#syscall (v5.13.0-rc5 2021-06-09),x86,x86_64,x32,arm,aarch64,mips,mips64,mips64n32,parisc,parisc64,ppc,ppc64,riscv32,riscv64,s390,s390x,sh ++accept,PNR,43,43,285,202,168,42,42,35,35,330,330,202,202,PNR,PNR,344 ++accept4,364,288,288,366,242,334,293,297,320,320,344,344,242,242,364,364,358 ++access,33,21,21,33,PNR,33,20,20,33,33,33,33,PNR,PNR,33,33,33 ++acct,51,163,163,51,89,51,158,158,51,51,51,51,89,89,51,51,51 ++add_key,286,248,248,309,217,280,239,243,264,264,269,269,217,217,278,278,285 ++adjtimex,124,159,159,124,171,124,154,154,124,124,124,124,171,171,124,124,124 ++afs_syscall,137,183,183,PNR,PNR,137,176,176,PNR,PNR,137,137,PNR,PNR,137,137,PNR ++alarm,27,37,37,PNR,PNR,27,37,37,27,27,27,27,PNR,PNR,27,27,27 ++arch_prctl,384,158,158,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++arm_fadvise64_64,PNR,PNR,PNR,270,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++arm_sync_file_range,PNR,PNR,PNR,341,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++bdflush,134,PNR,PNR,134,PNR,134,PNR,PNR,134,134,134,134,PNR,PNR,134,134,134 ++bind,361,49,49,282,200,169,48,48,22,22,327,327,200,200,361,361,341 ++bpf,357,321,321,386,280,355,315,319,341,341,361,361,280,280,351,351,375 ++break,17,PNR,PNR,PNR,PNR,17,PNR,PNR,PNR,PNR,17,17,PNR,PNR,PNR,PNR,PNR ++breakpoint,PNR,PNR,PNR,983041,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++brk,45,12,12,45,214,45,12,12,45,45,45,45,214,214,45,45,45 ++cachectl,PNR,PNR,PNR,PNR,PNR,148,198,198,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++cacheflush,PNR,PNR,PNR,983042,PNR,147,197,197,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,123 ++capget,184,125,125,184,90,204,123,123,106,106,183,183,90,90,184,184,184 ++capset,185,126,126,185,91,205,124,124,107,107,184,184,91,91,185,185,185 ++chdir,12,80,80,12,49,12,78,78,12,12,12,12,49,49,12,12,12 ++chmod,15,90,90,15,PNR,15,88,88,15,15,15,15,PNR,PNR,15,15,15 ++chown,182,92,92,182,PNR,202,90,90,180,180,181,181,PNR,PNR,182,212,182 ++chown32,212,PNR,PNR,212,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,212,PNR,212 ++chroot,61,161,161,61,51,61,156,156,61,61,61,61,51,51,61,61,61 ++clock_adjtime,343,305,305,372,266,341,300,305,324,324,347,347,266,266,337,337,361 ++clock_adjtime64,405,PNR,PNR,405,PNR,405,PNR,405,405,PNR,405,PNR,PNR,PNR,405,PNR,405 ++clock_getres,266,229,229,264,114,264,223,227,257,257,247,247,114,114,261,261,266 ++clock_getres_time64,406,PNR,PNR,406,PNR,406,PNR,406,406,PNR,406,PNR,PNR,PNR,406,PNR,406 ++clock_gettime,265,228,228,263,113,263,222,226,256,256,246,246,113,113,260,260,265 ++clock_gettime64,403,PNR,PNR,403,PNR,403,PNR,403,403,PNR,403,PNR,PNR,PNR,403,PNR,403 ++clock_nanosleep,267,230,230,265,115,265,224,228,258,258,248,248,115,115,262,262,267 ++clock_nanosleep_time64,407,PNR,PNR,407,PNR,407,PNR,407,407,PNR,407,PNR,PNR,PNR,407,PNR,407 ++clock_settime,264,227,227,262,112,262,221,225,255,255,245,245,112,112,259,259,264 ++clock_settime64,404,PNR,PNR,404,PNR,404,PNR,404,404,PNR,404,PNR,PNR,PNR,404,PNR,404 ++clone,120,56,56,120,220,120,55,55,120,120,120,120,220,220,120,120,120 ++clone3,435,435,435,435,435,435,435,435,435,435,435,435,435,435,435,435,PNR ++close,6,3,3,6,57,6,3,3,6,6,6,6,57,57,6,6,6 ++close_range,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436 ++connect,362,42,42,283,203,170,41,41,31,31,328,328,203,203,362,362,342 ++copy_file_range,377,326,326,391,285,360,320,324,346,346,379,379,285,285,375,375,380 ++creat,8,85,85,8,PNR,8,83,83,8,8,8,8,PNR,PNR,8,8,8 ++create_module,127,174,PNR,PNR,PNR,127,167,167,PNR,PNR,127,127,PNR,PNR,127,127,PNR ++delete_module,129,176,176,129,106,129,169,169,129,129,129,129,106,106,129,129,129 ++dup,41,32,32,41,23,41,31,31,41,41,41,41,23,23,41,41,41 ++dup2,63,33,33,63,PNR,63,32,32,63,63,63,63,PNR,PNR,63,63,63 ++dup3,330,292,292,358,24,327,286,290,312,312,316,316,24,24,326,326,330 ++epoll_create,254,213,213,250,PNR,248,207,207,224,224,236,236,PNR,PNR,249,249,254 ++epoll_create1,329,291,291,357,20,326,285,289,311,311,315,315,20,20,327,327,329 ++epoll_ctl,255,233,233,251,21,249,208,208,225,225,237,237,21,21,250,250,255 ++epoll_ctl_old,PNR,214,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++epoll_pwait,319,281,281,346,22,313,272,276,297,297,303,303,22,22,312,312,319 ++epoll_pwait2,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441,441 ++epoll_wait,256,232,232,252,PNR,250,209,209,226,226,238,238,PNR,PNR,251,251,256 ++epoll_wait_old,PNR,215,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++eventfd,323,284,284,351,PNR,319,278,282,304,304,307,307,PNR,PNR,318,318,323 ++eventfd2,328,290,290,356,19,325,284,288,310,310,314,314,19,19,323,323,328 ++execve,11,59,520,11,221,11,57,57,11,11,11,11,221,221,11,11,11 ++execveat,358,322,545,387,281,356,316,320,342,342,362,362,281,281,354,354,376 ++exit,1,60,60,1,93,1,58,58,1,1,1,1,93,93,1,1,1 ++exit_group,252,231,231,248,94,246,205,205,222,222,234,234,94,94,248,248,252 ++faccessat,307,269,269,334,48,300,259,263,287,287,298,298,48,48,300,300,307 ++faccessat2,439,439,439,439,439,439,439,439,439,439,439,439,439,439,439,439,439 ++fadvise64,250,221,221,PNR,223,254,215,216,PNR,PNR,233,233,223,223,253,253,250 ++fadvise64_64,272,PNR,PNR,PNR,PNR,PNR,PNR,PNR,236,236,254,PNR,PNR,PNR,264,PNR,272 ++fallocate,324,285,285,352,47,320,279,283,305,305,309,309,47,47,314,314,324 ++fanotify_init,338,300,300,367,262,336,295,300,322,322,323,323,262,262,332,332,337 ++fanotify_mark,339,301,301,368,263,337,296,301,323,323,324,324,263,263,333,333,338 ++fchdir,133,81,81,133,50,133,79,79,133,133,133,133,50,50,133,133,133 ++fchmod,94,91,91,94,52,94,89,89,94,94,94,94,52,52,94,94,94 ++fchmodat,306,268,268,333,53,299,258,262,286,286,297,297,53,53,299,299,306 ++fchown,95,93,93,95,55,95,91,91,95,95,95,95,55,55,95,207,95 ++fchown32,207,PNR,PNR,207,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,207,PNR,207 ++fchownat,298,260,260,325,54,291,250,254,278,278,289,289,54,54,291,291,298 ++fcntl,55,72,72,55,25,55,70,70,55,55,55,55,25,25,55,55,55 ++fcntl64,221,PNR,PNR,221,PNR,220,PNR,212,202,202,204,PNR,PNR,PNR,221,PNR,221 ++fdatasync,148,75,75,148,83,152,73,73,148,148,148,148,83,83,148,148,148 ++fgetxattr,231,193,193,231,10,229,185,185,243,243,214,214,10,10,229,229,231 ++finit_module,350,313,313,379,273,348,307,312,333,333,353,353,273,273,344,344,368 ++flistxattr,234,196,196,234,13,232,188,188,246,246,217,217,13,13,232,232,234 ++flock,143,73,73,143,32,143,71,71,143,143,143,143,32,32,143,143,143 ++fork,2,57,57,2,PNR,2,56,56,2,2,2,2,PNR,PNR,2,2,2 ++fremovexattr,237,199,199,237,16,235,191,191,249,249,220,220,16,16,235,235,237 ++fsconfig,431,431,431,431,431,431,431,431,431,431,431,431,431,431,431,431,431 ++fsetxattr,228,190,190,228,7,226,182,182,240,240,211,211,7,7,226,226,228 ++fsmount,432,432,432,432,432,432,432,432,432,432,432,432,432,432,432,432,432 ++fsopen,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430 ++fspick,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433,433 ++fstat,108,5,5,108,80,108,5,5,28,28,108,108,80,80,108,108,108 ++fstat64,197,PNR,PNR,197,PNR,215,PNR,PNR,112,112,197,PNR,PNR,PNR,197,PNR,197 ++fstatat64,300,PNR,PNR,327,PNR,293,PNR,PNR,280,280,291,PNR,PNR,PNR,293,PNR,300 ++fstatfs,100,138,138,100,44,100,135,135,100,100,100,100,44,44,100,100,100 ++fstatfs64,269,PNR,PNR,267,PNR,256,PNR,218,299,299,253,253,PNR,PNR,266,266,269 ++fsync,118,74,74,118,82,118,72,72,118,118,118,118,82,82,118,118,118 ++ftime,35,PNR,PNR,PNR,PNR,35,PNR,PNR,PNR,PNR,35,35,PNR,PNR,PNR,PNR,PNR ++ftruncate,93,77,77,93,46,93,75,75,93,93,93,93,46,46,93,93,93 ++ftruncate64,194,PNR,PNR,194,PNR,212,PNR,PNR,200,200,194,PNR,PNR,PNR,194,PNR,194 ++futex,240,202,202,240,98,238,194,194,210,210,221,221,98,98,238,238,240 ++futex_time64,422,PNR,PNR,422,PNR,422,PNR,422,422,PNR,422,PNR,PNR,PNR,422,PNR,422 ++futimesat,299,261,261,326,PNR,292,251,255,279,279,290,290,PNR,PNR,292,292,299 ++getcpu,318,309,309,345,168,312,271,275,296,296,302,302,168,168,311,311,318 ++getcwd,183,79,79,183,17,203,77,77,110,110,182,182,17,17,183,183,183 ++getdents,141,78,78,141,PNR,141,76,76,141,141,141,141,PNR,PNR,141,141,141 ++getdents64,220,217,217,217,61,219,308,299,201,201,202,202,61,61,220,220,220 ++getegid,50,108,108,50,177,50,106,106,50,50,50,50,177,177,50,202,50 ++getegid32,202,PNR,PNR,202,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,202,PNR,202 ++geteuid,49,107,107,49,175,49,105,105,49,49,49,49,175,175,49,201,49 ++geteuid32,201,PNR,PNR,201,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,201,PNR,201 ++getgid,47,104,104,47,176,47,102,102,47,47,47,47,176,176,47,200,47 ++getgid32,200,PNR,PNR,200,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,200,PNR,200 ++getgroups,80,115,115,80,158,80,113,113,80,80,80,80,158,158,80,205,80 ++getgroups32,205,PNR,PNR,205,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,205,PNR,205 ++getitimer,105,36,36,105,102,105,35,35,105,105,105,105,102,102,105,105,105 ++get_kernel_syms,130,177,PNR,PNR,PNR,130,170,170,PNR,PNR,130,130,PNR,PNR,130,130,PNR ++get_mempolicy,275,239,239,320,236,269,228,232,261,261,260,260,236,236,269,269,275 ++getpeername,368,52,52,287,205,171,51,51,53,53,332,332,205,205,368,368,346 ++getpgid,132,121,121,132,155,132,119,119,132,132,132,132,155,155,132,132,132 ++getpgrp,65,111,111,65,PNR,65,109,109,65,65,65,65,PNR,PNR,65,65,65 ++getpid,20,39,39,20,172,20,38,38,20,20,20,20,172,172,20,20,20 ++getpmsg,188,181,181,PNR,PNR,208,174,174,PNR,PNR,187,187,PNR,PNR,188,188,PNR ++getppid,64,110,110,64,173,64,108,108,64,64,64,64,173,173,64,64,64 ++getpriority,96,140,140,96,141,96,137,137,96,96,96,96,141,141,96,96,96 ++getrandom,355,318,318,384,278,353,313,317,339,339,359,359,278,278,349,349,373 ++getresgid,171,120,120,171,150,191,118,118,171,171,170,170,150,150,171,211,171 ++getresgid32,211,PNR,PNR,211,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,211,PNR,211 ++getresuid,165,118,118,165,148,186,116,116,165,165,165,165,148,148,165,209,165 ++getresuid32,209,PNR,PNR,209,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,209,PNR,209 ++getrlimit,76,97,97,PNR,163,76,95,95,76,76,76,76,163,163,76,191,76 ++get_robust_list,312,274,531,339,100,310,269,273,290,290,299,299,100,100,305,305,312 ++getrusage,77,98,98,77,165,77,96,96,77,77,77,77,165,165,77,77,77 ++getsid,147,124,124,147,156,151,122,122,147,147,147,147,156,156,147,147,147 ++getsockname,367,51,51,286,204,172,50,50,44,44,331,331,204,204,367,367,345 ++getsockopt,365,55,542,295,209,173,54,54,182,182,340,340,209,209,365,365,354 ++get_thread_area,244,211,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++gettid,224,186,186,224,178,222,178,178,206,206,207,207,178,178,236,236,224 ++gettimeofday,78,96,96,78,169,78,94,94,78,78,78,78,169,169,78,78,78 ++get_tls,PNR,PNR,PNR,983046,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++getuid,24,102,102,24,174,24,100,100,24,24,24,24,174,174,24,199,24 ++getuid32,199,PNR,PNR,199,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,199,PNR,199 ++getxattr,229,191,191,229,8,227,183,183,241,241,212,212,8,8,227,227,229 ++gtty,32,PNR,PNR,PNR,PNR,32,PNR,PNR,PNR,PNR,32,32,PNR,PNR,PNR,PNR,PNR ++idle,112,PNR,PNR,PNR,PNR,112,PNR,PNR,PNR,PNR,112,112,PNR,PNR,112,112,PNR ++init_module,128,175,175,128,105,128,168,168,128,128,128,128,105,105,128,128,128 ++inotify_add_watch,292,254,254,317,27,285,244,248,270,270,276,276,27,27,285,285,291 ++inotify_init,291,253,253,316,PNR,284,243,247,269,269,275,275,PNR,PNR,284,284,290 ++inotify_init1,332,294,294,360,26,329,288,292,314,314,318,318,26,26,324,324,332 ++inotify_rm_watch,293,255,255,318,28,286,245,249,271,271,277,277,28,28,286,286,292 ++io_cancel,249,210,210,247,3,245,204,204,219,219,231,231,3,3,247,247,249 ++ioctl,54,16,514,54,29,54,15,15,54,54,54,54,29,29,54,54,54 ++io_destroy,246,207,207,244,1,242,201,201,216,216,228,228,1,1,244,244,246 ++io_getevents,247,208,208,245,4,243,202,202,217,217,229,229,4,4,245,245,247 ++ioperm,101,173,173,PNR,PNR,101,PNR,PNR,PNR,PNR,101,101,PNR,PNR,101,PNR,PNR ++io_pgetevents,385,333,333,399,292,368,328,332,350,350,388,388,292,292,382,382,PNR ++io_pgetevents_time64,416,PNR,PNR,416,PNR,416,PNR,416,416,PNR,416,PNR,PNR,PNR,416,PNR,416 ++iopl,110,172,172,PNR,PNR,110,PNR,PNR,PNR,PNR,110,110,PNR,PNR,PNR,PNR,PNR ++ioprio_get,290,252,252,315,31,315,274,278,268,268,274,274,31,31,283,283,289 ++ioprio_set,289,251,251,314,30,314,273,277,267,267,273,273,30,30,282,282,288 ++io_setup,245,206,543,243,0,241,200,200,215,215,227,227,0,0,243,243,245 ++io_submit,248,209,544,246,2,244,203,203,218,218,230,230,2,2,246,246,248 ++io_uring_enter,426,426,426,426,426,426,426,426,426,426,426,426,426,426,426,426,426 ++io_uring_register,427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,427,427 ++io_uring_setup,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425 ++ipc,117,PNR,PNR,PNR,PNR,117,PNR,PNR,PNR,PNR,117,117,PNR,PNR,117,117,117 ++kcmp,349,312,312,378,272,347,306,311,332,332,354,354,272,272,343,343,367 ++kexec_file_load,PNR,320,320,401,294,PNR,PNR,PNR,355,355,382,382,294,294,381,381,PNR ++kexec_load,283,246,528,347,104,311,270,274,300,300,268,268,104,104,277,277,283 ++keyctl,288,250,250,311,219,282,241,245,266,266,271,271,219,219,280,280,287 ++kill,37,62,62,37,129,37,60,60,37,37,37,37,129,129,37,37,37 ++landlock_add_rule,445,445,445,445,445,445,445,445,445,445,445,445,445,445,445,445,445 ++landlock_create_ruleset,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444,444 ++landlock_restrict_self,446,446,446,446,446,446,446,446,446,446,446,446,446,446,446,446,446 ++lchown,16,94,94,16,PNR,16,92,92,16,16,16,16,PNR,PNR,16,198,16 ++lchown32,198,PNR,PNR,198,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,198,PNR,198 ++lgetxattr,230,192,192,230,9,228,184,184,242,242,213,213,9,9,228,228,230 ++link,9,86,86,9,PNR,9,84,84,9,9,9,9,PNR,PNR,9,9,9 ++linkat,303,265,265,330,37,296,255,259,283,283,294,294,37,37,296,296,303 ++listen,363,50,50,284,201,174,49,49,32,32,329,329,201,201,363,363,343 ++listxattr,232,194,194,232,11,230,186,186,244,244,215,215,11,11,230,230,232 ++llistxattr,233,195,195,233,12,231,187,187,245,245,216,216,12,12,231,231,233 ++_llseek,140,PNR,PNR,140,PNR,140,PNR,PNR,140,140,140,140,PNR,PNR,140,PNR,140 ++lock,53,PNR,PNR,PNR,PNR,53,PNR,PNR,PNR,PNR,53,53,PNR,PNR,PNR,PNR,PNR ++lookup_dcookie,253,212,212,249,18,247,206,206,223,223,235,235,18,18,110,110,253 ++lremovexattr,236,198,198,236,15,234,190,190,248,248,219,219,15,15,234,234,236 ++lseek,19,8,8,19,62,19,8,8,19,19,19,19,62,62,19,19,19 ++lsetxattr,227,189,189,227,6,225,181,181,239,239,210,210,6,6,225,225,227 ++lstat,107,6,6,107,PNR,107,6,6,84,84,107,107,PNR,PNR,107,107,107 ++lstat64,196,PNR,PNR,196,PNR,214,PNR,PNR,198,198,196,PNR,PNR,PNR,196,PNR,196 ++madvise,219,28,28,220,233,218,27,27,119,119,205,205,233,233,219,219,219 ++mbind,274,237,237,319,235,268,227,231,260,260,259,259,235,235,268,268,274 ++membarrier,375,324,324,389,283,358,318,322,343,343,365,365,283,283,356,356,378 ++memfd_create,356,319,319,385,279,354,314,318,340,340,360,360,279,279,350,350,374 ++migrate_pages,294,256,256,400,238,287,246,250,272,272,258,258,238,238,287,287,294 ++mincore,218,27,27,219,232,217,26,26,72,72,206,206,232,232,218,218,218 ++mkdir,39,83,83,39,PNR,39,81,81,39,39,39,39,PNR,PNR,39,39,39 ++mkdirat,296,258,258,323,34,289,248,252,276,276,287,287,34,34,289,289,296 ++mknod,14,133,133,14,PNR,14,131,131,14,14,14,14,PNR,PNR,14,14,14 ++mknodat,297,259,259,324,33,290,249,253,277,277,288,288,33,33,290,290,297 ++mlock,150,149,149,150,228,154,146,146,150,150,150,150,228,228,150,150,150 ++mlock2,376,325,325,390,284,359,319,323,345,345,378,378,284,284,374,374,379 ++mlockall,152,151,151,152,230,156,148,148,152,152,152,152,230,230,152,152,152 ++mmap,90,9,9,PNR,222,90,9,9,90,90,90,90,222,222,90,90,90 ++mmap2,192,PNR,PNR,192,PNR,210,PNR,PNR,89,89,192,PNR,PNR,PNR,192,PNR,192 ++modify_ldt,123,154,154,PNR,PNR,123,PNR,PNR,PNR,PNR,123,123,PNR,PNR,PNR,PNR,PNR ++mount,21,165,165,21,40,21,160,160,21,21,21,21,40,40,21,21,21 ++mount_setattr,442,442,442,442,442,442,442,442,442,442,442,442,442,442,442,442,442 ++move_mount,429,429,429,429,429,429,429,429,429,429,429,429,429,429,429,429,429 ++move_pages,317,279,533,344,239,308,267,271,295,295,301,301,239,239,310,310,317 ++mprotect,125,10,10,125,226,125,10,10,125,125,125,125,226,226,125,125,125 ++mpx,56,PNR,PNR,PNR,PNR,56,PNR,PNR,PNR,PNR,56,56,PNR,PNR,PNR,PNR,PNR ++mq_getsetattr,282,245,245,279,185,276,235,239,234,234,267,267,185,185,276,276,282 ++mq_notify,281,244,527,278,184,275,234,238,233,233,266,266,184,184,275,275,281 ++mq_open,277,240,240,274,180,271,230,234,229,229,262,262,180,180,271,271,277 ++mq_timedreceive,280,243,243,277,183,274,233,237,232,232,265,265,183,183,274,274,280 ++mq_timedreceive_time64,419,PNR,PNR,419,PNR,419,PNR,419,419,PNR,419,PNR,PNR,PNR,419,PNR,419 ++mq_timedsend,279,242,242,276,182,273,232,236,231,231,264,264,182,182,273,273,279 ++mq_timedsend_time64,418,PNR,PNR,418,PNR,418,PNR,418,418,PNR,418,PNR,PNR,PNR,418,PNR,418 ++mq_unlink,278,241,241,275,181,272,231,235,230,230,263,263,181,181,272,272,278 ++mremap,163,25,25,163,216,167,24,24,163,163,163,163,216,216,163,163,163 ++msgctl,402,71,71,304,187,402,69,69,191,191,402,402,187,187,402,402,402 ++msgget,399,68,68,303,186,399,66,66,190,190,399,399,186,186,399,399,399 ++msgrcv,401,70,70,302,188,401,68,68,189,189,401,401,188,188,401,401,401 ++msgsnd,400,69,69,301,189,400,67,67,188,188,400,400,189,189,400,400,400 ++msync,144,26,26,144,227,144,25,25,144,144,144,144,227,227,144,144,144 ++multiplexer,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,201,201,PNR,PNR,PNR,PNR,PNR ++munlock,151,150,150,151,229,155,147,147,151,151,151,151,229,229,151,151,151 ++munlockall,153,152,152,153,231,157,149,149,153,153,153,153,231,231,153,153,153 ++munmap,91,11,11,91,215,91,11,11,91,91,91,91,215,215,91,91,91 ++name_to_handle_at,341,303,303,370,264,339,298,303,325,325,345,345,264,264,335,335,359 ++nanosleep,162,35,35,162,101,166,34,34,162,162,162,162,101,101,162,162,162 ++newfstatat,PNR,262,262,PNR,79,PNR,252,256,PNR,PNR,PNR,291,79,79,PNR,293,PNR ++_newselect,142,PNR,PNR,142,PNR,142,22,22,142,142,142,142,PNR,PNR,142,PNR,142 ++nfsservctl,169,180,PNR,169,42,189,173,173,PNR,PNR,168,168,42,42,169,169,169 ++nice,34,PNR,PNR,34,PNR,34,PNR,PNR,34,34,34,34,PNR,PNR,34,34,34 ++oldfstat,28,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,28,28,PNR,PNR,PNR,PNR,28 ++oldlstat,84,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,84,84,PNR,PNR,PNR,PNR,84 ++oldolduname,59,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,59,59,PNR,PNR,PNR,PNR,PNR ++oldstat,18,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,18,18,PNR,PNR,PNR,PNR,18 ++olduname,109,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,109,109,PNR,PNR,PNR,PNR,109 ++open,5,2,2,5,PNR,5,2,2,5,5,5,5,PNR,PNR,5,5,5 ++openat,295,257,257,322,56,288,247,251,275,275,286,286,56,56,288,288,295 ++openat2,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437 ++open_by_handle_at,342,304,304,371,265,340,299,304,326,326,346,346,265,265,336,336,360 ++open_tree,428,428,428,428,428,428,428,428,428,428,428,428,428,428,428,428,428 ++pause,29,34,34,29,PNR,29,33,33,29,29,29,29,PNR,PNR,29,29,29 ++pciconfig_iobase,PNR,PNR,PNR,271,PNR,PNR,PNR,PNR,PNR,PNR,200,200,PNR,PNR,PNR,PNR,PNR ++pciconfig_read,PNR,PNR,PNR,272,PNR,PNR,PNR,PNR,PNR,PNR,198,198,PNR,PNR,PNR,PNR,PNR ++pciconfig_write,PNR,PNR,PNR,273,PNR,PNR,PNR,PNR,PNR,PNR,199,199,PNR,PNR,PNR,PNR,PNR ++perf_event_open,336,298,298,364,241,333,292,296,318,318,319,319,241,241,331,331,336 ++personality,136,135,135,136,92,136,132,132,136,136,136,136,92,92,136,136,136 ++pidfd_getfd,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438,438 ++pidfd_open,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434,434 ++pidfd_send_signal,424,424,424,424,424,424,424,424,424,424,424,424,424,424,424,424,424 ++pipe,42,22,22,42,PNR,42,21,21,42,42,42,42,PNR,PNR,42,42,42 ++pipe2,331,293,293,359,59,328,287,291,313,313,317,317,59,59,325,325,331 ++pivot_root,217,155,155,218,41,216,151,151,67,67,203,203,41,41,217,217,217 ++pkey_alloc,381,330,330,395,289,364,324,328,352,352,384,384,289,289,385,385,385 ++pkey_free,382,331,331,396,290,365,325,329,353,353,385,385,290,290,386,386,386 ++pkey_mprotect,380,329,329,394,288,363,323,327,351,351,386,386,288,288,384,384,384 ++poll,168,7,7,168,PNR,188,7,7,168,168,167,167,PNR,PNR,168,168,168 ++ppoll,309,271,271,336,73,302,261,265,274,274,281,281,73,73,302,302,309 ++ppoll_time64,414,PNR,PNR,414,PNR,414,PNR,414,414,PNR,414,PNR,PNR,PNR,414,PNR,414 ++prctl,172,157,157,172,167,192,153,153,172,172,171,171,167,167,172,172,172 ++pread64,180,17,17,180,67,200,16,16,108,108,179,179,67,67,180,180,180 ++preadv,333,295,534,361,69,330,289,293,315,315,320,320,69,69,328,328,333 ++preadv2,378,327,546,392,286,361,321,325,347,347,380,380,286,286,376,376,381 ++prlimit64,340,302,302,369,261,338,297,302,321,321,325,325,261,261,334,334,339 ++process_madvise,440,440,440,440,440,440,440,440,440,440,440,440,440,440,440,440,440 ++process_vm_readv,347,310,539,376,270,345,304,309,330,330,351,351,270,270,340,340,365 ++process_vm_writev,348,311,540,377,271,346,305,310,331,331,352,352,271,271,341,341,366 ++prof,44,PNR,PNR,PNR,PNR,44,PNR,PNR,PNR,PNR,44,44,PNR,PNR,PNR,PNR,PNR ++profil,98,PNR,PNR,PNR,PNR,98,PNR,PNR,PNR,PNR,98,98,PNR,PNR,PNR,PNR,PNR ++pselect6,308,270,270,335,72,301,260,264,273,273,280,280,72,72,301,301,308 ++pselect6_time64,413,PNR,PNR,413,PNR,413,PNR,413,413,PNR,413,PNR,PNR,PNR,413,PNR,413 ++ptrace,26,101,521,26,117,26,99,99,26,26,26,26,117,117,26,26,26 ++putpmsg,189,182,182,PNR,PNR,209,175,175,PNR,PNR,188,188,PNR,PNR,189,189,PNR ++pwrite64,181,18,18,181,68,201,17,17,109,109,180,180,68,68,181,181,181 ++pwritev,334,296,535,362,70,331,290,294,316,316,321,321,70,70,329,329,334 ++pwritev2,379,328,547,393,287,362,322,326,348,348,381,381,287,287,377,377,382 ++query_module,167,178,PNR,PNR,PNR,187,171,171,PNR,PNR,166,166,PNR,PNR,167,167,PNR ++quotactl,131,179,179,131,60,131,172,172,131,131,131,131,60,60,131,131,131 ++quotactl_path,PNR,PNR,PNR,PNR,443,PNR,PNR,PNR,PNR,PNR,PNR,PNR,443,443,PNR,PNR,PNR ++read,3,0,0,3,63,3,0,0,3,3,3,3,63,63,3,3,3 ++readahead,225,187,187,225,213,223,179,179,207,207,191,191,213,213,222,222,225 ++readdir,89,PNR,PNR,PNR,PNR,89,PNR,PNR,PNR,PNR,89,89,PNR,PNR,89,89,89 ++readlink,85,89,89,85,PNR,85,87,87,85,85,85,85,PNR,PNR,85,85,85 ++readlinkat,305,267,267,332,78,298,257,261,285,285,296,296,78,78,298,298,305 ++readv,145,19,515,145,65,145,18,18,145,145,145,145,65,65,145,145,145 ++reboot,88,169,169,88,142,88,164,164,88,88,88,88,142,142,88,88,88 ++recv,PNR,PNR,PNR,291,PNR,175,PNR,PNR,98,98,336,336,PNR,PNR,PNR,PNR,350 ++recvfrom,371,45,517,292,207,176,44,44,123,123,337,337,207,207,371,371,351 ++recvmmsg,337,299,537,365,243,335,294,298,319,319,343,343,243,243,357,357,357 ++recvmmsg_time64,417,PNR,PNR,417,PNR,417,PNR,417,417,PNR,417,PNR,PNR,PNR,417,PNR,417 ++recvmsg,372,47,519,297,212,177,46,46,184,184,342,342,212,212,372,372,356 ++remap_file_pages,257,216,216,253,234,251,210,210,227,227,239,239,234,234,267,267,257 ++removexattr,235,197,197,235,14,233,189,189,247,247,218,218,14,14,233,233,235 ++rename,38,82,82,38,PNR,38,80,80,38,38,38,38,PNR,PNR,38,38,38 ++renameat,302,264,264,329,38,295,254,258,282,282,293,293,PNR,PNR,295,295,302 ++renameat2,353,316,316,382,276,351,311,315,337,337,357,357,276,276,347,347,371 ++request_key,287,249,249,310,218,281,240,244,265,265,270,270,218,218,279,279,286 ++restart_syscall,0,219,219,0,128,253,213,214,0,0,0,0,128,128,7,7,0 ++riscv_flush_icache,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,259,259,PNR,PNR,PNR ++rmdir,40,84,84,40,PNR,40,82,82,40,40,40,40,PNR,PNR,40,40,40 ++rseq,386,334,334,398,293,367,327,331,354,354,387,387,293,293,383,383,387 ++rtas,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,255,255,PNR,PNR,PNR,PNR,PNR ++rt_sigaction,174,13,512,174,134,194,13,13,174,174,173,173,134,134,174,174,174 ++rt_sigpending,176,127,522,176,136,196,125,125,176,176,175,175,136,136,176,176,176 ++rt_sigprocmask,175,14,14,175,135,195,14,14,175,175,174,174,135,135,175,175,175 ++rt_sigqueueinfo,178,129,524,178,138,198,127,127,178,178,177,177,138,138,178,178,178 ++rt_sigreturn,173,15,513,173,139,193,211,211,173,173,172,172,139,139,173,173,173 ++rt_sigsuspend,179,130,130,179,133,199,128,128,179,179,178,178,133,133,179,179,179 ++rt_sigtimedwait,177,128,523,177,137,197,126,126,177,177,176,176,137,137,177,177,177 ++rt_sigtimedwait_time64,421,PNR,PNR,421,PNR,421,PNR,421,421,PNR,421,PNR,PNR,PNR,421,PNR,421 ++rt_tgsigqueueinfo,335,297,536,363,240,332,291,295,317,317,322,322,240,240,330,330,335 ++s390_guarded_storage,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,378,378,PNR ++s390_pci_mmio_read,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,353,353,PNR ++s390_pci_mmio_write,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,352,352,PNR ++s390_runtime_instr,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,342,342,PNR ++s390_sthyi,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,380,380,PNR ++sched_getaffinity,242,204,204,242,123,240,196,196,212,212,223,223,123,123,240,240,242 ++sched_getattr,352,315,315,381,275,350,310,314,335,335,356,356,275,275,346,346,369 ++sched_getparam,155,143,143,155,121,159,140,140,155,155,155,155,121,121,155,155,155 ++sched_get_priority_max,159,146,146,159,125,163,143,143,159,159,159,159,125,125,159,159,159 ++sched_get_priority_min,160,147,147,160,126,164,144,144,160,160,160,160,126,126,160,160,160 ++sched_getscheduler,157,145,145,157,120,161,142,142,157,157,157,157,120,120,157,157,157 ++sched_rr_get_interval,161,148,148,161,127,165,145,145,161,161,161,161,127,127,161,161,161 ++sched_rr_get_interval_time64,423,PNR,PNR,423,PNR,423,PNR,423,423,PNR,423,PNR,PNR,PNR,423,PNR,423 ++sched_setaffinity,241,203,203,241,122,239,195,195,211,211,222,222,122,122,239,239,241 ++sched_setattr,351,314,314,380,274,349,309,313,334,334,355,355,274,274,345,345,370 ++sched_setparam,154,142,142,154,118,158,139,139,154,154,154,154,118,118,154,154,154 ++sched_setscheduler,156,144,144,156,119,160,141,141,156,156,156,156,119,119,156,156,156 ++sched_yield,158,24,24,158,124,162,23,23,158,158,158,158,124,124,158,158,158 ++seccomp,354,317,317,383,277,352,312,316,338,338,358,358,277,277,348,348,372 ++security,PNR,185,185,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++select,82,23,23,PNR,PNR,PNR,PNR,PNR,PNR,PNR,82,82,PNR,PNR,PNR,142,PNR ++semctl,394,66,66,300,191,394,64,64,187,187,394,394,191,191,394,394,394 ++semget,393,64,64,299,190,393,62,62,186,186,393,393,190,190,393,393,393 ++semop,PNR,65,65,298,193,PNR,63,63,185,185,PNR,PNR,193,193,PNR,PNR,PNR ++semtimedop,PNR,220,220,312,192,PNR,214,215,228,228,PNR,392,192,192,PNR,392,PNR ++semtimedop_time64,420,PNR,PNR,420,PNR,420,PNR,420,420,PNR,420,PNR,PNR,PNR,420,PNR,420 ++send,PNR,PNR,PNR,289,PNR,178,PNR,PNR,58,58,334,334,PNR,PNR,PNR,PNR,348 ++sendfile,187,40,40,187,71,207,39,39,122,122,186,186,71,71,187,187,187 ++sendfile64,239,PNR,PNR,239,PNR,237,PNR,219,209,209,226,PNR,PNR,PNR,223,PNR,239 ++sendmmsg,345,307,538,374,269,343,302,307,329,329,349,349,269,269,358,358,363 ++sendmsg,370,46,518,296,211,179,45,45,183,183,341,341,211,211,370,370,355 ++sendto,369,44,44,290,206,180,43,43,82,82,335,335,206,206,369,369,349 ++setdomainname,121,171,171,121,162,121,166,166,121,121,121,121,162,162,121,121,121 ++setfsgid,139,123,123,139,152,139,121,121,139,139,139,139,152,152,139,216,139 ++setfsgid32,216,PNR,PNR,216,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,216,PNR,216 ++setfsuid,138,122,122,138,151,138,120,120,138,138,138,138,151,151,138,215,138 ++setfsuid32,215,PNR,PNR,215,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,215,PNR,215 ++setgid,46,106,106,46,144,46,104,104,46,46,46,46,144,144,46,214,46 ++setgid32,214,PNR,PNR,214,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,214,PNR,214 ++setgroups,81,116,116,81,159,81,114,114,81,81,81,81,159,159,81,206,81 ++setgroups32,206,PNR,PNR,206,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,206,PNR,206 ++sethostname,74,170,170,74,161,74,165,165,74,74,74,74,161,161,74,74,74 ++setitimer,104,38,38,104,103,104,36,36,104,104,104,104,103,103,104,104,104 ++set_mempolicy,276,238,238,321,237,270,229,233,262,262,261,261,237,237,270,270,276 ++setns,346,308,308,375,268,344,303,308,328,328,350,350,268,268,339,339,364 ++setpgid,57,109,109,57,154,57,107,107,57,57,57,57,154,154,57,57,57 ++setpriority,97,141,141,97,140,97,138,138,97,97,97,97,140,140,97,97,97 ++setregid,71,114,114,71,143,71,112,112,71,71,71,71,143,143,71,204,71 ++setregid32,204,PNR,PNR,204,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,204,PNR,204 ++setresgid,170,119,119,170,149,190,117,117,170,170,169,169,149,149,170,210,170 ++setresgid32,210,PNR,PNR,210,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,210,PNR,210 ++setresuid,164,117,117,164,147,185,115,115,164,164,164,164,147,147,164,208,164 ++setresuid32,208,PNR,PNR,208,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,208,PNR,208 ++setreuid,70,113,113,70,145,70,111,111,70,70,70,70,145,145,70,203,70 ++setreuid32,203,PNR,PNR,203,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,203,PNR,203 ++setrlimit,75,160,160,75,164,75,155,155,75,75,75,75,164,164,75,75,75 ++set_robust_list,311,273,530,338,99,309,268,272,289,289,300,300,99,99,304,304,311 ++setsid,66,112,112,66,157,66,110,110,66,66,66,66,157,157,66,66,66 ++setsockopt,366,54,541,294,208,181,53,53,181,181,339,339,208,208,366,366,353 ++set_thread_area,243,205,PNR,PNR,PNR,283,242,246,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++set_tid_address,258,218,218,256,96,252,212,213,237,237,232,232,96,96,252,252,258 ++settimeofday,79,164,164,79,170,79,159,159,79,79,79,79,170,170,79,79,79 ++set_tls,PNR,PNR,PNR,983045,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++setuid,23,105,105,23,146,23,103,103,23,23,23,23,146,146,23,213,23 ++setuid32,213,PNR,PNR,213,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,213,PNR,213 ++setxattr,226,188,188,226,5,224,180,180,238,238,209,209,5,5,224,224,226 ++sgetmask,68,PNR,PNR,PNR,PNR,68,PNR,PNR,68,68,68,68,PNR,PNR,PNR,PNR,68 ++shmat,397,30,30,305,196,397,29,29,192,192,397,397,196,196,397,397,397 ++shmctl,396,31,31,308,195,396,30,30,195,195,396,396,195,195,396,396,396 ++shmdt,398,67,67,306,197,398,65,65,193,193,398,398,197,197,398,398,398 ++shmget,395,29,29,307,194,395,28,28,194,194,395,395,194,194,395,395,395 ++shutdown,373,48,48,293,210,182,47,47,117,117,338,338,210,210,373,373,352 ++sigaction,67,PNR,PNR,67,PNR,67,PNR,PNR,PNR,PNR,67,67,PNR,PNR,67,67,67 ++sigaltstack,186,131,525,186,132,206,129,129,166,166,185,185,132,132,186,186,186 ++signal,48,PNR,PNR,PNR,PNR,48,PNR,PNR,48,48,48,48,PNR,PNR,48,48,48 ++signalfd,321,282,282,349,PNR,317,276,280,302,302,305,305,PNR,PNR,316,316,321 ++signalfd4,327,289,289,355,74,324,283,287,309,309,313,313,74,74,322,322,327 ++sigpending,73,PNR,PNR,73,PNR,73,PNR,PNR,73,73,73,73,PNR,PNR,73,73,73 ++sigprocmask,126,PNR,PNR,126,PNR,126,PNR,PNR,126,126,126,126,PNR,PNR,126,126,126 ++sigreturn,119,PNR,PNR,119,PNR,119,PNR,PNR,PNR,PNR,119,119,PNR,PNR,119,119,119 ++sigsuspend,72,PNR,PNR,72,PNR,72,PNR,PNR,PNR,PNR,72,72,PNR,PNR,72,72,72 ++socket,359,41,41,281,198,183,40,40,17,17,326,326,198,198,359,359,340 ++socketcall,102,PNR,PNR,PNR,PNR,102,PNR,PNR,PNR,PNR,102,102,PNR,PNR,102,102,102 ++socketpair,360,53,53,288,199,184,52,52,56,56,333,333,199,199,360,360,347 ++splice,313,275,275,340,76,304,263,267,291,291,283,283,76,76,306,306,313 ++spu_create,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,279,279,PNR,PNR,PNR,PNR,PNR ++spu_run,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,278,278,PNR,PNR,PNR,PNR,PNR ++ssetmask,69,PNR,PNR,PNR,PNR,69,PNR,PNR,69,69,69,69,PNR,PNR,PNR,PNR,69 ++stat,106,4,4,106,PNR,106,4,4,18,18,106,106,PNR,PNR,106,106,106 ++stat64,195,PNR,PNR,195,PNR,213,PNR,PNR,101,101,195,PNR,PNR,PNR,195,PNR,195 ++statfs,99,137,137,99,43,99,134,134,99,99,99,99,43,43,99,99,99 ++statfs64,268,PNR,PNR,266,PNR,255,PNR,217,298,298,252,252,PNR,PNR,265,265,268 ++statx,383,332,332,397,291,366,326,330,349,349,383,383,291,291,379,379,383 ++stime,25,PNR,PNR,PNR,PNR,25,PNR,PNR,25,25,25,25,PNR,PNR,25,PNR,25 ++stty,31,PNR,PNR,PNR,PNR,31,PNR,PNR,PNR,PNR,31,31,PNR,PNR,PNR,PNR,PNR ++subpage_prot,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,310,310,PNR,PNR,PNR,PNR,PNR ++swapcontext,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,249,249,PNR,PNR,PNR,PNR,PNR ++swapoff,115,168,168,115,225,115,163,163,115,115,115,115,225,225,115,115,115 ++swapon,87,167,167,87,224,87,162,162,87,87,87,87,224,224,87,87,87 ++switch_endian,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,363,363,PNR,PNR,PNR,PNR,PNR ++symlink,83,88,88,83,PNR,83,86,86,83,83,83,83,PNR,PNR,83,83,83 ++symlinkat,304,266,266,331,36,297,256,260,284,284,295,295,36,36,297,297,304 ++sync,36,162,162,36,81,36,157,157,36,36,36,36,81,81,36,36,36 ++sync_file_range,314,277,277,PNR,84,305,264,268,292,292,PNR,PNR,84,84,307,307,314 ++sync_file_range2,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,308,308,PNR,PNR,PNR,PNR,PNR ++syncfs,344,306,306,373,267,342,301,306,327,327,348,348,267,267,338,338,362 ++syscall,PNR,PNR,PNR,PNR,PNR,0,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++_sysctl,149,156,PNR,149,PNR,153,152,152,149,149,149,149,PNR,PNR,149,149,149 ++sys_debug_setcontext,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,256,256,PNR,PNR,PNR,PNR,PNR ++sysfs,135,139,139,135,PNR,135,136,136,135,135,135,135,PNR,PNR,135,135,135 ++sysinfo,116,99,99,116,179,116,97,97,116,116,116,116,179,179,116,116,116 ++syslog,103,103,103,103,116,103,101,101,103,103,103,103,116,116,103,103,103 ++sysmips,PNR,PNR,PNR,PNR,PNR,149,199,199,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++tee,315,276,276,342,77,306,265,269,293,293,284,284,77,77,308,308,315 ++tgkill,270,234,234,268,131,266,225,229,259,259,250,250,131,131,241,241,270 ++time,13,201,201,PNR,PNR,13,PNR,PNR,13,13,13,13,PNR,PNR,13,PNR,13 ++timer_create,259,222,526,257,107,257,216,220,250,250,240,240,107,107,254,254,259 ++timer_delete,263,226,226,261,111,261,220,224,254,254,244,244,111,111,258,258,263 ++timerfd,PNR,PNR,PNR,PNR,PNR,318,277,281,PNR,PNR,PNR,PNR,PNR,PNR,317,317,PNR ++timerfd_create,322,283,283,350,85,321,280,284,306,306,306,306,85,85,319,319,322 ++timerfd_gettime,326,287,287,354,87,322,281,285,308,308,312,312,87,87,321,321,326 ++timerfd_gettime64,410,PNR,PNR,410,PNR,410,PNR,410,410,PNR,410,PNR,PNR,PNR,410,PNR,410 ++timerfd_settime,325,286,286,353,86,323,282,286,307,307,311,311,86,86,320,320,325 ++timerfd_settime64,411,PNR,PNR,411,PNR,411,PNR,411,411,PNR,411,PNR,PNR,PNR,411,PNR,411 ++timer_getoverrun,262,225,225,260,109,260,219,223,253,253,243,243,109,109,257,257,262 ++timer_gettime,261,224,224,259,108,259,218,222,252,252,242,242,108,108,256,256,261 ++timer_gettime64,408,PNR,PNR,408,PNR,408,PNR,408,408,PNR,408,PNR,PNR,PNR,408,PNR,408 ++timer_settime,260,223,223,258,110,258,217,221,251,251,241,241,110,110,255,255,260 ++timer_settime64,409,PNR,PNR,409,PNR,409,PNR,409,409,PNR,409,PNR,PNR,PNR,409,PNR,409 ++times,43,100,100,43,153,43,98,98,43,43,43,43,153,153,43,43,43 ++tkill,238,200,200,238,130,236,192,192,208,208,208,208,130,130,237,237,238 ++truncate,92,76,76,92,45,92,74,74,92,92,92,92,45,45,92,92,92 ++truncate64,193,PNR,PNR,193,PNR,211,PNR,PNR,199,199,193,PNR,PNR,PNR,193,PNR,193 ++tuxcall,PNR,184,184,PNR,PNR,PNR,PNR,PNR,PNR,PNR,225,225,PNR,PNR,PNR,PNR,PNR ++ugetrlimit,191,PNR,PNR,191,PNR,PNR,PNR,PNR,PNR,PNR,190,190,PNR,PNR,191,PNR,191 ++ulimit,58,PNR,PNR,PNR,PNR,58,PNR,PNR,PNR,PNR,58,58,PNR,PNR,PNR,PNR,PNR ++umask,60,95,95,60,166,60,93,93,60,60,60,60,166,166,60,60,60 ++umount,22,PNR,PNR,PNR,PNR,22,PNR,PNR,PNR,PNR,22,22,PNR,PNR,22,22,22 ++umount2,52,166,166,52,39,52,161,161,52,52,52,52,39,39,52,52,52 ++uname,122,63,63,122,160,122,61,61,59,59,122,122,160,160,122,122,122 ++unlink,10,87,87,10,PNR,10,85,85,10,10,10,10,PNR,PNR,10,10,10 ++unlinkat,301,263,263,328,35,294,253,257,281,281,292,292,35,35,294,294,301 ++unshare,310,272,272,337,97,303,262,266,288,288,282,282,97,97,303,303,310 ++uselib,86,134,PNR,86,PNR,86,PNR,PNR,86,86,86,86,PNR,PNR,86,86,86 ++userfaultfd,374,323,323,388,282,357,317,321,344,344,364,364,282,282,355,355,377 ++usr26,PNR,PNR,PNR,983043,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++usr32,PNR,PNR,PNR,983044,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++ustat,62,136,136,62,PNR,62,133,133,62,62,62,62,PNR,PNR,62,62,62 ++utime,30,132,132,PNR,PNR,30,130,130,30,30,30,30,PNR,PNR,30,30,30 ++utimensat,320,280,280,348,88,316,275,279,301,301,304,304,88,88,315,315,320 ++utimensat_time64,412,PNR,PNR,412,PNR,412,PNR,412,412,PNR,412,PNR,PNR,PNR,412,PNR,412 ++utimes,271,235,235,269,PNR,267,226,230,336,336,251,251,PNR,PNR,313,313,271 ++vfork,190,58,58,190,PNR,PNR,PNR,PNR,113,113,189,189,PNR,PNR,190,190,190 ++vhangup,111,153,153,111,58,111,150,150,111,111,111,111,58,58,111,111,111 ++vm86,166,PNR,PNR,PNR,PNR,113,PNR,PNR,PNR,PNR,113,113,PNR,PNR,PNR,PNR,PNR ++vm86old,113,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++vmsplice,316,278,532,343,75,307,266,270,294,294,285,285,75,75,309,309,316 ++vserver,273,236,PNR,313,PNR,277,236,240,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR ++wait4,114,61,61,114,260,114,59,59,114,114,114,114,260,260,114,114,114 ++waitid,284,247,529,280,95,278,237,241,235,235,272,272,95,95,281,281,284 ++waitpid,7,PNR,PNR,PNR,PNR,7,PNR,PNR,7,7,7,7,PNR,PNR,PNR,PNR,7 ++write,4,1,1,4,64,4,1,1,4,4,4,4,64,64,4,4,4 ++writev,146,20,516,146,66,146,19,19,146,146,146,146,66,66,146,146,146 +-- +2.32.0 diff --git a/poky/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb b/poky/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb index 8fe102390..79736f2ad 100644 --- a/poky/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb +++ b/poky/meta/recipes-support/libseccomp/libseccomp_2.5.1.bb @@ -7,14 +7,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=0;endline=1;md5=8eac08d22113880357c DEPENDS += "gperf-native" -SRCREV = "4bf70431a339a2886ab8c82e9a45378f30c6e6c7" +PV .= "+git${SRCPV}" +SRCREV = "5822e50c2920ce597d038077dea4a0eedf193f86" -SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.5 \ +SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=main \ + file://0001-configure.ac-Bump-version-to-2.5.99.patch \ + file://0001-arch-Add-riscv32-architecture-support.patch \ + file://0002-Regenerate-syscall-cvs-file-from-5.13-rc5-kernel.patch \ file://run-ptest \ " -COMPATIBLE_HOST_riscv32 = "null" - S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig ptest features_check diff --git a/poky/meta/recipes-support/sqlite/sqlite3_3.35.5.bb b/poky/meta/recipes-support/sqlite/sqlite3_3.36.0.bb index d74a6210d..f5d75e8e4 100644 --- a/poky/meta/recipes-support/sqlite/sqlite3_3.35.5.bb +++ b/poky/meta/recipes-support/sqlite/sqlite3_3.36.0.bb @@ -4,7 +4,7 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" SRC_URI = "http://www.sqlite.org/2021/sqlite-autoconf-${SQLITE_PV}.tar.gz" -SRC_URI[sha256sum] = "f52b72a5c319c3e516ed7a92e123139a6e87af08a2dc43d7757724f6132e6db0" +SRC_URI[sha256sum] = "bd90c3eb96bee996206b83be7065c9ce19aef38c3f4fb53073ada0d0b69bbce3" # -19242 is only an issue in specific development branch commits CVE_CHECK_WHITELIST += "CVE-2019-19242" diff --git a/poky/meta/recipes-support/vte/vte_0.64.1.bb b/poky/meta/recipes-support/vte/vte_0.64.2.bb index 0401eaa04..b0baa3f42 100644 --- a/poky/meta/recipes-support/vte/vte_0.64.1.bb +++ b/poky/meta/recipes-support/vte/vte_0.64.2.bb @@ -20,7 +20,7 @@ inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-intros # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" -SRC_URI[archive.sha256sum] = "12fb41a9ff8e03c5f1711b46560910a4b9b3102aec3e9e7609ceef4dfa98aa2a" +SRC_URI[archive.sha256sum] = "2b3c820b65a667c1d8859ba20478be626d1519cc3159dac25f703330c6d07e18" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/poky/scripts/lib/devtool/deploy.py b/poky/scripts/lib/devtool/deploy.py index e5af2c95a..833322571 100644 --- a/poky/scripts/lib/devtool/deploy.py +++ b/poky/scripts/lib/devtool/deploy.py @@ -168,7 +168,7 @@ def deploy(args, config, basepath, workspace): if args.strip and not args.dry_run: # Fakeroot copy to new destination srcdir = recipe_outdir - recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'deploy-target-stripped') + recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'devtool-deploy-target-stripped') if os.path.isdir(recipe_outdir): bb.utils.remove(recipe_outdir, True) exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) diff --git a/poky/scripts/lib/devtool/upgrade.py b/poky/scripts/lib/devtool/upgrade.py index 24e3700ec..da1456a01 100644 --- a/poky/scripts/lib/devtool/upgrade.py +++ b/poky/scripts/lib/devtool/upgrade.py @@ -261,21 +261,20 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee logger.warning('By user choice, the following patches will NOT be applied to the new source tree:\n %s' % '\n '.join([os.path.basename(patch) for patch in patches])) else: __run('git checkout devtool-patched -b %s' % branch) - skiptag = False - try: - __run('git rebase %s' % rev) - except bb.process.ExecutionError as e: - skiptag = True - if 'conflict' in e.stdout: - logger.warning('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip())) - else: - logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) - if not skiptag: - if uri.startswith('git://') or uri.startswith('gitsm://'): - suffix = 'new' - else: - suffix = newpv - __run('git tag -f devtool-patched-%s' % suffix) + (stdout, _) = __run('git branch --list devtool-override-*') + branches_to_rebase = [branch] + stdout.split() + for b in branches_to_rebase: + logger.info("Rebasing {} onto {}".format(b, rev)) + __run('git checkout %s' % b) + try: + __run('git rebase %s' % rev) + except bb.process.ExecutionError as e: + if 'conflict' in e.stdout: + logger.warning('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip())) + __run('git rebase --abort') + else: + logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) + __run('git checkout %s' % branch) if tmpsrctree: if keep_temp: @@ -522,6 +521,15 @@ def upgrade(args, config, basepath, workspace): else: srctree = standard.get_default_srctree(config, pn) + # Check that recipe isn't using a shared workdir + s = os.path.abspath(rd.getVar('S')) + workdir = os.path.abspath(rd.getVar('WORKDIR')) + srctree_s = srctree + if s.startswith(workdir) and s != workdir and os.path.dirname(s) != workdir: + # Handle if S is set to a subdirectory of the source + srcsubdir = os.path.relpath(s, workdir).split(os.sep, 1)[1] + srctree_s = os.path.join(srctree, srcsubdir) + # try to automatically discover latest version and revision if not provided on command line if not args.version and not args.srcrev: version_info = oe.recipeutils.get_recipe_upstream_version(rd) @@ -551,12 +559,12 @@ def upgrade(args, config, basepath, workspace): try: logger.info('Extracting current version source...') rev1, srcsubdir1 = standard._extract_source(srctree, False, 'devtool-orig', False, config, basepath, workspace, args.fixed_setup, rd, tinfoil, no_overrides=args.no_overrides) - old_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or "")) + old_licenses = _extract_licenses(srctree_s, (rd.getVar('LIC_FILES_CHKSUM') or "")) logger.info('Extracting upgraded version source...') rev2, md5, sha256, srcbranch, srcsubdir2 = _extract_new_source(args.version, srctree, args.no_patch, args.srcrev, args.srcbranch, args.branch, args.keep_temp, tinfoil, rd) - new_licenses = _extract_licenses(srctree, (rd.getVar('LIC_FILES_CHKSUM') or "")) + new_licenses = _extract_licenses(srctree_s, (rd.getVar('LIC_FILES_CHKSUM') or "")) license_diff = _generate_license_diff(old_licenses, new_licenses) rf, copied = _create_new_recipe(args.version, md5, sha256, args.srcrev, srcbranch, srcsubdir1, srcsubdir2, config.workspace_path, tinfoil, rd, license_diff, new_licenses, srctree, args.keep_failure) except bb.process.CmdError as e: @@ -565,7 +573,7 @@ def upgrade(args, config, basepath, workspace): _upgrade_error(e, rf, srctree, args.keep_failure) standard._add_md5(config, pn, os.path.dirname(rf)) - af = _write_append(rf, srctree, args.same_dir, args.no_same_dir, rev2, + af = _write_append(rf, srctree_s, args.same_dir, args.no_same_dir, rev2, copied, config.workspace_path, rd) standard._add_md5(config, pn, af) diff --git a/poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py index f2639e700..32e47f183 100644 --- a/poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/poky/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -186,8 +186,10 @@ class BootimgPcbiosPlugin(SourcePlugin): # dosfs image, created by mkdosfs bootimg = "%s/boot%s.img" % (cr_workdir, part.lineno) - dosfs_cmd = "mkdosfs -n boot -i %s -S 512 -C %s %d" % \ - (part.fsuuid, bootimg, blocks) + label = part.label if part.label else "boot" + + dosfs_cmd = "mkdosfs -n %s -i %s -S 512 -C %s %d" % \ + (label, part.fsuuid, bootimg, blocks) exec_native_cmd(dosfs_cmd, native_sysroot) mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (bootimg, hdddir) diff --git a/poky/scripts/oe-time-dd-test.sh b/poky/scripts/oe-time-dd-test.sh index ccdd55e66..386de83dc 100755 --- a/poky/scripts/oe-time-dd-test.sh +++ b/poky/scripts/oe-time-dd-test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # oe-time-dd-test records how much time it takes to # write <count> number of kilobytes to the filesystem. @@ -8,23 +8,24 @@ # The purporse of this script is to find which part of # the build system puts stress on the filesystem io and # log all the processes. - usage() { - echo "Usage: $0 <count>" -} - -TIMEOUT=15 + echo "$0 is used to detect i/o latency and runs commands to display host information." + echo "The following commands are run in order:" + echo "1) top -c -b -n1 -w 512" + echo "2) iostat -y -z -x 5 1" + echo "3) tail -30 tmp*/log/cooker/*/console-latest.log to gather cooker log." + echo " " + echo "Options:" + echo "-c | --count <amount> dd (transfer) <amount> KiB of data within specified timeout to detect latency." + echo " Must enable -t option." + echo "-t | --timeout <time> timeout in seconds for the <count> amount of data to be transferred." + echo "-l | --log-only run the commands without performing the data transfer." + echo "-h | --help show help" -if [ $# -ne 1 ]; then - usage - exit 1 -fi +} -uptime -timeout ${TIMEOUT} dd if=/dev/zero of=oe-time-dd-test.dat bs=1024 count=$1 conv=fsync -if [ $? -ne 0 ]; then - echo "Timeout used: ${TIMEOUT}" - echo "start: top output" +run_cmds() { + echo "start: top output" top -c -b -n1 -w 512 echo "end: top output" echo "start: iostat" @@ -33,4 +34,69 @@ if [ $? -ne 0 ]; then echo "start: cooker log" tail -30 tmp*/log/cooker/*/console-latest.log echo "end: cooker log" +} + +if [ $# -lt 1 ]; then + usage + exit 1 +fi + +re_c='^[0-9]+$' +#re_t='^[0-9]+([.][0-9]+)?$' + +while [[ $# -gt 0 ]]; do + key="$1" + + case $key in + -c|--count) + COUNT=$2 + shift + shift + if ! [[ $COUNT =~ $re_c ]] || [[ $COUNT -le 0 ]] ; then + usage + exit 1 + fi + ;; + -t|--timeout) + TIMEOUT=$2 + shift + shift + if ! [[ $TIMEOUT =~ $re_c ]] || [[ $TIMEOUT -le 0 ]] ; then + usage + exit 1 + fi + ;; + -l|--log-only) + LOG_ONLY="true" + shift + shift + ;; + -h|--help) + usage + exit 0 + ;; + *) + usage + exit 1 + ;; + esac +done + + +if [ "$LOG_ONLY" = "true" ] ; then + uptime + run_cmds + exit +fi + +if [ -z ${TIMEOUT+x} ] || [ -z ${COUNT+x} ] ; then + usage + exit 1 +fi + +uptime +echo "Timeout used: ${TIMEOUT}" +timeout ${TIMEOUT} dd if=/dev/zero of=oe-time-dd-test.dat bs=1024 count=${COUNT} conv=fsync +if [ $? -ne 0 ]; then + run_cmds fi diff --git a/poky/scripts/runqemu b/poky/scripts/runqemu index 1f332ef52..2914f15d0 100755 --- a/poky/scripts/runqemu +++ b/poky/scripts/runqemu @@ -233,9 +233,12 @@ class BaseConfig(object): def release_taplock(self): if self.taplock_descriptor: logger.debug("Releasing lockfile for tap device '%s'" % self.tap) - fcntl.flock(self.taplock_descriptor, fcntl.LOCK_UN) + # We pass the fd to the qemu process and if we unlock here, it would unlock for + # that too. Therefore don't unlock, just close + # fcntl.flock(self.taplock_descriptor, fcntl.LOCK_UN) self.taplock_descriptor.close() - os.remove(self.taplock) + # Removing the file is a potential race, don't do that either + # os.remove(self.taplock) self.taplock_descriptor = None def check_free_port(self, host, port, lockdir): @@ -273,17 +276,23 @@ class BaseConfig(object): def release_portlock(self, lockfile=None): if lockfile != None: - logger.debug("Releasing lockfile '%s'" % lockfile) - fcntl.flock(self.portlocks[lockfile], fcntl.LOCK_UN) - self.portlocks[lockfile].close() - os.remove(lockfile) - del self.portlocks[lockfile] + logger.debug("Releasing lockfile '%s'" % lockfile) + # We pass the fd to the qemu process and if we unlock here, it would unlock for + # that too. Therefore don't unlock, just close + # fcntl.flock(self.portlocks[lockfile], fcntl.LOCK_UN) + self.portlocks[lockfile].close() + # Removing the file is a potential race, don't do that either + # os.remove(lockfile) + del self.portlocks[lockfile] elif len(self.portlocks): for lockfile, descriptor in self.portlocks.items(): logger.debug("Releasing lockfile '%s'" % lockfile) - fcntl.flock(descriptor, fcntl.LOCK_UN) + # We pass the fd to the qemu process and if we unlock here, it would unlock for + # that too. Therefore don't unlock, just close + # fcntl.flock(descriptor, fcntl.LOCK_UN) descriptor.close() - os.remove(lockfile) + # Removing the file is a potential race, don't do that either + # os.remove(lockfile) self.portlocks = {} def get(self, key): |