diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-04 22:10:14 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-04 22:10:14 +0300 |
| commit | 794d26fa53ad7e8cb54a3a5773436b1d8e813f35 (patch) | |
| tree | 92940f7842138b00efea3b42140093a3bf39b81b | |
| parent | 235618c7396902842906bc3a8c90a3320aeeaeba (diff) | |
| parent | a6da583e088a2e9462d5330555a704402eff74a9 (diff) | |
| download | openbmc-794d26fa53ad7e8cb54a3a5773436b1d8e813f35.tar.xz | |
Merge tag 'wht-0.53' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
158 files changed, 794 insertions, 561 deletions
diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf index 9741d26b2..cba3b77da 100644 --- a/meta-aspeed/conf/layer.conf +++ b/meta-aspeed/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "aspeed-layer" BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/" LAYERVERSION_aspeed-layer = "1" -LAYERSERIES_COMPAT_aspeed-layer = "warrior zeus" +LAYERSERIES_COMPAT_aspeed-layer = "warrior zeus dunfell" 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 491068520..78c352f27 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} DEVICE_TREE=${UBOOT_DEVICETREE}" +UBOOT_MAKE_TARGET ?= "DEVICE_TREE=${UBOOT_DEVICETREE}" require recipes-bsp/u-boot/u-boot.inc 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 f19fb3932..d39aa1865 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig @@ -229,6 +229,7 @@ CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 # CONFIG_SCHED_DEBUG is not set CONFIG_SCHED_STACK_END_CHECK=y +CONFIG_DEBUG_LIST=y CONFIG_FUNCTION_TRACER=y # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_DEBUG_WX=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 45da2b24b..1c6c0f649 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -252,6 +252,7 @@ CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 # CONFIG_SCHED_DEBUG is not set CONFIG_SCHED_STACK_END_CHECK=y +CONFIG_DEBUG_LIST=y CONFIG_FUNCTION_TRACER=y # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_DEBUG_WX=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 8f21ec507..a7d1d7d44 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -285,6 +285,7 @@ CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 # CONFIG_SCHED_DEBUG is not set CONFIG_SCHED_STACK_END_CHECK=y +CONFIG_DEBUG_LIST=y CONFIG_FUNCTION_TRACER=y # CONFIG_RUNTIME_TESTING_MENU is not set CONFIG_DEBUG_WX=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index ad443aac5..28d939903 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.26" +LINUX_VERSION ?= "5.4.32" -SRCREV="1440369fcdef35f5b30dde253032188fd9611af8" +SRCREV="2cf49560af20199920858cb91e3b7b138e54f597" require linux-aspeed.inc diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf index 45538ab4e..d37fc56dd 100644 --- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf +++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf @@ -6,6 +6,8 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc +SERIAL_CONSOLES = "57600;ttyS4" + OBMC_MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ diff --git a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg index 7ea8dc31a..c093eafc2 100644 --- a/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg +++ b/meta-facebook/meta-yosemitev2/recipes-kernel/linux/linux-aspeed/yosemitev2.cfg @@ -1,6 +1,3 @@ -CONFIG_SENSORS_TMP421=y -CONFIG_SENSORS_MAX31785=y -CONFIG_RTC_DRV_RV8803=y -CONFIG_TCG_TPM=y -CONFIG_TCG_TIS_I2C_INFINEON=y CONFIG_NCSI_OEM_CMD_GET_MAC=y +CONFIG_I2C_SLAVE=y +CONFIG_IPMB_DEVICE_INTERFACE=y diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf index 94f1dff85..94f1dff85 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/tiogapass/obmc-console.conf diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf new file mode 100644 index 000000000..88aa57cff --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2200.conf @@ -0,0 +1 @@ +socket-id = host0 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf new file mode 100644 index 000000000..22273d4f3 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2201.conf @@ -0,0 +1 @@ +socket-id = host1 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf new file mode 100644 index 000000000..0eeb5b785 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2202.conf @@ -0,0 +1 @@ +socket-id = host2 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf new file mode 100644 index 000000000..be8e82e23 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/client.2203.conf @@ -0,0 +1 @@ +socket-id = host3 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf new file mode 100644 index 000000000..f800b35a7 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS0.conf @@ -0,0 +1,3 @@ +local-tty = ttyS0 +baud = 57600 +socket-id = host0 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf new file mode 100644 index 000000000..4a605424b --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS1.conf @@ -0,0 +1,3 @@ +local-tty = ttyS1 +baud = 57600 +socket-id = host1 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf new file mode 100644 index 000000000..bf37ca363 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS2.conf @@ -0,0 +1,3 @@ +local-tty = ttyS2 +baud = 57600 +socket-id = host2 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf new file mode 100644 index 000000000..d8c3ebfc5 --- /dev/null +++ b/meta-facebook/recipes-phosphor/console/obmc-console/yosemitev2/server.ttyS3.conf @@ -0,0 +1,3 @@ +local-tty = ttyS3 +baud = 57600 +socket-id = host3 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend index 24b52d731..ab61422cb 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,2 +1,16 @@ -FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" OBMC_CONSOLE_HOST_TTY = "ttyS2" + +SRC_URI += "file://*.conf" +SRC_URI_remove = "file://${BPN}.conf" + +SYSTEMD_SERVICE_${PN}_remove_yosemitev2 = "obmc-console-ssh.socket" +EXTRA_OECONF_append_yosemitev2 = " --enable-concurrent-servers" + +do_install_append() { + # Install the server configuration + install -m 0755 -d ${D}${sysconfdir}/${BPN} + install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/ + # Remove upstream-provided server configuration + rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf +} diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 8a58a2da2..72d991c7e 100644 --- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend index b3205affa..c2d5ed8b9 100644 --- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_tiogapass = " file://ipmb-channels.json" diff --git a/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb index 42f5a94fc..1b72e5321 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb @@ -14,7 +14,7 @@ DEPENDS += "phosphor-ipmi-host" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/google-ipmi-i2c" -SRCREV = "14853c73362a208bb5310c40dd07c44d318f38b7" +SRCREV = "2da4d98236d46de9adc664a22f5895dfdbfc65fc" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf index 4506bba62..482b56aa0 100644 --- a/meta-ibm/conf/layer.conf +++ b/meta-ibm/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "ibm-layer" BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ibm-layer = "warrior zeus" +LAYERSERIES_COMPAT_ibm-layer = "warrior zeus dunfell" diff --git a/meta-ibm/meta-witherspoon/conf/conf-notes.txt b/meta-ibm/meta-witherspoon/conf/conf-notes.txt index 0c78d458d..112353d6f 100644 --- a/meta-ibm/meta-witherspoon/conf/conf-notes.txt +++ b/meta-ibm/meta-witherspoon/conf/conf-notes.txt @@ -7,6 +7,6 @@ DISTRO=openbmc-witherspoon MACHINE=swift bitbake obmc-phosphor-image witherspoon: DISTRO=openbmc-witherspoon MACHINE=witherspoon bitbake obmc-phosphor-image witherspoon-tacoma: -DISTRO=openbmc-openpower MACHINE=witherspoon-tacoma bitbake aspeed-image-norootfs +DISTRO=openbmc-openpower MACHINE=witherspoon-tacoma bitbake obmc-phosphor-image witherspoon-128: DISTRO=openbmc-witherspoon MACHINE=witherspoon-128 bitbake obmc-phosphor-image diff --git a/meta-ibm/meta-witherspoon/conf/layer.conf b/meta-ibm/meta-witherspoon/conf/layer.conf index 8cac30c39..2f6f9364b 100644 --- a/meta-ibm/meta-witherspoon/conf/layer.conf +++ b/meta-ibm/meta-witherspoon/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "witherspoon-layer" BBFILE_PATTERN_witherspoon-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_witherspoon-layer = "warrior zeus" +LAYERSERIES_COMPAT_witherspoon-layer = "warrior zeus dunfell" diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf index 1f8c21e73..4ce298e43 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf @@ -1,6 +1,7 @@ KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" -UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" UBOOT_DEVICETREE = "ast2600-rainier" +SPL_BINARY = "spl/u-boot-spl.bin" 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 765c0684a..c367e4c73 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf @@ -1,8 +1,9 @@ KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb" -UBOOT_MACHINE = "ast2600_openbmc_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" UBOOT_DEVICETREE = "ast2600-tacoma" +SPL_BINARY = "spl/u-boot-spl.bin" -IMAGE_FSTYPES += "ext4" +IMAGE_FSTYPES += "ext4 mmc-ext4-tar" OBMC_POWER_SUPPLY_INSTANCES = "0 1" diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Add-witherspoon-128-machine.patch b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Add-witherspoon-128-machine.patch deleted file mode 100644 index 86362db15..000000000 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/0001-ARM-dts-Aspeed-Add-witherspoon-128-machine.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 4c69603d48eebce36aedd28fc572bb43c1146f9c Mon Sep 17 00:00:00 2001 -From: Eddie James <eajames@linux.ibm.com> -Date: Wed, 2 Oct 2019 10:13:36 -0500 -Subject: [PATCH] ARM: dts: Aspeed: Add witherspoon-128 machine - -Create a witherspoon machine with 128MB flash chips. - -Signed-off-by: Eddie James <eajames@linux.ibm.com> ---- - arch/arm/boot/dts/Makefile | 1 + - .../dts/aspeed-bmc-opp-witherspoon-128.dts | 59 +++++++++++++++++++ - 2 files changed, 60 insertions(+) - create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts - -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 3ad9706337a2..7f60d157ef5d 100644 ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -1292,6 +1292,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ - aspeed-bmc-opp-tacoma.dtb \ - aspeed-bmc-opp-vesnin.dtb \ - aspeed-bmc-opp-witherspoon.dtb \ -+ aspeed-bmc-opp-witherspoon-128.dtb \ - aspeed-bmc-opp-zaius.dtb \ - aspeed-bmc-portwell-neptune.dtb \ - aspeed-bmc-quanta-q71l.dtb -diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts -new file mode 100644 -index 000000000000..1ba673a49334 ---- /dev/null -+++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon-128.dts -@@ -0,0 +1,59 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later -+// Copyright 2019 IBM Corp. -+/dts-v1/; -+ -+#include "aspeed-bmc-opp-witherspoon.dts" -+ -+&fmc { -+ status = "okay"; -+ -+ flash@0 { -+ status = "okay"; -+ label = "bmc"; -+ m25p,fast-read; -+ spi-max-frequency = <100000000>; -+ -+ partitions { -+ #address-cells = < 1 >; -+ #size-cells = < 1 >; -+ compatible = "fixed-partitions"; -+ u-boot@0 { -+ reg = < 0 0x60000 >; -+ label = "u-boot"; -+ }; -+ u-boot-env@60000 { -+ reg = < 0x60000 0x20000 >; -+ label = "u-boot-env"; -+ }; -+ obmc-ubi@80000 { -+ reg = < 0x80000 0x7F80000>; -+ label = "obmc-ubi"; -+ }; -+ }; -+ }; -+ -+ flash@1 { -+ status = "okay"; -+ label = "alt-bmc"; -+ m25p,fast-read; -+ spi-max-frequency = <100000000>; -+ -+ partitions { -+ #address-cells = < 1 >; -+ #size-cells = < 1 >; -+ compatible = "fixed-partitions"; -+ u-boot@0 { -+ reg = < 0 0x60000 >; -+ label = "alt-u-boot"; -+ }; -+ u-boot-env@60000 { -+ reg = < 0x60000 0x20000 >; -+ label = "alt-u-boot-env"; -+ }; -+ obmc-ubi@80000 { -+ reg = < 0x80000 0x7F80000>; -+ label = "alt-obmc-ubi"; -+ }; -+ }; -+ }; -+}; --- -2.23.0 - diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend index 30df8a8a3..dfd3afded 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -2,4 +2,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_ibm-ac-server = " file://witherspoon.cfg" SRC_URI_append_rainier = " file://rainier.cfg" SRC_URI_append_mihawk = " file://mihawk.cfg" -SRC_URI_append_witherspoon-128 = " file://0001-ARM-dts-Aspeed-Add-witherspoon-128-machine.patch" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf index 638ae7e5d..638ae7e5d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/obmc-console.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf index a5ba3f328..a5ba3f328 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/obmc-console.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/client.2201.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/client.2201.conf new file mode 100644 index 000000000..7264e8278 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/client.2201.conf @@ -0,0 +1 @@ +socket-id = guests diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf new file mode 100644 index 000000000..638ae7e5d --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf @@ -0,0 +1,5 @@ +lpc-address = 0x3f8 +sirq = 4 +local-tty = ttyS0 +local-tty-baud = 115200 +logsize = 256k diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf new file mode 100644 index 000000000..e98587f15 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf @@ -0,0 +1,3 @@ +lpc-address = 0x2f8 +sirq = 3 +socket-id = guests diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf new file mode 100644 index 000000000..7264e8278 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf @@ -0,0 +1 @@ +socket-id = guests diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf new file mode 100644 index 000000000..010d82468 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf @@ -0,0 +1,3 @@ +lpc-address = 0x3f8 +sirq = 4 +logsize = 256k diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf new file mode 100644 index 000000000..e98587f15 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf @@ -0,0 +1,3 @@ +lpc-address = 0x2f8 +sirq = 3 +socket-id = guests diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend index 72d991c7e..c10b7ce04 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend @@ -1 +1,64 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_remove = "file://${BPN}.conf" +SRC_URI += "file://server.ttyVUART0.conf" + +install_concurrent_console_config() { + # Install configuration for the servers and clients. Keep commandline + # compatibility with previous configurations by defaulting to not + # specifying a socket-id for VUART0/2200 + install -m 0755 -d ${D}${sysconfdir}/${BPN} + + # Remove the default client configuration as we don't to define a + # socket-id for the 2200 console + rm -f ${D}${sysconfdir}/${BPN}/client.2200.conf + + # However, now link to /dev/null as a way of not specifying a + # socket-id while having a configuration file present. We need to + # provide a configuration path to meet the requirements of the packaged + # unit file. + ln -sr ${D}/dev/null ${D}${sysconfdir}/${BPN}/client.2200.conf + + # We need to populate socket-id for remaining consoles + install -m 0644 ${WORKDIR}/client.2201.conf ${D}${sysconfdir}/${BPN}/ + + # Install configuration for remaining servers - the base recipe + # installs the configuration for the first. + install -m 0644 ${WORKDIR}/server.ttyVUART1.conf ${D}${sysconfdir}/${BPN}/ +} + +SRC_URI_append_rainier = " file://client.2201.conf" +SRC_URI_append_rainier = " file://server.ttyVUART1.conf" + +REGISTERED_SERVICES_${PN}_append_rainier = " obmc_console_guests:tcp:2201:" + +SYSTEMD_SERVICE_${PN}_append_rainier = " obmc-console-ssh@2200.service \ + obmc-console-ssh@2201.service \ + " +SYSTEMD_SERVICE_${PN}_remove_rainier = "obmc-console-ssh.socket" + +FILES_${PN}_remove_rainier = "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" + +EXTRA_OECONF_append_rainier = " --enable-concurrent-servers" + +do_install_append_rainier() { + install_concurrent_console_config +} + +SRC_URI_append_witherspoon-tacoma = " file://client.2201.conf" +SRC_URI_append_witherspoon-tacoma = " file://server.ttyVUART1.conf" + +REGISTERED_SERVICES_${PN}_append_witherspoon-tacoma = " obmc_console_guests:tcp:2201:" + +SYSTEMD_SERVICE_${PN}_append_witherspoon-tacoma = " obmc-console-ssh@2200.service \ + obmc-console-ssh@2201.service \ + " +SYSTEMD_SERVICE_${PN}_remove_witherspoon-tacoma = "obmc-console-ssh.socket" + +FILES_${PN}_remove_witherspoon-tacoma = "/lib/systemd/system/obmc-console-ssh@.service.d/use-socket.conf" + +EXTRA_OECONF_append_witherspoon-tacoma = " --enable-concurrent-servers" + +do_install_append_witherspoon-tacoma() { + install_concurrent_console_config +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb new file mode 100644 index 000000000..2281192fe --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb @@ -0,0 +1,23 @@ +SUMMARY = "Wistron OEM commands" +DESCRIPTION = "Wistron OEM commands" +HOMEPAGE = "https://github.com/openbmc/wistron-ipmi-oem" +PR = "r1" +PV = "0.1+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" + +inherit autotools pkgconfig +inherit obmc-phosphor-ipmiprovider-symlink + +DEPENDS += "phosphor-ipmi-host" +DEPENDS += "autoconf-archive-native" + +S = "${WORKDIR}/git" +SRC_URI = "git://github.com/openbmc/wistron-ipmi-oem" +SRCREV = "44cee319dd113335a7885a1ff63a287dc7706682" + +FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" + +HOSTIPMI_PROVIDER_LIBRARY += "libwistronoem.so" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend index 9dff37d10..5c1d740ba 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -1,2 +1,3 @@ PACKAGECONFIG_append_witherspoon-128 = " openpower-pels" +PACKAGECONFIG_append_witherspoon-tacoma = " openpower-pels" PACKAGECONFIG_append_rainier = " openpower-pels" 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 46f8b2766..972dacf45 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 @@ -19,13 +19,15 @@ RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-contr RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog" 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_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem" RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-logging_remove_rainier = "ibm-logging" +RDEPENDS_${PN}-logging_remove_witherspoon-tacoma = "ibm-logging" RDEPENDS_${PN}-extras_append_rainier = " pldm" -RDEPENDS_${PN}-extras_append_witherspoon-128 = " pldm" -RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm" +RDEPENDS_${PN}-extras_append_witherspoon-128 = " pldm openpower-hw-diags" + +RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm openpower-hw-diags" ${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" 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 1caacd1e5..1105e0cf6 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_${PN}-sequencer += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" +EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" -DEPENDS_${PN}-sequencer += " power-sequencer" +DEPENDS += " power-sequencer" do_install_append(){ install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend index 3fc3d487e..6c0cbeba9 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend @@ -7,3 +7,11 @@ do_install_append_swift() { DEST=${D}${inventory_envdir} printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a340.i2c-bus/i2c-8/8-0051/eeprom" >> ${DEST}/inventory } + +do_install_append_witherspoon-tacoma() { + DEST=${D}${inventory_envdir} + printf "FRUS=BMC,ETHERNET" > ${DEST}/inventory + printf "\nPATHS=/system/chassis/motherboard/bmc,/system/chassis/motherboard/bmc/eth0" >> ${DEST}/inventory + printf "\nEEPROM=/sys/devices/platform/ahb/ahb:apb/ahb:apb:bus@1e78a000/1e78a600.i2c-bus/i2c-11/11-0051/eeprom" >> ${DEST}/inventory +} + diff --git a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb index d22b4718f..99b933ab7 100644 --- a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb +++ b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces_git.bb @@ -8,24 +8,21 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" S = "${WORKDIR}/git" inherit autotools pkgconfig -inherit pythonnative +inherit python3native inherit phosphor-dbus-yaml DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbus++-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" SRC_URI += "git://github.com/openbmc/ibm-dbus-interfaces" SRCREV = "109271bb4de159b9cf13c56acded3eb79bff61fb" -DEPENDS_remove_class-native = "sdbus++-native" -DEPENDS_remove_class-nativesdk = "sdbus++-native" - PACKAGECONFIG ??= "libibm_dbus" PACKAGECONFIG[libibm_dbus] = " \ --enable-libibm_dbus, \ --disable-libibm_dbus, \ systemd sdbusplus, \ - libsystemd sdbusplus \ + libsystemd \ " PACKAGECONFIG_remove_class-native = "libibm_dbus" diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index f973d1521..50be5da41 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/openbmc/ibm-logging" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/ibm-logging" -SRCREV = "4c0e8945f072f9139d0efb04e8f955663b972a84" +SRCREV = "94924b4b106024c7a09daf3ebde8e0a33e050f3f" inherit autotools inherit pkgconfig diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/workbook/zaius-config_git.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/workbook/zaius-config_git.bb deleted file mode 100644 index f5a516ce3..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/workbook/zaius-config_git.bb +++ /dev/null @@ -1,6 +0,0 @@ -SUMMARY = "Zaius board wiring" -DESCRIPTION = "Board wiring information for the Zaius OpenPOWER system." -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit config-in-skeleton diff --git a/meta-intel/MAINTAINERS b/meta-intel/MAINTAINERS new file mode 100644 index 000000000..0a18b9aff --- /dev/null +++ b/meta-intel/MAINTAINERS @@ -0,0 +1,67 @@ +List of maintainers for meta-intel +=============================== + +How to use this list: + Find the most specific section entry (described below) that matches where + your change lives and add the reviewers (R) and maintainers (M) as + reviewers. You can use the same method to track down who knows a particular + code base best. + + Your change/query may span multiple entries; that is okay. + + If you do not find an entry that describes your request at all, someone + forgot to update this list; please at least file an issue or send an email + to a maintainer, but preferably you should just update this document. + +Description of section entries: + + Section entries are structured according to the following scheme: + + X: NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!> + X: ... + . + . + . + + Where REPO_NAME is the name of the repository within the OpenBMC GitHub + organization; FILE_PATH is a file path within the repository, possibly with + wildcards; X is a tag of one of the following types: + + M: Denotes maintainer; has fields NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!>; + if omitted from an entry, assume one of the maintainers from the + MAINTAINERS entry. + R: Denotes reviewer; has fields NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!>; + these people are to be added as reviewers for a change matching the repo + path. + F: Denotes forked from an external repository; has fields URL. + + Line comments are to be denoted "# SOME COMMENT" (typical shell style + comment); it is important to follow the correct syntax and semantics as we + may want to use automated tools with this file in the future. + + A change cannot be added to an OpenBMC repository without a MAINTAINER's + approval; thus, a MAINTAINER should always be listed as a reviewer. + +Change approval rules: + + - Patches must be available for review for a minimum of 48 hours before it + can be submitted. + - Patches must be be approved (+1) by at least 2 maintainers. + - Patches must not have an unresolved -1 vote by any maintainer. + - Patches should have all maintainers added for visibility. + - Patches should include unit tests where possible. + - Feel free to ping on IRC about patches that look good but have not + received +2 + +Design approval rules: + + - Design discussions should be carried out via email with, at minimum, + all maintainers on the thread. It's encouraged to include the + OpenBMC mailing list in the thread as well. + +START OF MAINTAINERS LIST +------------------------- + +M: Vernon Mauery <vernon.mauery@linux.intel.com> <vmauery!> +M: James Feist <james.feist@linux.intel.com> <jfei!> +M: Jason Bills <jason.m.bills@linux.intel.com> <jmbills!> diff --git a/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb b/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb new file mode 100644 index 000000000..4a2353f8b --- /dev/null +++ b/meta-intel/meta-common/recipes-core/host-error-monitor/host-error-monitor_git.bb @@ -0,0 +1,22 @@ +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" +inherit cmake systemd + +SRC_URI = "git://github.com/openbmc/host-error-monitor" + +DEPENDS = "boost sdbusplus libgpiod libpeci" + +PV = "0.1+git${SRCPV}" +SRCREV = "53099c49b89c22cfe09c7217679ae1fb20e019eb" + +S = "${WORKDIR}/git" + +SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.HostErrorMonitor.service" +SECURITY_CFLAGS_pn-host-error-monitor = "${SECURITY_NOPIE_CFLAGS}" + +# linux-libc-headers guides this way to include custom uapi headers +CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" +CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" +CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" +CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" +do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb b/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb new file mode 100644 index 000000000..ed1c7b508 --- /dev/null +++ b/meta-intel/meta-common/recipes-core/libpeci/libpeci_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "PECI Library" +DESCRIPTION = "PECI Library" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7becf906c8f8d03c237bad13bc3dac53" +inherit cmake + +SRC_URI = "git://github.com/openbmc/libpeci" + +PV = "0.1+git${SRCPV}" +SRCREV = "7ef5a55777bb4d0c403a4eca98c487fa4e9c7bd1" + +S = "${WORKDIR}/git" + +# linux-libc-headers guides this way to include custom uapi headers +CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" +CFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" +CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include/uapi" +CXXFLAGS_append = " -I ${STAGING_KERNEL_DIR}/include" +do_configure[depends] += "virtual/kernel:do_shared_workdir" diff --git a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb b/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb index 2922b6a36..7dd149e81 100755 --- a/meta-intel/meta-common/recipes-intel/chassis/x86-power-control_git.bb +++ b/meta-intel/meta-common/recipes-intel/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 = "e7520ba18a5b5ba6c8eb7a9d543704f9699295a1" +SRCREV = "fc1ecc59100d21c953501703bc5db9e02e25b333" PV = "1.0+git${SRCPV}" 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 d212933ca..53024e0c7 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 = "8709fbb3a396bdef42b2466011bb71fa2bcadfc0" +SRCREV = "2b664d5a185247f0448c763ba7d0e42cfc245024" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb b/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb index 76fb67dc3..cdb88bbfe 100644 --- a/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb +++ b/meta-intel/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces_git.bb @@ -8,27 +8,24 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" S = "${WORKDIR}/git" inherit autotools pkgconfig -inherit pythonnative +inherit python3native inherit phosphor-dbus-yaml DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbus++-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" SRC_URI = "git://github.com/openbmc/intel-dbus-interfaces" SRCREV = "b5f2dd444c5d3808d005452417e4ae2ea28624ff" -DEPENDS_remove_class-native = "sdbus++-native" -DEPENDS_remove_class-nativesdk = "sdbus++-native" - PACKAGECONFIG ??= "libintel_dbus" PACKAGECONFIG[libintel_dbus] = " \ --enable-libintel_dbus, \ --disable-libintel_dbus, \ systemd sdbusplus, \ - libsystemd sdbusplus \ + libsystemd \ " PACKAGECONFIG_remove_class-native = "libintel_dbus" PACKAGECONFIG_remove_class-nativesdk = "libintel_dbus" -BBCLASSEXTEND += "native nativesdk"
\ No newline at end of file +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-intel/meta-s2600wf/recipes-phosphor/workbook/s2600wf-config_git.bb b/meta-intel/meta-s2600wf/recipes-phosphor/workbook/s2600wf-config_git.bb deleted file mode 100644 index cc12010b1..000000000 --- a/meta-intel/meta-s2600wf/recipes-phosphor/workbook/s2600wf-config_git.bb +++ /dev/null @@ -1,6 +0,0 @@ -SUMMARY = "s2600wf board wiring" -DESCRIPTION = "Board wiring information for the s2600wf system." -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit config-in-skeleton diff --git a/meta-inventec/meta-lanyang/recipes-phosphor/workbook/lanyang-config_git.bb b/meta-inventec/meta-lanyang/recipes-phosphor/workbook/lanyang-config_git.bb deleted file mode 100644 index 48631cc01..000000000 --- a/meta-inventec/meta-lanyang/recipes-phosphor/workbook/lanyang-config_git.bb +++ /dev/null @@ -1,6 +0,0 @@ -SUMMARY = "Lanyang board wiring" -DESCRIPTION = "Board wiring information for the Lanyang OpenPOWER system." -PR = "r1" -PV = "1.0+git${SRCPV}" - -inherit config-in-skeleton diff --git a/meta-openpower/conf/layer.conf b/meta-openpower/conf/layer.conf index 0b3f1a8b6..134e5ef38 100644 --- a/meta-openpower/conf/layer.conf +++ b/meta-openpower/conf/layer.conf @@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "openpower-layer" BBFILE_PATTERN_openpower-layer := "^${LAYERDIR}/" LAYERVERSION_openpower-layer = "1" LAYERDEPENDS_openpower-layer = "core phosphor-layer aspeed-layer" -LAYERSERIES_COMPAT_openpower-layer = "warrior zeus" +LAYERSERIES_COMPAT_openpower-layer = "warrior zeus dunfell" diff --git a/meta-openpower/recipes-bsp/ecmd/croserver_git.bb b/meta-openpower/recipes-bsp/ecmd/croserver_git.bb index 376392350..6dd7fae57 100644 --- a/meta-openpower/recipes-bsp/ecmd/croserver_git.bb +++ b/meta-openpower/recipes-bsp/ecmd/croserver_git.bb @@ -11,10 +11,12 @@ SRC_URI += "file://croserver.service" S = "${WORKDIR}/git" -inherit pythonnative +inherit python3native do_configure() { - LD="${CXX}" ${S}/config.py --without-swig --output-root ${B} --target obj --extensions "cmd cip" --build-verbose + LD="${CXX}" ${PYTHON} ${S}/config.py \ + --without-swig --output-root ${B} --target obj \ + --extensions "cmd cip" --build-verbose } do_compile() { diff --git a/meta-openpower/recipes-bsp/ecmd/libecmd_git.bb b/meta-openpower/recipes-bsp/ecmd/libecmd_git.bb new file mode 100644 index 000000000..c2e43a4ce --- /dev/null +++ b/meta-openpower/recipes-bsp/ecmd/libecmd_git.bb @@ -0,0 +1,61 @@ +SUMMARY = "eCMD" +DESCRIPTION = "eCMD is a hardware access API for POWER Systems" +LICENSE= "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/NOTICE;md5=fee220301a2af3faf8f211524b4248ea" + +SRC_URI = "git://github.com/open-power/eCMD.git;branch=ecmd15;protocol=git" +SRCREV = "15e382180d49f7ea4117ccc341ca91e361721fd4" + +inherit python3native +DEPENDS = "zlib" + +S = "${WORKDIR}/git" + +export LD="${CXX}" +export SLDFLAGS="${LDFLAGS}" + +# use native config.py to build required ecmd extensions +do_configure() { + ${S}/config.py --without-swig --without-python --without-python3 --without-perl \ + --without-pyecmd --install-path ${D}${prefix} --output-root ${B} --target ${TARGET_ARCH} \ + --extensions "cmd cip" +} + +do_compile() { + oe_runmake all +} + +do_install() { + oe_runmake install + + # we don't need the target scripts or ecmd setup + rm ${D}${bindir}/target.* ${D}${bindir}/ecmdsetup.pl + + # ecmd installs to atypical places in the filesystem. + # move all the installed files to more conventional directories. + install -d ${D}${includedir} ${D}${datadir}/${BPN}/help ${D}${bindir} ${D}${libdir} + mv ${D}${prefix}/help/** ${D}${datadir}/${BPN}/help + mv ${D}${prefix}/${TARGET_ARCH}/bin/** ${D}${bindir} + mv ${D}${prefix}/${TARGET_ARCH}/lib/** ${D}${libdir} + + rm ${D}${bindir}/ecmdVersion + + rmdir ${D}${prefix}/help \ + ${D}${prefix}/${TARGET_ARCH}/lib \ + ${D}${prefix}/${TARGET_ARCH}/bin \ + ${D}${prefix}/${TARGET_ARCH}/perl \ + ${D}${prefix}/${TARGET_ARCH} +} + +# ecmd makefile assumes that dependencies are built from left to right. +PARALLEL_MAKE = "" + +# ecmd doesn't have proper library versioning +FILES_${PN}-dev_remove = "${libdir}/lib*.so" +FILES_${PN} += "${libdir}/lib*.so" + +RDEPENDS_${PN}-bin = "libecmd" + +# This allows someone to easily use ecmd bins, even if you don’t want them. +PACKAGE_BEFORE_PN = "libecmd-bin" +FILES_${PN}-bin += "${bindir}" diff --git a/meta-openpower/recipes-bsp/pdbg/pdbg_2.4.bb b/meta-openpower/recipes-bsp/pdbg/pdbg_2.5-rc1.bb index 08f936d18..42c65e680 100644 --- a/meta-openpower/recipes-bsp/pdbg/pdbg_2.4.bb +++ b/meta-openpower/recipes-bsp/pdbg/pdbg_2.5-rc1.bb @@ -3,10 +3,8 @@ DESCRIPTION = "pdbg allows JTAG-like debugging of the host POWER processors" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" -PV = "2.4+git${SRCPV}" - SRC_URI += "git://github.com/open-power/pdbg.git" -SRCREV = "8b4611b5d8e7e2279fe4aa80c892fcfe10aa398d" +SRCREV = "6ae2ba655ca5e24b403a33bf15dff7261d3e7052" DEPENDS += "dtc-native" diff --git a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces_git.bb b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces_git.bb index 62eaf634c..3545018b3 100644 --- a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces_git.bb +++ b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces_git.bb @@ -8,25 +8,22 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" S = "${WORKDIR}/git" inherit autotools pkgconfig -inherit pythonnative +inherit python3native inherit phosphor-dbus-yaml DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbus++-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "phosphor-dbus-interfaces" SRC_URI += "git://github.com/openbmc/openpower-dbus-interfaces" SRCREV = "109ded04f3fec7bbbd93f9c9956a355f4894a51f" -DEPENDS_remove_class-native = "sdbus++-native" -DEPENDS_remove_class-nativesdk = "sdbus++-native" - PACKAGECONFIG ??= "libopenpower_dbus" PACKAGECONFIG[libopenpower_dbus] = " \ --enable-libopenpower_dbus, \ --disable-libopenpower_dbus, \ systemd sdbusplus, \ - libsystemd sdbusplus \ + libsystemd \ " PACKAGECONFIG_remove_class-native = "libopenpower_dbus" 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 d79a01c5e..08b58ea7c 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -7,15 +7,15 @@ PV = "1.0+git${SRCPV}" inherit autotools \ pkgconfig \ obmc-phosphor-systemd \ - pythonnative \ + python3native \ phosphor-dbus-yaml -require ${PN}.inc +require ${BPN}.inc DEPENDS += " \ phosphor-logging \ autoconf-archive-native \ - sdbus++-native \ + ${PYTHON_PN}-sdbus++-native \ " S = "${WORKDIR}/git" 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 9c71a1e7c..841373706 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig systemd inherit obmc-phosphor-dbus-service -inherit pythonnative inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-ubi-fs', \ 'openpower-software-manager-ubi', \ @@ -33,7 +32,6 @@ DEPENDS += " \ phosphor-dbus-interfaces \ phosphor-logging \ sdbusplus \ - sdbusplus-native \ " RDEPENDS_${PN} += " \ @@ -44,7 +42,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "7f1967d56b89ffae5ea8e3313c000beb79cb63cd" +SRCREV = "228f16d47bf2fd45022faf05647e2bb1981a56f7" 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 b8105fc8d..8185ddf8f 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 @@ -12,10 +12,10 @@ 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-stop@0.target.wants 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" + LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/op-stop-instructions@0.service" TARGET="../op-stop-instructions@.service" ln -s $TARGET $LINK @@ -33,7 +33,7 @@ pkg_postinst_${PN}() { } pkg_prerm_${PN}() { - LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.requires/op-stop-instructions@0.service" + LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/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 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 9f17aa243..01ef6b043 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -33,4 +33,5 @@ SYSTEMD_SERVICE_${PN} += " \ xyz.openbmc_project.Control.Host.NMI.service \ op-stop-instructions@.service \ op-cfam-reset.service \ + ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ " diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb index 0b1e52b48..f0d54ea54 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb @@ -10,7 +10,7 @@ inherit obmc-phosphor-ipmiprovider-symlink DEPENDS += "phosphor-ipmi-host" DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "openpower-dbus-interfaces openpower-dbus-interfaces-native" @@ -22,7 +22,7 @@ HOSTIPMI_PROVIDER_LIBRARY += "libhiomap.so" S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-host-ipmi-flash" -SRCREV = "d4b7f5e4819aa6e3ddb165a80149dd1a1c1649d7" +SRCREV = "a182dce8b97c4ca17832b4cc47c7a7b947291466" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc index 81a901c74..7cfe609f4 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-host-ipmi-oem" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/openpower-host-ipmi-oem" -SRCREV = "36ae8e5c4256b751ada4d6a2c9486c78d03ecba9" +SRCREV = "9975ae919e4cb8968639d9f953912e6c73205c44" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb index 711b7e6a3..142c09d8d 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb @@ -7,17 +7,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit autotools pkgconfig inherit obmc-phosphor-ipmiprovider-symlink -inherit pythonnative +inherit python3native -require ${PN}.inc +require ${BPN}.inc DEPENDS += "phosphor-ipmi-host" DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus" +DEPENDS += "${PYTHON_PN}-sdbus++-native" +DEPENDS += "${PYTHON_PN}-mako-native" +DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "openpower-dbus-interfaces openpower-dbus-interfaces-native" -DEPENDS += "sdbus++-native" DEPENDS += "virtual/phosphor-ipmi-inventory-sel" TARGET_CFLAGS += "-fpic" 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 78ad53572..be11e2c43 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -5,11 +5,11 @@ DESCRIPTION = "Attention Handler and Hardware Diagnostics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/projects/openbmc/openpower-hw-diags" +SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SYSTEMD_SERVICE_${PN} = "attn_handler.service" PV = "0.1+git${SRCPV}" -SRCREV = "73ac368a7e435b27d1100037eb76ee65f6a85ce6" +SRCREV = "cf0e074e5793890920bc77075f207e21bef175fa" S = "${WORKDIR}/git" 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 aaab247f7..210b5fcc2 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -10,7 +10,7 @@ inherit autotools \ python3native \ phosphor-dbus-yaml -require ${PN}.inc +require ${BPN}.inc SRC_URI += "file://occ-active.sh" do_install_append() { @@ -26,7 +26,7 @@ SYSTEMD_SERVICE_${PN} += "op-occ-disable@.service" DEPENDS += "virtual/${PN}-config-native" DEPENDS += " \ sdbusplus \ - sdbusplus-native \ + ${PYTHON_PN}-sdbus++-native \ phosphor-logging \ phosphor-dbus-interfaces \ autoconf-archive-native \ @@ -50,11 +50,11 @@ OCC_DISABLE = "disable" HOST_START = "startmin" HOST_STOP = "stop" -# Ensure host-stop and host-startmin targets require needed occ states +# Ensure host-stop and host-startmin targets wants needed occ states OCC_TMPL = "op-occ-{0}@.service" HOST_TGTFMT = "obmc-host-{1}@{2}.target" OCC_INSTFMT = "op-occ-{0}@{2}.service" -HOST_OCC_FMT = "../${OCC_TMPL}:${HOST_TGTFMT}.requires/${OCC_INSTFMT}" +HOST_OCC_FMT = "../${OCC_TMPL}:${HOST_TGTFMT}.wants/${OCC_INSTFMT}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_ENABLE', 'HOST_START', 'OBMC_HOST_INSTANCES')}" SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_OCC_FMT', 'OCC_DISABLE', 'HOST_STOP', 'OBMC_HOST_INSTANCES')}" @@ -74,6 +74,7 @@ S = "${WORKDIR}/git" DEPENDS_remove_class-native = " \ phosphor-logging \ systemd \ + sdbusplus \ virtual/${PN}-config-native \ " RDEPENDS_${PN}_remove_class-native += "phosphor-state-manager-obmc-targets" @@ -82,6 +83,7 @@ RDEPENDS_${PN}_remove_class-native += "phosphor-state-manager-obmc-targets" DEPENDS_remove_class-nativesdk = " \ phosphor-logging \ systemd \ + sdbusplus \ virtual/${PN}-config-native \ " RDEPENDS_${PN}_remove_class-nativesdk += "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 a65c9162e..f064d1270 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 = "675ee7e4459c8c3fc5c2733289dc35406bb6d400" +SRCREV = "3d7b4fe107d210fb300ae8dccf07252ccda4c00c" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb index 87377edc5..b82ae84da 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb @@ -5,10 +5,10 @@ PV = "1.0+git${SRCPV}" inherit autotools pkgconfig inherit openpower-fru-vpd -inherit pythonnative +inherit python3native inherit obmc-phosphor-systemd -require ${PN}.inc +require ${BPN}.inc SRC_URI += "file://70-op-vpd.rules" @@ -18,8 +18,8 @@ DEPENDS += " \ virtual/openpower-fru-properties \ sdbusplus \ phosphor-logging \ - python-mako-native \ - python-pyyaml-native \ + ${PYTHON_PN}-mako-native \ + ${PYTHON_PN}-pyyaml-native \ autoconf-archive-native \ " diff --git a/meta-phosphor/classes/config-in-skeleton.bbclass b/meta-phosphor/classes/config-in-skeleton.bbclass deleted file mode 100644 index b76753724..000000000 --- a/meta-phosphor/classes/config-in-skeleton.bbclass +++ /dev/null @@ -1,36 +0,0 @@ -# In general this class should only be used by board layers -# that keep their machine-readable-workbook in the skeleton repository. - -inherit allarch -inherit setuptools -inherit pythonnative -inherit skeleton-rev - -HOMEPAGE = "http://github.com/openbmc/skeleton" - -PROVIDES += "virtual/obmc-inventory-data" -RPROVIDES_${PN} += "virtual-obmc-inventory-data" - -DEPENDS += "python" -SRC_URI += "${SKELETON_URI};" -S = "${WORKDIR}/git/configs" - -python() { - machine = d.getVar('MACHINE', True).capitalize() + '.py' - d.setVar('_config_in_skeleton', machine) -} - -do_make_setup() { - cp ${S}/${_config_in_skeleton} \ - ${S}/obmc_system_config.py - cat <<EOF > ${S}/setup.py -from distutils.core import setup - -setup(name='${BPN}', - version='${PR}', - py_modules=['obmc_system_config'], - ) -EOF -} - -addtask make_setup after do_patch before do_configure diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index 39534db8d..0259cf634 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -42,6 +42,7 @@ FLASH_PAGE_SIZE ?= "1" FLASH_NOR_UBI_OVERHEAD ?= "64" # Fixed partition offsets +FLASH_UBOOT_SPL_SIZE ?= "64" FLASH_UBOOT_OFFSET ?= "0" FLASH_KERNEL_OFFSET ?= "512" FLASH_KERNEL_OFFSET_flash-131072 ?= "1024" @@ -336,9 +337,19 @@ python do_generate_static() { 'if=%s' % imgpath, 'of=%s' % nor_image]) + uboot_offset = int(d.getVar('FLASH_UBOOT_OFFSET', True)) + + spl_binary = d.getVar('SPL_BINARY', True) + if spl_binary: + _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), + 'u-boot-spl.%s' % d.getVar('UBOOT_SUFFIX',True)), + int(d.getVar('FLASH_UBOOT_OFFSET', True)), + int(d.getVar('FLASH_UBOOT_SPL_SIZE', True))) + uboot_offset += int(d.getVar('FLASH_UBOOT_SPL_SIZE', True)) + _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), 'u-boot.%s' % d.getVar('UBOOT_SUFFIX',True)), - int(d.getVar('FLASH_UBOOT_OFFSET', True)), + uboot_offset, int(d.getVar('FLASH_KERNEL_OFFSET', True))) _append_image(os.path.join(d.getVar('DEPLOY_DIR_IMAGE', True), diff --git a/meta-phosphor/classes/mrw-rev.bbclass b/meta-phosphor/classes/mrw-rev.bbclass index b0a6b1f40..29384304c 100644 --- a/meta-phosphor/classes/mrw-rev.bbclass +++ b/meta-phosphor/classes/mrw-rev.bbclass @@ -2,4 +2,4 @@ MRW_API_SRC_URI ?= "git://github.com/open-power/serverwiz.git" MRW_API_SRCREV ?= "60c8e10cbb11768cd1ba394b35cb1d6627efec42" MRW_TOOLS_SRC_URI ?= "git://github.com/openbmc/phosphor-mrw-tools" -MRW_TOOLS_SRCREV ?= "715c97ea76bb6c976e57dfa899f76a7106a7c2d5" +MRW_TOOLS_SRCREV ?= "721dcbd23da4f9679ddf58119c478922bf420a1e" diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 8ce0acd52..6e13a6520 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -38,7 +38,7 @@ FEATURE_PACKAGES_obmc-host-ipmi ?= "${@cf_enabled(d, 'obmc-host-ipmi', 'virtual- FEATURE_PACKAGES_obmc-host-state-mgmt ?= "packagegroup-obmc-apps-host-state-mgmt" FEATURE_PACKAGES_obmc-inventory ?= "packagegroup-obmc-apps-inventory" FEATURE_PACKAGES_obmc-leds ?= "packagegroup-obmc-apps-leds" -FEATURE_PACKAGES_obmc-logging-mgmt ?= "${@df_enabled(d, 'obmc-logging-mgmt', 'packagegroup-obmc-apps-logging')}" +FEATURE_PACKAGES_obmc-logging-mgmt ?= "packagegroup-obmc-apps-logging" FEATURE_PACKAGES_obmc-remote-logging-mgmt ?= "packagegroup-obmc-apps-remote-logging" FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net" FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors" diff --git a/meta-phosphor/classes/obmc-phosphor-python-autotools.bbclass b/meta-phosphor/classes/obmc-phosphor-python-autotools.bbclass deleted file mode 100644 index 0922a1ab6..000000000 --- a/meta-phosphor/classes/obmc-phosphor-python-autotools.bbclass +++ /dev/null @@ -1,30 +0,0 @@ -inherit obmc-phosphor-utils -inherit pythonnative - -DEPENDS += "python" - -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - -PYTHON_AUTOTOOLS_PACKAGE ?= "${PN}" - -python() { - for pkg in listvar_to_list(d, 'PYTHON_AUTOTOOLS_PACKAGE'): - 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-systemd.bbclass b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass index 9b4419bcd..830d0390c 100644 --- a/meta-phosphor/classes/obmc-phosphor-systemd.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-systemd.bbclass @@ -130,8 +130,11 @@ python() { 'base_bindir', 'bindir', 'sbindir', + 'libexecdir', 'envfiledir', 'sysconfdir', + 'localstatedir', + 'datadir', 'SYSTEMD_DEFAULT_TARGET' ]: set_append(d, 'SYSTEMD_SUBSTITUTIONS', '%s:%s:%s' % (x, d.getVar(x, True), file)) @@ -336,6 +339,9 @@ do_install_append() { sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ -e 's,@BINDIR@,${bindir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@LIBEXECDIR@,${libexecdir},g' \ + -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ + -e 's,@DATADIR@,${datadir},g' \ ${D}${systemd_system_unitdir}/$s done } diff --git a/meta-phosphor/classes/phosphor-networkd-rev.bbclass b/meta-phosphor/classes/phosphor-networkd-rev.bbclass index aa5dc3136..ed47935d0 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 = "99801cea8c6dd13b4f4965c362966e5d497ea71e" +SRCREV = "d0679f9bb46670c593061c4aaebec2a577cdd5c3" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 25672efca..86cc54ca9 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -94,15 +94,13 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = " \ " DISTRO_FEATURES_OBMC = " \ + ipmi-fru \ obmc-host-ctl \ obmc-host-ipmi \ - obmc-logging-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ obmc-phosphor-system-mgmt \ - obmc-phosphor-user-mgmt \ - obmc-settings-mgmt \ " DISTRO_FEATURES_DEFAULT = " \ @@ -139,12 +137,6 @@ IMAGE_CLASSES_append_npcm7xx = " image_types_phosphor_nuvoton" IMAGE_INSTALL_append = " dbus-broker" -# OpenBMC uses a couple recipes from meta-virtualization -# but we do not actually want any virtualization support -# enabled on a BMC distribution. Silence the emitted -# warning. -SKIP_META_VIRT_SANITY_CHECK = "1" - # Skip the udev database by default. It adds around 2MB # compressed to the root filesystem, and probably doesn't # make sense on a BMC anyway. diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index 55b6e0fec..58be25a05 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -110,11 +110,6 @@ PREFERRED_PROVIDER_virtual/obmc-system-mgmt ??= "obmc-phosphor-sysd" # automatically if the MRW feature is enabled. VIRTUAL-RUNTIME_phosphor-hwmon-config ?= "" -# obmc-settings-mgmt -# -# Provides a manager for user settings. -VIRTUAL-RUNTIME_obmc-settings-mgmt ?= "phosphor-settings-manager" - # obmc-network-manager # # Provide support for managing network diff --git a/meta-phosphor/conf/layer.conf b/meta-phosphor/conf/layer.conf index d35230656..028c6e52e 100644 --- a/meta-phosphor/conf/layer.conf +++ b/meta-phosphor/conf/layer.conf @@ -8,7 +8,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "phosphor-layer" BBFILE_PATTERN_phosphor-layer := "^${LAYERDIR}/" LAYERVERSION_phosphor-layer = "1" -LAYERSERIES_COMPAT_phosphor-layer = "warrior zeus" +LAYERSERIES_COMPAT_phosphor-layer = "warrior zeus dunfell" IMAGE_FEATURES[validitems] += "tools-profile" diff --git a/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb b/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb index 6f0afc633..afc36d46e 100644 --- a/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb +++ b/meta-phosphor/recipes-connectivity/jsnbd/jsnbd_git.bb @@ -15,7 +15,7 @@ RDEPENDS_${PN} += "nbd-client" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/jsnbd" -SRCREV = "bcc6cc5bcadb20005ae03c8c4a4eb87006f0d222" +SRCREV = "74c8a728212021e750686f4ec797e5f16283168a" NBD_PROXY_CONFIG_JSON ??= "${S}/config.sample.json" diff --git a/meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend b/meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend index d494db505..a3e2dcda2 100644 --- a/meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend +++ b/meta-phosphor/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bbappend @@ -2,6 +2,6 @@ RDEPENDS_${PN}_append = " \ nativesdk-autoconf-archive \ nativesdk-meson \ nativesdk-phosphor-dbus-interfaces-yaml \ - nativesdk-sdbus++ \ + nativesdk-python3-sdbus++ \ nativesdk-phosphor-logging-elog \ " diff --git a/meta-phosphor/recipes-devtools/python/python-pytest_%.bbappend b/meta-phosphor/recipes-devtools/python/python-pytest_%.bbappend new file mode 100644 index 000000000..e8dd736ef --- /dev/null +++ b/meta-phosphor/recipes-devtools/python/python-pytest_%.bbappend @@ -0,0 +1,13 @@ +# python-pytest installs /usr/bin/pytest 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}/py.test + rm ${D}${bindir}/pytest +} diff --git a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb index 2f17076a7..2e9894f94 100644 --- a/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb +++ b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb @@ -8,7 +8,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/pam-ipmi" -SRCREV = "65edb939ef8ffc4d46c7d12e759580c048c5d348" +SRCREV = "c2ef3319b42d86862b479e08e652ab36a26a14db" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb new file mode 100644 index 000000000..bf815ce03 --- /dev/null +++ b/meta-phosphor/recipes-extended/sdbusplus/python3-sdbus++_git.bb @@ -0,0 +1,31 @@ +SUMMARY = "sdbus++ dbus API / binding generator" +DESCRIPTION = "Generates bindings against sdbusplus for dbus APIs" + +inherit autotools pkgconfig +inherit obmc-phosphor-python3-autotools + +include sdbusplus-rev.inc + +# Provide these aliases temporarily until everyone can move over to the +# new package name. +PROVIDES_class-native += "sdbusplus-native" +PROVIDES_class-nativesdk += "sdbusplus-nativesdk" + +DEPENDS += " \ + autoconf-archive-native \ + ${PYTHON_PN}-inflection-native \ + ${PYTHON_PN}-mako-native \ + ${PYTHON_PN}-pyyaml-native \ + " + +RDEPENDS_${PN} += " \ + ${PYTHON_PN}-inflection \ + ${PYTHON_PN}-mako \ + ${PYTHON_PN}-pyyaml \ + " + +PACKAGECONFIG ??= "transaction" +PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd" +PACKAGECONFIG[transaction] = "--enable-transaction,--disable-transaction" + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc new file mode 100644 index 000000000..2c13668ba --- /dev/null +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus-rev.inc @@ -0,0 +1,10 @@ +HOMEPAGE = "http://github.com/openbmc/sdbusplus" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +S = "${WORKDIR}/git" + +SRC_URI += "git://github.com/openbmc/sdbusplus" +SRCREV = "afe80cf2e5dc4aefe3b041adeb0230e61929bf12" diff --git a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb index 79d638d51..9cc4cdc3f 100644 --- a/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb +++ b/meta-phosphor/recipes-extended/sdbusplus/sdbusplus_git.bb @@ -1,13 +1,10 @@ SUMMARY = "C++ bindings for systemd dbus APIs" DESCRIPTION = "C++ bindings for systemd dbus APIs." -HOMEPAGE = "http://github.com/openbmc/sdbusplus" -PR = "r1" -PV = "1.0+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig -inherit obmc-phosphor-python-autotools +inherit obmc-phosphor-python3-autotools + +include sdbusplus-rev.inc DEPENDS += " \ autoconf-archive-native \ @@ -15,43 +12,15 @@ DEPENDS += " \ ${PYTHON_PN}-mako-native \ ${PYTHON_PN}-pyyaml-native \ " -RDEPENDS_sdbus++ += " \ - ${PYTHON_PN} \ - ${PYTHON_PN}-inflection \ - ${PYTHON_PN}-mako \ - ${PYTHON_PN}-pyyaml \ - " - -# sdbus++ has a handful of runtime dependencies on other python packages. -# Bitbake doesn't do anything with RDEPENDS in native context because -# native context doesn't have packages. -# -# While technically sdbus++ doesn't require its runtime dependencies to be -# installed to build, work around the above native context behavior -# by adding a build dependency so that clients don't have to DEPEND -# on sdbus++ runtime dependencies manually. - -DEPENDS_append_class-native = " \ - ${PYTHON_PN}-inflection-native \ - ${PYTHON_PN}-mako-native \ - ${PYTHON_PN}-pyyaml-native \ - " - -SRC_URI += "git://github.com/openbmc/sdbusplus" -SRCREV = "ddc0eba2bea1f55dff275726903deecd88ac6f3d" PACKAGECONFIG ??= "libsdbusplus transaction" PACKAGECONFIG[libsdbusplus] = "--enable-libsdbusplus,--disable-libsdbusplus,systemd,libsystemd" PACKAGECONFIG[transaction] = "--enable-transaction,--disable-transaction" -S = "${WORKDIR}/git" - -PROVIDES_prepend = "sdbus++ " -PACKAGE_BEFORE_PN = "sdbus++" -FILES_sdbus++_append = " ${bindir}/sdbus++" -PYTHON_AUTOTOOLS_PACKAGE = "sdbus++" - -PACKAGECONFIG_remove_class-native = "libsdbusplus" -PACKAGECONFIG_remove_class-nativesdk = "libsdbusplus" - -BBCLASSEXTEND += "native nativesdk" +# Remove unused sdbus++ contents (included in python3-sdbus++ package). +do_install_append() { + rm ${D}/${bindir}/sdbus++ + rmdir ${D}/${bindir} || true + rm -rf ${D}/${PYTHON_SITEPACKAGES_DIR} + rmdir ${D}/${libdir}/${PYTHON_DIR} || true +} diff --git a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb index e1440c1b6..4c3822fe4 100644 --- a/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb +++ b/meta-phosphor/recipes-extended/stdplus/stdplus_git.bb @@ -14,6 +14,6 @@ EXTRA_OEMESON = " \ " SRC_URI += "git://github.com/openbmc/stdplus" -SRCREV = "3b4c20fe517c23fbe8d1418ee3cdb98b59b2fd30" +SRCREV = "a2d67e20529a1f720c13586553ad2cec1451d5a8" S = "${WORKDIR}/git" 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 17689f5d0..4491a31ab 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -22,7 +22,6 @@ DEPENDS = " \ phosphor-dbus-interfaces-native \ phosphor-logging \ sdbusplus \ - sdbusplus-native \ sdeventplus \ " diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index 25cd24a31..abe19d24e 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,23 +3,24 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "29d83258f1268b3c41f97649518fa9bb1ffe83ed" +SRCREV = "ba5424ae0ae7bb76ee770068efbd05214a0e3b53" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.EntityManager.service \ - xyz.openbmc_project.FruDevice.service" + ${@bb.utils.contains('DISTRO_FEATURES', 'ipmi-fru', 'xyz.openbmc_project.FruDevice.service', '', d)}" DEPENDS = "boost \ - i2c-tools \ nlohmann-json \ sdbusplus \ valijson" S = "${WORKDIR}/git/" -inherit cmake systemd +inherit meson systemd -EXTRA_OECMAKE = "-DYOCTO=1" +EXTRA_OEMESON = "-Dtests=disabled" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipmi-fru', d)}" +PACKAGECONFIG[ipmi-fru] = "-Dfru-device=true, -Dfru-device=false, i2c-tools," diff --git a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb index 9fbd28708..ebb642717 100644 --- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb @@ -5,17 +5,17 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -inherit autotools pkgconfig pythonnative +inherit autotools pkgconfig python3native inherit obmc-phosphor-dbus-service DEPENDS += "autoconf-archive-native" DEPENDS += "phosphor-mapper" DEPENDS += "systemd" DEPENDS += "sdbusplus" -DEPENDS += "sdbusplus-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-dbus-interfaces" -RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-settings-mgmt}" +RDEPENDS_${PN} += "phosphor-settings-manager" RDEPENDS_${PN} += "phosphor-network" RDEPENDS_${PN} += "phosphor-mapper" 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 f31e70e58..30453c8ad 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -7,24 +7,21 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig -inherit pythonnative +inherit python3native inherit phosphor-dbus-yaml DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbus++-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" -SRC_URI += "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "86d1ab141212fd5380ac220217e46d01108b995f" - -DEPENDS_remove_class-native = "sdbus++-native" -DEPENDS_remove_class-nativesdk = "sdbus++-native" +SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" +SRCREV = "1362ce345867b4bc380f1d0b1c9ca77e5d5c996d" PACKAGECONFIG ??= "libphosphor_dbus" PACKAGECONFIG[libphosphor_dbus] = " \ --enable-libphosphor_dbus, \ --disable-libphosphor_dbus, \ systemd sdbusplus, \ - libsystemd sdbusplus \ + libsystemd \ " PACKAGECONFIG_remove_class-native = "libphosphor_dbus" 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 f31233ff4..3e4fa8ae4 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -7,11 +7,11 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-dbus-monitor" -SRCREV = "b4d69909425dac7bccb28331f2da78a0ad7092b8" +SRCREV = "44fd7e89b5d4517c28f5a03b806373188426ee5f" inherit autotools \ pkgconfig \ - pythonnative \ + python3native \ phosphor-dbus-monitor \ obmc-phosphor-systemd @@ -23,7 +23,7 @@ DEPENDS += " \ ${PN}-config \ phosphor-logging \ autoconf-archive-native \ - sdbusplus-native \ + ${PYTHON_PN}-sdbus++-native \ sdeventplus \ gtest \ phosphor-snmp \ diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index ba88c9b2f..f8566791e 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 = "59642e214dd0df652f8ca6e5b6780218f0ce4f51" +SRCREV = "719c5f08214f5571d51ec273eaa71d1b9817f79e" 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 8e455b54d..7f05e75a9 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector_git.bb @@ -23,7 +23,7 @@ SYSTEMD_PACKAGES = "${PN}-monitor" inherit autotools \ pkgconfig \ obmc-phosphor-dbus-service \ - pythonnative \ + python3native \ phosphor-debug-collector require phosphor-debug-collector.inc @@ -33,7 +33,7 @@ DEPENDS += " \ phosphor-dbus-interfaces-native \ phosphor-logging \ sdbusplus \ - sdbusplus-native \ + ${PYTHON_PN}-sdbus++-native \ autoconf-archive-native \ virtual/phosphor-debug-errors \ ${PYTHON_PN}-native \ diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc b/meta-phosphor/recipes-phosphor/fans/phosphor-fan.inc index cc3a85315..fe482caa1 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 = "5a80f3aec4cc817b0f20ce2ddd83d930b7df3af1" +SRCREV = "f24d7749b3c65af3b76039fce729fe4ae278b892" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb index 38a6fb1c0..02eee307d 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-fan_git.bb @@ -4,9 +4,9 @@ control applications." PR = "r1" PV = "1.0+git${SRCPV}" -require ${PN}.inc +require ${BPN}.inc -inherit autotools pkgconfig pythonnative +inherit autotools pkgconfig python3native inherit obmc-phosphor-systemd inherit phosphor-fan @@ -17,7 +17,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "sdbusplus" -DEPENDS += "sdbusplus-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "sdeventplus" DEPENDS += "gpioplus" DEPENDS += "phosphor-logging" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager.inc index 840f49efb..fd7fc206e 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 = "1891869f39fe66ee23f25ed31f43a2c327c48e09" +SRCREV = "1bb6dcb4a1ea8dca818d17fec834aa9e2482c4b4" diff --git a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb index ca9471ea5..301e4e788 100644 --- a/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/flash/phosphor-software-manager_git.bb @@ -5,7 +5,7 @@ platforms." PR = "r1" PV = "1.0+git${SRCPV}" -require ${PN}.inc +require ${BPN}.inc SOFTWARE_MGR_PACKAGES = " \ ${PN}-version \ @@ -30,7 +30,7 @@ PACKAGECONFIG[flash_bios] = "--enable-host_bios_upgrade" inherit autotools pkgconfig inherit obmc-phosphor-dbus-service -inherit pythonnative +inherit python3native inherit ${@bb.utils.contains('DISTRO_FEATURES', 'obmc-ubi-fs', 'phosphor-software-manager-ubi-fs', '', d)} DEPENDS += " \ @@ -38,7 +38,7 @@ DEPENDS += " \ openssl \ phosphor-dbus-interfaces \ phosphor-logging \ - sdbus++-native \ + ${PYTHON_PN}-sdbus++-native \ sdbusplus \ " diff --git a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb index 36ffe9c93..4bbfd1638 100644 --- a/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/gpio/phosphor-gpio-monitor_git.bb @@ -23,7 +23,7 @@ RPROVIDES_${PN}-presence += "virtual/obmc-gpio-presence" PROVIDES += "virtual/obmc-gpio-monitor" PROVIDES += "virtual/obmc-gpio-presence" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "libevdev" DEPENDS += "phosphor-logging" diff --git a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb index 0f19371b3..4d12a9688 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -17,7 +17,7 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd" -SRCREV = "f21475a23019e0a0abbb76417e505843c132255d" +SRCREV = "ad2a08c7de9198246fec77c457d4c14f7bc4c1fb" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" POST_CODE_BYTES ?= "1" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 3f63c3a5c..c74419ee0 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 = "12c7f4388b58a974265827ab62d3981ba98ed8f2" +SRCREV = "043a05366c1fe54d7b9ef883292d0cd2d01c66b2" 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 d4c9672bf..512268742 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 = "5a71b4c637ea92f5801007503968a4c4999bcab1" +SRCREV = "ebff814fb7de90d78d424f4554d19c5de1af89db" 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 9b5530b61..7fe311da5 100644 --- a/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/inventory/phosphor-inventory-manager_git.bb @@ -7,7 +7,7 @@ PV = "1.0+git${SRCPV}" inherit autotools \ pkgconfig \ - pythonnative \ + python3native \ phosphor-dbus-yaml \ phosphor-inventory-manager \ obmc-phosphor-dbus-service @@ -20,7 +20,7 @@ DEPENDS += " \ phosphor-dbus-interfaces-native \ phosphor-logging \ sdbusplus \ - sdbusplus-native \ + ${PYTHON_PN}-sdbus++-native \ autoconf-archive-native \ libcereal \ ${PYTHON_PN}-native \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb index 8de43d28f..2d8b49105 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config.bb @@ -14,6 +14,7 @@ SRC_URI = " \ file://channel_access.json \ file://channel_config.json \ file://entity-map.json \ + file://cs_privilege_levels.json \ " FILES_${PN} = " \ @@ -25,6 +26,7 @@ FILES_${PN} = " \ ${datadir}/ipmi-providers/channel_access.json \ ${datadir}/ipmi-providers/channel_config.json \ ${datadir}/ipmi-providers/entity-map.json \ + ${datadir}/ipmi-providers/cs_privilege_levels.json \ " do_fetch[noexec] = "1" @@ -50,4 +52,6 @@ do_install() { ${D}${datadir}/ipmi-providers/channel_config.json install -m 0644 -D ${WORKDIR}/entity-map.json \ ${D}${datadir}/ipmi-providers/entity-map.json + install -m 0644 -D ${WORKDIR}/cs_privilege_levels.json \ + ${D}${datadir}/ipmi-providers/cs_privilege_levels.json } diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json index 767fc708c..049ded062 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cipher_list.json @@ -1,10 +1,4 @@ { - "a":{ - "cipher":3, - "authentication":1, - "integrity":1, - "confidentiality":1 - }, "b":{ "cipher":17, "authentication":3, diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cs_privilege_levels.json b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cs_privilege_levels.json new file mode 100644 index 000000000..15a3cdddf --- /dev/null +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-config/cs_privilege_levels.json @@ -0,0 +1 @@ +{"Channel0":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel1":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel10":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel11":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel12":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel13":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel14":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel15":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel2":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel3":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel4":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel5":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel6":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel7":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel8":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"},"Channel9":{"CipherID0":"priv-admin","CipherID1":"priv-admin","CipherID10":"priv-admin","CipherID11":"priv-admin","CipherID12":"priv-admin","CipherID13":"priv-admin","CipherID14":"priv-admin","CipherID15":"priv-admin","CipherID2":"priv-admin","CipherID3":"priv-admin","CipherID4":"priv-admin","CipherID5":"priv-admin","CipherID6":"priv-admin","CipherID7":"priv-admin","CipherID8":"priv-admin","CipherID9":"priv-admin"}} diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index 40254b3fe..d8a170474 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -45,7 +45,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "79fc7c0680ebb0d5399eab83230b3d047dc8eb82" +SRCREV = "01593f96589c0381599e2feaa2981eb8ede9728f" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc index 1e85b9354..ef91bb9e9 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 = "686da1839e3416f0edf48dacb4c0e0d13daa8a16" +SRCREV = "0968237b479d649ecaac7561cf07fbacf241d98c" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service index ae8c0388e..1486cace0 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc-read-eeprom@.service @@ -7,6 +7,7 @@ After=mapper-wait@-xyz-openbmc_project-inventory.service Restart=no Type=oneshot EnvironmentFile={envfiledir}/obmc/eeproms/%I +ExecStartPre={bindir}/of-name-to-eeprom.sh {envfiledir}/obmc/eeproms/%I ExecStart=/usr/bin/env phosphor-read-eeprom --eeprom $SYSFS_PATH --fruid $FRUID SyslogIdentifier=phosphor-read-eeprom diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/of-name-to-eeprom.sh b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/of-name-to-eeprom.sh new file mode 100755 index 000000000..40c489613 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru/of-name-to-eeprom.sh @@ -0,0 +1,5 @@ +#!/bin/bash -eu +[ -n "${OF_NAME+1}" ] || exit 0 +path="$(grep -xl "$OF_NAME" /sys/bus/i2c/devices/*/of_node/name)" +eeprom="${path%/of_node/name}/eeprom" +sed -i "s,^SYSFS_PATH=.*$,SYSFS_PATH=$eeprom," "$1" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb index d79078a1b..4ee1e16a3 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb @@ -7,17 +7,17 @@ inherit autotools pkgconfig inherit obmc-phosphor-systemd inherit obmc-phosphor-ipmiprovider-symlink inherit phosphor-ipmi-fru -inherit pythonnative +inherit python3native -require ${PN}.inc +require ${BPN}.inc DEPENDS += " \ virtual/phosphor-ipmi-fru-inventory \ virtual/phosphor-ipmi-fru-properties \ systemd \ sdbusplus \ - python-mako-native \ - python-pyyaml-native \ + ${PYTHON_PN}-mako-native \ + ${PYTHON_PN}-pyyaml-native \ phosphor-ipmi-host \ phosphor-mapper \ autoconf-archive-native \ @@ -25,12 +25,17 @@ DEPENDS += " \ cli11 \ " +RDEPENDS_${PN} += "bash" + +SRC_URI += "file://of-name-to-eeprom.sh" + SYSTEMD_SERVICE_${PN} += "obmc-read-eeprom@.service" S = "${WORKDIR}/git" HOSTIPMI_PROVIDER_LIBRARY += "libstrgfnhandler.so" +FILES_${PN} += "${bindir}/of-name-to-eeprom.sh" FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" @@ -39,3 +44,8 @@ EXTRA_OECONF = " \ YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml \ PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/extra-properties.yaml \ " + +do_install_append() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/of-name-to-eeprom.sh ${D}${bindir} +} diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 8babca20b..9c304afb0 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 = "e0af1c496a2f79f0e9357a4344e800957aeed3fe" +SRCREV = "0e2dbee2d19ee6865d6e95b07398943b8f536336" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py index 877e3eb57..928e8bdef 100755 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host/merge_yamls.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Copied from phosphor-settings-manager Loads a "target" YAML file and overwrites its values with values from "override" YAML files. @@ -34,7 +34,7 @@ def dict_merge(target, source): """ if not isinstance(source, dict): return source - for k, v in source.iteritems(): + for k, v in source.items(): if k in target and isinstance(target[k], dict): dict_merge(target[k], v) else: 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 a59e1fdd0..56df13bdd 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -12,7 +12,7 @@ inherit obmc-phosphor-ipmiprovider-symlink inherit obmc-phosphor-sdbus-service inherit obmc-phosphor-systemd inherit phosphor-ipmi-host -inherit pythonnative +inherit python3native def ipmi_whitelists(d): whitelists = d.getVar( @@ -29,7 +29,7 @@ DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-mapper" DEPENDS += "sdbusplus" -DEPENDS += "sdbus++-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "virtual/phosphor-ipmi-inventory-sel" DEPENDS += "virtual/phosphor-ipmi-fru-merge-config" DEPENDS += "virtual/phosphor-ipmi-sensor-inventory" @@ -60,10 +60,10 @@ GROUPADD_PARAM_${PN} = "ipmi" SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service phosphor-ipmi-host.service" -RRECOMMENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-settings-mgmt}" +RRECOMMENDS_${PN} += "phosphor-settings-manager" -require ${PN}.inc +require ${BPN}.inc # Setup IPMI Whitelist Conf files WHITELIST_CONF = " \ 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 99f5830cf..fb489acd5 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -16,7 +16,7 @@ DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-host" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "2555e2ec1c5bd6636eb67a1a2cdf6b8b567772c9" +SRCREV = "9979e9971e17c974f29ec9ab720f5482308c119c" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb index 23bd32b45..c3666857c 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-mrw-native.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit native inherit phosphor-ipmi-host -inherit pythonnative +inherit python3native inherit mrw-xml DEPENDS += " \ @@ -13,7 +13,7 @@ DEPENDS += " \ mrw-perl-tools-native \ phosphor-ipmi-sensor-config-native \ phosphor-ipmi-sensor-inventory-mrw-config-native \ - python-pyyaml-native \ + ${PYTHON_PN}-pyyaml-native \ " PROVIDES += "virtual/phosphor-ipmi-sensor-inventory" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc index 32ce93d7c..a74ffd121 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-led-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-led-manager" -SRCREV = "e0cf8fe1e2e20dd79391fe989a342bf018bcbb1b" +SRCREV = "4f43f5e48bb593c8ca806abd1f4029dc7479d216" diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb index 8689e06c0..9fdeea0f0 100644 --- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb @@ -3,9 +3,9 @@ DESCRIPTION = "Daemon to cater to triggering actions on LED groups" PR = "r1" PV = "1.0+git${SRCPV}" -require ${PN}.inc +require ${BPN}.inc -inherit autotools pkgconfig pythonnative +inherit autotools pkgconfig python3native inherit obmc-phosphor-dbus-service obmc-phosphor-systemd LED_MGR_PACKAGES = " \ @@ -20,9 +20,11 @@ DBUS_PACKAGES = "${PN}-ledmanager" SYSTEMD_PACKAGES = "${LED_MGR_PACKAGES}" -DEPENDS += "python-pyyaml-native" +DEPENDS += "${PYTHON_PN}-native" +DEPENDS += "${PYTHON_PN}-pyyaml-native" +DEPENDS += "${PYTHON_PN}-inflection-native" DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" DEPENDS += "systemd" DEPENDS += "phosphor-logging" diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb index 1c38d2a39..1f5513114 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 = "59642e214dd0df652f8ca6e5b6780218f0ce4f51" +SRCREV = "719c5f08214f5571d51ec273eaa71d1b9817f79e" do_install() { install -d ${D}${bindir} diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb index 5a6a4d2fe..58b0034f4 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-hostlogger_git.bb @@ -6,7 +6,7 @@ PV = "1.0+git${SRCPV}" inherit autotools inherit pkgconfig -inherit pythonnative +inherit python3native inherit systemd # License info @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS += "\ autoconf-archive-native \ sdbusplus \ - sdbusplus-native \ + ${PYTHON_PN}-sdbus++-native \ phosphor-dbus-interfaces \ " RDEPENDS_${PN} += "obmc-console" diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 6d95406bc..7844a44ef 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -8,7 +8,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig -inherit pythonnative +inherit python3native inherit obmc-phosphor-dbus-service inherit phosphor-logging inherit phosphor-dbus-yaml @@ -18,7 +18,8 @@ DEPENDS += "systemd" DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "${PYTHON_PN}-native" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "${PYTHON_PN}-sdbus++-native" +DEPENDS += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "virtual/phosphor-logging-callouts" DEPENDS += "phosphor-logging-error-logs-native" @@ -55,7 +56,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "bebeb948177220985f6ede067b9c8f2ab30401dd" +SRCREV = "182071455a82b22e8111217d624c25f4c86dce43" S = "${WORKDIR}/git" @@ -63,7 +64,7 @@ S = "${WORKDIR}/git" # as they will not be available in host machine DEPENDS_remove_class-native = " \ virtual/phosphor-logging-callouts \ - sdbus++ \ + sdbusplus \ systemd \ libcereal \ sdeventplus \ @@ -73,7 +74,7 @@ DEPENDS_remove_class-native = " \ # as they will not be available in host machine DEPENDS_remove_class-nativesdk = " \ virtual/phosphor-logging-callouts \ - sdbus++-native \ + sdbusplus \ libcereal \ systemd \ phosphor-dbus-interfaces \ diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index 13264a70a..2b8d806a4 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -39,6 +39,6 @@ SYSTEMD_SERVICE_${PN} += "mboxd.service" SYSTEMD_SERVICE_${PN} += "mboxd-reload@.service" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" -# Enable virtual-pnor by DISTRO_FEATURE openpower-ubi-fs. -PACKAGECONFIG_append_df-openpower-ubi-fs = "virtual-pnor" +# Enable virtual-pnor by DISTRO_FEATURE openpower-virtual-pnor. +PACKAGECONFIG_append_df-openpower-virtual-pnor = " virtual-pnor" PACKAGECONFIG[virtual-pnor] = "--enable-virtual-pnor,--disable-virtual-pnor" diff --git a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb index 11544f9d1..97de44896 100644 --- a/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb +++ b/meta-phosphor/recipes-phosphor/mrw/mrw-patch-native_git.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/git" inherit native inherit mrw-rev -DEPENDS += "python-native python-lxml-native" +DEPENDS += "python3-native python3-lxml-native" SRC_URI += "${MRW_TOOLS_SRC_URI}" SRCREV = "${MRW_TOOLS_SRCREV}" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb index aa6addbb9..0928c95ff 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-network_git.bb @@ -7,14 +7,14 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" inherit autotools pkgconfig -inherit pythonnative +inherit python3native inherit phosphor-networkd-rev inherit systemd DEPENDS += "systemd" DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" DEPENDS += "sdeventplus" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "phosphor-logging" diff --git a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb index 9faa30daf..71dc00fa3 100644 --- a/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/phosphor-snmp_git.bb @@ -5,7 +5,7 @@ PR = "r1" PV = "0.1+git${SRCPV}" inherit autotools pkgconfig -inherit pythonnative +inherit python3native inherit obmc-phosphor-dbus-service LICENSE = "Apache-2.0" @@ -18,7 +18,7 @@ DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.SNMP.service" DEPENDS += "systemd" DEPENDS += "autoconf-archive-native" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus ${PYTHON_PN}-sdbus++-native" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "phosphor-logging" DEPENDS += "net-snmp" diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb index 28f375363..8e6fe769c 100644 --- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb +++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb @@ -50,7 +50,6 @@ RDEPENDS_${PN}-extras = " \ SUMMARY_${PN}-extrasdev = "Development features" RDEPENDS_${PN}-extrasdev = " \ - rest-dbus \ " SUMMARY_${PN}-extrasdevtools = "Development tools" @@ -128,7 +127,7 @@ RDEPENDS_${PN}-debug-collector = " \ SUMMARY_${PN}-settings = "Settings applications" RDEPENDS_${PN}-settings = " \ - ${VIRTUAL-RUNTIME_obmc-settings-mgmt} \ + phosphor-settings-manager \ " SUMMARY_${PN}-network = "BMC Network Manager" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 4b5ad8f9f..65149a717 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 = "442210e450bcd9bced09988ac2d237416193a89d" +SRCREV = "a556eb2cf3aa08085c94f433b889066347234b71" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb index f9013a908..d8dcd0d2c 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb +++ b/meta-phosphor/recipes-phosphor/pldm/pldm_git.bb @@ -11,7 +11,6 @@ DEPENDS += "systemd" DEPENDS += "sdeventplus" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "nlohmann-json" -DEPENDS += "boost" DEPENDS += "cli11" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index a593f8c83..92ed524f6 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 = "8b89f1b1837cd99a15b6bea2ac17bb325422dee6" +SRCREV = "9af855569ec2d9dc9afe60542cf606b82b47141b" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb index e51e536b6..730335a0f 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb @@ -9,7 +9,7 @@ inherit pkgconfig inherit systemd inherit python3native -require ${PN}.inc +require ${BPN}.inc S = "${WORKDIR}/git" @@ -32,7 +32,7 @@ SYSTEMD_PACKAGES = "${POWER_SERVICE_PACKAGES}" DEPENDS += " \ phosphor-logging \ openpower-dbus-interfaces \ - sdbus++-native \ + ${PYTHON_PN}-sdbus++-native \ sdeventplus \ nlohmann-json \ cli11 \ diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index f24e52c96..460c49be8 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 = "6b1247a16d52be853c18015e7163d60abce5c00a" +SRCREV = "17aba776373e14851a04e6b9ac518622b117b2a1" PV = "0.1+git${SRCPV}" 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 f1b2d1fb2..3541fdb49 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml @@ -45,7 +45,7 @@ Unit: "Watts" PowerCapEnable: Default: 'false' - + /xyz/openbmc_project/control/host0/power_restore_policy: - Interface: xyz.openbmc_project.Control.Power.RestorePolicy Properties: @@ -128,6 +128,12 @@ Enabled: Default: 'false' +/xyz/openbmc_project/logging/settings: + - Interface: xyz.openbmc_project.Logging.Settings + Properties: + QuiesceOnHwError: + Default: 'false' + /xyz/openbmc_project/software/apply_time: - Interface: xyz.openbmc_project.Software.ApplyTime Properties: diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc index a6223e9ac..d08273e38 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-settingsd" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-settingsd" -SRCREV = "3d805fe94abf741d4a228f8eef59f70bcb2328a7" +SRCREV = "6f62cc844b3e9f356e8ee79af256c41069a57140" diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py index 01f5e3552..d910da5ba 100755 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager/merge_settings.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Loads a "target" YAML file and overwrites its values with values from "override" YAML files. @@ -28,7 +28,7 @@ def dict_merge(target, source): """ if not isinstance(source, dict): return source - for k, v in source.iteritems(): + for k, v in source.items(): if k in target and isinstance(target[k], dict): dict_merge(target[k], v) else: diff --git a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb index d525ae333..85a63d243 100644 --- a/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/settings/phosphor-settings-manager_git.bb @@ -6,19 +6,19 @@ PV = "1.0+git${SRCPV}" inherit autotools inherit obmc-phosphor-dbus-service -inherit pythonnative +inherit python3native inherit phosphor-settings-manager require phosphor-settings-manager.inc DBUS_SERVICE_${PN} = "xyz.openbmc_project.Settings.service" -DEPENDS += "python-pyyaml-native" -DEPENDS += "python-mako-native" +DEPENDS += "${PYTHON_PN}-pyyaml-native" +DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "autoconf-archive-native" DEPENDS += "virtual/phosphor-settings-defaults" DEPENDS += "${@df_enabled(d, 'obmc-mrw', 'phosphor-settings-read-settings-mrw-native')}" -DEPENDS += "sdbusplus sdbusplus-native" +DEPENDS += "sdbusplus" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" DEPENDS += "phosphor-logging" DEPENDS += "libcereal" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb index 0bbf0e9a9..d5b73beae 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-post-code-manager_git.bb @@ -4,7 +4,7 @@ interface /xyz/openbmc_project/state/boot/raw by snoopd daemon and save them \ in a file under /var/lib for history." SRC_URI = "git://github.com/openbmc/phosphor-post-code-manager.git" -SRCREV = "655837973feb51da3767f5f246ec198877900b0b" +SRCREV = "993d4dd9dc583e62a84c6056edffad957d7b7b5d" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index b92a0136f..1c1805757 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 = "4148f2eee6313068d3223871005160b2902abb18" +SRCREV = "6a8d180f284e513da2f3d8e0a76769e8b4108abf" 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 bcc8cec5e..af476abb3 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 = "fd22b5b0e770442294bd883a8b4e25ad512717ed" +SRCREV = "532a4b033669497d972683320e3d1d6dde1943f6" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-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 2922b6a36..7dd149e81 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 = "e7520ba18a5b5ba6c8eb7a9d543704f9699295a1" +SRCREV = "fc1ecc59100d21c953501703bc5db9e02e25b333" PV = "1.0+git${SRCPV}" diff --git a/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/files/gsj-hotswap-change-setting.service b/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/files/gsj-hotswap-change-setting.service new file mode 100644 index 000000000..ccf4ee1b0 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/files/gsj-hotswap-change-setting.service @@ -0,0 +1,13 @@ +[Unit] +Description=Hotswap Controller Setting Changing +Before=xyz.openbmc_project.Hwmon@.service + +[Service] +ExecStart=/usr/bin/gsj-hotswap-change-setting.sh +Restart=no +Type=oneshot +RemainAfterExit=true +StandardOutput=syslog + +[Install] +WantedBy=multi-user.target
\ No newline at end of file diff --git a/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/files/gsj-hotswap-change-setting.sh b/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/files/gsj-hotswap-change-setting.sh new file mode 100644 index 000000000..bed745dda --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/files/gsj-hotswap-change-setting.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +# Purpose: +# The purpose of the script is to change the CB/CL ratio setting of the hotswap controller from 1.9x to 3.9x + +I2C_BUS=11 +CHIP_ADDR=0x15 +GPIO_ID=91 #Revision ID +GPIO_BasePath=/sys/class/gpio + +function set_hotswap_reg() +{ + #set reg "0xd9" bit 3 to 1 + i2cset -f -y $I2C_BUS $CHIP_ADDR 0xd9 0x08 +} + +function get_hotswap_value() +{ + #get the value of reg "0xd9", return value should be "0x08" + echo "$(i2cget -f -y $I2C_BUS $CHIP_ADDR 0xd9)" +} + +function export_gpio() +{ + if [ -d "$GPIO_BasePath/gpio$GPIO_ID" ]; then + echo "gpio$GPIO_ID folder exist, skip export." + else + echo "Export gpio$GPIO_ID..." + echo $GPIO_ID > $GPIO_BasePath/export + fi +} + +function get_gpio_value() +{ + echo "$(cat $GPIO_BasePath/gpio$GPIO_ID/value)" +} + +function setting_hotswap() +{ + echo "setting hotswap controller..." + set_hotswap_reg + + for i in {0..3}; + do + if [ "$i" == "3" ];then + echo "change hotswap controller setting failed after retry 3 times." + else + hotswap_value=$(get_hotswap_value) + echo "get hotswap controller return value : $hotswap_value" + if [ "$hotswap_value" == "0x08" ];then + echo "change hotswap controller setting success." + break; + else + echo "hotswap controller setting failed, retry $i times..." + fi + fi + done +} + +export_gpio +gpio_value=$(get_gpio_value) +if [ "$gpio_value" == "1" ];then + echo "gpio$GPIO_ID value is: $gpio_value, setting hotswap." + setting_hotswap +else + echo "gpio$GPIO_ID value is: $gpio_value, no need to set hotswap." +fi
\ No newline at end of file diff --git a/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb b/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb new file mode 100644 index 000000000..f9d9a9e47 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb @@ -0,0 +1,26 @@ +SUMMARY = "Hotswap Controller Setting Changing" +DESCRIPTION = "Hotswap Controller Setting Changing Daemon" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit systemd + +DEPENDS += "systemd" +RDEPENDS_${PN} += "bash" + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +SRC_URI_append = " file://gsj-hotswap-change-setting.sh \ + file://gsj-hotswap-change-setting.service \ + " + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/gsj-hotswap-change-setting.sh ${D}${bindir}/ + + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/gsj-hotswap-change-setting.service ${D}${systemd_unitdir}/system +} + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "gsj-hotswap-change-setting.service" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend index 9950401c6..4ceec7d2f 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -2,3 +2,5 @@ OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-ipmi-flash" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-pid-control" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " detect-fan-fail" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " google-ipmi-sys" +OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " gsj-hotswap-change-setting" +OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " iperf3" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend new file mode 100644 index 000000000..5723801b2 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_access.json b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_access.json new file mode 100644 index 000000000..fe64edc6c --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_access.json @@ -0,0 +1,9 @@ +{ + "0" : { + "access_mode" : "always_available", + "user_auth_disabled" : false, + "per_msg_auth_disabled" : false, + "alerting_disabled" : false, + "priv_limit" : "priv-admin" + } +} diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json new file mode 100644 index 000000000..a2bb3bec8 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config/channel_config.json @@ -0,0 +1,25 @@ +{ + "0" : { + "name" : "usb0", + "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 + } + }, + "8" : { + "name" : "INTRABMC", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "oem", + "protocol_type" : "oem", + "session_supported" : "session-less", + "is_ipmi" : true + } + } +} + diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend new file mode 100644 index 000000000..ac2c0ba5e --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -0,0 +1,3 @@ +# In gsj, usb0 is the interface. +RMCPP_IFACE_gsj = "usb0" + diff --git a/poky/meta/recipes-devtools/meson/meson.inc b/poky/meta/recipes-devtools/meson/meson.inc index 84bcc8409..50fb41ac9 100644 --- a/poky/meta/recipes-devtools/meson/meson.inc +++ b/poky/meta/recipes-devtools/meson/meson.inc @@ -16,10 +16,9 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://cross-prop-default.patch \ file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \ file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ - file://dbc9e971bd320f3df15c1ee74f54858e6792b183.patch \ " -SRC_URI[sha256sum] = "d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32" -SRC_URI[md5sum] = "7ea7772414dda8ae11072244bf7ba991" +SRC_URI[sha256sum] = "3e8f830f33184397c2eb0b651ec502adb63decb28978bdc84b3558d71284c21f" +SRC_URI[md5sum] = "80303535995fcae72bdb887df102b421" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \ diff --git a/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch index fc55dcacf..9ce31e548 100644 --- a/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +++ b/poky/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch @@ -1,4 +1,4 @@ -From c07d29b715209cd5d75b142a00a540d45b00c36d Mon Sep 17 00:00:00 2001 +From ee638fd4a299bfc53a2238e9f71ae310c8d97460 Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal @@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index a59cd89..17de654 100644 +index 0f277a7..24578ea 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -186,7 +186,7 @@ class MachineInfo: +@@ -192,7 +192,7 @@ class MachineInfo: cpu_family = literal['cpu_family'] if cpu_family not in known_cpu_families: @@ -25,15 +25,15 @@ index a59cd89..17de654 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 3704921..f1988f2 100644 +index dc8b14f..3aab71e 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -251,9 +251,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: +@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: trial = 'parisc' if trial not in known_cpu_families: - mlog.warning('Unknown CPU family {!r}, please report this at ' -- 'https://github.com/mesonbuild/meson/issues/new with the' +- 'https://github.com/mesonbuild/meson/issues/new with the ' - 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) diff --git a/poky/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/poky/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch index bf715d1e9..eb0e90dbd 100644 --- a/poky/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +++ b/poky/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch @@ -1,4 +1,4 @@ -From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001 +From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Mon, 19 Nov 2018 14:24:26 +0100 Subject: [PATCH] python module: do not manipulate the environment when calling @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 12 deletions(-) diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py -index 9cfbd6f..3ff687a 100644 +index 07be318..b770603 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py -@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency): +@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency): old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR') old_pkg_path = os.environ.get('PKG_CONFIG_PATH') @@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644 - os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir - try: - self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs) - mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir)) -@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency): - mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir)) + self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs) + mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir)) +@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency): + mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir)) mlog.debug(e) - if old_pkg_path is not None: @@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644 - else: - os.environ.pop('PKG_CONFIG_LIBDIR', None) else: - mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir)) + mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir)) diff --git a/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch index b8837d77b..ce1866075 100644 --- a/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +++ b/poky/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch @@ -1,4 +1,4 @@ -From 263fc0e26e1fd92e25fa3ef93f4a549dcebc5887 Mon Sep 17 00:00:00 2001 +From 9c221c74bd306dfa6fec22c8f156eb9d4e4f7fcb Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt <pkj@axis.com> Date: Thu, 26 Jul 2018 16:32:49 +0200 Subject: [PATCH] Support building allarch recipes again @@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> 1 file changed, 1 insertion(+) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 17de654..2d2deef 100644 +index 24578ea..216e71f 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T') @@ -22,5 +22,5 @@ index 17de654..2d2deef 100644 known_cpu_families = ( + 'allarch', 'aarch64', + 'alpha', 'arc', - 'arm', diff --git a/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch index 76cc4931d..dc822fb1f 100644 --- a/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch +++ b/poky/meta/recipes-devtools/meson/meson/0003-native_bindir.patch @@ -1,4 +1,4 @@ -From 4a1d676522d6b56cbe9a45c3b040afaa27d37f78 Mon Sep 17 00:00:00 2001 +From e76726321067748362b39937bd1e663a1a948ad5 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir @@ -22,10 +22,10 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 3c55a56..eb52fd1 100644 +index 40e304c..4b687df 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py -@@ -185,7 +185,7 @@ class Dependency: +@@ -184,7 +184,7 @@ class Dependency: def get_exe_args(self, compiler): return [] @@ -34,7 +34,7 @@ index 3c55a56..eb52fd1 100644 raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) def get_configtool_variable(self, variable_name): -@@ -248,7 +248,7 @@ class InternalDependency(Dependency): +@@ -247,7 +247,7 @@ class InternalDependency(Dependency): self.sources = sources self.ext_deps = ext_deps @@ -43,7 +43,7 @@ index 3c55a56..eb52fd1 100644 raise DependencyException('Method "get_pkgconfig_variable()" is ' 'invalid for an internal dependency') -@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency): +@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency): return s.format(self.__class__.__name__, self.name, self.is_found, self.version_reqs) @@ -54,18 +54,18 @@ index 3c55a56..eb52fd1 100644 + cmd = [self.pkgbin.get_command()[0] + "-native"] + args + else: + cmd = self.pkgbin.get_command() + args - p, out = Popen_safe(cmd, env=env)[0:2] - rc, out = p.returncode, out.strip() + p, out, err = Popen_safe(cmd, env=env) + rc, out, err = p.returncode, out.strip(), err.strip() call = ' '.join(cmd) mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out)) - return rc, out + return rc, out, err - def _call_pkgbin(self, args, env=None): + def _call_pkgbin(self, args, env=None, use_native=False): # Always copy the environment since we're going to modify it # with pkg-config variables if env is None: -@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency): targs = tuple(args) cache = PkgConfigDependency.pkgbin_cache if (self.pkgbin, targs, fenv) not in cache: @@ -73,27 +73,27 @@ index 3c55a56..eb52fd1 100644 + cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native) return cache[(self.pkgbin, targs, fenv)] - def _convert_mingw_paths(self, args): -@@ -926,7 +929,7 @@ class PkgConfigDependency(ExternalDependency): - mlog.warning('Could not determine complete list of dependencies for %s' % self.name) - self.link_args, self.raw_link_args = self._search_libs(out, out_raw, out_all) + def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: +@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency): + (self.name, out_raw)) + self.link_args, self.raw_link_args = self._search_libs(out, out_raw) - def get_pkgconfig_variable(self, variable_name, kwargs): + def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): options = ['--variable=' + variable_name, self.name] if 'define_variable' in kwargs: -@@ -939,7 +942,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency): options = ['--define-variable=' + '='.join(definition)] + options -- ret, out = self._call_pkgbin(options) -+ ret, out = self._call_pkgbin(options, use_native=use_native) +- ret, out, err = self._call_pkgbin(options) ++ ret, out, err = self._call_pkgbin(options, use_native=use_native) variable = '' if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index 6d784e6..73a9e13 100644 +index da411ef..856506a 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency): @@ -105,7 +105,7 @@ index 6d784e6..73a9e13 100644 if prefix: self.bindir = os.path.join(prefix, 'bin') -@@ -507,7 +507,7 @@ class Qt4Dependency(QtBaseDependency): +@@ -508,7 +508,7 @@ class Qt4Dependency(QtBaseDependency): applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease'] for application in applications: try: @@ -114,7 +114,7 @@ index 6d784e6..73a9e13 100644 except MesonException: pass -@@ -517,7 +517,7 @@ class Qt5Dependency(QtBaseDependency): +@@ -518,7 +518,7 @@ class Qt5Dependency(QtBaseDependency): QtBaseDependency.__init__(self, 'qt5', env, kwargs) def get_pkgconfig_host_bins(self, core): diff --git a/poky/meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch b/poky/meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch deleted file mode 100644 index 7ea8a133e..000000000 --- a/poky/meta/recipes-devtools/meson/meson/dbc9e971bd320f3df15c1ee74f54858e6792b183.patch +++ /dev/null @@ -1,95 +0,0 @@ -From dbc9e971bd320f3df15c1ee74f54858e6792b183 Mon Sep 17 00:00:00 2001 -From: Xavier Claessens <xavier.claessens@collabora.com> -Date: Fri, 11 Oct 2019 11:01:22 -0400 -Subject: [PATCH] Remove duplicated object files in static libraries - -When a static library link_whole to a bunch of other static libraries, -we have to extract all their objects recursively. But that could -introduce duplicated objects. ar is dumb enough to allow this without -error, but once the resulting static library is linked into an -executable or shared library, the linker will complain about duplicated -symbols. - -Upstream-Status: Backport -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - ---- - mesonbuild/backend/backends.py | 3 ++- - test cases/unit/69 static link/lib/func17.c | 4 ++++ - test cases/unit/69 static link/lib/func18.c | 6 ++++++ - test cases/unit/69 static link/lib/func19.c | 7 +++++++ - test cases/unit/69 static link/lib/meson.build | 12 ++++++++++++ - 5 files changed, 31 insertions(+), 1 deletion(-) - create mode 100644 test cases/unit/69 static link/lib/func17.c - create mode 100644 test cases/unit/69 static link/lib/func18.c - create mode 100644 test cases/unit/69 static link/lib/func19.c - -diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py -index 947be1cbef..e54809657f 100644 ---- a/mesonbuild/backend/backends.py -+++ b/mesonbuild/backend/backends.py -@@ -281,7 +281,8 @@ def relpath(self, todir, fromdir): - os.path.join('dummyprefixdir', fromdir)) - - def flatten_object_list(self, target, proj_dir_to_build_root=''): -- return self._flatten_object_list(target, target.get_objects(), proj_dir_to_build_root) -+ obj_list = self._flatten_object_list(target, target.get_objects(), proj_dir_to_build_root) -+ return list(dict.fromkeys(obj_list)) - - def _flatten_object_list(self, target, objects, proj_dir_to_build_root): - obj_list = [] -diff --git a/test cases/unit/69 static link/lib/func17.c b/test cases/unit/69 static link/lib/func17.c -new file mode 100644 -index 0000000000..d1d8ec498c ---- /dev/null -+++ b/test cases/unit/69 static link/lib/func17.c -@@ -0,0 +1,4 @@ -+int func17() -+{ -+ return 1; -+} -diff --git a/test cases/unit/69 static link/lib/func18.c b/test cases/unit/69 static link/lib/func18.c -new file mode 100644 -index 0000000000..c149085ba4 ---- /dev/null -+++ b/test cases/unit/69 static link/lib/func18.c -@@ -0,0 +1,6 @@ -+int func17(); -+ -+int func18() -+{ -+ return func17() + 1; -+} -diff --git a/test cases/unit/69 static link/lib/func19.c b/test cases/unit/69 static link/lib/func19.c -new file mode 100644 -index 0000000000..69120e4bf8 ---- /dev/null -+++ b/test cases/unit/69 static link/lib/func19.c -@@ -0,0 +1,7 @@ -+int func17(); -+int func18(); -+ -+int func19() -+{ -+ return func17() + func18(); -+} -diff --git a/test cases/unit/69 static link/lib/meson.build b/test cases/unit/69 static link/lib/meson.build -index 5f04aab6a1..8f95fc4546 100644 ---- a/test cases/unit/69 static link/lib/meson.build -+++ b/test cases/unit/69 static link/lib/meson.build -@@ -66,3 +66,15 @@ libfunc15 = static_library('func15', 'func15.c', - libfunc16 = static_library('func16', 'func16.c', - link_with : libfunc15, - install : true) -+ -+# Verify func17.c.o gets included only once into libfunc19, otherwise -+# func19-shared would failed with duplicated symbol. -+libfunc17 = static_library('func17', 'func17.c', -+ install : false) -+libfunc18 = static_library('func18', 'func18.c', -+ link_with : libfunc17, -+ install : false) -+libfunc19 = static_library('func19', 'func19.c', -+ link_whole : [libfunc17, libfunc18], -+ install : false) -+shared_library('func19-shared', link_whole : [libfunc19]) diff --git a/poky/meta/recipes-devtools/meson/meson_0.52.0.bb b/poky/meta/recipes-devtools/meson/meson_0.53.2.bb index 897fa148d..de9b905c1 100644 --- a/poky/meta/recipes-devtools/meson/meson_0.52.0.bb +++ b/poky/meta/recipes-devtools/meson/meson_0.53.2.bb @@ -1,3 +1,4 @@ include meson.inc BBCLASSEXTEND = "native" + diff --git a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb index 1756f342c..67add2c25 100644 --- a/poky/meta/recipes-devtools/meson/nativesdk-meson_0.52.0.bb +++ b/poky/meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb @@ -31,7 +31,6 @@ c = @CC cpp = @CXX ar = @AR nm = @NM -ld = @LD strip = @STRIP pkgconfig = 'pkg-config' diff --git a/poky/meta/recipes-kernel/perf/perf.bb b/poky/meta/recipes-kernel/perf/perf.bb index 5f0ba7c18..070d5ecab 100644 --- a/poky/meta/recipes-kernel/perf/perf.bb +++ b/poky/meta/recipes-kernel/perf/perf.bb @@ -237,10 +237,11 @@ do_configure_prepend () { fi # use /usr/bin/env instead of version specific python - for s in `find ${S}/tools/perf/ -name '*.py'`; do - sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" + for s in `find ${S}/tools/perf/ -name '*.py'` scripts/bpf_helpers_doc.py; do sed -i 's,/usr/bin/python2,/usr/bin/env python3,' "${s}" sed -i 's,/usr/bin/env python2,/usr/bin/env python3,' "${s}" + sed -i 's,/usr/bin/python3,/usr/bin/env python3,' "${s}" + sed -i 's,/usr/bin/python,/usr/bin/env python3,' "${s}" done # unistd.h can be out of sync between libc-headers and the captured version in the perf source diff --git a/poky/scripts/lib/wic/filemap.py b/poky/scripts/lib/wic/filemap.py index a3919fbca..c53147c2f 100644 --- a/poky/scripts/lib/wic/filemap.py +++ b/poky/scripts/lib/wic/filemap.py @@ -34,9 +34,11 @@ def get_block_size(file_obj): # the FIGETBSZ ioctl (number 2). try: binary_data = fcntl.ioctl(file_obj, 2, struct.pack('I', 0)) + bsize = struct.unpack('I', binary_data)[0] except OSError: - raise IOError("Unable to determine block size") - bsize = struct.unpack('I', binary_data)[0] + bsize = None + + # If ioctl causes OSError or give bsize to zero failback to os.fstat if not bsize: import os stat = os.fstat(file_obj.fileno()) @@ -49,7 +49,9 @@ machine() { fi return fi - else + elif test -e $tmpl/bblayers.conf.sample && \ + grep -q "##OEROOT##/meta-phosphor" $tmpl/bblayers.conf.sample; + then echo "${name}" fi done |