diff options
80 files changed, 571 insertions, 363 deletions
diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf index 9c8c64963..9fb38e090 100644 --- a/meta-aspeed/conf/machine/evb-ast2600.conf +++ b/meta-aspeed/conf/machine/evb-ast2600.conf @@ -1,5 +1,6 @@ KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb" -UBOOT_MACHINE = "evb-ast2600_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_DEVICETREE = "ast2600a1-evb" require conf/machine/include/ast2600.inc diff --git a/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch b/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch deleted file mode 100644 index e010f26c1..000000000 --- a/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2add5b8d1216be2e446a3d707767c2a5ec6be9f4 Mon Sep 17 00:00:00 2001 -From: Brad Bishop <bradleyb@fuzziesquirrel.com> -Date: Thu, 5 Sep 2019 20:39:57 -0400 -Subject: [PATCH u-boot aspeed-dev-v2019.04] arm: evb-ast2600: put environment - back at 512KiB - -Prior to 473f430b90 the environment was at 512KiB, and compatible with -OpenBMC. Restore OpenBMC compatibility by moving the environment back -to 512KiB. - -Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> ---- - include/configs/aspeed-common.h | 4 +++- - include/configs/evb_ast2600.h | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h -index 7a730d17ad..d1eb4688e6 100644 ---- a/include/configs/aspeed-common.h -+++ b/include/configs/aspeed-common.h -@@ -52,7 +52,9 @@ - /* - * Miscellaneous configurable options - */ --#define CONFIG_BOOTCOMMAND "bootm 200a0000" -+#ifndef CONFIG_BOOTCOMMAND -+#define CONFIG_BOOTCOMMAND "bootm 20080000" -+#endif - #define CONFIG_ENV_OVERWRITE - - #define CONFIG_SYS_BOOTM_LEN (0x800000 * 2) -diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h -index b4de42a05a..3a12f2f0d4 100644 ---- a/include/configs/evb_ast2600.h -+++ b/include/configs/evb_ast2600.h -@@ -18,7 +18,7 @@ - - /* Environment */ - #define CONFIG_ENV_SIZE 0x10000 --#define CONFIG_ENV_OFFSET 0x90000 -+#define CONFIG_ENV_OFFSET 0x60000 - #define CONFIG_ENV_SECT_SIZE (4 << 10) - - #endif /* __CONFIG_H */ --- -2.21.0 - diff --git a/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config new file mode 100644 index 000000000..ccd037ee6 --- /dev/null +++ b/meta-aspeed/recipes-bsp/u-boot/files/fw_env_ast2600_nor.config @@ -0,0 +1,2 @@ +# MTD device name Device offset Env. size Flash sector size Number of sectors +/dev/mtd/u-boot-env 0x0000 0x10000 0x1000 diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg deleted file mode 100644 index 6862aaeb7..000000000 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="bootm 20100000" diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb index fe8533859..491068520 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb @@ -1,6 +1,6 @@ require u-boot-common-aspeed-sdk_${PV}.inc -UBOOT_MAKE_TARGET ?= "u-boot.${UBOOT_SUFFIX}" +UBOOT_MAKE_TARGET ?= "u-boot.${UBOOT_SUFFIX} DEVICE_TREE=${UBOOT_DEVICETREE}" require recipes-bsp/u-boot/u-boot.inc diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index 31dc5f2c8..46ab2e782 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -8,16 +8,9 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "4d29b04c7aca4121d542b759575fbb93e52aef47" +SRCREV = "0991f0b8ae2eaad7d06977d2fabbb599f0d28a97" -UBRANCH = "aspeed-dev-v2019.04" -SRC_URI = "git://github.com/AspeedTech-BMC/u-boot;branch=${UBRANCH};protocol=https" -SRC_URI += "file://0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch" - -# There are different BOOTCOMMANDS for differently sized raw flash modules. -ASPEED_IMAGE_SIZE_KB ?= "32768" -MACHINEOVERRIDES .= ":flash-${ASPEED_IMAGE_SIZE_KB}" -SRC_URI_append_flash-131072 = " file://bootcmd.cfg" +SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb index 59fdbdeab..821457901 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_2019.04.bb @@ -5,6 +5,8 @@ DEPENDS += "mtd-utils" PROVIDES += "u-boot-fw-utils" +SRC_URI += "file://fw_env_ast2600_nor.config" + INSANE_SKIP_${PN} = "already-stripped" EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1' EXTRA_OEMAKE_class-cross = 'HOSTCC="${CC} ${CFLAGS} ${LDFLAGS}" V=1' @@ -21,7 +23,7 @@ do_install () { install -d ${D}${sysconfdir} install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv - install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config + install -m 644 ${WORKDIR}/fw_env_ast2600_nor.config ${D}${sysconfdir}/fw_env.config } do_install_class-cross () { 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 939a60e91..f19fb3932 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig @@ -7,6 +7,9 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y +CONFIG_CGROUP_BPF=y +CONFIG_NAMESPACES=y +CONFIG_USER_NS=y CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZO is not set @@ -204,7 +207,6 @@ CONFIG_SQUASHFS_ZSTD=y # CONFIG_NETWORK_FILESYSTEMS is not set CONFIG_HARDENED_USERCOPY=y CONFIG_FORTIFY_SOURCE=y -# CONFIG_CRYPTO_ECHAINIV is not set CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_USER_API_HASH=y 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 d189de899..45da2b24b 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -9,6 +9,9 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y +CONFIG_CGROUP_BPF=y +CONFIG_NAMESPACES=y +CONFIG_USER_NS=y CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZO is not set @@ -227,7 +230,6 @@ CONFIG_SQUASHFS_ZSTD=y # CONFIG_NETWORK_FILESYSTEMS is not set CONFIG_HARDENED_USERCOPY=y CONFIG_FORTIFY_SOURCE=y -# CONFIG_CRYPTO_ECHAINIV is not set CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_USER_API_HASH=y 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 bf6e9527c..8f21ec507 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -9,6 +9,9 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_CGROUPS=y +CONFIG_CGROUP_BPF=y +CONFIG_NAMESPACES=y +CONFIG_USER_NS=y CONFIG_BLK_DEV_INITRD=y # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZO is not set @@ -220,7 +223,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_EDAC=y # CONFIG_EDAC_LEGACY_SYSFS is not set -CONFIG_EDAC_ASPEED=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_PCF8523=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 28848681c..ad443aac5 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.4" -LINUX_VERSION ?= "5.4.21" +LINUX_VERSION ?= "5.4.26" -SRCREV="3589f2ee8207e6fdc8c0633b1965dd280a536282" +SRCREV="1440369fcdef35f5b30dde253032188fd9611af8" require linux-aspeed.inc diff --git a/meta-facebook/meta-yosemitev2/recipes-fbyv2/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/meta-yosemitev2/recipes-fbyv2/packagegroups/packagegroup-fb-apps.bb deleted file mode 100644 index 49cf44c24..000000000 --- a/meta-facebook/meta-yosemitev2/recipes-fbyv2/packagegroups/packagegroup-fb-apps.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "OpenBMC for Facebook - Applications" -PR = "r1" - -inherit packagegroup - -PROVIDES = "${PACKAGES}" -PACKAGES = " \ - ${PN}-system \ - " - -PROVIDES += "virtual/obmc-system-mgmt" - -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" - -SUMMARY_${PN}-system = "Facebook system for Yosemite platform" -RDEPENDS_${PN}-system = " \ - entity-manager \ - dbus-sensors \ - phosphor-pid-control \ - " diff --git a/meta-facebook/meta-yosemitev2/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-yosemitev2/recipes-phosphor/fans/phosphor-pid-control_%.bbappend deleted file mode 100644 index 02e2b16cc..000000000 --- a/meta-facebook/meta-yosemitev2/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -EXTRA_OECONF_append_yosemitev2 = " --enable-configure-dbus=yes" diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index 77d1e4570..012186da0 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem" -SRCREV = "317999d3ac917654950e1288171b0cd546754880" +SRCREV = "dd14c0f75d9af7783afb3e9e124ca5c015a8609b" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index b70a42957..83567e906 100644 --- a/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-facebook/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,3 +1,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -EXTRA_OECONF_append_tiogapass = " --enable-configure-dbus=yes" +EXTRA_OECONF_append = " --enable-configure-dbus=yes" diff --git a/meta-ibm/meta-witherspoon/conf/local.conf.sample b/meta-ibm/meta-witherspoon/conf/local.conf.sample index d3a2303fc..94e76f3db 100644 --- a/meta-ibm/meta-witherspoon/conf/local.conf.sample +++ b/meta-ibm/meta-witherspoon/conf/local.conf.sample @@ -1,6 +1,7 @@ #MACHINE ?= "mihawk" #MACHINE ?= "swift" #MACHINE ?= "witherspoon-128" +#MACHINE ?= "rainier" MACHINE ??= "witherspoon" DISTRO ?= "openbmc-witherspoon" PACKAGE_CLASSES ?= "package_rpm" diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf index 78ffbbc82..1f8c21e73 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf @@ -1,5 +1,6 @@ KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" -UBOOT_MACHINE = "evb-ast2600_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_DEVICETREE = "ast2600-rainier" OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf index 2184847fd..765c0684a 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf @@ -1,5 +1,8 @@ KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb" -UBOOT_MACHINE = "evb-ast2600_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_DEVICETREE = "ast2600-tacoma" + +IMAGE_FSTYPES += "ext4" OBMC_POWER_SUPPLY_INSTANCES = "0 1" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend new file mode 100644 index 000000000..9b66d367e --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend @@ -0,0 +1,3 @@ +PACKAGECONFIG_append_witherspoon-128 = " host-dump-offload-pldm" +PACKAGECONFIG_append_rainier = " host-dump-offload-pldm" +PACKAGECONFIG_append_witherspoon-tacoma = " host-dump-offload-pldm" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf index 354fbe3ff..dcab0ee98 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf @@ -1,6 +1,5 @@ OBJPATH="--path=/system/chassis" AIR="--air" WATER="" -DEVICE="--dev=/dev/input/by-path/platform-gpio-keys-event" -CODE="--event=135" - +DEVICE="" +CODE="" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/toggle_identify_led.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/toggle_identify_led.sh index cd44c4b6b..496ece2b2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/toggle_identify_led.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/toggle_identify_led.sh @@ -7,7 +7,7 @@ PROPERTY="Asserted" # Get current state object=$(busctl tree $SERVICE --list | grep identify) -led=$(cat /sys/devices/platform/leds/leds/rear-id/brightness) +led=$(cat /sys/devices/platform/leds/leds/front-id/brightness) if [ "$led" == "0" ]; then busctl set-property $SERVICE $object $INTERFACE $PROPERTY b false else diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml index 59693ce77..0a7a160fe 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml @@ -1,23 +1,23 @@ BmcBooted: - power: + power-button: Action: 'Blink' DutyOn: 50 Period: 250 Priority: 'On' PowerOn: - power: + power-button: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' EnclosureFault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' EnclosureIdentify: - rear-id: + front-id: Action: 'On' DutyOn: 50 Period: 0 @@ -28,7 +28,7 @@ Fan0Fault: DutyOn: 50 Period: 0 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 @@ -39,7 +39,7 @@ Fan1Fault: DutyOn: 50 Period: 1000 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 @@ -50,7 +50,7 @@ Fan2Fault: DutyOn: 50 Period: 0 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 @@ -61,7 +61,7 @@ Fan3Fault: DutyOn: 50 Period: 1000 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 @@ -72,7 +72,7 @@ Fan4Fault: DutyOn: 50 Period: 0 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 @@ -83,35 +83,35 @@ Fan5Fault: DutyOn: 50 Period: 1000 Priority: 'Blink' - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' Powersupply0Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' Powersupply1Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' LampTest: - fault: + front-fault: Action: 'Blink' DutyOn: 50 Period: 1000 Priority: 'On' - rear-id: + front-id: Action: 'Blink' DutyOn: 50 Period: 1000 Priority: 'On' - power: + power-button: Action: 'Blink' DutyOn: 50 Period: 1000 @@ -147,367 +147,367 @@ LampTest: Period: 1000 Priority: 'Blink' core0Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core1Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core2Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core3Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core4Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core5Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core6Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core7Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core8Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core9Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core10Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core11Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core12Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core13Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core14Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core15Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core16Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core17Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core18Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core19Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core20Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core21Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core22Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' core23Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' cpu0Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' cpu1Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm0Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm1Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm2Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm3Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm4Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm5Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm6Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm7Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm8Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm9Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm10Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm11Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm12Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm13Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm14Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm15Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm16Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm17Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm18Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm19Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm20Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm21Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm22Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm23Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm24Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm25Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm26Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm27Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm28Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm29Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm30Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' dimm31Fault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' motherboardFault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' occFault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 Priority: 'On' systemFault: - fault: + front-fault: Action: 'On' DutyOn: 50 Period: 0 diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 090912ec1..46f8b2766 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,9 +1,24 @@ +POWER_SERVICE_PACKAGES_AC_SERVER = " \ + phosphor-power-monitor \ + phosphor-power-systemd-links-monitor \ + phosphor-power-sequencer \ + phosphor-power-systemd-links-sequencer \ + phosphor-power-utils \ + phosphor-power \ +" + +POWER_SERVICE_PACKAGES_RAINIER = " \ + ${POWER_SERVICE_PACKAGES_AC_SERVER} \ + phosphor-power-regulators \ + phosphor-power-psu-monitor \ +" + RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog" -RDEPENDS_${PN}-extras_append_ibm-ac-server = " phosphor-power phosphor-power-systemd-links witherspoon-power-supply-sync phosphor-webui" -RDEPENDS_${PN}-extras_append_rainier = " phosphor-power phosphor-power-systemd-links phosphor-webui" +RDEPENDS_${PN}-extras_append_ibm-ac-server = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" +RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} phosphor-webui" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing" RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend index 350c996d0..1caacd1e5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend @@ -4,9 +4,9 @@ inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" -EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" +EXTRA_OEMESON_${PN}-sequencer += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" -DEPENDS += " power-sequencer" +DEPENDS_${PN}-sequencer += " power-sequencer" do_install_append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json @@ -14,4 +14,4 @@ do_install_append(){ FILES_${PN} += "${datadir}/phosphor-power/psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor_append_ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index f98ee1c70..f973d1521 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -10,7 +10,7 @@ SRCREV = "4c0e8945f072f9139d0efb04e8f955663b972a84" inherit autotools inherit pkgconfig -inherit pythonnative +inherit python3native inherit obmc-phosphor-dbus-service inherit obmc-phosphor-systemd inherit phosphor-dbus-yaml diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 642049c72..d212933ca 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/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 = "849c319f95bfc5b76b1731cadbf95c24093aa53c" +SRCREV = "8709fbb3a396bdef42b2466011bb71fa2bcadfc0" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/host/p9-host-start.bbappend b/meta-inventec/meta-lanyang/recipes-phosphor/host/p9-host-start.bbappend index e2fe9f274..15030a8f2 100644 --- a/meta-inventec/meta-lanyang/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-inventec/meta-lanyang/recipes-phosphor/host/p9-host-start.bbappend @@ -1,2 +1 @@ RDEPENDS_${PN} += 'avsbus-control' -RDEPENDS_${PN}_remove += "p9-vcs-workaround" diff --git a/meta-openpower/recipes-bsp/ecmd/files/croserver.service b/meta-openpower/recipes-bsp/ecmd/files/croserver.service index 38d1fd2ff..79809e15d 100644 --- a/meta-openpower/recipes-bsp/ecmd/files/croserver.service +++ b/meta-openpower/recipes-bsp/ecmd/files/croserver.service @@ -9,4 +9,4 @@ ExecStart=/usr/bin/croserver Restart=on-failure ProtectHome=yes ProtectSystem=full -RestrictAddressFamilies=AF_UNIX +RestrictAddressFamilies=AF_INET AF_INET6 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 4be44e57f..9c71a1e7c 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -44,7 +44,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "647d6134d448178e6b32892322596a5cc3d78b2d" +SRCREV = "7f1967d56b89ffae5ea8e3313c000beb79cb63cd" DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service" diff --git a/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service b/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service index e6bc9389c..8b773ec38 100644 --- a/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service +++ b/meta-openpower/recipes-phosphor/host/op-host-control/cfam_override@.service @@ -7,6 +7,7 @@ After=obmc-power-on@%i.target Wants=fsi-scan@%i.service After=fsi-scan@%i.service Conflicts=obmc-chassis-poweroff@%i.target +Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on ConditionPathExists=/var/lib/obmc/cfam_overrides @@ -18,3 +19,4 @@ RemainAfterExit=yes [Install] WantedBy=obmc-chassis-poweron@%i.target +WantedBy=obmc-host-startmin@%i.target 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 new file mode 100644 index 000000000..b8105fc8d --- /dev/null +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -0,0 +1,45 @@ +SUMMARY = "OpenPOWER processor control services installation" +PR = "r1" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch + +RDEPENDS_${PN} += "op-proc-control" +RDEPENDS_${PN} += "phosphor-state-manager-obmc-targets" + +ALLOW_EMPTY_${PN} = "1" + +pkg_postinst_${PN}() { + mkdir -p $D$systemd_system_unitdir/obmc-host-stop@0.target.requires + mkdir -p $D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires + + LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.requires/op-stop-instructions@0.service" + TARGET="../op-stop-instructions@.service" + ln -s $TARGET $LINK + + LINK="$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/op-cfam-reset.service" + TARGET="../op-cfam-reset.service" + ln -s $TARGET $LINK + + # Only install cfam override if p9 system + if [ "${@bb.utils.contains("MACHINE_FEATURES", "p9-cfam-override", "True", "False", d)}" = True ]; then + mkdir -p $D$systemd_system_unitdir/obmc-host-startmin@0.target.requires + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/cfam_override@0.service" + TARGET="../cfam_override@.service" + ln -s $TARGET $LINK + fi +} + +pkg_prerm_${PN}() { + LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.requires/op-stop-instructions@0.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/op-cfam-reset.service" + rm $LINK + # Only uninstall cfam override if p9 system + if [ "${@bb.utils.contains("MACHINE_FEATURES", "p9-cfam-override", "True", "False", d)}" = True ]; then + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/cfam_override@0.service" + rm $LINK + fi +} 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 d765b504d..9f17aa243 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -7,17 +7,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" S = "${WORKDIR}/git" -inherit autotools obmc-phosphor-utils pkgconfig pythonnative +inherit autotools obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "a5311abddaa057a50b492c839b310f968a7e270f" +SRCREV = "7847960506ca4357e267fe05866b38aad236708f" DEPENDS += " \ autoconf-archive-native \ phosphor-logging \ phosphor-dbus-interfaces \ - openpower-dbus-interfaces \ libgpiod \ " @@ -32,4 +31,6 @@ SYSTEMD_SERVICE_${PN} = "${TEMPLATE} ${INSTANCES}" SYSTEMD_SERVICE_${PN} += " \ xyz.openbmc_project.Control.Host.NMI.service \ + op-stop-instructions@.service \ + op-cfam-reset.service \ " diff --git a/meta-openpower/recipes-phosphor/host/p9-host-start.bb b/meta-openpower/recipes-phosphor/host/p9-host-start.bb index 374359838..6905f34aa 100644 --- a/meta-openpower/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openpower/recipes-phosphor/host/p9-host-start.bb @@ -11,7 +11,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/op-host-control:" PROVIDES += 'virtual/obmc-host-ctl' RPROVIDES_${PN} += 'virtual-obmc-host-ctl' -RDEPENDS_${PN} += "p9-vcs-workaround op-proc-control" +RDEPENDS_${PN} += "p9-vcs-workaround \ + op-proc-control \ + op-proc-control-systemd-links" S = "${WORKDIR}" diff --git a/meta-openpower/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-openpower/recipes-phosphor/logging/phosphor-logging_%.bbappend index e5de414f7..c128cfe15 100644 --- a/meta-openpower/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-openpower/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -1,5 +1,4 @@ DEPENDS_append_df-openpower = " \ openpower-debug-collector-native \ - openpower-dbus-interfaces-native \ openpower-occ-control-native \ " diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index f74026379..0445bd027 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "5ebf803cf6b2bee06b76c6638daecdcd50a3a70e" +SRCREV = "65f8cd379d2aa0078352714f9a6bb513cc5e7b17" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index 33ebb4676..aaab247f7 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -7,7 +7,7 @@ PV = "1.0+git${SRCPV}" inherit autotools \ pkgconfig \ obmc-phosphor-dbus-service \ - pythonnative \ + python3native \ phosphor-dbus-yaml require ${PN}.inc @@ -28,11 +28,13 @@ DEPENDS += " \ sdbusplus \ sdbusplus-native \ phosphor-logging \ - openpower-dbus-interfaces \ phosphor-dbus-interfaces \ - openpower-dbus-interfaces-native \ autoconf-archive-native \ systemd \ + ${PYTHON_PN}-native \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-setuptools-native \ + ${PYTHON_PN}-mako-native \ " RDEPENDS_${PN} += "phosphor-state-manager-obmc-targets" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 80fb65fbc..a65c9162e 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 = "18197ae979ea3fea5f5f34216987f497e02ce96e" +SRCREV = "675ee7e4459c8c3fc5c2733289dc35406bb6d400" diff --git a/meta-phosphor/MAINTAINERS b/meta-phosphor/MAINTAINERS index 842b1675e..bfe81dea1 100644 --- a/meta-phosphor/MAINTAINERS +++ b/meta-phosphor/MAINTAINERS @@ -43,4 +43,3 @@ START OF MAINTAINERS LIST ------------------------- M: Brad Bishop <bradleyb@fuzziesquirrel.com> <radsquirrel!> -R: Ed Tanous <ed.tanous@intel.com> <EdTanous!> diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index 10388d257..39534db8d 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -324,7 +324,11 @@ python do_generate_static() { def _append_image(imgpath, start_kb, finish_kb): imgsize = os.path.getsize(imgpath) - if imgsize > (finish_kb - start_kb) * 1024: + maxsize = (finish_kb - start_kb) * 1024 + bb.debug(1, 'Considering file size=' + str(imgsize) + ' name=' + imgpath) + bb.debug(1, 'Spanning start=' + str(start_kb) + 'K end=' + str(finish_kb) + 'K') + bb.debug(1, 'Compare needed=' + str(imgsize) + ' available=' + str(maxsize) + ' margin=' + str(maxsize - imgsize)) + if imgsize > maxsize: bb.fatal("Image '%s' is too large!" % imgpath) subprocess.check_call(['dd', 'bs=1k', 'conv=notrunc', diff --git a/meta-phosphor/classes/obmc-phosphor-python-autotools.bbclass b/meta-phosphor/classes/obmc-phosphor-python-autotools.bbclass index d69eb345e..0922a1ab6 100644 --- a/meta-phosphor/classes/obmc-phosphor-python-autotools.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-python-autotools.bbclass @@ -15,3 +15,16 @@ python() { set_append(d, 'FILES_%s' % pkg, d.getVar('PYTHON_SITEPACKAGES_DIR', True)) } + +# In order to facilitate packages that use python3native, but also +# depend on python2 scripts we need to replace the #! to be nativepython +# instead of just python. Without this, `which python` points to the +# host's python, which is not the one where required modules would be +# installed. +do_install_append_class-native() { + for i in ${D}${bindir}/* ${D}${sbindir}/*; do + if [ -f "$i" ]; then + sed -i -e s:env\ python:env\ nativepython:g $i + fi + done +} diff --git a/meta-phosphor/classes/obmc-phosphor-python3-autotools.bbclass b/meta-phosphor/classes/obmc-phosphor-python3-autotools.bbclass index d76598a36..89a884a1b 100644 --- a/meta-phosphor/classes/obmc-phosphor-python3-autotools.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-python3-autotools.bbclass @@ -1,6 +1,9 @@ inherit obmc-phosphor-utils inherit python3native +OBMC_PYTHON_EXE="python3" +OBMC_PYTHON_EXE_class-native="nativepython3" + DEPENDS += "python3" export BUILD_SYS @@ -15,3 +18,21 @@ python() { set_append(d, 'FILES_%s' % pkg, d.getVar('PYTHON_SITEPACKAGES_DIR', True)) } + +# python-setuptools does some mangling of the #! in any scripts it installs, +# which has been reported for years at pypa/setuptools#494. OE has +# workarounds in distutils3.bbclass, but we cannot inherit that here because +# it conflicts with autotools.bbclass. Port the un-mangling code here. +# +# This finds any ${PYTHON} executable path that got put into the scripts +# and reverts it back to "/usr/bin/env python3". It also reverts any full +# ${STAGING_BINDIR_NATIVE} path back to "/usr/bin". +# +do_install_append() { + for i in ${D}${bindir}/* ${D}${sbindir}/*; do + if [ -f "$i" ]; then + sed -i -e s:${PYTHON}:${USRBINPATH}/env\ ${OBMC_PYTHON_EXE}:g $i + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i + fi + done +} diff --git a/meta-phosphor/classes/obmc-xmlpatch.bbclass b/meta-phosphor/classes/obmc-xmlpatch.bbclass index 9dc37507a..359820622 100644 --- a/meta-phosphor/classes/obmc-xmlpatch.bbclass +++ b/meta-phosphor/classes/obmc-xmlpatch.bbclass @@ -7,15 +7,15 @@ #See patchxml.py for details on the XML patch format. # -inherit pythonnative +inherit python3native inherit obmc-phosphor-utils do_patch[depends] = "mrw-patch-native:do_populate_sysroot" def find_patch_files(d): all_patches = listvar_to_list(d, 'SRC_URI') - xml_patches = filter(lambda x: x.endswith('.patch.xml') and - x.startswith('file://'), all_patches) + xml_patches = [x for x in all_patches if x.endswith('.patch.xml') and + x.startswith('file://')] return [x.lstrip('file://') for x in xml_patches] diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index 378d2020c..aa5dc3136 100644 --- a/meta-phosphor/classes/phosphor-networkd-rev.bbclass +++ b/meta-phosphor/classes/phosphor-networkd-rev.bbclass @@ -1,2 +1,2 @@ SRC_URI += "git://github.com/openbmc/phosphor-networkd" -SRCREV = "dbd328d7e037b1af13fb0f20f3708e2261b9e0b6" +SRCREV = "99801cea8c6dd13b4f4965c362966e5d497ea71e" diff --git a/meta-phosphor/recipes-devtools/python/python-mako_%.bbappend b/meta-phosphor/recipes-devtools/python/python-mako_%.bbappend new file mode 100644 index 000000000..020bdd6ab --- /dev/null +++ b/meta-phosphor/recipes-devtools/python/python-mako_%.bbappend @@ -0,0 +1,12 @@ +# python-mako installs /usr/bin/mako-render for both python2 and python3, +# which causes a bitbake QA failure. Remove it from installation for the +# native target to avoid the collision. +# +# We don't currently use this as a target package and if we did, we shouldn't +# install both python2 and python3 variants. +# +# Once we are done with python2, we can delete this. + +do_install_append_class-native() { + rm ${D}${bindir}/mako-render +} diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index a54ba6e49..79d638d51 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -38,7 +38,7 @@ DEPENDS_append_class-native = " \ " SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "67c79b0ca6e013c8621dd2cff95e367dbb75bb2a" +SRCREV = "ddc0eba2bea1f55dff275726903deecd88ac6f3d" PACKAGECONFIG ??= "libsdbusplus transaction" PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd" diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb index b6bc9241a..17689f5d0 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "bddee63b9a630d5c6ec1a76552ecd4a7733b5ed6" +SRCREV = "c4522d2ea747e139dc97238b58c9609ac9d11776" inherit autotools \ pkgconfig \ diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb index a32ba1246..d9dcd1af2 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-chassisd.bb @@ -10,4 +10,4 @@ PROVIDES += "virtual/obmc-chassis-mgmt" RPROVIDES_${PN} += "virtual-obmc-chassis-mgmt" S = "${WORKDIR}" -SRC_URI += "file://${PN}.py" +SRC_URI += "file://${BPN}.py" diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 1542f70c4..25cd24a31 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "41622a95da34e3aacbf2b70d687d3a3a7c816c8a" +SRCREV = "29d83258f1268b3c41f97649518fa9bb1ffe83ed" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" @@ -21,5 +21,5 @@ DEPENDS = "boost \ S = "${WORKDIR}/git/" inherit cmake systemd -EXTRA_OECMAKE = "-DYOCTO=1 -DUSE_OVERLAYS=0" +EXTRA_OECMAKE = "-DYOCTO=1" diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket deleted file mode 100644 index 3174489ef..000000000 --- a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Phosphor Host Console SSH Per-Connection socket -Wants=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service - -[Socket] -ListenStream=2200 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service deleted file mode 100644 index 82ffe7919..000000000 --- a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console-ssh@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor Host Console SSH Per-Connection -Wants=obmc-console@{OBMC_CONSOLE_HOST_TTY}.service - -[Service] -Environment="DROPBEAR_RSAKEY_DIR=/etc/dropbear" -EnvironmentFile={envfiledir}/dropbear -ExecStart=-/usr/bin/env dropbear -i -r ${{DROPBEAR_RSAKEY_DIR}}/dropbear_rsa_host_key -c "/usr/bin/env obmc-console-client" $DROPBEAR_EXTRA_ARGS -SyslogIdentifier=dropbear -ExecReload={base_bindir}/kill -HUP $MAINPID -StandardInput=socket -KillMode=process diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console@.service b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console@.service deleted file mode 100644 index 246544a62..000000000 --- a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console@.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Phosphor Console Muxer listening on device /dev/%I -BindsTo=dev-%i.device -After=dev-%i.device - -[Service] -ExecStart=/usr/bin/env obmc-console-server --config {sysconfdir}/obmc-console.conf %i -SyslogIdentifier=obmc-console-server -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index 7d11bffe0..baa7c8c1f 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -5,36 +5,57 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" -inherit obmc-phosphor-systemd inherit autotools pkgconfig inherit obmc-phosphor-discovery-service +inherit systemd -TARGET_CFLAGS += "-fpic -O2" +S = "${WORKDIR}/git" + +TARGET_CFLAGS += "-fpic -O2" + +PACKAGECONFIG ??= "udev ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[udev] = "--with-udevdir=`pkg-config --variable=udevdir udev`,\ + --without-udevdir,udev" +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, \ + --without-systemdsystemunitdir" DEPENDS += "autoconf-archive-native \ systemd \ - " + " SRC_URI += "git://github.com/openbmc/obmc-console" SRC_URI += "file://${BPN}.conf" -SRCREV = "c5ce2cbd12e395749c3b4abedf0d81f49b402b70" +SRCREV = "fdf1a7102f800711daadfc3895fc8feeffa73c0e" PV = "1.0+git${SRCPV}" REGISTERED_SERVICES_${PN} += "obmc_console:tcp:2200:" -OBMC_CONSOLE_HOST_TTY ?= "ttyVUART0" -SYSTEMD_SUBSTITUTIONS += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" -SYSTEMD_SUBSTITUTIONS += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" - -SYSTEMD_SERVICE_${PN} = " \ - ${PN}@.service \ - ${PN}@${OBMC_CONSOLE_HOST_TTY}.service \ - ${PN}-ssh.socket \ - ${PN}-ssh@.service \ - " + +SYSTEMD_SERVICE_${PN} += "obmc-console-ssh@.service \ + obmc-console-ssh.socket \ + obmc-console@.service \ + " + +FILES_${PN} += "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" + do_install_append() { - install -m 0755 -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/${PN}.conf ${D}${sysconfdir}/${PN}.conf + # Install the server configuration + install -m 0755 -d ${D}${sysconfdir}/${BPN} + if test -f "${WORKDIR}/${BPN}.conf"; then + # Remove the upstream-provided server configuration + rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf + # Install the old-style server configuration + install -m 0644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/ + # Link the custom configuration to the required location + ln -sr ${D}${sysconfdir}/${BPN}.conf ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf + elif test -f "${WORKDIR}/server.ttyVUART0.conf" ; then + # Remove the upstream-provided server configuration + rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf + # Install the package-provided new-style configuration + install -m 0644 ${WORKDIR}/server.ttyVUART0.conf ${D}${sysconfdir}/${BPN}/ + else + # Otherwise, remove socket-id from the shipped configuration to + # align with the lack of a client configuration file + sed -ri '/^socket-id =/d' ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf + fi } - -S = "${WORKDIR}/git" 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 d22f7a93e..f31e70e58 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -14,7 +14,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "sdbus++-native" SRC_URI += "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "79064a8e0c49b35cfa1c343cef31f21ebfd7298d" +SRCREV = "86d1ab141212fd5380ac220217e46d01108b995f" DEPENDS_remove_class-native = "sdbus++-native" DEPENDS_remove_class-nativesdk = "sdbus++-native" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb index 3e2cd9a34..f31233ff4 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -27,6 +27,10 @@ DEPENDS += " \ sdeventplus \ gtest \ phosphor-snmp \ + ${PYTHON_PN}-native \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-setuptools-native \ + ${PYTHON_PN}-mako-native \ " FILES_phosphor-msl-verify = "${bindir}/phosphor-msl-verify" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index eb753cb69..ba88c9b2f 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 = "004938eb17af464fc1ba02f883adb78ad3bd40dd" +SRCREV = "59642e214dd0df652f8ca6e5b6780218f0ce4f51" 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 922124798..8e455b54d 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -36,6 +36,10 @@ DEPENDS += " \ sdbusplus-native \ autoconf-archive-native \ virtual/phosphor-debug-errors \ + ${PYTHON_PN}-native \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-setuptools-native \ + ${PYTHON_PN}-mako-native \ " RDEPENDS_${PN}-manager += " \ @@ -179,6 +183,11 @@ PACKAGECONFIG[ubifs-workaround] = " \ --disable-ubifs-workaround \ " +PACKAGECONFIG[host-dump-offload-pldm] = " \ + --with-host-dump-offload-transport=pldm,, \ + pldm \ + " + do_install[postfuncs] += "install_dreport" do_install[postfuncs] += "install_dreport_conf_file" do_install[postfuncs] += "install_dreport_plugins_scripts" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index d80736b91..cc3a85315 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 = "005ff2ff2194195003bb3126c88570a1d8d9f05b" +SRCREV = "5a80f3aec4cc817b0f20ce2ddd83d930b7df3af1" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index ccb69892b..38a6fb1c0 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -14,8 +14,8 @@ S = "${WORKDIR}/git" # Common build dependencies DEPENDS += "autoconf-archive-native" -DEPENDS += "python-pyyaml-native" -DEPENDS += "python-mako-native" +DEPENDS += "${PYTHON_PN}-pyyaml-native" +DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "sdbusplus" DEPENDS += "sdbusplus-native" DEPENDS += "sdeventplus" @@ -62,8 +62,7 @@ PACKAGECONFIG[control] = "--enable-control \ FAN_DEF_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/fans.yaml \ FAN_ZONE_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/zones.yaml \ ZONE_EVENTS_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/events.yaml \ - ZONE_CONDITIONS_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/zone_conditions.yaml \ - FAN_ZONE_OUTPUT_DIR=${S}/control, \ + ZONE_CONDITIONS_YAML_FILE=${STAGING_DIR_HOST}${control_datadir}/zone_conditions.yaml, \ --disable-control, \ virtual/phosphor-fan-control-fan-config \ phosphor-fan-control-zone-config \ @@ -90,8 +89,7 @@ SYSTEMD_LINK_${PN}-control += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHAS # -------------------------------------- # ${PN}-monitor specific configuration PACKAGECONFIG[monitor] = "--enable-monitor \ - FAN_MONITOR_YAML_FILE=${STAGING_DIR_HOST}${monitor_datadir}/monitor.yaml \ - FAN_MONITOR_OUTPUT_DIR=${S}/monitor, \ + FAN_MONITOR_YAML_FILE=${STAGING_DIR_HOST}${monitor_datadir}/monitor.yaml, \ --disable-monitor, \ phosphor-fan-monitor-config \ , \ diff --git a/meta-phosphor/recipes-phosphor/flash/obmc-phosphor-flashd.bb b/meta-phosphor/recipes-phosphor/flash/obmc-phosphor-flashd.bb index 602dbe9ec..92871502f 100644 --- a/meta-phosphor/recipes-phosphor/flash/obmc-phosphor-flashd.bb +++ b/meta-phosphor/recipes-phosphor/flash/obmc-phosphor-flashd.bb @@ -10,4 +10,4 @@ PROVIDES += "virtual/obmc-flash-mgmt" RPROVIDES_${PN} += "virtual-obmc-flash-mgmt" S = "${WORKDIR}" -SRC_URI += "file://${PN}.py" +SRC_URI += "file://${BPN}.py" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 19d5c86f5..3f63c3a5c 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "363c23022eb3fb0cde577405e8a084a2e819b642" +SRCREV = "12c7f4388b58a974265827ab62d3981ba98ed8f2" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb index 520cdcc99..9b5530b61 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb @@ -23,6 +23,9 @@ DEPENDS += " \ sdbusplus-native \ autoconf-archive-native \ libcereal \ + ${PYTHON_PN}-native \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-mako-native \ " OBMC_INVENTORY_PATH="${OBMC_DBUS_PATH_ROOT}/inventory" diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool/0001-create_pen_list-only-print-if-values-are-set.patch b/meta-phosphor/recipes-phosphor/ipmi/ipmitool/0001-create_pen_list-only-print-if-values-are-set.patch deleted file mode 100644 index c9b955d6f..000000000 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool/0001-create_pen_list-only-print-if-values-are-set.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 51f3c26190f91981e35671ac87bb716dac8a9b7f Mon Sep 17 00:00:00 2001 -From: Vernon Mauery <vernon.mauery@intel.com> -Date: Wed, 27 Feb 2019 15:22:52 -0800 -Subject: [PATCH] create_pen_list: only print if values are set - -On a failed download of the PEN list, the create_pen_list script -improperly printed an invalid entry of { , "" } causing the build to -fail. The last line print must check that it has something to print or -it will print the wrong thing. - -Partially resolves ipmitool/ipmitool#11 - -Signed-off-by: Vernon Mauery <vernon.mauery@intel.com> ---- - lib/create_pen_list | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/create_pen_list b/lib/create_pen_list -index e2b44d2..81864ad 100755 ---- a/lib/create_pen_list -+++ b/lib/create_pen_list -@@ -67,7 +67,9 @@ parse_pen_list() { - } - - END { -- print "{ " PEN ", \"" ENTERPRISE "\" }," -+ if(PEN) { -+ print "{ " PEN ", \"" ENTERPRISE "\" }," -+ } - }' - } - --- -2.17.1 - diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool/enterprise-numbers b/meta-phosphor/recipes-phosphor/ipmi/ipmitool/enterprise-numbers new file mode 100644 index 000000000..74842b561 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool/enterprise-numbers @@ -0,0 +1,113 @@ +PRIVATE ENTERPRISE NUMBERS + +(last updated 2020-03-05) + +SMI Network Management Private Enterprise Codes: + +Prefix: iso.org.dod.internet.private.enterprise (1.3.6.1.4.1) + +This file is http://www.iana.org/assignments/enterprise-numbers +This file has been reduced to entities signing CLAs with OpenBMC +https://drive.google.com/drive/folders/1Ooi0RdTcaOWF1DWFJUAJDdN7tRKde7Nl + +Decimal +| Organization +| | Contact +| | | Email +| | | | +0 + Reserved + Internet Assigned Numbers Authority + iana&iana.org +2 + IBM (https://w3.ibm.com/standards ) + Glenn Daly + gdaly&us.ibm.com +343 + Intel Corporation + Adam Kaminski + adam.kaminski&intel.com +674 + Dell Inc. + David L. Douglas + david_l_douglas&dell.com +1694 + HCL Technologies Limited + Ms. Bindu Dandapani + bindud&hcl.in +2487 + Phoenix Technologies Ltd. + Ian Anderson + ian_anderson&phoenix.com +4128 + ARM Ltd. + Jon Brawn + jbrawn&arm.com +6569 + INVENTEC CORPORATION + JH CHYAN + chyan.jh&inventec.com +7244 + Quanta Computer Inc. + Strong Chen + @strong.chen&quantatw.com +8554 + Departement Elektrotechnik, ETH Zuerich + Simon Moser + smoser&ee.ethz.ch +11129 + Google, Inc. + Ben Laurie + benl&google.com +11183 + Mitac International Corp. + P.C. Wang + p.c.wang&mic.com.tw +19046 + Lenovo Enterprise Business Group + Joe Bolan + jbolan&lenovo.com +20974 + American Megatrends, Inc + Kenny Chiang + kennychiang&ami.com.tw +33049 + Mellanox Technologies LTD + Sagi Rotem + sagir&mellanox.co.il +40092 + Wiwynn Corporation + Zong Bing, Wu + bing_wu&wiwynn.com +40981 + Facebook, Inc. + Tim Tickel + twt&fb.com +45065 + Insyde + Y.C. Lin + yc.lin&insyde.com +48482 + Linaro Ltd + Dave Pigott + dave.pigott&linaro.org +48512 + Inspur Group Co.,Ltd. + Chunpeng Mao + Maochp&inspur.com +49150 + Vertiv Co + John Bogdan + john.bogdan&vertivco.com +49769 + YADRO + Support + snmp&yadro.com +51974 + Raptor Computing Systems, LLC + Support Department + support&raptorcs.com +52538 + Ampere Computing + AJ Shah + aj&erecomputing.com diff --git a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend index d52f33038..8f390f554 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend +++ b/meta-phosphor/recipes-phosphor/ipmi/ipmitool_%.bbappend @@ -3,13 +3,29 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" DEPENDS += "systemd" SRC_URI = "git://github.com/ipmitool/ipmitool.git;protocol=https" -SRCREV = "d818c2ff85c011be29c8d3047e516a5e032a1923" +SRCREV = "c3939dac2c060651361fc71516806f9ab8c38901" -# this patch has been submitted to ipmitool upstream and is in review +# TODO: when a new company joins the OpenBMC project by signing +# a CLA, if they have an enterprise number on file with the +# IANA, the versioned file, $PWD/ipmitool/enterprise-numbers +# needs to be updated to add their entry. The canonical +# version of the file is locatede here: +# https://www.iana.org/assignments/enterprise-numbers +# +# This file is manually downloaded so it can be versioned +# instead of having the makefile download it during do_compile SRC_URI += " \ - file://0001-create_pen_list-only-print-if-values-are-set.patch \ + file://enterprise-numbers \ " +# make sure that the enterprise-numbers file gets installed in the root FS +FILES_${PN} += "/usr/share/misc/enterprise-numbers" +do_compile_prepend() { + # copy the SRC_URI version of enterprise-numbers + # to the build dir to prevent a fetch + cp "${WORKDIR}/enterprise-numbers" "${WORKDIR}/build/enterprise-numbers" +} + S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=9aa91e13d644326bf281924212862184" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 871ac1348..8babca20b 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 = "3165569a562983cf3c43b0b10c23e7695a031b56" +SRCREV = "e0af1c496a2f79f0e9357a4344e800957aeed3fe" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 6bd95e86f..a59e1fdd0 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -35,6 +35,9 @@ DEPENDS += "virtual/phosphor-ipmi-fru-merge-config" DEPENDS += "virtual/phosphor-ipmi-sensor-inventory" DEPENDS += "boost" DEPENDS += "sdeventplus" +DEPENDS += "${PYTHON_PN}-native" +DEPENDS += "${PYTHON_PN}-pyyaml-native" +DEPENDS += "${PYTHON_PN}-mako-native" VIRTUAL-RUNTIME_ipmi-config ?= "phosphor-ipmi-config" diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb index fc74af106..1c38d2a39 100644 --- a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb @@ -15,7 +15,7 @@ RDEPENDS_${PN} += " \ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "5ba7176ca2755080e35daba0b5417386abf17f6d" +SRCREV = "59642e214dd0df652f8ca6e5b6780218f0ce4f51" do_install() { install -d ${D}${bindir} diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index e68b52fd0..6d95406bc 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -15,8 +15,9 @@ inherit phosphor-dbus-yaml DEPENDS += "autoconf-archive-native" DEPENDS += "systemd" -DEPENDS += "python-mako-native" -DEPENDS += "python-pyyaml-native" +DEPENDS += "${PYTHON_PN}-mako-native" +DEPENDS += "${PYTHON_PN}-pyyaml-native" +DEPENDS += "${PYTHON_PN}-native" DEPENDS += "sdbusplus sdbusplus-native" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "virtual/phosphor-logging-callouts" @@ -54,7 +55,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "51e927cc63034f998a2c6c54e7a324ab623d975a" +SRCREV = "bebeb948177220985f6ede067b9c8f2ab30401dd" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 00730dde6..4b5ad8f9f 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 = "e53193fa06a74c489f9c26ab1bd8c124f360c780" +SRCREV = "442210e450bcd9bced09988ac2d237416193a89d" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb new file mode 100644 index 000000000..77df3acf5 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-monitor.bb @@ -0,0 +1,33 @@ +SUMMARY = "Phosphor Power Monitor services installation" +PR = "r1" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch + +RDEPENDS_${PN}-monitor += "phosphor-power-monitor" + +ALLOW_EMPTY_${PN} = "1" + + +pkg_postinst_${PN}() { + mkdir -p $D$systemd_system_unitdir/multi-user.target.requires + + [ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1 + + for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do + LINK="$D$systemd_system_unitdir/multi-user.target.requires/power-supply-monitor@$inst.service" + TARGET="../power-supply-monitor@.service" + ln -s $TARGET $LINK + done +} + +pkg_prerm_${PN}() { + [ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1 + + for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do + LINK="$D$systemd_system_unitdir/multi-user.target.requires/power-supply-monitor@$inst.service" + rm $LINK + done +} diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb new file mode 100644 index 000000000..ac91c353e --- /dev/null +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links-sequencer.bb @@ -0,0 +1,31 @@ +SUMMARY = "Phosphor Power Sequencer services installation" +PR = "r1" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch + +RDEPENDS_${PN} += "phosphor-power-sequencer" + +ALLOW_EMPTY_${PN} = "1" + +pkg_postinst_${PN}() { + mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants + mkdir -p $D$systemd_system_unitdir/multi-user.target.requires + + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor.service" + TARGET="../pseq-monitor.service" + ln -s $TARGET $LINK + + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor-pgood.service" + TARGET="../pseq-monitor-pgood.service" + ln -s $TARGET $LINK +} + +pkg_prerm_${PN}() { + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor-pgood.service" + rm $LINK +} diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb index 2baaf0d70..f84ad2826 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power-systemd-links.bb @@ -1,3 +1,7 @@ +# TODO: This is splitted into two recipes; +# To avoid build error, this is kept for now. +# Remove me when the refactor of phosphor-power recipe is finished + SUMMARY = "Phosphor Power services installation" PR = "r1" @@ -9,38 +13,3 @@ inherit allarch RDEPENDS_${PN} += "phosphor-power" ALLOW_EMPTY_${PN} = "1" - -pkg_postinst_${PN}() { - mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants - mkdir -p $D$systemd_system_unitdir/multi-user.target.requires - - LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor.service" - TARGET="../pseq-monitor.service" - ln -s $TARGET $LINK - - LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor-pgood.service" - TARGET="../pseq-monitor-pgood.service" - ln -s $TARGET $LINK - - [ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1 - - for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do - LINK="$D$systemd_system_unitdir/multi-user.target.requires/power-supply-monitor@$inst.service" - TARGET="../power-supply-monitor@.service" - ln -s $TARGET $LINK - done -} - -pkg_prerm_${PN}() { - LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor.service" - rm $LINK - LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.wants/pseq-monitor-pgood.service" - rm $LINK - - [ -z "${OBMC_POWER_SUPPLY_INSTANCES}" ] && echo "No power supply instance defined" && exit 1 - - for inst in ${OBMC_POWER_SUPPLY_INSTANCES}; do - LINK="$D$systemd_system_unitdir/multi-user.target.requires/power-supply-monitor@$inst.service" - rm $LINK - done -} diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 75db0c55c..a593f8c83 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 = "dc72b62ad334da29e7bb790b91c77bb5736815a3" +SRCREV = "8b89f1b1837cd99a15b6bea2ac17bb325422dee6" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb index c71064558..e51e536b6 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb @@ -7,12 +7,26 @@ PV = "1.0+git${SRCPV}" inherit meson inherit pkgconfig inherit systemd -inherit pythonnative +inherit python3native require ${PN}.inc S = "${WORKDIR}/git" +POWER_SERVICE_PACKAGES = " \ + ${PN}-cold-redundancy \ + ${PN}-monitor \ + ${PN}-psu-monitor \ + ${PN}-regulators \ + ${PN}-sequencer \ +" +POWER_UTIL_PACKAGES = "${PN}-utils" + +PACKAGE_BEFORE_PN = "${POWER_SERVICE_PACKAGES} ${POWER_UTIL_PACKAGES}" +ALLOW_EMPTY_${PN} = "1" + +SYSTEMD_PACKAGES = "${POWER_SERVICE_PACKAGES}" + # TODO: in future when openpower-dbus-interfaces is removed from # phosphor-power, remove the dependency here. DEPENDS += " \ @@ -23,20 +37,29 @@ DEPENDS += " \ nlohmann-json \ cli11 \ i2c-tools \ + ${PYTHON_PN}-native \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-setuptools-native \ + ${PYTHON_PN}-mako-native \ " -PACKAGE_BEFORE_PN = "phosphor-psu-monitor" -FILES_phosphor-psu-monitor = "${bindir}/phosphor-psu-monitor \ - ${systemd_system_unitdir}/phosphor-psu-monitor.service" - SEQ_MONITOR_SVC = "pseq-monitor.service" SEQ_PGOOD_SVC = "pseq-monitor-pgood.service" PSU_MONITOR_TMPL = "power-supply-monitor@.service" -SYSTEMD_SERVICE_${PN} += "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC} ${PSU_MONITOR_TMPL}" +PSU_MONITOR_SVC = "phosphor-psu-monitor.service" +REGS_SVC = "phosphor-regulators.service" -# Package all phosphor-regulators config files -FILES_${PN} += "${datadir}/phosphor-regulators" +SYSTEMD_SERVICE_${PN}-sequencer = "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}" +SYSTEMD_SERVICE_${PN}-monitor = "${PSU_MONITOR_TMPL}" +SYSTEMD_SERVICE_${PN}-psu-monitor = "${PSU_MONITOR_SVC}" +SYSTEMD_SERVICE_${PN}-regulators = "${REGS_SVC}" -# ${PN}-regulators service/systemd setup -REGS_SVC = "phosphor-regulators.service" -SYSTEMD_SERVICE_${PN} += "${REGS_SVC}" + +# TODO: cold-redundancy is not installed in the repo yet +# FILES_${PN}-cold-redundancy = "${bindir}/cold-redundancy" + +FILES_${PN}-monitor = "${bindir}/psu-monitor" +FILES_${PN}-psu-monitor = "${bindir}/phosphor-psu-monitor ${datadir}/phosphor-psu-monitor" +FILES_${PN}-regulators = "${bindir}/phosphor-regulators ${datadir}/phosphor-regulators" +FILES_${PN}-sequencer = "${bindir}/pseq-monitor" +FILES_${PN}-utils = "${bindir}/psutils" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 040f32113..f24e52c96 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 = "14ce281a953e271ed10ae21a0fb03985e9ea45af" +SRCREV = "6b1247a16d52be853c18015e7163d60abce5c00a" PV = "0.1+git${SRCPV}" 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 55a1033a5..10fcdd747 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -262,6 +262,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 = "c9844634fb87318a6f7c13356e426191361f8bab" +SRCREV = "4ca6f3f4fe136a593df8e3a61adf6620cd4ca45c" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index a8c4beec8..bcc8cec5e 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 = "66f903fb69e8d8b9d7564e82a3daa3697cb92c54" +SRCREV = "fd22b5b0e770442294bd883a8b4e25ad512717ed" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index 21a4eaa10..21a4eaa10 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf diff --git a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf index 096c5c5dc..096c5c5dc 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf diff --git a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index ab8594170..d03b2c40f 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -4,10 +4,10 @@ EXTRA_OECONF_append = " --enable-negative-errno-on-fail" OCCS = " \ 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ - 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ + 00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ " -OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" |