commit b4af56f7f44ff7e2f565c548aa65489f151d36f2
author George Hung <george.hung@quantatw.com> Wed Apr 28 14:19:23 2021 +0800
committer George Hung <george.hung@quantatw.com> Thu Apr 29 04:56:30 2021 +0000
tree 7bc6a384da2928a2f616db3bcc2ace1877b398fe
parent b588235e34a679c45ca41848473da3f59613acd7

meta-quanta: gbs: fix yaml file and override config were not used

- meson.build doesn't parse the led.yaml you provide,
  so replace the yaml file of source before compiling

- install service-override.conf directly intead of
  using SYSTEMD_OVERRIDE to avoid package name
  changing

- remove unused json config

Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: I28c72dfabf32d22f917ca1e244f5b700ae941667

meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend

diff --git a/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index a7ec24f..e887b19 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-quanta/meta-gbs/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,5 +1,16 @@
 FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
 SRC_URI_append_gbs = " file://service-override.conf"
 
-SYSTEMD_OVERRIDE_${PN}-ledmanager_append_gbs = " \
-  service-override.conf:xyz.openbmc_project.LED.GroupManager.service.d/service-override.conf"
+FILES_${PN}_append_gbs = " ${systemd_system_unitdir}/xyz.openbmc_project.LED.GroupManager.service.d/service-override.conf"
+
+do_compile_prepend_gbs() {
+    install -m 0644 ${STAGING_DATADIR_NATIVE}/${PN}/led.yaml ${S}
+}
+
+do_install_append_gbs() {
+    rm -rf ${D}${datadir}/${PN}/*
+
+    install -d ${D}${systemd_system_unitdir}/xyz.openbmc_project.LED.GroupManager.service.d
+    install -D -m 0644 ${WORKDIR}/service-override.conf \
+      ${D}${systemd_system_unitdir}/xyz.openbmc_project.LED.GroupManager.service.d/
+}