diff options
Diffstat (limited to 'meta-yadro/meta-nicole/recipes-phosphor')
22 files changed, 43 insertions, 43 deletions
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb b/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb index 1865e61e8..3e376e12b 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "i2c-tools" +RDEPENDS:${PN} += "i2c-tools" S = "${WORKDIR}" SRC_URI += "file://avsbus-control.sh" @@ -21,5 +21,5 @@ INSTFMT= "avsbus-control@{0}.service" TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${TMPL}" +SYSTEMD_SERVICE:${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend index 6708a6a9f..6617917ba 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend @@ -1,4 +1,4 @@ -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ obmc-yadro-backup \ obmc-yadro-lsinventory \ op-proc-control \ diff --git a/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb b/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb index 26cad61da..05feba369 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config.bb @@ -25,11 +25,11 @@ do_install() { ${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-inventory-sensors.yaml \ ${datadir}/${BPN}/ipmi-sensors.yaml \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console_%.bbappend index 72d991c7e..4fc41d058 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/flash/openpower-software-manager_%.bbappend index a2df9cf70..356925a55 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/flash/openpower-software-manager_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/flash/openpower-software-manager_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " verify_pnor_signature" +PACKAGECONFIG:append = " verify_pnor_signature" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index c92b1a89c..0d9c1a269 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " verify_signature" +PACKAGECONFIG:append = " verify_signature" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/host/op-proc-control_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/host/op-proc-control_%.bbappend index ed1cec767..e0ecbab0d 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/host/op-proc-control_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/host/op-proc-control_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-Stop-and-send-SRESET-for-one-thread-only.patch" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend index d26a4d696..32077037e 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}_append = " avsbus-control" +RDEPENDS:${PN}:append = " avsbus-control" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend index 75dc1399a..a18048d7f 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,8 +1,8 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " \ +OBMC_IMAGE_EXTRA_INSTALL:append = " \ admin-account \ first-boot-set-hostname \ mboxd \ obmc-yadro-cli \ openpower-fru-vpd \ " -IMAGE_FEATURES_remove_nicole = "obmc-user-mgmt-ldap" +IMAGE_FEATURES:remove:nicole = "obmc-user-mgmt-ldap" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/interfaces/bmcweb_%.bbappend index 0f663ddc0..d08408063 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,3 +1,3 @@ -EXTRA_OECMAKE_append = " \ +EXTRA_OECMAKE:append = " \ -DBMCWEB_ENABLE_MUTUAL_TLS_AUTHENTICATION=OFF \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend index 775119b54..91ef9ac79 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend @@ -1,4 +1,4 @@ -DEPENDS_append = " nicole-yaml-config" +DEPENDS:append = " nicole-yaml-config" EXTRA_OECONF = " \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-inventory-sensors.yaml \ diff --git a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 466f42f0b..d2ea14c79 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1,21 +1,21 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" inherit systemd -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils}" -SYSTEMD_SERVICE_${PN} = "${BPN}.service" -SRC_URI_append = " \ +RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils}" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" +SRC_URI:append = " \ file://${BPN}-set-device-id.sh \ file://${BPN}.service \ " S = "${WORKDIR}" -do_install_append() { +do_install:append() { install -d ${D}${bindir} ${D}${systemd_system_unitdir} install ${BPN}-set-device-id.sh ${D}${bindir}/ install -m 0644 ${BPN}.service ${D}${systemd_system_unitdir}/ } -FILES_${PN}_append = " \ +FILES:${PN}:append = " \ ${bindir}/${BPN}-set-device-id.sh \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 16d815ade..18f32c0cc 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,4 +1,4 @@ -DEPENDS_append = " nicole-yaml-config" +DEPENDS:append = " nicole-yaml-config" EXTRA_OECONF = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-fru-read.yaml \ diff --git a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 7983e94bb..aa0ae9942 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,4 +1,4 @@ -DEPENDS_append = " nicole-yaml-config" +DEPENDS:append = " nicole-yaml-config" EXTRA_OECONF = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-sensors.yaml \ diff --git a/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend index 5be003a75..ae025bbc6 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -PACKAGECONFIG_append = " sync-mac" -SRC_URI_append = " file://config.json " -FILES_${PN} += "${datadir}/network/*.json" +PACKAGECONFIG:append = " sync-mac" +SRC_URI:append = " file://config.json " +FILES:${PN} += "${datadir}/network/*.json" -do_install_append() { +do_install:append() { install -d ${D}${datadir}/network/ install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/ } diff --git a/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb b/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb index 31cd0450e..f5f78cdaa 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/occ/nicole-occ-control-config-native.bb @@ -8,7 +8,7 @@ inherit native PROVIDES += "virtual/openpower-occ-control-config-native" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://occ_sensor.yaml" S = "${WORKDIR}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 61bf12e06..455eb1e42 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,7 +1,7 @@ -RDEPENDS_${PN}-inventory_append = " openpower-occ-control" -RDEPENDS_${PN}-extras_append = " \ +RDEPENDS:${PN}-inventory:append = " openpower-occ-control" +RDEPENDS:${PN}-extras:append = " \ phosphor-hostlogger \ " -RDEPENDS_${PN}-software_append = " \ +RDEPENDS:${PN}-software:append = " \ obmc-yadro-fwupdate \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index e06afb48a..8988ff1af 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append = " -Dnegative-errno-on-fail=true" +EXTRA_OEMESON:append = " -Dnegative-errno-on-fail=true" ITEMS = "iio-hwmon-battery.conf" @@ -13,5 +13,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 848bf4e5b..8190ab430 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend_nicole := "${THISDIR}/${PN}:" -SRC_URI_append_nicole = " \ +FILESEXTRAPATHS:prepend:nicole := "${THISDIR}/${PN}:" +SRC_URI:append:nicole = " \ file://bootmailbox.override.yml \ file://time-sync-method.override.yml \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 72d991c7e..4fc41d058 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend index dcf8cac00..cdd6bf0e7 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" DEPS_CFG = "resetreason.conf" DEPS_TGT = "phosphor-discover-system-state@.service" -SYSTEMD_OVERRIDE_${PN}-discover_append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" +SYSTEMD_OVERRIDE_${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb b/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb index c6be7e067..dbdabb8c9 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb +++ b/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb @@ -23,14 +23,14 @@ GROUP_IPMI = "ipmi" ADMIN_LOGIN = "admin" ADMIN_PASSW = "\$1\$Fze0kFe8\$sylEANC01t.osF8OewyB/1" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--groups ${GROUP_ADMIN},${GROUP_IPMI} \ +USERADD_PARAM:${PN} = "--groups ${GROUP_ADMIN},${GROUP_IPMI} \ --password '${ADMIN_PASSW}' \ ${ADMIN_LOGIN}" # We don't have package body -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" # Workaround for meta-phosphor/classes/phosphor-rootfs-postcommands.bbclass. # The bb-script cannot add root to non-empty groups (invalid sed command). -GROUPMEMS_PARAM_${PN} = "-a root -g ${GROUP_ADMIN}; \ +GROUPMEMS_PARAM:${PN} = "-a root -g ${GROUP_ADMIN}; \ -a root -g ${GROUP_IPMI}" |