From 026925dd6641c96768d9636b6114acbfcdb8579f Mon Sep 17 00:00:00 2001 From: David Wang Date: Fri, 13 Aug 2021 11:39:20 +0800 Subject: meta-quanta: Cleanup for Yocto override syntax change - Cleanup subtree meta-f0b, meta-olympus-nuvoton, meta-q71l with convert-overrides.py meta-quanta/meta-f0b convert-overrides.py meta-quanta/meta-olympus-nuvoton convert-overrides.py meta-quanta/meta-q71l git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-f0b git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-olympus-nuvoton git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-q71l git grep -l _f0b -- meta-quanta/meta-f0b | xargs sed -i 's/_f0b/:f0b/' git grep -l _olympus-nuvoton -- meta-quanta/meta-olympus-nuvoton | xargs sed -i 's/_olympus-nuvoton/:olympus-nuvoton/' git grep -l _quanta-q71l -- meta-quanta/meta-q71l | xargs sed -i 's/_quanta-q71l/:quanta-q71l/' - Fix up a few by hand - Revert 'BBFILE_PATTERN' and 'LAYERSERIES_COMPAT' - Add honister to 'LAYERSERIES_COMPAT' - Update 'CONF_VERSION' - Fix up 'SYSTEMD_ENVIRONMENT_FILE', 'SYSTEMD_LINK' and 'SYSTEMD_OVERRIDE' in all subtree Signed-off-by: David Wang Change-Id: Ic431624d09dc5899b1d84439559bea9efca08ad8 --- meta-quanta/meta-f0b/conf/layer.conf | 2 +- meta-quanta/meta-f0b/conf/local.conf.sample | 13 +++++----- .../recipes-kernel/linux/linux-aspeed_%.bbappend | 2 +- .../ipmi/phosphor-ipmi-fru_%.bbappend | 6 ++--- .../sensors/phosphor-hwmon_%.bbappend | 6 ++--- .../gpio/phosphor-gpio-monitor_%.bbappend | 28 +++++++++++----------- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 ++-- .../sensors/phosphor-hwmon_%.bbappend | 4 ++-- .../watchdog/phosphor-watchdog_%.bbappend | 8 +++---- .../ipmi/phosphor-ipmi-fru_%.bbappend | 4 ++-- .../sensors/phosphor-hwmon_%.bbappend | 4 ++-- meta-quanta/meta-olympus-nuvoton/conf/layer.conf | 2 +- .../meta-olympus-nuvoton/conf/local.conf.sample | 10 ++++---- .../u-boot/u-boot-fw-utils-nuvoton_%.bbappend | 4 ++-- .../recipes-core/busybox/busybox_%.bbappend | 4 ++-- .../recipes-kernel/linux/linux-nuvoton_%.bbappend | 2 +- .../adm1278-hotswap-power-cycle.bb | 4 ++-- .../network/mac-address_%.bbappend | 8 +++---- .../network/olympus-nuvoton-iptable-save.bb | 2 +- .../packagegroup-olympus-nuvoton-apps.bb | 16 ++++++------- .../power/first-boot-set-psu.bb | 8 +++---- .../configuration/olympus-nuvoton-yaml-config.bb | 8 +++---- .../console/obmc-console_%.bbappend | 6 ++--- .../fans/phosphor-pid-control_%.bbappend | 22 ++++++++--------- .../inventory/olympus-nuvoton-inventory-cleanup.bb | 6 ++--- .../phosphor-inventory-manager_%.bbappend | 10 ++++---- .../ipmi/phosphor-ipmi-fru_%.bbappend | 10 ++++---- .../ipmi/phosphor-ipmi-host_%.bbappend | 4 ++-- .../ipmi/phosphor-ipmi-ipmb_%.bbappend | 8 +++---- .../ipmi/phosphor-ipmi-kcs_%.bbappend | 8 +++---- .../sensors/phosphor-hwmon_%.bbappend | 8 +++---- .../settings/phosphor-settings-manager_%.bbappend | 4 ++-- meta-quanta/meta-q71l/conf/layer.conf | 2 +- meta-quanta/meta-q71l/conf/local.conf.sample | 10 ++++---- .../images/obmc-phosphor-image.bbappend | 4 ++-- .../ipmi/phosphor-ipmi-fru_%.bbappend | 6 ++--- .../ipmi/q71l-ipmi-fru-merge-config-native.bb | 2 +- .../quanta-powerctrl/quanta-powerctrl.bb | 8 +++---- .../sensors/phosphor-hwmon_%.bbappend | 6 ++--- 39 files changed, 136 insertions(+), 137 deletions(-) (limited to 'meta-quanta') diff --git a/meta-quanta/meta-f0b/conf/layer.conf b/meta-quanta/meta-f0b/conf/layer.conf index fc0a1a720..f29015eb6 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 = "gatesgarth 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/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index edf81760f..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 @@ -8,25 +8,25 @@ 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() { install -d ${D}${systemd_system_unitdir} 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 f36178d35..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 @@ -11,14 +11,14 @@ 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 = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \ 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 657684d7a..723ac418d 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -22,12 +22,12 @@ GBS_ITEMS += "${@compose_list(d, 'GBS_ITEMSFMT', 'GBS_NAMES')}" 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" 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 23b063fc3..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,11 +1,11 @@ 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_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 \ 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 2fb5443fb..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 @@ -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/sensors/phosphor-hwmon_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 4363aa352..a27865239 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -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-olympus-nuvoton/conf/layer.conf b/meta-quanta/meta-olympus-nuvoton/conf/layer.conf index 0c2366e53..c62ff264a 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 = "gatesgarth 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..5231622da 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,8 +1,8 @@ -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}/ 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..efca54174 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() { +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 } 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..98e71463b 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 = "gatesgarth 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" -- cgit v1.2.3