meta-gbmc-staging: Make nvmesensor metric store configurable Introduce a systemd drop-in override for xyz.openbmc_project.nvmesensor to dynamically control the metric store functionality at runtime. This commit updates the nvmed.bb recipe to deploy an override.conf that evaluates the presence of enable.flag or disable.flag during ExecStart. Also, SRCREV bump to ca96e2fc78 platform15: http://fusion2/0d0c7dff-16d2-3caa-86e3-55bb5c6fcac0, Result: pass platform11: http://fusion2/1970c041-f822-38a1-a200-0cf9e07a64c5, Result: pass Platforms-Affected: All w/ NVMe Tested: N/A Google-Bug-Id: 514372983 Change-Id: I9d45bc94352c5969542e81c5dad93b1556d786cf Signed-off-by: Muhammad Usama <muhammadusama@google.com> (cherry picked from commit 3838eec9b67afdded28836f2a451577fc2f6d17e)
diff --git a/recipes-google/nvme/nvmed.bb b/recipes-google/nvme/nvmed.bb index 7f35a0f..a37f20e 100644 --- a/recipes-google/nvme/nvmed.bb +++ b/recipes-google/nvme/nvmed.bb
@@ -16,11 +16,12 @@ shared-memory \ " -SRC_URI = "git://gbmc.googlesource.com/dbus-sensors;protocol=https;branch=google-dev" +SRC_URI = "git://gbmc.googlesource.com/dbus-sensors;protocol=https;branch=google-dev \ + file://override.conf" # Modify these as desired PV = "1.0+git" -SRCREV = "2e5a337c826032c54184cf279f0dc2419bc36b67" +SRCREV = "ca96e2fc78b78f5b42b5039f86ae181407609778" S = "${WORKDIR}/git" @@ -47,3 +48,9 @@ " SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.nvmesensor.service" +FILES:${PN} += "${systemd_system_unitdir}/xyz.openbmc_project.nvmesensor.service.d/override.conf" + +do_install:append() { + install -d ${D}${systemd_system_unitdir}/xyz.openbmc_project.nvmesensor.service.d + install -m 0644 ${WORKDIR}/override.conf ${D}${systemd_system_unitdir}/xyz.openbmc_project.nvmesensor.service.d/ +}
diff --git a/recipes-google/nvme/nvmed/override.conf b/recipes-google/nvme/nvmed/override.conf new file mode 100644 index 0000000..b2a73a2 --- /dev/null +++ b/recipes-google/nvme/nvmed/override.conf
@@ -0,0 +1,3 @@ +[Service] +ExecStart= +ExecStart=/bin/sh -c 'ARGS=""; if [ -f /var/google/config-package/enable-nvme-metrics.flag ]; then ARGS="--enable-metrics"; elif [ -f /var/google/config-package/disable-nvme-metrics.flag ]; then ARGS="--disable-metrics"; fi; exec /usr/bin/nvmesensor $ARGS'