| commit | 006c1492cbbcea5af6d3d185bc33b866b18b6dd8 | [log] [tgz] |
|---|---|---|
| author | Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com> | Tue Jun 27 14:02:40 2023 +0800 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Sun Aug 06 16:14:31 2023 -0500 |
| tree | c6d5bdf053ea98ae2a366f64e25a26b932abcae2 | |
| parent | 5500d05b0e7e15b4698cf61815f230db1d4ed720 [diff] |
meta-facebook: move virtual sensor config json into platform layers Description: Most platforms need some sort of phosphor-virtual-sensor config, but some install multiple. Modify the common bbappend so it can be reused and with a minimal bbappend most platforms can add their own config in the platform layer. Tested: Build service on changed platforms- pass Change-Id: I77f4be1519325c0ebb00d0dc9a2f4e104601f62b Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com> Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index dbf7e0d..2b4a213 100644 --- a/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-facebook/meta-bletchley/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,10 +1,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ - file://virtual_sensor_config_hdc1080.json \ - file://virtual_sensor_config_si7021.json \ +SENSOR_CONFIGS = " \ + virtual_sensor_config_hdc1080.json \ + virtual_sensor_config_si7021.json \ " - -do_install:append() { - install -m 0644 -D ${WORKDIR}/virtual_sensor_config_hdc1080.json ${D}${datadir}/phosphor-virtual-sensor/ - install -m 0644 -D ${WORKDIR}/virtual_sensor_config_si7021.json ${D}${datadir}/phosphor-virtual-sensor/ -}
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/greatlakes/greatlakes_sensor_config.json b/meta-facebook/meta-greatlakes/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json similarity index 100% rename from meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/greatlakes/greatlakes_sensor_config.json rename to meta-facebook/meta-greatlakes/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
diff --git a/meta-facebook/meta-greatlakes/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/meta-greatlakes/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 0000000..4fc41d0 --- /dev/null +++ b/meta-facebook/meta-greatlakes/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -0,0 +1 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json similarity index 100% rename from meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json rename to meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
diff --git a/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 0000000..4fc41d0 --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -0,0 +1 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json b/meta-facebook/meta-yosemitev2/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json similarity index 100% rename from meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json rename to meta-facebook/meta-yosemitev2/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json
diff --git a/meta-facebook/meta-yosemitev2/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/meta-yosemitev2/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 0000000..4fc41d0 --- /dev/null +++ b/meta-facebook/meta-yosemitev2/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -0,0 +1 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/bletchley/bletchley_sensor_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/bletchley/bletchley_sensor_config.json deleted file mode 100644 index fe51488..0000000 --- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/bletchley/bletchley_sensor_config.json +++ /dev/null
@@ -1 +0,0 @@ -[]
diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 301766d..c428550 100644 --- a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend
@@ -1,11 +1,18 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" +SENSOR_CONFIGS ?= "virtual_sensor_config.json" -SRC_URI:append = " file://${MACHINE}_sensor_config.json" +SRC_URI:append = "\ + ${@ ' '.join([ 'file://' + x for x in d.getVar('SENSOR_CONFIGS').split()])} \ + " do_install:append() { + # Delete the default one from Meson. + if [ -e "${D}${datadir}/phosphor-virtual-sensor/virtual_sensor_config.json" ]; then + rm "${D}${datadir}/phosphor-virtual-sensor/virtual_sensor_config.json" + fi + # Install the ones from our meta-layer. install -d ${D}${datadir}/phosphor-virtual-sensor - - install -m 0644 -D ${WORKDIR}/${MACHINE}_sensor_config.json \ - ${D}${datadir}/phosphor-virtual-sensor/virtual_sensor_config.json + for s in ${SENSOR_CONFIGS}; do + install -m 0644 ${WORKDIR}/$s ${D}${datadir}/phosphor-virtual-sensor + done }