diff options
author | David Wang <davidwang@quantatw.com> | 2021-08-13 06:39:20 +0300 |
---|---|---|
committer | David Wang <davidwang@quantatw.com> | 2021-08-13 12:36:23 +0300 |
commit | 026925dd6641c96768d9636b6114acbfcdb8579f (patch) | |
tree | cdec2edbb3b471b1bd83f621a3983c6440dfe3cd /meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory | |
parent | ca3e1d9f86212282ca59f384055497eb0d156d49 (diff) | |
download | openbmc-026925dd6641c96768d9636b6114acbfcdb8579f.tar.xz |
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
Diffstat (limited to 'meta-quanta/meta-olympus-nuvoton/recipes-phosphor/inventory')
2 files changed, 8 insertions, 8 deletions
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 } |