From 24c7115035adb17b11847e2dc33ceb0979c27581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E5=87=A1=E4=B8=9C?= Date: Tue, 28 Apr 2026 16:54:01 +0800 Subject: [PATCH] build: Add opencas_exporter to rpm package and fix make rpm issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 秦凡东 --- extra/Makefile | 2 +- extra/prometheus/Makefile | 6 ++++-- tools/pckgen.d/rpm/CAS_NAME.spec | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/extra/Makefile b/extra/Makefile index 665c8296e..675049311 100644 --- a/extra/Makefile +++ b/extra/Makefile @@ -5,7 +5,7 @@ DIRS := prometheus -all clean install uninstall: +all clean install install_files uninstall: @for dir in $(DIRS); do \ $(MAKE) -C $$dir $@; \ done diff --git a/extra/prometheus/Makefile b/extra/prometheus/Makefile index 6fa9a254d..7cffe61a4 100644 --- a/extra/prometheus/Makefile +++ b/extra/prometheus/Makefile @@ -21,10 +21,12 @@ else SYSTEMD_DIR=/lib/systemd/system endif -install: all +install: install_files + $(SYSTEMCTL) daemon-reload + +install_files: all install -m 755 -D opencas_exporter $(DESTDIR)/usr/bin/opencas_exporter install -m 644 -D opencas_exporter.service $(DESTDIR)$(SYSTEMD_DIR)/opencas_exporter.service - $(SYSTEMCTL) daemon-reload uninstall: -$(SYSTEMCTL) disable --now opencas_exporter diff --git a/tools/pckgen.d/rpm/CAS_NAME.spec b/tools/pckgen.d/rpm/CAS_NAME.spec index 8e0f607ab..5e51959cd 100644 --- a/tools/pckgen.d/rpm/CAS_NAME.spec +++ b/tools/pckgen.d/rpm/CAS_NAME.spec @@ -163,9 +163,11 @@ fi /lib/udev/rules.d/60-persistent-storage-cas.rules /sbin/casadm /sbin/casctl +/usr/bin/opencas_exporter /usr/lib/systemd/system-shutdown/open-cas.shutdown /usr/lib/systemd/system/open-cas-shutdown.service /usr/lib/systemd/system/open-cas.service +/usr/lib/systemd/system/opencas_exporter.service /usr/share/man/man5/opencas.conf.5.gz /usr/share/man/man8/casadm.8.gz /usr/share/man/man8/casctl.8.gz @@ -181,6 +183,8 @@ fi %changelog +* Tue Apr 28 2026 Qin Fandong - 26.06-1 +- Add opencas_exporter * Mon Aug 25 2025 Rafal Stefanowski - 25.03-1 * Thu Aug 7 2025 Brian J. Murrell - 25.03-1 - Allow building RPM packages for different kernel versions