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 <davidwang@quantatw.com>
Change-Id: Ic431624d09dc5899b1d84439559bea9efca08ad8
diff --git a/meta-quanta/meta-q71l/conf/layer.conf b/meta-quanta/meta-q71l/conf/layer.conf
index 9e56160..98e7146 100644
--- a/meta-quanta/meta-q71l/conf/layer.conf
+++ b/meta-quanta/meta-q71l/conf/layer.conf
@@ -7,4 +7,4 @@
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 5a686f4..9fadf82 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 @@
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 d77d9a0..f04d814 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 1175232..48bd7d2 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_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 f6db0c9..a009526 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 @@
# 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 37b27ac..a540355 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 @@
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 89a0b74..16cc272 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_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"