diff options
Diffstat (limited to 'meta-inspur')
46 files changed, 152 insertions, 105 deletions
diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf index 14a32e923..9e1f53fb1 100644 --- a/meta-inspur/conf/layer.conf +++ b/meta-inspur/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "inspur-layer" BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_inspur-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_inspur-layer = "hardknott honister" diff --git a/meta-inspur/meta-fp5280g2/conf/layer.conf b/meta-inspur/meta-fp5280g2/conf/layer.conf index 18e651877..f921ba6fe 100644 --- a/meta-inspur/meta-fp5280g2/conf/layer.conf +++ b/meta-inspur/meta-fp5280g2/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "fp5280g2-layer" BBFILE_PATTERN_fp5280g2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_fp5280g2-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_fp5280g2-layer = "hardknott honister" diff --git a/meta-inspur/meta-fp5280g2/conf/local.conf.sample b/meta-inspur/meta-fp5280g2/conf/local.conf.sample index 33fd6fd42..bb64c15eb 100644 --- a/meta-inspur/meta-fp5280g2/conf/local.conf.sample +++ b/meta-inspur/meta-fp5280g2/conf/local.conf.sample @@ -1,11 +1,11 @@ MACHINE ??= "fp5280g2" DISTRO ?= "openbmc-fp5280g2" PACKAGE_CLASSES ?= "package_rpm" -SANITY_TESTED_DISTROS_append ?= " *" -EXTRA_IMAGE_FEATURES = "debug-tweaks" +SANITY_TESTED_DISTROS:append ?= " *" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" USER_CLASSES ?= "buildstats image-prelink" 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-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed_%.bbappend index 4d2288fe4..500cfc0e7 100644 --- a/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_fp5280g2 = " file://fp5280g2.cfg" +SRC_URI:append:fp5280g2 = " file://fp5280g2.cfg" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend index 960a97844..0f93c1a8b 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/bmcweb/bmcweb_%.bbappend @@ -1,3 +1,3 @@ -EXTRA_OEMESON_append = " \ +EXTRA_OEMESON:append = " \ -Dinsecure-tftp-update=enabled \ " diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb index c10330b9b..1d4cfe187 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config.bb @@ -28,11 +28,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-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-sensors.yaml b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-sensors.yaml index 2612464c6..b1dd81383 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-sensors.yaml +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/configuration/fp5280g2-yaml-config/fp5280g2-ipmi-sensors.yaml @@ -970,6 +970,7 @@ entityID: 208 entityInstance: 1 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1001,6 +1002,7 @@ entityID: 208 entityInstance: 2 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1032,6 +1034,7 @@ entityID: 208 entityInstance: 3 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1063,6 +1066,7 @@ entityID: 208 entityInstance: 4 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1094,6 +1098,7 @@ entityID: 208 entityInstance: 5 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1125,6 +1130,7 @@ entityID: 208 entityInstance: 6 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1156,6 +1162,7 @@ entityID: 208 entityInstance: 7 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1187,6 +1194,7 @@ entityID: 208 entityInstance: 8 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1218,6 +1226,7 @@ entityID: 208 entityInstance: 9 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1249,6 +1258,7 @@ entityID: 208 entityInstance: 10 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1280,6 +1290,7 @@ entityID: 208 entityInstance: 11 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1311,6 +1322,7 @@ entityID: 208 entityInstance: 12 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1342,6 +1354,7 @@ entityID: 208 entityInstance: 13 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1373,6 +1386,7 @@ entityID: 208 entityInstance: 14 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1404,6 +1418,7 @@ entityID: 208 entityInstance: 15 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1435,6 +1450,7 @@ entityID: 208 entityInstance: 16 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1466,6 +1482,7 @@ entityID: 208 entityInstance: 17 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1497,6 +1514,7 @@ entityID: 208 entityInstance: 18 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1528,6 +1546,7 @@ entityID: 208 entityInstance: 19 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1559,6 +1578,7 @@ entityID: 208 entityInstance: 20 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1590,6 +1610,7 @@ entityID: 208 entityInstance: 21 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1621,6 +1642,7 @@ entityID: 208 entityInstance: 22 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1652,6 +1674,7 @@ entityID: 208 entityInstance: 23 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1683,6 +1706,7 @@ entityID: 208 entityInstance: 24 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1714,6 +1738,7 @@ entityID: 208 entityInstance: 25 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1745,6 +1770,7 @@ entityID: 208 entityInstance: 26 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1776,6 +1802,7 @@ entityID: 208 entityInstance: 27 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1807,6 +1834,7 @@ entityID: 208 entityInstance: 28 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1838,6 +1866,7 @@ entityID: 208 entityInstance: 29 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1869,6 +1898,7 @@ entityID: 208 entityInstance: 30 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1900,6 +1930,7 @@ entityID: 208 entityInstance: 31 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1931,6 +1962,7 @@ entityID: 208 entityInstance: 32 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1962,6 +1994,7 @@ entityID: 208 entityInstance: 33 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -1993,6 +2026,7 @@ entityID: 208 entityInstance: 34 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2024,6 +2058,7 @@ entityID: 208 entityInstance: 35 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2055,6 +2090,7 @@ entityID: 208 entityInstance: 36 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2086,6 +2122,7 @@ entityID: 208 entityInstance: 37 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2117,6 +2154,7 @@ entityID: 208 entityInstance: 38 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2148,6 +2186,7 @@ entityID: 208 entityInstance: 39 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2179,6 +2218,7 @@ entityID: 208 entityInstance: 40 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2210,6 +2250,7 @@ entityID: 208 entityInstance: 41 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2241,6 +2282,7 @@ entityID: 208 entityInstance: 42 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2272,6 +2314,7 @@ entityID: 208 entityInstance: 43 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2303,6 +2346,7 @@ entityID: 208 entityInstance: 44 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2334,6 +2378,7 @@ entityID: 208 entityInstance: 45 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2365,6 +2410,7 @@ entityID: 208 entityInstance: 46 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2396,6 +2442,7 @@ entityID: 208 entityInstance: 47 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: @@ -2427,6 +2474,7 @@ entityID: 208 entityInstance: 48 interfaces: + xyz.openbmc_project.Inventory.Item.CpuCore: xyz.openbmc_project.Inventory.Item: Present: Offsets: diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console_%.bbappend index 72d991c7e..4fc41d058 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy.bb index 5940009a3..01aee6adc 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/events-policy.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit phosphor-dbus-monitor -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" SRC_URI += "file://config.yaml" @@ -14,4 +14,4 @@ do_install() { install -D ${WORKDIR}/config.yaml ${D}${config_dir}/config.yaml } -FILES_${PN} += "${config_dir}/config.yaml" +FILES:${PN} += "${config_dir}/config.yaml" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend index 570cb6b82..779e364c5 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend @@ -1 +1 @@ -PHOSPHOR_DBUS_MONITOR_CONFIGS_append_fp5280g2 = " events-policy" +PHOSPHOR_DBUS_MONITOR_CONFIGS:append:fp5280g2 = " events-policy" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend index a5847a64f..f48eef4f2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend index a5847a64f..f48eef4f2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend index a5847a64f..f48eef4f2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend index 956e7bf25..a29da8b68 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend index a5847a64f..f48eef4f2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend index a5847a64f..f48eef4f2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend index 2e3dcadbb..79a13f695 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -1,21 +1,21 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # Package configuration FAN_PACKAGES += " \ phosphor-cooling-type \ " -PACKAGECONFIG_append_fp5280g2 = " cooling-type" +PACKAGECONFIG:append:fp5280g2 = " cooling-type" TMPL_COOLING = "phosphor-cooling-type@.service" INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" COOLING_TGT = "multi-user.target" FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" -FILES_phosphor-cooling-type = "${bindir}/phosphor-cooling-type" -SYSTEMD_SERVICE_phosphor-cooling-type += "${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +FILES:phosphor-cooling-type = "${bindir}/phosphor-cooling-type" +SYSTEMD_SERVICE:phosphor-cooling-type += "${TMPL_COOLING}" +SYSTEMD_LINK:phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/openpower-software-manager_%.bbappend index a6cbb74b0..c83a2e9be 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/openpower-software-manager_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/openpower-software-manager_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_fp5280g2 = " verify_pnor_signature" +PACKAGECONFIG:append:fp5280g2 = " verify_pnor_signature" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 77ec086f8..650787017 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_fp5280g2 = " verify_signature" +PACKAGECONFIG:append:fp5280g2 = " verify_signature" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 04d1c07cb..aa3b357a2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence_append_fp5280g2 = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_fp5280g2 = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:fp5280g2 = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/host/checkstop-monitor.bbappend index 27e7cf9cf..dc8ab8668 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/host/checkstop-monitor.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/host/checkstop-monitor.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${PN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend index 5248c34a6..61c1b4b54 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_fp5280g2 = " mboxd liberation-fonts uart-render-controller first-boot-set-mac" +OBMC_IMAGE_EXTRA_INSTALL:append:fp5280g2 = " mboxd liberation-fonts uart-render-controller first-boot-set-mac" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb index 11ff66261..145078f09 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager-chassis.bb @@ -15,4 +15,4 @@ do_install() { install -D chassis.yaml ${D}${base_datadir}/events.d/chassis.yaml } -FILES_${PN} += "${base_datadir}/events.d/chassis.yaml" +FILES:${PN} += "${base_datadir}/events.d/chassis.yaml" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index 325086aca..0620c2d8c 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGECONFIG_append = " associations" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +PACKAGECONFIG:append = " associations" SRC_URI += " file://associations.json" DEPENDS += " phosphor-inventory-manager-chassis" -do_install_append() { +do_install:append() { install -d ${D}${base_datadir} install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir}/associations.json } diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend index ecf943f4a..8daea02ae 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend @@ -1,5 +1,5 @@ -DEPENDS_append_fp5280g2= " fp5280g2-yaml-config" +DEPENDS:append:fp5280g2= " fp5280g2-yaml-config" -EXTRA_OECONF_fp5280g2= " \ +EXTRA_OECONF:fp5280g2= " \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-inventory-sensors.yaml \ " diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 0eaffff37..71826959e 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # Calculate the auxiliary firmware revision to be updated in the dev_id.json # file. It is calculated from the VERSION_ID field which currently has two diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 3f7032ccb..19bb4df9d 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,6 @@ -DEPENDS_append_fp5280g2= " fp5280g2-yaml-config" +DEPENDS:append:fp5280g2= " fp5280g2-yaml-config" -EXTRA_OECONF_fp5280g2= " \ +EXTRA_OECONF:fp5280g2= " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-fru-read.yaml \ PROP_YAML=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-extra-properties.yaml \ " diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 0694b7bf2..31f2a9936 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,6 @@ -DEPENDS_append_fp5280g2= " fp5280g2-yaml-config" +DEPENDS:append:fp5280g2= " fp5280g2-yaml-config" -EXTRA_OECONF_fp5280g2= " \ +EXTRA_OECONF:fp5280g2= " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-sensors.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-inventory-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-fru-read.yaml \ diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index ed9666776..f4021e929 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://led-group-config.json" -PACKAGECONFIG_append = " use-json use-lamp-test" +PACKAGECONFIG:append = " use-json use-lamp-test" -do_install_append() { +do_install:append() { install -m 0644 ${WORKDIR}/led-group-config.json ${D}${datadir}/phosphor-led-manager/ } diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp/mctp index 2d5f2465e..2d5f2465e 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp/mctp diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend new file mode 100644 index 000000000..5418cd76a --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://mctp" + +PACKAGECONFIG:append:fp5280g2 = " astlpc-raw-kcs" + +do_install:append() { + install -m 0644 ${WORKDIR}/mctp ${D}${sysconfdir}/default/mctp +} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/mboxd/mboxd_%.bbappend index b6a7b0ca3..fb5757882 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/mboxd/mboxd_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/mboxd/mboxd_%.bbappend @@ -1 +1 @@ -MBOXD_FLASH_SIZE_fp5280g2 = "64M" +MBOXD_FLASH_SIZE:fp5280g2 = "64M" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend deleted file mode 100644 index b27014bb1..000000000 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend +++ /dev/null @@ -1,8 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://mctp" - -do_install_append() { - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/mctp ${D}${sysconfdir}/default/mctp -} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend index e8ac0e29c..431768e1c 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -PACKAGECONFIG_append = " sync-mac" +PACKAGECONFIG:append = " sync-mac" SRC_URI += "file://config.json" -FILES_${PN} += "${datadir}/network" +FILES:${PN} += "${datadir}/network" -do_install_append() { +do_install:append() { install -d ${D}${datadir}/network install -m 0644 ${WORKDIR}/config.json ${D}${datadir}/network/ } diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 58b4d8ec9..dc8135f27 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -6,20 +6,21 @@ POWER_SERVICE_PACKAGES_FP5280G2 = " \ phosphor-power-psu-monitor \ " -RDEPENDS_${PN}-inventory_append_fp5280g2 = " \ +RDEPENDS:${PN}-inventory:append:fp5280g2 = " \ openpower-fru-vpd \ openpower-occ-control \ phosphor-cooling-type \ virtual/obmc-gpio-presence \ " -RDEPENDS_${PN}-extras_append_fp5280g2 = " \ +RDEPENDS:${PN}-extras:append:fp5280g2 = " \ ${POWER_SERVICE_PACKAGES_FP5280G2} \ phosphor-led-manager \ pldm \ - mctp \ + libmctp \ phosphor-fp5280g2-psu-update \ phosphor-psu-software-manager \ + biosconfig-manager \ webui-vue \ " diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb index 7c9e4f679..ce285f14f 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb @@ -16,5 +16,5 @@ do_install() { install -m 0755 ${S}/fp5280g2-psu-update ${D}${bindir}/fp5280g2-psu-update } -INSANE_SKIP_${PN} = "ldflags" +INSANE_SKIP:${PN} = "ldflags" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend index b9c22beb4..427018808 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend @@ -1,15 +1,15 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" -PACKAGECONFIG_append = " monitor" +PACKAGECONFIG:append = " monitor" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor_append_fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -do_install_append() { +do_install:append() { install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json } -FILES_${PN} += "${datadir}/phosphor-power/psu.json" +FILES:${PN} += "${datadir}/phosphor-power/psu.json" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend index 6d4804d12..1b6c91265 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index b856e66fd..4f8fd6e8b 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append_fp5280g2= " -Dnegative-errno-on-fail=true" +EXTRA_OEMESON:append:fp5280g2= " -Dnegative-errno-on-fail=true" CHIPS = " \ bus@1e78a000/i2c-bus@c0/tmp112@48 \ @@ -26,5 +26,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_fp5280g2 = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_fp5280g2 = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:fp5280g2 = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 70532c57c..9e0c9c54f 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " file://sol-default.override.yml" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 27e7cf9cf..dc8ab8668 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${PN}:" diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf index 59a0a8a6a..2dcf54c88 100644 --- a/meta-inspur/meta-on5263m5/conf/layer.conf +++ b/meta-inspur/meta-on5263m5/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "on5263m5-layer" BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_on5263m5-layer = "gatesgarth hardknott" +LAYERSERIES_COMPAT_on5263m5-layer = "hardknott honister" diff --git a/meta-inspur/meta-on5263m5/conf/local.conf.sample b/meta-inspur/meta-on5263m5/conf/local.conf.sample index 56a7e9621..6e212f30c 100644 --- a/meta-inspur/meta-on5263m5/conf/local.conf.sample +++ b/meta-inspur/meta-on5263m5/conf/local.conf.sample @@ -114,7 +114,7 @@ PACKAGE_CLASSES ?= "package_rpm" # running the build on (i.e. building i686 packages on an x86_64 host). # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" +SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*" # # Extra image configuration defaults @@ -138,7 +138,7 @@ SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features @@ -190,7 +190,7 @@ PATCHRESOLVE = "noop" # files and damages the build in ways which may not be easily recoverable. # It's necessary to monitor /tmp, if there is no space left the build will fail # with very exotic errors. -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -224,17 +224,14 @@ BB_DISKMON_DIRS = "\ # By default qemu will build with a builtin VNC server where graphical output can be # seen. The two lines below enable the SDL backend too. This assumes there is a # libsdl library available on your build system. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +PACKAGECONFIG:append:pn-qemu-native = " sdl" +PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" #ASSUME_PROVIDED += "libsdl-native" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. -CONF_VERSION = "1" +CONF_VERSION = "2" # Set the root password to '0penBmc' -INHERIT += "extrausers" -EXTRA_USERS_PARAMS = " \ - usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \ - " +# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb b/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb index 2174da950..441f21819 100644 --- a/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb @@ -17,7 +17,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "gpioplus" -SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.inspur.identify_led.controller.service" +SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.inspur.identify_led.controller.service" SRC_URI = "git://github.com/inspur-bmc/inspur-uuid.git" diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb index 517b9eb77..68a2184cf 100644 --- a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb @@ -16,31 +16,31 @@ 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}-chassis = "Inspur Chassis" -RDEPENDS_${PN}-chassis = " \ +SUMMARY:${PN}-chassis = "Inspur Chassis" +RDEPENDS:${PN}-chassis = " \ obmc-control-chassis \ obmc-op-control-power \ obmc-host-failure-reboots \ " -SUMMARY_${PN}-fans = "Inspur Fans" -RDEPENDS_${PN}-fans = "" +SUMMARY:${PN}-fans = "Inspur Fans" +RDEPENDS:${PN}-fans = "" -SUMMARY_${PN}-flash = "Inspur Flash" -RDEPENDS_${PN}-flash = " \ +SUMMARY:${PN}-flash = "Inspur Flash" +RDEPENDS:${PN}-flash = " \ obmc-flash-bmc \ obmc-mgr-download \ obmc-control-bmc \ " -SUMMARY_${PN}-system = "Inspur System" -RDEPENDS_${PN}-system = " \ +SUMMARY:${PN}-system = "Inspur System" +RDEPENDS:${PN}-system = " \ bmcweb \ entity-manager \ - phosphor-webui \ + webui-vue \ " diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index ac03883e8..863f59c38 100644 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append_on5263m5= " -Dnegative-errno-on-fail=true" +EXTRA_OEMESON:append:on5263m5= " -Dnegative-errno-on-fail=true" CHIPS = " \ bus@1e78a000/i2c-bus@1c0/tmp112@48 \ @@ -16,4 +16,4 @@ ITEMS += "iio-hwmon.conf" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" |