commit dbc758e1cac839f15ea40ed0b7ac0b72cc02d1d7
author Thang Q. Nguyen <thang@os.amperecomputing.com> Wed Nov 16 17:07:57 2022 +0700
committer Thang Q. Nguyen <thang@os.amperecomputing.com> Fri Nov 18 01:42:49 2022 +0000
tree 9dc81fc319acc369d294d37c18067f3e023c0607
parent 09bbbcbdb73d83e9b4d0d2078948bf05c9ef592a

meta-ampere: mtjade: remove redundant mtjade string

The meta-ampere/meta-jade folder contains features for Mt.Jade platform
which might support various chassis. Having :mtjade is redundant and
will limit features to work only with "standard mtjade".
This commit removes this string so that additional MACHINEs based on
Mt.Jade can work.

Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: If57acd557d678b8834f0c77f98855277e4eee844

meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend

diff --git a/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend
index f10b289..bd66ef4 100644
--- a/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-kernel/linux/linux-aspeed_%.bbappend
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS:prepend:mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
-    file://${MACHINE}.cfg \
-"
+            file://mtjade.cfg \
+           "
 

meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb

diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
index 06046c3..365d210 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
+++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb
@@ -5,14 +5,14 @@
 inherit allarch
 
 SRC_URI = " \
-    file://mtjade-ipmi-sensors.yaml \
+    file://${MACHINE}-ipmi-sensors.yaml \
     file://mtjade-ipmi-fru.yaml \
     "
 
 S = "${WORKDIR}"
 
 do_install() {
-    install -m 0644 -D mtjade-ipmi-sensors.yaml \
+    install -m 0644 -D ${MACHINE}-ipmi-sensors.yaml \
         ${D}${datadir}/${BPN}/ipmi-sensors.yaml
     install -m 0644 -D mtjade-ipmi-fru.yaml \
         ${D}${datadir}/${BPN}/ipmi-fru-read.yaml

meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend

diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 23358f0..eadb7e4 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"

meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend

diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 3656006..5e726c3 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -1,16 +1,16 @@
-RDEPENDS:${PN}-extras:append:mtjade = " \
-                                       webui-vue \
-                                       phosphor-image-signing \
-                                       phosphor-virtual-sensor \
-                                       phosphor-misc-usb-ctrl \
-                                       ampere-gpio-handling \
-                                      "
+RDEPENDS:${PN}-extras:append = " \
+                                webui-vue \
+                                phosphor-image-signing \
+                                phosphor-virtual-sensor \
+                                phosphor-misc-usb-ctrl \
+                                ampere-gpio-handling \
+                               "
 
-RDEPENDS:${PN}-inventory:append:mtjade = " \
-                                          dbus-sensors \
-                                          entity-manager \
-                                         "
+RDEPENDS:${PN}-inventory:append = " \
+                                   dbus-sensors \
+                                   entity-manager \
+                                  "
 
-RDEPENDS:${PN}-extras:remove:mtjade = " phosphor-hwmon"
+RDEPENDS:${PN}-extras:remove = " phosphor-hwmon"
 VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors"
-RDEPENDS:${PN}-extras:append:mtjade = " phosphor-virtual-sensor"
+RDEPENDS:${PN}-extras:append = " phosphor-virtual-sensor"

meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend

diff --git a/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
index 23358f0..eadb7e4 100644
--- a/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
+++ b/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}:"