diff options
| author | jmbills <jason.m.bills@intel.com> | 2021-10-04 22:42:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 22:42:48 +0300 |
| commit | 0c9e31989c615598b5d042ffab385606660c93c0 (patch) | |
| tree | 8019999b0ca042482e5193d6cabc06220c71d776 /meta-quanta | |
| parent | 04cd92067d2481643df5010cb39b2134b648cf4d (diff) | |
| parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
| download | openbmc-0c9e31989c615598b5d042ffab385606660c93c0.tar.xz | |
Update
Diffstat (limited to 'meta-quanta')
110 files changed, 500 insertions, 456 deletions
diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf index 5ab3e2684..a64d93e6c 100644 --- a/meta-quanta/conf/layer.conf +++ b/meta-quanta/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "quanta-layer" BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_quanta-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_quanta-layer = "hardknott honister" diff --git a/meta-quanta/meta-common/recipes-phosphor/health/phosphor-health-monitor_%.bbappend b/meta-quanta/meta-common/recipes-phosphor/health/phosphor-health-monitor_%.bbappend index 1d8bb4ecd..81c537120 100755 --- a/meta-quanta/meta-common/recipes-phosphor/health/phosphor-health-monitor_%.bbappend +++ b/meta-quanta/meta-common/recipes-phosphor/health/phosphor-health-monitor_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_append = " file://bmc_health_config.json \ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append = " file://bmc_health_config.json \ " -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/healthMon/ install -m 0644 ${WORKDIR}/bmc_health_config.json ${D}/${sysconfdir}/healthMon/ } diff --git a/meta-quanta/meta-common/recipes-quanta/fans/read-margin-temp_git.bb b/meta-quanta/meta-common/recipes-quanta/fans/read-margin-temp_git.bb index 63551ef99..676bdf345 100644 --- a/meta-quanta/meta-common/recipes-quanta/fans/read-margin-temp_git.bb +++ b/meta-quanta/meta-common/recipes-quanta/fans/read-margin-temp_git.bb @@ -14,9 +14,9 @@ DEPENDS += " nlohmann-json" DEPENDS += " sdbusplus" DEPENDS += " sdeventplus" DEPENDS += " phosphor-dbus-interfaces" -RDEPENDS_${PN} += " bash" +RDEPENDS:${PN} += " bash" -FILES_${PN} = "${bindir}/read-margin-temp" +FILES:${PN} = "${bindir}/read-margin-temp" do_install() { install -d ${D}${bindir} diff --git a/meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb b/meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb index 5b63e49cb..9bbf43c2c 100644 --- a/meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb +++ b/meta-quanta/meta-common/recipes-quanta/network/mac-address_git.bb @@ -11,10 +11,10 @@ SRCREV = "08b87370c56ff69df852eca87391ae46c05d437a" DEPENDS += "autoconf-archive-native" DEPENDS += "systemd" -FILES_${PN} += "${bindir}/mac-address" +FILES:${PN} += "${bindir}/mac-address" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "mac-address.service" +SYSTEMD_SERVICE:${PN} = "mac-address.service" EXTRA_OECONF = " \ SYSTEMD_TARGET="multi-user.target" \ diff --git a/meta-quanta/meta-common/recipes-quanta/network/usb-network.bb b/meta-quanta/meta-common/recipes-quanta/network/usb-network.bb index 85146aa1f..41094c05d 100644 --- a/meta-quanta/meta-common/recipes-quanta/network/usb-network.bb +++ b/meta-quanta/meta-common/recipes-quanta/network/usb-network.bb @@ -1,17 +1,17 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -SRC_URI_append = " file://usb-network.sh" -SRC_URI_append = " file://usb-network.service" +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" +SRC_URI:append = " file://usb-network.sh" +SRC_URI:append = " file://usb-network.service" inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" -FILES_${PN}_append = " ${sysconfdir_native}/systemd/network/00-bmc-usb0.network" +FILES:${PN}:append = " ${sysconfdir_native}/systemd/network/00-bmc-usb0.network" do_install() { install -d ${D}/${sbindir} @@ -22,4 +22,4 @@ do_install() { ${D}${systemd_unitdir}/system } -SYSTEMD_SERVICE_${PN}_append = "usb-network.service" +SYSTEMD_SERVICE:${PN}:append = "usb-network.service" diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf index fc0a1a720..021711a07 100644 --- a/meta-quanta/meta-f0b/conf/layer.conf +++ b/meta-quanta/meta-f0b/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "f0b-layer" BBFILE_PATTERN_f0b-layer = "" -LAYERSERIES_COMPAT_f0b-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_f0b-layer = "hardknott honister" diff --git a/meta-quanta/meta-f0b/conf/local.conf.sample b/meta-quanta/meta-f0b/conf/local.conf.sample index aa00f10cf..40b76ba9c 100644 --- a/meta-quanta/meta-f0b/conf/local.conf.sample +++ b/meta-quanta/meta-f0b/conf/local.conf.sample @@ -1,12 +1,11 @@ - MACHINE ??= "f0b" -DISTRO = "openbmc-phosphor" +DISTRO ?= "openbmc-phosphor" PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " *" -EXTRA_IMAGE_FEATURES = "debug-tweaks" -USER_CLASSES ?= "buildstats image-prelink" +SANITY_TESTED_DISTROS:append ?= " *" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" +USER_CLASSES ?= "buildstats" PATCHRESOLVE = "noop" -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -15,5 +14,5 @@ BB_DISKMON_DIRS = "\ ABORT,${DL_DIR},100M,1K \ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" -CONF_VERSION = "1" +CONF_VERSION = "2" INHERIT += "extrausers" diff --git a/meta-quanta/meta-f0b/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-quanta/meta-f0b/recipes-kernel/linux/linux-aspeed_%.bbappend index 6d7b90687..e65dfc862 100644 --- a/meta-quanta/meta-f0b/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-quanta/meta-f0b/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " file://f0b.cfg" diff --git a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 72c783400..ec17b3bbf 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-f0b/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,6 @@ inherit obmc-phosphor-systemd -FILESEXTRAPATHS_prepend_f0b := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:f0b := "${THISDIR}/${PN}:" EEPROM_NAMES = "motherboard " @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_f0b := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:f0b := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}_append_f0b := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:f0b := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 9d0fbe264..1066cb215 100644 --- a/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-f0b/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append_f0b = " -Dnegative-errno-on-fail=true" +EXTRA_OEMESON:append:f0b = " -Dnegative-errno-on-fail=true" NAME = " \ bus@1e78a000/i2c-bus@80/tmp421@4c \ @@ -19,4 +19,4 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAME')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-quanta/meta-gbs/conf/layer.conf b/meta-quanta/meta-gbs/conf/layer.conf index ec03a3ad6..9f41e0501 100644 --- a/meta-quanta/meta-gbs/conf/layer.conf +++ b/meta-quanta/meta-gbs/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gbs-layer" BBFILE_PATTERN_gbs-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gbs-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_gbs-layer = "hardknott honister" diff --git a/meta-quanta/meta-gbs/conf/local.conf.sample b/meta-quanta/meta-gbs/conf/local.conf.sample index f590e64f8..bd20df653 100644 --- a/meta-quanta/meta-gbs/conf/local.conf.sample +++ b/meta-quanta/meta-gbs/conf/local.conf.sample @@ -1,11 +1,11 @@ MACHINE ??= "gbs" DISTRO ?= "gbmc" PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " *" -EXTRA_IMAGE_FEATURES = "debug-tweaks" -USER_CLASSES ?= "buildstats image-prelink" +SANITY_TESTED_DISTROS:append ?= " *" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" +USER_CLASSES ?= "buildstats" PATCHRESOLVE = "noop" -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -14,4 +14,4 @@ BB_DISKMON_DIRS = "\ ABORT,${DL_DIR},100M,1K \ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" -CONF_VERSION = "1" +CONF_VERSION = "2" diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf index 59973e80c..8fb72f286 100644 --- a/meta-quanta/meta-gbs/conf/machine/gbs.conf +++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf @@ -14,9 +14,9 @@ SERIAL_CONSOLES = "115200;ttyS0" GBMC_NCSI_IF_NAME = "eth0" # Overwrite flash offsets -FLASH_KERNEL_OFFSET_flash-65536 = "2048" -FLASH_ROFS_OFFSET_flash-65536 = "7168" -FLASH_RWFS_OFFSET_flash-65536 = "62400" +FLASH_KERNEL_OFFSET:flash-65536 = "2048" +FLASH_ROFS_OFFSET:flash-65536 = "7168" +FLASH_RWFS_OFFSET:flash-65536 = "62400" FLASH_SIZE = "65536" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" @@ -25,35 +25,35 @@ PREFERRED_PROVIDER_virtual/bios-update = "gbs-bios-update" PREFERRED_PROVIDER_virtual/bmc-update = "gbs-bmc-update" # Remove unneeded binaries from image -IMAGE_FEATURES_remove = "obmc-bmc-state-mgmt" -IMAGE_FEATURES_remove = "obmc-bmcweb" -IMAGE_FEATURES_remove = "obmc-chassis-mgmt" -IMAGE_FEATURES_remove = "obmc-chassis-state-mgmt" -IMAGE_FEATURES_remove = "obmc-console" -IMAGE_FEATURES_remove = "obmc-dbus-monitor" -IMAGE_FEATURES_remove = "obmc-devtools" -IMAGE_FEATURES_remove = "obmc-fan-control" -IMAGE_FEATURES_remove = "obmc-fan-mgmt" -IMAGE_FEATURES_remove = "obmc-flash-mgmt" -IMAGE_FEATURES_remove = "obmc-fru-ipmi" -IMAGE_FEATURES_remove = "obmc-health-monitor" -IMAGE_FEATURES_remove = "obmc-host-ctl" -IMAGE_FEATURES_remove = "obmc-host-ipmi" -IMAGE_FEATURES_remove = "obmc-host-state-mgmt" -IMAGE_FEATURES_remove = "obmc-ikvm" -IMAGE_FEATURES_remove = "obmc-inventory" -IMAGE_FEATURES_remove = "obmc-leds" -IMAGE_FEATURES_remove = "obmc-logging-mgmt" -IMAGE_FEATURES_remove = "obmc-remote-logging-mgmt" -IMAGE_FEATURES_remove = "obmc-rng" -IMAGE_FEATURES_remove = "obmc-net-ipmi" -IMAGE_FEATURES_remove = "obmc-sensors" -IMAGE_FEATURES_remove = "obmc-software" -IMAGE_FEATURES_remove = "obmc-system-mgmt" -IMAGE_FEATURES_remove = "obmc-telemetry" -IMAGE_FEATURES_remove = "obmc-debug-collector" -IMAGE_FEATURES_remove = "obmc-settings-mgmt" -IMAGE_FEATURES_remove = "obmc-network-mgmt" -IMAGE_FEATURES_remove = "obmc-user-mgmt" -IMAGE_FEATURES_remove = "obmc-user-mgmt-ldap" -OBMC_IMAGE_BASE_INSTALL_remove = "packagegroup-obmc-apps-extras" +IMAGE_FEATURES:remove = "obmc-bmc-state-mgmt" +IMAGE_FEATURES:remove = "obmc-bmcweb" +IMAGE_FEATURES:remove = "obmc-chassis-mgmt" +IMAGE_FEATURES:remove = "obmc-chassis-state-mgmt" +IMAGE_FEATURES:remove = "obmc-console" +IMAGE_FEATURES:remove = "obmc-dbus-monitor" +IMAGE_FEATURES:remove = "obmc-devtools" +IMAGE_FEATURES:remove = "obmc-fan-control" +IMAGE_FEATURES:remove = "obmc-fan-mgmt" +IMAGE_FEATURES:remove = "obmc-flash-mgmt" +IMAGE_FEATURES:remove = "obmc-fru-ipmi" +IMAGE_FEATURES:remove = "obmc-health-monitor" +IMAGE_FEATURES:remove = "obmc-host-ctl" +IMAGE_FEATURES:remove = "obmc-host-ipmi" +IMAGE_FEATURES:remove = "obmc-host-state-mgmt" +IMAGE_FEATURES:remove = "obmc-ikvm" +IMAGE_FEATURES:remove = "obmc-inventory" +IMAGE_FEATURES:remove = "obmc-leds" +IMAGE_FEATURES:remove = "obmc-logging-mgmt" +IMAGE_FEATURES:remove = "obmc-remote-logging-mgmt" +IMAGE_FEATURES:remove = "obmc-rng" +IMAGE_FEATURES:remove = "obmc-net-ipmi" +IMAGE_FEATURES:remove = "obmc-sensors" +IMAGE_FEATURES:remove = "obmc-software" +IMAGE_FEATURES:remove = "obmc-system-mgmt" +IMAGE_FEATURES:remove = "obmc-telemetry" +IMAGE_FEATURES:remove = "obmc-debug-collector" +IMAGE_FEATURES:remove = "obmc-settings-mgmt" +IMAGE_FEATURES:remove = "obmc-network-mgmt" +IMAGE_FEATURES:remove = "obmc-user-mgmt" +IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap" +OBMC_IMAGE_BASE_INSTALL:remove = "packagegroup-obmc-apps-extras" diff --git a/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend b/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend index 06bc31f6a..0921a809e 100644 --- a/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-bsp/images/npcm7xx-igps-native_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append += "file://BootBlockAndHeader_GBS.xml" -SRC_URI_append += "file://UbootHeader_GBS.xml" +SRC_URI:append += "file://BootBlockAndHeader_GBS.xml" +SRC_URI:append += "file://UbootHeader_GBS.xml" # Prepare the Bootblock XMLs. do_gbs_prepare_xmls() { diff --git a/meta-quanta/meta-gbs/recipes-core/busybox/busybox_%.bbappend b/meta-quanta/meta-gbs/recipes-core/busybox/busybox_%.bbappend index 6947a4cbb..adced6348 100644 --- a/meta-quanta/meta-gbs/recipes-core/busybox/busybox_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-core/busybox/busybox_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " file://busybox.cfg" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" +SRC_URI:append:gbs = " file://busybox.cfg" diff --git a/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh b/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh index 4723c20b4..a80082a1c 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh +++ b/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/files/boot-status-led.sh @@ -1,6 +1,6 @@ #!/bin/bash -BOOT_SERVICE_NAME="xyz.openbmc_project.State.Host0" +BOOT_SERVICE_NAME="xyz.openbmc_project.State.Host" BOOT_STATUS_OBJPATH="/xyz/openbmc_project/state/os" BOOT_INTERFACE_NAME="xyz.openbmc_project.State.OperatingSystem.Status" BOOT_Property="OperatingSystemState" @@ -11,7 +11,7 @@ LED_STANDBY_OBJPATH="/xyz/openbmc_project/led/groups/boot_status_standby" LED_INTERFACE_NAME="xyz.openbmc_project.Led.Group" LED_Property="Asserted" -PWR_STATE_SERVICE="xyz.openbmc_project.State.Chassis0" +PWR_STATE_SERVICE="xyz.openbmc_project.State.Chassis" PWR_STATE_OBJPATH="/xyz/openbmc_project/state/chassis0" PWR_STATE_INTERFACE_NAME="xyz.openbmc_project.State.Chassis" PWR_STATE_Property="CurrentPowerState" diff --git a/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/gbs-boot-status-led.bb b/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/gbs-boot-status-led.bb index 61c6ed407..464f7b86b 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/gbs-boot-status-led.bb +++ b/meta-quanta/meta-gbs/recipes-gbs/boot-status-led/gbs-boot-status-led.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" SRC_URI = " file://boot-status-led.sh \ file://boot-status-led.service \ @@ -22,4 +22,4 @@ do_install() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "boot-status-led.service" +SYSTEMD_SERVICE:${PN} = "boot-status-led.service" diff --git a/meta-quanta/meta-gbs/recipes-gbs/cpld-ver-check/gbs-cpld-ver-check.bb b/meta-quanta/meta-gbs/recipes-gbs/cpld-ver-check/gbs-cpld-ver-check.bb index afe91fc60..e28bc37c0 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/cpld-ver-check/gbs-cpld-ver-check.bb +++ b/meta-quanta/meta-gbs/recipes-gbs/cpld-ver-check/gbs-cpld-ver-check.bb @@ -12,9 +12,9 @@ SRC_URI = " file://cpld_version.sh \ S = "${WORKDIR}" DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" -SYSTEMD_SERVICE_${PN} = "cpld-version.service" +SYSTEMD_SERVICE:${PN} = "cpld-version.service" do_install() { install -d ${D}${bindir} diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/gbs-bios-update.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/gbs-bios-update.bb index 0ea731c35..b02842f19 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/gbs-bios-update.bb +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-bios-update/gbs-bios-update.bb @@ -10,10 +10,10 @@ inherit obmc-phosphor-systemd DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" PROVIDES += "virtual/bios-update" -RPROVIDES_${PN} += "virtual/bios-update" +RPROVIDES:${PN} += "virtual/bios-update" SRC_URI += " file://bios-verify.sh \ file://bios-update.sh \ @@ -22,7 +22,7 @@ SRC_URI += " file://bios-verify.sh \ file://config-bios.json \ " -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bios.json" do_install() { install -d ${D}${bindir} @@ -39,4 +39,4 @@ do_install() { SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "phosphor-ipmi-flash-bios-verify.service phosphor-ipmi-flash-bios-update.service" +SYSTEMD_SERVICE:${PN} = "phosphor-ipmi-flash-bios-verify.service phosphor-ipmi-flash-bios-update.service" diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb index da672001e..fea9ce1b5 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-bmc-update/gbs-bmc-update.bb @@ -10,14 +10,14 @@ SRC_URI = " file://phosphor-ipmi-flash-bmc-verify.service \ file://config-bmc.json \ " -FILES_${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash/config-bmc.json" PROVIDES += "virtual/bmc-update" -RPROVIDES_${PN} += "virtual/bmc-update" +RPROVIDES:${PN} += "virtual/bmc-update" DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-flash" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" do_install() { install -d ${D}${bindir} @@ -32,4 +32,4 @@ do_install() { SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "phosphor-ipmi-flash-bmc-verify.service" +SYSTEMD_SERVICE:${PN} = "phosphor-ipmi-flash-bmc-verify.service" diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/gbs-detect-gpio-present.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/gbs-detect-gpio-present.bb index 3e1a6d8ac..b74089cd8 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/gbs-detect-gpio-present.bb +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-detect-gpio-present/gbs-detect-gpio-present.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" SRC_URI = " file://detect-gpio-present.sh \ file://detect-gpio-present.service \ @@ -22,4 +22,4 @@ do_install() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "detect-gpio-present.service" +SYSTEMD_SERVICE:${PN} = "detect-gpio-present.service" diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/gbs-ipmi-entity-association-map.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/gbs-ipmi-entity-association-map.bb index 8b5551e79..bc6c700bb 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/gbs-ipmi-entity-association-map.bb +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-ipmi-entity-association-map/gbs-ipmi-entity-association-map.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 SRC_URI += "file://entity_association_map.json" -FILES_${PN} = " \ +FILES:${PN} = " \ ${datadir}/ipmi-entity-association/entity_association_map.json \ " diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh index 17074ddaf..8b660c2dc 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/files/gbs-sysinit.sh @@ -221,7 +221,7 @@ parse_pe_fru() { } check_power_status() { - res0="$(busctl get-property -j xyz.openbmc_project.State.Chassis0 \ + res0="$(busctl get-property -j xyz.openbmc_project.State.Chassis \ /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis \ CurrentPowerState | jq -r '.["data"]')" echo $res0 @@ -260,7 +260,7 @@ main() { set_gpio_persistence echo "Starting host power!" >&2 - busctl set-property xyz.openbmc_project.State.Host0 \ + busctl set-property xyz.openbmc_project.State.Host \ /xyz/openbmc_project/state/host0 \ xyz.openbmc_project.State.Host \ RequestedHostTransition s \ diff --git a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/gbs-sysinit.bb b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/gbs-sysinit.bb index c9d595a3d..ffc0871d8 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/gbs-sysinit.bb +++ b/meta-quanta/meta-gbs/recipes-gbs/gbs-sysinit/gbs-sysinit.bb @@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN} += "i2c-tools" -RDEPENDS_${PN} += "jq" -RDEPENDS_${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "i2c-tools" +RDEPENDS:${PN} += "jq" +RDEPENDS:${PN} += "libsystemd" SRC_URI = "file://gbs-sysinit.sh \ file://gbs-gpio-common.sh \ @@ -29,4 +29,4 @@ do_install () { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "gbs-sysinit.service" +SYSTEMD_SERVICE:${PN} = "gbs-sysinit.service" diff --git a/meta-quanta/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb b/meta-quanta/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb index 7c28dc28d..e1cb2ac71 100644 --- a/meta-quanta/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb +++ b/meta-quanta/meta-gbs/recipes-gbs/hotswap-power-cycle/gbs-hotswap-power-cycle.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN} += "libgpiod-tools" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "libgpiod-tools" SRC_URI = " file://hotswap-power-cycle.service \ file://tray_powercycle.sh \ @@ -23,5 +23,5 @@ do_install() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "hotswap-power-cycle.service" +SYSTEMD_SERVICE:${PN} = "hotswap-power-cycle.service" diff --git a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh index f6f1be4e0..6580fbe91 100644 --- a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh +++ b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon/gbs-set-boot-failsafe.sh @@ -16,7 +16,7 @@ main() { local pgd_val - pgd_val="$(busctl get-property -j xyz.openbmc_project.State.Chassis0 \ + pgd_val="$(busctl get-property -j xyz.openbmc_project.State.Chassis \ /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis \ CurrentPowerState | jq -r '.["data"]')" diff --git a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon_%.bbappend b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon_%.bbappend index f833b5577..0c20dc4fb 100644 --- a/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-google/acpi-power-state/acpi-power-state-daemon_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " \ +SRC_URI:append:gbs = " \ file://gbs-host-s0-set-failsafe.service \ file://gbs-host-s5-set-failsafe.service \ file://gbs-host-set-boot-failsafe@.service \ @@ -11,11 +11,11 @@ SRC_URI_append_gbs = " \ file://gbs-host-ready.target \ " -RDEPENDS_${PN}_append_gbs = "bash" +RDEPENDS:${PN}:append:gbs = "bash" CHASSIS_INSTANCE="0" -SYSTEMD_SERVICE_${PN}_append_gbs = " \ +SYSTEMD_SERVICE:${PN}:append:gbs = " \ gbs-host-s0-set-failsafe.service \ gbs-host-s5-set-failsafe.service \ gbs-host-set-boot-failsafe@${CHASSIS_INSTANCE}.service \ @@ -23,11 +23,11 @@ SYSTEMD_SERVICE_${PN}_append_gbs = " \ gbs-host-ready.target \ " -FILES_${PN}_append_gbs = " \ +FILES:${PN}:append:gbs = " \ ${systemd_system_unitdir}/gbs-host-set-boot-failsafe@.service \ " -do_install_append_gbs() { +do_install:append:gbs() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/gbs-set-failsafe.sh ${D}${bindir}/. diff --git a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg index 221910a36..0fca8252f 100644 --- a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg +++ b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton/gbs.cfg @@ -72,12 +72,12 @@ CONFIG_USB_OHCI_HCD_NPCM7XX=y CONFIG_USB_SERIAL_CP210X=y CONFIG_USB_U_ETHER=y -#SPI +# SPI CONFIG_SPI=y CONFIG_SPI_NPCM_FIU=y CONFIG_SPI_NPCM_PSPI=y -#I2C support +# I2C support CONFIG_I2C_MUX_LTC4306=y CONFIG_I2C_MUX_PCA954x=y CONFIG_I2C_MUX=y @@ -85,11 +85,20 @@ CONFIG_I2C_SLAVE_EEPROM=y CONFIG_I2C_SLAVE_MQUEUE=y CONFIG_I2C_SLAVE=y -#I2C GPIO expanders +# I2C GPIO expanders CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCF857X=y +# Enable phsophor-gpio-keys feature +CONFIG_INPUT_EVDEV=y +# Need for CONFIG_KEYBOARD_GPIO Kconfig +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_GPIO=y + +# Enable the IPMI KCS driver +CONFIG_IPMI_KCS_BMC_CDEV_IPMI=y + # Misc CONFIG_OVERLAY_FS=y CONFIG_JFFS2_FS=y @@ -110,9 +119,3 @@ CONFIG_MTD_M25P80=y CONFIG_MUX_MMIO=y CONFIG_NPCM7XX_LPC_BPC=y CONFIG_MTD_PARTITIONED_MASTER=y - -# Enable phsophor-gpio-keys feature -CONFIG_INPUT_EVDEV=y -# Need for CONFIG_KEYBOARD_GPIO Kconfig -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_GPIO=y diff --git a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend index c2b5da404..85d0607f3 100644 --- a/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/linux-nuvoton:" -SRC_URI_append_gbs = " file://gbs.cfg" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/linux-nuvoton:" +SRC_URI:append:gbs = " file://gbs.cfg" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb index 167f78df9..c1f866f2d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb +++ b/meta-quanta/meta-gbs/recipes-phosphor/configuration/gbs-yaml-config.bb @@ -25,11 +25,11 @@ do_install() { ${D}${datadir}/${BPN}/ipmi-inventory-sensors.yaml } -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${datadir}/${BPN}/ipmi-fru-read.yaml \ ${datadir}/${BPN}/ipmi-sensors.yaml \ ${datadir}/${BPN}/ipmi-extra-properties.yaml \ ${datadir}/${BPN}/ipmi-inventory-sensors.yaml \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend index 142661078..6f0774e96 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/files:" -OBMC_CONSOLE_FRONT_TTY_gbs = "ttyS3" -OBMC_CONSOLE_HOST_TTY_gbs = "ttyS1" +OBMC_CONSOLE_FRONT_TTY:gbs = "ttyS3" +OBMC_CONSOLE_HOST_TTY:gbs = "ttyS1" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index e617f8679..a68b4d61a 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,17 +1,17 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " file://config.json.in \ +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" +SRC_URI:append:gbs = " file://config.json.in \ file://fan-table-init.sh \ file://phosphor-pid-control.service \ " -FILES_${PN}_append_gbs = " ${datadir}/swampd/config.json.in" -FILES_${PN}_append_gbs = " ${bindir}/fan-table-init.sh" +FILES:${PN}:append:gbs = " ${datadir}/swampd/config.json.in" +FILES:${PN}:append:gbs = " ${bindir}/fan-table-init.sh" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -SYSTEMD_SERVICE_${PN}_append_gbs = " phosphor-pid-control.service" +SYSTEMD_SERVICE:${PN}:append:gbs = " phosphor-pid-control.service" -do_install_append_gbs() { +do_install:append:gbs() { install -d ${D}/${bindir} install -m 0755 ${WORKDIR}/fan-table-init.sh ${D}/${bindir} diff --git a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index f4ac6066d..c9a0c38c3 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -1,34 +1,34 @@ inherit obmc-phosphor-systemd -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " file://phosphor-gpio-presence@.service.replace" +SRC_URI:append:gbs = " file://phosphor-gpio-presence@.service.replace" TMPL_PRESENT = "phosphor-gpio-presence@.service" INSTFMT_PRESENT = "phosphor-gpio-presence@{0}.service" PRESENT_TGT = "multi-user.target" FMT_PRESENT = "../${TMPL_PRESENT}:${PRESENT_TGT}.requires/${INSTFMT_PRESENT}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-0.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-1.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-2.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-3.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-4.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-5.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-6.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-7.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-8.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-9.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-10.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs +="obmc/gpio/gpios-11.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-0.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-1.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-2.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-3.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-4.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-5.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-6.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-7.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-8.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-9.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-10.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs +="obmc/gpio/gpios-11.conf" GBS_OBMC_PRESENT_INSTANCES = "0 1 2 3 4 5 6 7 8 9 10 11" -SYSTEMD_LINK_${PN}-presence_append_gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:gbs = " ${@compose_list(d, 'FMT_PRESENT', 'GBS_OBMC_PRESENT_INSTANCES')}" GBS_PRESENT_ENV_FMT = "obmc/gpio/gpios-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:gbs = " ${@compose_list(d, 'GBS_PRESENT_ENV_FMT', 'GBS_OBMC_PRESENT_INSTANCES')}" -do_install_append_gbs() { +do_install:append:gbs() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/phosphor-gpio-presence@.service.replace ${D}${systemd_system_unitdir}/phosphor-gpio-presence@.service } diff --git a/meta-quanta/meta-gbs/recipes-phosphor/host/phosphor-host-postd_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/host/phosphor-host-postd_%.bbappend index ef3ecb2e4..6201ab558 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/host/phosphor-host-postd_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/host/phosphor-host-postd_%.bbappend @@ -1,2 +1,2 @@ -SNOOP_DEVICE_gbs = "npcm7xx-lpc-bpc0" -PACKAGECONFIG_append_gbs = " 7seg" +SNOOP_DEVICE:gbs = "npcm7xx-lpc-bpc0" +PACKAGECONFIG:append:gbs = " 7seg" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend index 2ed0fb7e9..9860495ea 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,45 +1,47 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-host-postd" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-sel-logger" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " google-ipmi-sys" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " google-ipmi-i2c" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-hotswap-power-cycle" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " loadsvf" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-cpld-ver-check" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " memtester" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " net-tools" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-boot-status-led" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-nvme" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-detect-gpio-present" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-ecc" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-sysinit" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " gbs-ipmi-entity-association-map" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " usb-network" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-image-signing" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " openssl-bin" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-ipmi-blobs-binarystore" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-virtual-sensor" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " acpi-power-state-daemon" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " virtual/obmc-gpio-presence" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ipmitool" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-health-monitor" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-host-postd" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-sel-logger" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " google-ipmi-sys" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " google-ipmi-i2c" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-hotswap-power-cycle" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " loadsvf" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-cpld-ver-check" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " memtester" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " net-tools" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-boot-status-led" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-nvme" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-detect-gpio-present" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-ecc" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-sysinit" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " gbs-ipmi-entity-association-map" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " usb-network" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-image-signing" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " openssl-bin" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-ipmi-blobs-binarystore" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-virtual-sensor" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " acpi-power-state-daemon" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " virtual/obmc-gpio-presence" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ipmitool" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-health-monitor" # Add back packages that were part of packagegroup-obmc-apps-extras -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-hwmon" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-inventory-manager" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-hwmon" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-inventory-manager" # Required for obmc-bmcweb -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " bmcweb" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-bmcweb-cert-config" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-nslcd-authority-cert-config" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-user-manager" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " bmcweb" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-bmcweb-cert-config" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-nslcd-authority-cert-config" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-user-manager" # Required for LEDs. Part of obmc-leds -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ${VIRTUAL-RUNTIME_obmc-leds-manager}" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ${VIRTUAL-RUNTIME_obmc-leds-sysfs}" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " ${VIRTUAL-RUNTIME_obmc-led-monitor}" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-leds-manager}" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-leds-sysfs}" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " ${VIRTUAL-RUNTIME_obmc-led-monitor}" # Required for the front port. Part of obmc-console -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " obmc-console" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " obmc-console" # Required from packagegroup-gbs-apps -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " virtual/bios-update" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " x86-power-control" -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " phosphor-pid-control" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " virtual/bios-update" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " x86-power-control" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " phosphor-pid-control" # Required for phosphor-ipmi-kcs -OBMC_IMAGE_EXTRA_INSTALL_append_gbs = " virtual-obmc-host-ipmi-hw" +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " virtual-obmc-host-ipmi-hw" +# Required for some services, such as phosphor-virtual-sensors +OBMC_IMAGE_EXTRA_INSTALL:append:gbs = " obmc-targets" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/interfaces/bmcweb_%.bbappend index 2c19a3ead..26856a728 100755 --- a/meta-quanta/meta-gbs/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,8 +1,8 @@ -EXTRA_OEMESON_append_gbs = " \ +EXTRA_OEMESON:append:gbs = " \ -Dredfish-dbus-log=enabled \ -Dhttp-body-limit=40 \ " -do_install_append_gbs(){ +do_install:append:gbs(){ install -d ${D}${localstatedir}/lib/bmcweb } diff --git a/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-inventory-cleanup.bb b/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-inventory-cleanup.bb index 0c4b56f72..1b5a119b1 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-inventory-cleanup.bb +++ b/meta-quanta/meta-gbs/recipes-phosphor/inventory/gbs-inventory-cleanup.bb @@ -14,4 +14,4 @@ do_install() { install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml } -FILES_${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" +FILES:${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 38825835d..8c15e4d8f 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" -PACKAGECONFIG_append_gbs = " associations" -SRC_URI_append_gbs = " file://associations.json" -DEPENDS_append_gbs = " gbs-inventory-cleanup" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" +PACKAGECONFIG:append:gbs = " associations" +SRC_URI:append:gbs = " file://associations.json" +DEPENDS:append:gbs = " gbs-inventory-cleanup" -do_install_append_gbs() { +do_install:append:gbs() { install -d ${D}${base_datadir} install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json } diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend index 1dba2ec35..1e31ff184 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-blobs-binarystore_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " file://config.json" -FILES_${PN}_append_gbs = " ${datadir}/binaryblob/config.json" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" +SRC_URI:append:gbs = " file://config.json" +FILES:${PN}:append:gbs = " ${datadir}/binaryblob/config.json" -do_install_append_gbs() { +do_install:append:gbs() { install -d ${D}${datadir}/binaryblob/ install ${WORKDIR}/config.json ${D}${datadir}/binaryblob/config.json } diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index ca7172498..308620f99 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend index 14f333b81..8744bef0b 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend @@ -1,5 +1,5 @@ NUVOTON_FLASH_PCIMBOX = "0xF0848000" -PACKAGECONFIG_append_gbs = " nuvoton-p2a-mbox" +PACKAGECONFIG:append:gbs = " nuvoton-p2a-mbox" -IPMI_FLASH_BMC_ADDRESS_gbs = "${NUVOTON_FLASH_PCIMBOX}" +IPMI_FLASH_BMC_ADDRESS:gbs = "${NUVOTON_FLASH_PCIMBOX}" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 877129716..b9ea43e1c 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,7 +1,7 @@ inherit obmc-phosphor-systemd -DEPENDS_append_gbs = " gbs-yaml-config" +DEPENDS:append:gbs = " gbs-yaml-config" -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" EEPROM_NAMES = "motherboard hsbp fan" @@ -11,16 +11,16 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}_append_gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" -EXTRA_OECONF_append_gbs = " \ +EXTRA_OECONF:append:gbs = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \ PROP_YAML=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-extra-properties.yaml \ " diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 78fa57039..181527fca 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,14 +1,14 @@ -DEPENDS_append_gbs = " gbs-yaml-config" +DEPENDS:append:gbs = " gbs-yaml-config" -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " file://gbs-ipmid-whitelist.conf" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" +SRC_URI:append:gbs = " file://gbs-ipmid-whitelist.conf" -WHITELIST_CONF_gbs = "${WORKDIR}/gbs-ipmid-whitelist.conf" +WHITELIST_CONF:gbs = "${WORKDIR}/gbs-ipmid-whitelist.conf" -EXTRA_OECONF_append_gbs = " \ +EXTRA_OECONF:append:gbs = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-inventory-sensors.yaml \ " -RDEPENDS_${PN}_remove_gbs = "clear-once" +RDEPENDS:${PN}:remove:gbs = "clear-once" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend index 34b6b790c..f832a4120 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend @@ -1 +1 @@ -KCS_DEVICE_gbs = "ipmi-kcs1" +KCS_DEVICE:gbs = "ipmi-kcs1" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index 30bf313cb..4e3ce61e9 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " file://service-override.conf" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" +SRC_URI:append:gbs = " file://service-override.conf" -FILES_${PN}_append_gbs = " ${systemd_system_unitdir}/xyz.openbmc_project.LED.GroupManager.service.d/service-override.conf" +FILES:${PN}:append:gbs = " ${systemd_system_unitdir}/xyz.openbmc_project.LED.GroupManager.service.d/service-override.conf" -do_install_append_gbs() { +do_install:append:gbs() { rm -rf ${D}${datadir}/${PN}/* install -d ${D}${systemd_system_unitdir}/xyz.openbmc_project.LED.GroupManager.service.d diff --git a/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend index 264423933..a77425ee5 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -1 +1 @@ -EXTRA_OEMESON_append_gbs = " -Derror_info_cap=256" +EXTRA_OEMESON:append:gbs = " -Derror_info_cap=256" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend index 9caf61e66..195838d05 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG_append_gbs = " nic-ethtool" -PACKAGECONFIG_remove_gbs = "uboot-env" +PACKAGECONFIG:append:gbs = " nic-ethtool" +PACKAGECONFIG:remove:gbs = "uboot-env" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 9bd1ffd04..37a36fba8 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_gbs = " send-to-logger log-alarm" +PACKAGECONFIG:append:gbs = " send-to-logger log-alarm log-watchdog" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 7307de7fa..723ac418d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" DEPENDS += "boost" @@ -19,15 +19,15 @@ GBS_NAMES = " \ GBS_ITEMSFMT = "ahb/apb/{0}.conf" GBS_ITEMS += "${@compose_list(d, 'GBS_ITEMSFMT', 'GBS_NAMES')}" -GBS_ITEMS_append_gbs += " iio-hwmon-battery.conf" +GBS_ITEMS:append:gbs += " iio-hwmon-battery.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " ${@compose_list(d, 'ENVS', 'GBS_ITEMS')}" # Fan sensors FITEMS = "pwm-fan-controller@103000.conf" FENVS = "obmc/hwmon/ahb/apb/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " ${@compose_list(d, 'FENVS', 'FITEMS')}" -EXTRA_OEMESON_append_gbs = " -Dupdate-functional-on-fail=true -Dnegative-errno-on-fail=false" +EXTRA_OEMESON:append:gbs = " -Dupdate-functional-on-fail=true -Dnegative-errno-on-fail=false" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme_%.bbappend index c3db11dad..974c6204d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme_%.bbappend @@ -1,11 +1,11 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " file://nvme_config.json" -SRC_URI_append_gbs = " file://nvme_json_rewrite.sh" -SRC_URI_append_gbs = " file://xyz.openbmc_project.nvme.manager.service.replace" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +SRC_URI:append:gbs = " file://nvme_config.json" +SRC_URI:append:gbs = " file://nvme_json_rewrite.sh" +SRC_URI:append:gbs = " file://xyz.openbmc_project.nvme.manager.service.replace" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -do_install_append_gbs() { +do_install:append:gbs() { install -d ${D}/${sysconfdir}/nvme/ install -m 0644 ${WORKDIR}/nvme_config.json ${D}/${sysconfdir}/nvme/ diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index d151f2025..224a26235 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " file://config-virtual-sensor.json \ +SRC_URI:append:gbs = " file://config-virtual-sensor.json \ file://phosphor-virtual-sensor.service.replace \ " -RDEPENDS_${PN}_append_gbs = "bash" +RDEPENDS:${PN}:append:gbs = "bash" -do_install_append_gbs() { +do_install:append:gbs() { install -d ${D}${datadir}/${PN} install -m 0644 -D ${WORKDIR}/config-virtual-sensor.json \ ${D}${datadir}/${PN}/virtual_sensor_config.json diff --git a/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 7e2056844..8bd8b22bf 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_append_gbs := ":${THISDIR}/${PN}" -SRC_URI_append_gbs = " file://time-default.override.yml" -SRC_URI_append_gbs = " file://restrictionmode-default-whitelist.override.yml" +FILESEXTRAPATHS:append:gbs := ":${THISDIR}/${PN}" +SRC_URI:append:gbs = " file://time-default.override.yml" +SRC_URI:append:gbs = " file://restrictionmode-default-whitelist.override.yml" diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 index c0f04ef03..27c438d90 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/host0 @@ -3,3 +3,6 @@ SERVICE=xyz.openbmc_project.Watchdog UNIT_HARD_RESET=phosphor-host-watchdog-reset.service UNIT_POWER_OFF=phosphor-host-watchdog-poweroff.service UNIT_POWER_CYCLE=phosphor-host-watchdog-powercycle.service +FALLBACK_ACTION=xyz.openbmc_project.State.Watchdog.Action.PowerCycle +FALLBACK_INTERVAL=180000 +MIN_INTERVAL=60000 diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service index 6c3592f88..9b8b0d691 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-powercycle.service @@ -4,6 +4,6 @@ After=xyz.openbmc_project.Chassis.Control.Power.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis0 /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.PowerCycle -ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause0 /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.PowerCycle +ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer SyslogIdentifier=phosphor-watchdog diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service index 603856cb9..af7e6ef0d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-poweroff.service @@ -4,5 +4,5 @@ After=xyz.openbmc_project.Chassis.Control.Power.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Chassis0 /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off +ExecStart=busctl set-property xyz.openbmc_project.State.Chassis /xyz/openbmc_project/state/chassis0 xyz.openbmc_project.State.Chassis RequestedPowerTransition s xyz.openbmc_project.State.Chassis.Transition.Off SyslogIdentifier=phosphor-watchdog diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service index b444c6b1b..655618b05 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-host-watchdog-reset.service @@ -4,6 +4,6 @@ After=xyz.openbmc_project.Chassis.Control.Power.service [Service] Type=oneshot -ExecStart=busctl set-property xyz.openbmc_project.State.Host0 /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s xyz.openbmc_project.State.Host.Transition.ForceWarmReboot -ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause0 /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer +ExecStart=busctl set-property xyz.openbmc_project.State.Host /xyz/openbmc_project/state/host0 xyz.openbmc_project.State.Host RequestedHostTransition s xyz.openbmc_project.State.Host.Transition.ForceWarmReboot +ExecStart=busctl set-property xyz.openbmc_project.Control.Host.RestartCause /xyz/openbmc_project/control/host0/restart_cause xyz.openbmc_project.Control.Host.RestartCause RequestedRestartCause s xyz.openbmc_project.State.Host.RestartCause.WatchdogTimer SyslogIdentifier=phosphor-watchdog diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service index df11b22e5..4577cd1c1 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service @@ -4,7 +4,8 @@ Description=Phosphor Watchdog [Service] EnvironmentFile={envfiledir}/obmc/watchdog/%I ExecStart=/usr/bin/env phosphor-watchdog --service=${{SERVICE}} --path=${{DEVPATH}} \ - --continue \ + --continue --fallback_always --min_interval=${{MIN_INTERVAL}} \ + --fallback_action=${{FALLBACK_ACTION}} --fallback_interval=${{FALLBACK_INTERVAL}} \ --action_target=xyz.openbmc_project.State.Watchdog.Action.HardReset=${{UNIT_HARD_RESET}} \ --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerOff=${{UNIT_POWER_OFF}} \ --action_target=xyz.openbmc_project.State.Watchdog.Action.PowerCycle=${{UNIT_POWER_CYCLE}} diff --git a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index d8b1aa956..7ad4e2521 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gbs = " obmc/watchdog/host0" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gbs = " obmc/watchdog/host0" OBMC_HOST_WATCHDOG_INSTANCES_A = "host0" WATCHDOG_FMT_A = "phosphor-watchdog@{0}.service" -SYSTEMD_OVERRIDE_${PN}_remove_gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" -SYSTEMD_LINK_${PN}_remove_gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_LINK_${PN}_remove_gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_SERVICE_${PN}_gbs = " ${@compose_list(d, 'WATCHDOG_FMT_A', 'OBMC_HOST_WATCHDOG_INSTANCES_A')} \ +SYSTEMD_OVERRIDE:${PN}:remove:gbs = "poweron.conf:phosphor-watchdog@poweron.service.d/poweron.conf" +SYSTEMD_LINK:${PN}:remove:gbs = "${@compose_list(d, 'ENABLE_WATCHDOG_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_LINK:${PN}:remove:gbs = "${@compose_list(d, 'WATCHDOG_FMT', 'OBMC_HOST_WATCHDOG_INSTANCES', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_SERVICE:${PN}:gbs = " ${@compose_list(d, 'WATCHDOG_FMT_A', 'OBMC_HOST_WATCHDOG_INSTANCES_A')} \ phosphor-host-watchdog-reset.service \ phosphor-host-watchdog-poweroff.service \ phosphor-host-watchdog-powercycle.service \ diff --git a/meta-quanta/meta-gbs/recipes-quanta/network/usb-network.bbappend b/meta-quanta/meta-gbs/recipes-quanta/network/usb-network.bbappend index b6439a158..8cd6e594b 100644 --- a/meta-quanta/meta-gbs/recipes-quanta/network/usb-network.bbappend +++ b/meta-quanta/meta-gbs/recipes-quanta/network/usb-network.bbappend @@ -1,11 +1,11 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " file://00-bmc-usb0.network" -SRC_URI_append_gbs = " file://usb-network.conf" +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" +SRC_URI:append:gbs = " file://00-bmc-usb0.network" +SRC_URI:append:gbs = " file://usb-network.conf" -FILES_${PN}_append_gbs = " ${datadir}/usb-network/usb-network.conf" -FILES_${PN}_append_gbs = " ${sysconfdir_native}/systemd/network/00-bmc-usb0.network" +FILES:${PN}:append:gbs = " ${datadir}/usb-network/usb-network.conf" +FILES:${PN}:append:gbs = " ${sysconfdir_native}/systemd/network/00-bmc-usb0.network" -do_install_append_gbs() { +do_install:append:gbs() { install -d ${D}${sysconfdir_native}/systemd/network/ install -m 0644 ${WORKDIR}/00-bmc-usb0.network \ ${D}${sysconfdir_native}/systemd/network diff --git a/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control_%.bbappend index 33cc6d4e0..348ad1043 100644 --- a/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,14 +1,14 @@ -FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:" -SRC_URI_append_gbs = " file://power-config-host0.json \ +FILESEXTRAPATHS:prepend:gbs := "${THISDIR}/${PN}:" +SRC_URI:append:gbs = " file://power-config-host0.json \ file://chassis-system-reset.service \ " -EXTRA_OECMAKE_append_gbs = " -DCHASSIS_SYSTEM_RESET=ON" +EXTRA_OECMAKE:append:gbs = " -DCHASSIS_SYSTEM_RESET=ON" -RDEPENDS_${PN}_append_gbs = " bash" -RDEPENDS_${PN}_append_gbs = " gbs-hotswap-power-cycle" +RDEPENDS:${PN}:append:gbs = " bash" +RDEPENDS:${PN}:append:gbs = " gbs-hotswap-power-cycle" -do_install_append_gbs() { +do_install:append:gbs() { install -d ${D}${datadir}/${PN} install -m 0644 ${WORKDIR}/power-config-host0.json ${D}${datadir}/${PN} } diff --git a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf index f6433733b..34b1dacea 100644 --- a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf +++ b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf @@ -1,4 +1,4 @@ require conf/distro/openbmc-phosphor.conf -DISTRO_FEATURES_remove = "avahi" -DISTRO_FEATURES_remove = "slp" +DISTRO_FEATURES:remove = "avahi" +DISTRO_FEATURES:remove = "slp" diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf index 9bb671876..7591e0953 100644 --- a/meta-quanta/meta-gsj/conf/layer.conf +++ b/meta-quanta/meta-gsj/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gsj-layer" BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gsj-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_gsj-layer = "hardknott honister" diff --git a/meta-quanta/meta-gsj/conf/local.conf.sample b/meta-quanta/meta-gsj/conf/local.conf.sample index eacba35bc..feaa9cd06 100644 --- a/meta-quanta/meta-gsj/conf/local.conf.sample +++ b/meta-quanta/meta-gsj/conf/local.conf.sample @@ -1,11 +1,11 @@ MACHINE ??= "gsj" DISTRO ?= "openbmc-gsj" PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " *" -EXTRA_IMAGE_FEATURES = "debug-tweaks" -USER_CLASSES ?= "buildstats image-prelink" +SANITY_TESTED_DISTROS:append ?= " *" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" +USER_CLASSES ?= "buildstats" PATCHRESOLVE = "noop" -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -14,5 +14,5 @@ BB_DISKMON_DIRS = "\ ABORT,${DL_DIR},100M,1K \ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" -CONF_VERSION = "1" +CONF_VERSION = "2" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index b0d508e44..c5089e804 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -20,7 +20,37 @@ OBMC_MACHINE_FEATURES += "\ obmc-bmc-state-mgmt \ " # Remove unneeded binaries from image -IMAGE_FEATURES_remove = "obmc-debug-collector" +IMAGE_FEATURES:remove = "obmc-bmc-state-mgmt" +IMAGE_FEATURES:remove = "obmc-bmcweb" +IMAGE_FEATURES:remove = "obmc-chassis-state-mgmt" +IMAGE_FEATURES:remove = "obmc-chassis-mgmt" +IMAGE_FEATURES:remove = "obmc-console" +IMAGE_FEATURES:remove = "obmc-dbus-monitor" +IMAGE_FEATURES:remove = "obmc-devtools" +IMAGE_FEATURES:remove = "obmc-fan-control" +IMAGE_FEATURES:remove = "obmc-fan-mgmt" +IMAGE_FEATURES:remove = "obmc-flash-mgmt" +IMAGE_FEATURES:remove = "obmc-fru-ipmi" +IMAGE_FEATURES:remove = "obmc-health-monitor" +IMAGE_FEATURES:remove = "obmc-host-ctl" +IMAGE_FEATURES:remove = "obmc-host-ipmi" +IMAGE_FEATURES:remove = "obmc-host-state-mgmt" +IMAGE_FEATURES:remove = "obmc-ikvm" +IMAGE_FEATURES:remove = "obmc-inventory" +IMAGE_FEATURES:remove = "obmc-leds" +IMAGE_FEATURES:remove = "obmc-logging-mgmt" +IMAGE_FEATURES:remove = "obmc-remote-logging-mgmt" +IMAGE_FEATURES:remove = "obmc-rng" +IMAGE_FEATURES:remove = "obmc-sensors" +IMAGE_FEATURES:remove = "obmc-settings-mgmt" +IMAGE_FEATURES:remove = "obmc-software" +IMAGE_FEATURES:remove = "obmc-system-mgmt" +IMAGE_FEATURES:remove = "obmc-user-mgmt" +IMAGE_FEATURES:remove = "obmc-user-mgmt-ldap" +IMAGE_FEATURES:remove = "obmc-debug-collector" +IMAGE_FEATURES:remove = "obmc-network-mgmt" +IMAGE_FEATURES:remove = "obmc-telemetry" +OBMC_IMAGE_BASE_INSTALL:remove = "packagegroup-obmc-apps-extras" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gsj-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gsj-apps" diff --git a/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend b/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend index c5aea4089..4ab1be303 100644 --- a/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:" -SRC_URI_append_gsj = " file://fw_env.config" +SRC_URI:append:gsj = " file://fw_env.config" -do_install_append_gsj () { +do_install:append:gsj () { install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config } diff --git a/meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend b/meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend index eff0845ac..c59d0d554 100644 --- a/meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend @@ -1,8 +1,8 @@ -SYSTEMD_SERVICE_${PN}_remove_gsj = " \ +SYSTEMD_SERVICE:${PN}:remove:gsj = " \ gbmc-host-poweroff.target \ gbmc-psu-hardreset.target \ " -do_install_append_gsj() { +do_install:append:gsj() { rm -r ${D}/lib } diff --git a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb index 24ca38d8f..17f1fc826 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb @@ -7,14 +7,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -FILESEXTRAPATHS_append_gsj := "${THISDIR}/files:" -SRC_URI_append_gsj = " file://detect-fan-fail.sh \ +FILESEXTRAPATHS:append:gsj := "${THISDIR}/files:" +SRC_URI:append:gsj = " file://detect-fan-fail.sh \ file://detect-fan-fail.service \ " -do_install_append_gsj() { +do_install:append:gsj() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/detect-fan-fail.sh ${D}${bindir}/ @@ -23,4 +23,4 @@ do_install_append_gsj() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "detect-fan-fail.service" +SYSTEMD_SERVICE:${PN} = "detect-fan-fail.service" 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 index f9d9a9e47..d88b9a2f1 100644 --- 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 @@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_append = " file://gsj-hotswap-change-setting.sh \ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append = " file://gsj-hotswap-change-setting.sh \ file://gsj-hotswap-change-setting.service \ " @@ -23,4 +23,4 @@ do_install() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "gsj-hotswap-change-setting.service" +SYSTEMD_SERVICE:${PN} = "gsj-hotswap-change-setting.service" diff --git a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb index c1a7c1c10..1d416c4b3 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb @@ -14,17 +14,17 @@ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" -RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" -SUMMARY_${PN}-chassis = "GSJ Chassis" -RDEPENDS_${PN}-chassis = "" +SUMMARY:${PN}-chassis = "GSJ Chassis" +RDEPENDS:${PN}-chassis = "" -SUMMARY_${PN}-fans = "GSJ Fans" -RDEPENDS_${PN}-fans = "" +SUMMARY:${PN}-fans = "GSJ Fans" +RDEPENDS:${PN}-fans = "" -SUMMARY_${PN}-flash = "GSJ Flash" -RDEPENDS_${PN}-flash = " \ +SUMMARY:${PN}-flash = "GSJ Flash" +RDEPENDS:${PN}-flash = " \ phosphor-ipmi-flash \ " diff --git a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb index 887b50305..a5f5084f3 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb @@ -4,13 +4,13 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -FILESEXTRAPATHS_append := "${THISDIR}/files:" +FILESEXTRAPATHS:append := "${THISDIR}/files:" inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" SRC_URI += "file://init_once.sh \ file://nvme_powermanager.sh \ @@ -33,4 +33,4 @@ do_install () { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "nvme_gpio.service nvme_powermanager.service" +SYSTEMD_SERVICE:${PN} = "nvme_gpio.service nvme_powermanager.service" diff --git a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb index ad46c0b32..63e6d5d13 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files:" +FILESEXTRAPATHS:append := "${THISDIR}/files:" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" DEPENDS += "systemd" -RDEPENDS_${PN} += "libsystemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "libsystemd" +RDEPENDS:${PN} += "bash" SRC_URI += "file://usb_network.sh \ file://usb_network.service \ @@ -23,7 +23,7 @@ do_install() { NATIVE_SYSTEMD_SUPPORT = "1" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "usb_network.service" -FILES_${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network" +SYSTEMD_SERVICE:${PN} = "usb_network.service" +FILES:${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network" inherit allarch systemd
\ No newline at end of file diff --git a/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend index a0f6c7361..74da3217f 100644 --- a/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/linux-nuvoton:" -SRC_URI_append_gsj = " file://gsj.cfg" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/linux-nuvoton:" +SRC_URI:append:gsj = " file://gsj.cfg" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index 13d037e41..1160fcfc6 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,25 +1,25 @@ -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" -SRC_URI_append_gsj = " file://config-8ssd.json" -SRC_URI_append_gsj = " file://config-2ssd.json" -SRC_URI_append_gsj = " file://fan-control.sh" -SRC_URI_append_gsj = " file://fan-default-speed.sh" -SRC_URI_append_gsj = " file://phosphor-pid-control.service" -SRC_URI_append_gsj = " file://fan-reboot-control.service" -SRC_URI_append_gsj = " file://fan-boot-control.service" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:" +SRC_URI:append:gsj = " file://config-8ssd.json" +SRC_URI:append:gsj = " file://config-2ssd.json" +SRC_URI:append:gsj = " file://fan-control.sh" +SRC_URI:append:gsj = " file://fan-default-speed.sh" +SRC_URI:append:gsj = " file://phosphor-pid-control.service" +SRC_URI:append:gsj = " file://fan-reboot-control.service" +SRC_URI:append:gsj = " file://fan-boot-control.service" -FILES_${PN}_append_gsj = " ${datadir}/swampd/config-8ssd.json" -FILES_${PN}_append_gsj = " ${datadir}/swampd/config-2ssd.json" -FILES_${PN}_append_gsj = " ${bindir}/fan-control.sh" -FILES_${PN}_append_gsj = " ${bindir}/fan-default-speed.sh" +FILES:${PN}:append:gsj = " ${datadir}/swampd/config-8ssd.json" +FILES:${PN}:append:gsj = " ${datadir}/swampd/config-2ssd.json" +FILES:${PN}:append:gsj = " ${bindir}/fan-control.sh" +FILES:${PN}:append:gsj = " ${bindir}/fan-default-speed.sh" inherit systemd -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -SYSTEMD_SERVICE_${PN}_append_gsj = " phosphor-pid-control.service" -SYSTEMD_SERVICE_${PN}_append_gsj = " fan-reboot-control.service" -SYSTEMD_SERVICE_${PN}_append_gsj = " fan-boot-control.service" +SYSTEMD_SERVICE:${PN}:append:gsj = " phosphor-pid-control.service" +SYSTEMD_SERVICE:${PN}:append:gsj = " fan-reboot-control.service" +SYSTEMD_SERVICE:${PN}:append:gsj = " fan-boot-control.service" -do_install_append_gsj() { +do_install:append:gsj() { install -d ${D}/${bindir} install -m 0755 ${WORKDIR}/fan-control.sh ${D}/${bindir} install -m 0755 ${WORKDIR}/fan-default-speed.sh ${D}/${bindir} 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 7d217b7d9..655929695 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 @@ -1,8 +1,14 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " quanta-nvme-powerctrl" -OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-nvme" -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" -IMAGE_FEATURES_remove_gsj = "obmc-user-mgmt-ldap" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " quanta-nvme-powerctrl" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-nvme" +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" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-ipmi-host" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-hwmon" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-inventory-manager" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " phosphor-host-postd" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-leds-manager}" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-leds-sysfs}" +OBMC_IMAGE_EXTRA_INSTALL:append:gsj = " ${VIRTUAL-RUNTIME_obmc-led-monitor}" 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 index 5723801b2..45c2ab20b 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend index a51d07ef8..10b1d2901 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_gsj = " net-bridge reboot-update static-bmc" +PACKAGECONFIG:append:gsj = " net-bridge reboot-update static-bmc" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 32989f2bb..d8e2cb14e 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,6 @@ inherit obmc-phosphor-systemd -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:" EEPROM_NAMES = "hsbp bmc" @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}_append_gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index f695261ba..70b2b63f2 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # Replace the default whitelist for GSJ board. -SRC_URI_append_gsj = " file://gsj-ipmid-whitelist.conf" +SRC_URI:append:gsj = " file://gsj-ipmid-whitelist.conf" -WHITELIST_CONF_remove_gsj = " ${S}/host-ipmid-whitelist.conf" -WHITELIST_CONF_append_gsj = " ${WORKDIR}/gsj-ipmid-whitelist.conf" +WHITELIST_CONF:remove:gsj = " ${S}/host-ipmid-whitelist.conf" +WHITELIST_CONF:append:gsj = " ${WORKDIR}/gsj-ipmid-whitelist.conf" 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 index ac2c0ba5e..aee769c32 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -1,3 +1,3 @@ # In gsj, usb0 is the interface. -RMCPP_IFACE_gsj = "usb0" +RMCPP_IFACE:gsj = "usb0" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index e2d753040..a27865239 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" NAMES = " \ @@ -15,9 +15,9 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS += "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Fan sensors FITEMS = "pwm-fan-controller@103000.conf" FENVS = "obmc/hwmon/ahb/apb/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:gsj = " ${@compose_list(d, 'FENVS', 'FITEMS')}" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 53db04d03..bbc797a45 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${BPN}:" -SRC_URI_append_gsj = " file://time-default.override.yml" -SRC_URI_append_gsj = " file://restrictionmode-default-whitelist.override.yml" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${BPN}:" +SRC_URI:append:gsj = " file://time-default.override.yml" +SRC_URI:append:gsj = " file://restrictionmode-default-whitelist.override.yml" diff --git a/meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend b/meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend index a90150b3d..3b1ee1744 100644 --- a/meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" -SRC_URI_append_gsj = " file://config.txt" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:" +SRC_URI:append:gsj = " file://config.txt" -FILES_${PN}_append_gsj = " ${datadir}/mac-address/config.txt" +FILES:${PN}:append:gsj = " ${datadir}/mac-address/config.txt" -do_install_append_gsj() { +do_install:append:gsj() { install -d ${D}${datadir}/mac-address install -m 0644 -D ${WORKDIR}/config.txt \ ${D}${datadir}/mac-address/config.txt diff --git a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf index 0c2366e53..e78bf9576 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/layer.conf +++ b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "olympus-nuvoton-layer" BBFILE_PATTERN_olympus-nuvoton-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_olympus-nuvoton-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_olympus-nuvoton-layer = "hardknott honister" diff --git a/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample b/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample index 0b07f63dd..f77eea42b 100644 --- a/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample +++ b/meta-quanta/meta-olympus-nuvoton/conf/local.conf.sample @@ -1,11 +1,11 @@ MACHINE ??= "olympus-nuvoton" DISTRO ?= "openbmc-phosphor" PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " *" -EXTRA_IMAGE_FEATURES = "debug-tweaks" -USER_CLASSES ?= "buildstats image-prelink" +SANITY_TESTED_DISTROS:append ?= " *" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" +USER_CLASSES ?= "buildstats" PATCHRESOLVE = "noop" -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -14,4 +14,4 @@ BB_DISKMON_DIRS = "\ ABORT,${DL_DIR},100M,1K \ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" -CONF_VERSION = "1" +CONF_VERSION = "2" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend index 91518decf..bd324bad1 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://fw_env.config" -do_install_append () { +do_install:append () { install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config } diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-core/busybox/busybox_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-core/busybox/busybox_%.bbappend index 1e1da25f1..c214587f1 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-core/busybox/busybox_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-core/busybox/busybox_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:" -SRC_URI_append_olympus-nuvoton = " file://busybox.cfg" +FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:" +SRC_URI:append:olympus-nuvoton = " file://busybox.cfg" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend index 0ebbb1aae..d7e125bd9 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-kernel/linux/linux-nuvoton_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-nuvoton:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-nuvoton:" SRC_URI += "file://olympus-nuvoton.cfg" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/hotswap-power-cycle/adm1278-hotswap-power-cycle.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/hotswap-power-cycle/adm1278-hotswap-power-cycle.bb index 1a20beec7..6f5acd4c7 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/hotswap-power-cycle/adm1278-hotswap-power-cycle.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/hotswap-power-cycle/adm1278-hotswap-power-cycle.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" SRC_URI = " file://hotswap-power-cycle.service" @@ -17,5 +17,5 @@ do_install() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "hotswap-power-cycle.service" +SYSTEMD_SERVICE:${PN} = "hotswap-power-cycle.service" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/mac-address_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/mac-address_%.bbappend index a9f0c407a..55531d54d 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/mac-address_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/mac-address_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/files:" -SRC_URI_append_olympus-nuvoton = " file://config.txt" +SRC_URI:append:olympus-nuvoton = " file://config.txt" -FILES_${PN}_append_olympus-nuvoton = " ${datadir}/mac-address/config.txt" +FILES:${PN}:append:olympus-nuvoton = " ${datadir}/mac-address/config.txt" -do_install_append_olympus-nuvoton() { +do_install:append:olympus-nuvoton() { install -d ${D}${datadir}/mac-address install -m 0644 -D ${WORKDIR}/config.txt \ ${D}${datadir}/mac-address/config.txt diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/olympus-nuvoton-iptable-save.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/olympus-nuvoton-iptable-save.bb index 2416ef932..b8d7b78f1 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/olympus-nuvoton-iptable-save.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/olympus-nuvoton-iptable-save.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch systemd SRC_URI = "file://phosphor-save-iptable-rules.service" -SYSTEMD_SERVICE_${PN} = "phosphor-save-iptable-rules.service" +SYSTEMD_SERVICE:${PN} = "phosphor-save-iptable-rules.service" S = "${WORKDIR}" do_install() { diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb index 6d9c86a76..d462d6905 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb @@ -16,18 +16,18 @@ PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" -SUMMARY_${PN}-fans = "OLYMPUS NUVOTON Fans" -RDEPENDS_${PN}-fans = " \ +SUMMARY:${PN}-fans = "OLYMPUS NUVOTON Fans" +RDEPENDS:${PN}-fans = " \ phosphor-pid-control \ " -SUMMARY_${PN}-system = "OLYMPUS NUVOTON System" -RDEPENDS_${PN}-system = " \ +SUMMARY:${PN}-system = "OLYMPUS NUVOTON System" +RDEPENDS:${PN}-system = " \ phosphor-webui \ obmc-ikvm \ obmc-console \ diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/power/first-boot-set-psu.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/power/first-boot-set-psu.bb index ed9c13687..de540db74 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/power/first-boot-set-psu.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/power/first-boot-set-psu.bb @@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch systemd -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils}" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils}" +RDEPENDS:${PN} += "bash" -SYSTEMD_SERVICE_${PN} = "first-boot-set-psu@.service" -SYSTEMD_SERVICE_${PN} += "first-boot-set-psu@0-2-0x58.service" +SYSTEMD_SERVICE:${PN} = "first-boot-set-psu@.service" +SYSTEMD_SERVICE:${PN} += "first-boot-set-psu@0-2-0x58.service" SRC_URI = "file://${BPN}.sh file://${BPN}@.service" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config.bb b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config.bb index c8b24cb61..34fa0194b 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/configuration/olympus-nuvoton-yaml-config.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch -SRC_URI_olympus-nuvoton = " \ +SRC_URI:olympus-nuvoton = " \ file://olympus-nuvoton-ipmi-fru.yaml \ file://olympus-nuvoton-ipmi-fru-properties.yaml \ file://olympus-nuvoton-ipmi-sensors.yaml \ @@ -13,7 +13,7 @@ SRC_URI_olympus-nuvoton = " \ S = "${WORKDIR}" -do_install_olympus-nuvoton() { +do_install:olympus-nuvoton() { install -m 0644 -D olympus-nuvoton-ipmi-fru-properties.yaml \ ${D}${datadir}/${BPN}/ipmi-extra-properties.yaml install -m 0644 -D olympus-nuvoton-ipmi-fru.yaml \ @@ -22,10 +22,10 @@ do_install_olympus-nuvoton() { ${D}${datadir}/${BPN}/ipmi-sensors.yaml } -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${datadir}/${BPN}/ipmi-extra-properties.yaml \ ${datadir}/${BPN}/ipmi-fru-read.yaml \ ${datadir}/${BPN}/ipmi-sensors.yaml \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend index fe0e34672..e38befbb6 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,14 +1,14 @@ -FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:" -SRC_URI_append_olympus-nuvoton = " file://80-olympus-nuvoton-sol.rules" +SRC_URI:append:olympus-nuvoton = " file://80-olympus-nuvoton-sol.rules" -do_install_append_olympus-nuvoton() { +do_install:append:olympus-nuvoton() { install -m 0755 -d ${D}${sysconfdir}/${BPN} rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf install -m 0644 ${WORKDIR}/${BPN}.conf ${D}${sysconfdir}/ ln -sr ${D}${sysconfdir}/${BPN}.conf ${D}${sysconfdir}/${BPN}/server.ttyS2.conf - install -d ${D}/lib/udev/rules.d - rm -f ${D}/lib/udev/rules.d/80-obmc-console-uart.rules - install -m 0644 ${WORKDIR}/80-olympus-nuvoton-sol.rules ${D}/lib/udev/rules.d + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + rm -f ${D}/${nonarch_base_libdir}/udev/rules.d/80-obmc-console-uart.rules + install -m 0644 ${WORKDIR}/80-olympus-nuvoton-sol.rules ${D}/${nonarch_base_libdir}/udev/rules.d } diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend index a61181dcb..749a1f23d 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/fans/phosphor-pid-control_%.bbappend @@ -1,19 +1,19 @@ -FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:" -SRC_URI_append_olympus-nuvoton = " file://config-olympus-nuvoton.json" -SRC_URI_append_olympus-nuvoton = " file://fan-full-speed.sh" -SRC_URI_append_olympus-nuvoton = " file://phosphor-pid-control.service" -SRC_URI_append_olympus-nuvoton = " file://fan-reboot-control.service" +SRC_URI:append:olympus-nuvoton = " file://config-olympus-nuvoton.json" +SRC_URI:append:olympus-nuvoton = " file://fan-full-speed.sh" +SRC_URI:append:olympus-nuvoton = " file://phosphor-pid-control.service" +SRC_URI:append:olympus-nuvoton = " file://fan-reboot-control.service" -FILES_${PN}_append_olympus-nuvoton = " ${bindir}/fan-full-speed.sh" -FILES_${PN}_append_olympus-nuvoton = " ${datadir}/swampd/config.json" +FILES:${PN}:append:olympus-nuvoton = " ${bindir}/fan-full-speed.sh" +FILES:${PN}:append:olympus-nuvoton = " ${datadir}/swampd/config.json" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -SYSTEMD_SERVICE_${PN}_append_olympus-nuvoton = " phosphor-pid-control.service" -SYSTEMD_SERVICE_${PN}_append_olympus-nuvoton = " fan-reboot-control.service" +SYSTEMD_SERVICE:${PN}:append:olympus-nuvoton = " phosphor-pid-control.service" +SYSTEMD_SERVICE:${PN}:append:olympus-nuvoton = " fan-reboot-control.service" -do_install_append_olympus-nuvoton() { +do_install:append:olympus-nuvoton() { install -d ${D}/${bindir} install -m 0755 ${WORKDIR}/fan-full-speed.sh ${D}/${bindir} diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup.bb b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup.bb index 5d52b9840..b841dc12f 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/olympus-nuvoton-inventory-cleanup.bb @@ -8,10 +8,10 @@ inherit phosphor-inventory-manager S = "${WORKDIR}" -SRC_URI_olympus-nuvoton = "file://inventory-cleanup.yaml" +SRC_URI:olympus-nuvoton = "file://inventory-cleanup.yaml" -do_install_olympus-nuvoton() { +do_install:olympus-nuvoton() { install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml } -FILES_${PN}_olympus-nuvoton += "${base_datadir}/events.d/inventory-cleanup.yaml" +FILES:${PN}:olympus-nuvoton += "${base_datadir}/events.d/inventory-cleanup.yaml" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 8ff6178a3..8c19d597a 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:" -PACKAGECONFIG_append_olympus-nuvoton = " associations" -SRC_URI_append_olympus-nuvoton = " file://associations.json" +FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:" +PACKAGECONFIG:append:olympus-nuvoton = " associations" +SRC_URI:append:olympus-nuvoton = " file://associations.json" -DEPENDS_append_olympus-nuvoton = " olympus-nuvoton-inventory-cleanup" +DEPENDS:append:olympus-nuvoton = " olympus-nuvoton-inventory-cleanup" -do_install_append_olympus-nuvoton() { +do_install:append:olympus-nuvoton() { install -d ${D}${base_datadir} install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json } diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index deec87d31..04f25c1b0 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,10 +1,10 @@ inherit obmc-phosphor-systemd -FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:" -DEPENDS_append_olympus-nuvoton = " olympus-nuvoton-yaml-config" +DEPENDS:append:olympus-nuvoton = " olympus-nuvoton-yaml-config" -EXTRA_OECONF_olympus-nuvoton = " \ +EXTRA_OECONF:olympus-nuvoton = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-fru-read.yaml \ PROP_YAML=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-extra-properties.yaml \ " @@ -17,11 +17,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_olympus-nuvoton := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "${SYSTEMD_DEFAULT_TARGET}" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}_append_olympus-nuvoton := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:olympus-nuvoton := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 7746e902f..929a61cc0 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,6 @@ -DEPENDS_append_olympus-nuvoton = " olympus-nuvoton-yaml-config" +DEPENDS:append:olympus-nuvoton = " olympus-nuvoton-yaml-config" -EXTRA_OECONF_olympus-nuvoton = " \ +EXTRA_OECONF:olympus-nuvoton = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend index 6feb2be84..24cc76d03 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:" -SRC_URI_append_olympus-nuvoton = " file://ipmb-olympus-channels.json" -FILES_${PN}_append_olympus-nuvoton = " ${datadir}/ipmbbridge/ipmb-channels.json" +SRC_URI:append:olympus-nuvoton = " file://ipmb-olympus-channels.json" +FILES:${PN}:append:olympus-nuvoton = " ${datadir}/ipmbbridge/ipmb-channels.json" -do_install_append_olympus-nuvoton() { +do_install:append:olympus-nuvoton() { install -d ${D}${datadir}/ipmbbridge install -m 0644 -D ${WORKDIR}/ipmb-olympus-channels.json \ ${D}${datadir}/ipmbbridge/ipmb-channels.json diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend index 2db810195..c40d537d0 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:" -SRC_URI_append_olympus-nuvoton = " file://99-ipmi-kcs.rules.rules" +SRC_URI:append:olympus-nuvoton = " file://99-ipmi-kcs.rules.rules" -KCS_DEVICE_olympus-nuvoton = "ipmi_kcs1" +KCS_DEVICE:olympus-nuvoton = "ipmi_kcs1" -do_install_append_olympus-nuvoton() { - install -d ${D}/lib/udev/rules.d - install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules.rules ${D}/lib/udev/rules.d +do_install:append:olympus-nuvoton() { + install -d ${D}/${nonarch_base_libdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules.rules ${D}/${nonarch_base_libdir}/udev/rules.d } diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 9b2fe3aa5..54b7ac14f 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:" ITEMS = " \ @@ -24,7 +24,7 @@ ITEMS = " \ " ENVS = "obmc/hwmon/ahb/apb/{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_olympus-nuvoton = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # PECI PECINAMES = " \ @@ -35,6 +35,6 @@ PECINAMES = " \ PECIITEMSFMT = "devices/platform/ahb/ahb--apb/f0100000.peci-bus/{0}.conf" PECIITEMS = "${@compose_list(d, 'PECIITEMSFMT', 'PECINAMES')}" PECIENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:olympus-nuvoton = " ${@compose_list(d, 'PECIENVS', 'PECIITEMS')}" -EXTRA_OEMESON_append_olympus-nuvoton = " -Dupdate-functional-on-fail=true" +EXTRA_OEMESON:append:olympus-nuvoton = " -Dupdate-functional-on-fail=true" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index f89ecad46..cf2c82107 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:" -SRC_URI_append_olympus-nuvoton = " file://sol-default.override.yml" +SRC_URI:append:olympus-nuvoton = " file://sol-default.override.yml" diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf index 9e5616029..991945384 100644 --- a/meta-quanta/meta-q71l/conf/layer.conf +++ b/meta-quanta/meta-q71l/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "q71l" BBFILE_PATTERN_q71l = "" -LAYERSERIES_COMPAT_q71l = "gatesgarth hardknott" +LAYERSERIES_COMPAT_q71l = "hardknott honister" diff --git a/meta-quanta/meta-q71l/conf/local.conf.sample b/meta-quanta/meta-q71l/conf/local.conf.sample index 5a686f4eb..9fadf8298 100644 --- a/meta-quanta/meta-q71l/conf/local.conf.sample +++ b/meta-quanta/meta-q71l/conf/local.conf.sample @@ -1,11 +1,11 @@ MACHINE ??= "quanta-q71l" DISTRO ?= "openbmc-phosphor" PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" -EXTRA_IMAGE_FEATURES = "debug-tweaks" -USER_CLASSES ?= "buildstats image-prelink" +SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" +USER_CLASSES ?= "buildstats" PATCHRESOLVE = "noop" -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -14,7 +14,7 @@ BB_DISKMON_DIRS = "\ ABORT,${DL_DIR},100M,1K \ ABORT,${SSTATE_DIR},100M,1K \ ABORT,/tmp,10M,1K" -CONF_VERSION = "1" +CONF_VERSION = "2" INHERIT += "extrausers" EXTRA_USERS_PARAMS = " \ usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ diff --git a/meta-quanta/meta-q71l/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/images/obmc-phosphor-image.bbappend index d77d9a024..f04d81484 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,5 +1,5 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_quanta-q71l = " quanta-powerctrl" +OBMC_IMAGE_EXTRA_INSTALL:append:quanta-q71l = " quanta-powerctrl" # dts for q71l includes snooping, so let's leverage that. -OBMC_IMAGE_EXTRA_INSTALL_append_quanta-q71l = " phosphor-host-postd" +OBMC_IMAGE_EXTRA_INSTALL:append:quanta-q71l = " phosphor-host-postd" diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 117523265..48bd7d2a1 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,6 @@ inherit obmc-phosphor-systemd -FILESEXTRAPATHS_prepend_quanta-q71l := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:quanta-q71l := "${THISDIR}/${PN}:" EEPROM_NAMES = "motherboard pdb fp bmc" @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_quanta-q71l := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}_append_quanta-q71l := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK:${PN}:append:quanta-q71l := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb index f6db0c914..a0095264e 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb +++ b/meta-quanta/meta-q71l/recipes-phosphor/ipmi/q71l-ipmi-fru-merge-config-native.bb @@ -8,7 +8,7 @@ PROVIDES += "virtual/phosphor-ipmi-fru-merge-config" # Put the fru_config in the right place with the right name. # Pull the IPMI FRU YAML config to use it in the IPMI HOST YAML. -do_install_append() { +do_install:append() { IPMI_FRU_SRC=${datadir}/phosphor-ipmi-fru/config IPMI_HOST_DEST=${D}${datadir}/phosphor-ipmi-host/config install -d ${IPMI_HOST_DEST} diff --git a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb index 37b27ac69..a5403556d 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb +++ b/meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/quanta-powerctrl.bb @@ -1,11 +1,11 @@ -FILESEXTRAPATHS_append := "${THISDIR}/files:" +FILESEXTRAPATHS:append := "${THISDIR}/files:" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit systemd inherit obmc-phosphor-systemd -S = "${WORKDIR}/" +S = "${WORKDIR}" SRC_URI = "file://init_once.sh \ file://poweroff.sh \ @@ -15,10 +15,10 @@ SRC_URI = "file://init_once.sh \ file://host-poweron.service" DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "host-gpio.service host-poweron.service host-poweroff.service" +SYSTEMD_SERVICE:${PN} = "host-gpio.service host-poweron.service host-poweroff.service" do_install() { install -d ${D}/${bindir} diff --git a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 89a0b7442..16cc2722a 100644 --- a/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-q71l/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,6 +1,6 @@ inherit obmc-phosphor-utils -FILESEXTRAPATHS_prepend_quanta-q71l := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:quanta-q71l := "${THISDIR}/${PN}:" # More conf files can be added as sensors are added. @@ -21,6 +21,6 @@ Q71L_PSUBASE = "ahb/apb/bus@1e78a000/i2c-bus@300/i2c-switch@70/i2c@{0}.conf" Q71L_ITEMS += "${@compose_list(d, 'Q71L_PSUBASE', 'Q71L_PSUS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_quanta-q71l := " ${@compose_list(d, 'ENVS', 'Q71L_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:quanta-q71l := " ${@compose_list(d, 'ENVS', 'Q71L_ITEMS')}" -EXTRA_OEMESON_append_quanta-q71l = " -Dnegative-errno-on-fail=true" +EXTRA_OEMESON:append:quanta-q71l = " -Dnegative-errno-on-fail=true" |