diff --git a/sysmonitor-kmod.spec b/sysmonitor-kmod.spec index db41886c1c8cc04f2b019644f420fe091da54efe..dd21dfa453c12de247ab19826180563f82e9cfe9 100644 --- a/sysmonitor-kmod.spec +++ b/sysmonitor-kmod.spec @@ -7,7 +7,7 @@ %define kmod_name sysmonitor %define version 1.3.2 -%define releaseversion 1.7 +%define releaseversion 1.8 Summary: System Monitor Daemon Name: %{kmod_name}-kmod Version: %{version} @@ -15,7 +15,6 @@ Release: %{releaseversion} License: GPLv2 and Mulan PSL v2 Group: System Environment/Daemons Source0: %{kmod_name}-%{version}.tar.bz2 -BuildRoot: %{_builddir}/%{kmod_name}-root BuildRequires: libboundscheck Requires: systemd BuildRequires: module-init-tools @@ -34,6 +33,7 @@ Requires: kernel >= 3.10.0-514.44.5.10 Requires: iotop Requires: python3 Provides: sysmonitor +%{?systemd_requires} Patch1: bugfix-fix-signal-monitor-err.patch Patch2: bugfix-fix-fd-path-failed-to-open.patch @@ -48,8 +48,8 @@ System Monitor Daemon %autosetup -n %{kmod_name}-%{version} -p1 %build -cmake . -make %{?_smp_mflags} +%cmake +%cmake_build cd module make KDIR=/lib/modules/`uname -r`/build strip -g sysmonitor.ko @@ -60,23 +60,23 @@ strip -g sysmonitor.ko dos2unix %_builddir/%{kmod_name}-%{version}/script/iomonitor_daemon dos2unix %_builddir/%{kmod_name}-%{version}/conf/io_monitor -mkdir -p %{buildroot}/usr/sbin/ +mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/etc/sysmonitor.d/ install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_sysconfdir}/sysconfig install -d -m 700 %{buildroot}%{_sysconfdir}/sysmonitor/ install -d -m 700 %{buildroot}%{_sysconfdir}/sysmonitor/process -install -d -m 700 %{buildroot}/usr/libexec/sysmonitor +install -d -m 700 %{buildroot}%{_libexecdir}/sysmonitor install -d -m 700 %{buildroot}%{_sysconfdir}/sysmonitor.d/ install -d %{buildroot}/etc/rsyslog.d/ install -d -m 750 %{buildroot}/lib/modules/sysmonitor -install -d -m 750 %{buildroot}/usr/libexec/sysmonitor/data +install -d -m 750 %{buildroot}%{_libexecdir}/sysmonitor/data install -m 600 conf/process/* %{buildroot}%{_sysconfdir}/sysmonitor/process install -m 600 conf/signal %{buildroot}%{_sysconfdir}/sysmonitor install -m 600 conf/network %{buildroot}%{_sysconfdir}/sysmonitor -install -m 500 src/sysmonitor %{buildroot}%{_bindir} +install -m 700 %{__cmake_builddir}/src/sysmonitor %{buildroot}%{_bindir} install -m 600 conf/sysmonitor %{buildroot}%{_sysconfdir}/sysconfig/sysmonitor install -m 640 module/sysmonitor.ko %{buildroot}/lib/modules/sysmonitor install -m 600 conf/disk %{buildroot}%{_sysconfdir}/sysmonitor/disk @@ -89,32 +89,32 @@ install -m 600 conf/iodelay %{buildroot}%{_sysconfdir}/sysmonitor/iodelay install -m 600 conf/process_fd_conf %{buildroot}%{_sysconfdir}/sysmonitor/process_fd_conf install -m 600 conf/sys_fd_conf %{buildroot}%{_sysconfdir}/sysmonitor/sys_fd_conf install -m 600 conf/w_log_conf %{buildroot}%{_sysconfdir}/sysmonitor/w_log_conf -install -m 500 script/get_local_disk.sh %{buildroot}/usr/libexec/sysmonitor/ -install -m 500 script/check_sshd.sh %{buildroot}/usr/libexec/sysmonitor/ -install -m 500 script/check_dbus.sh %{buildroot}/usr/libexec/sysmonitor/ +install -m 500 script/get_local_disk.sh %{buildroot}%{_libexecdir}/sysmonitor/ +install -m 500 script/check_sshd.sh %{buildroot}%{_libexecdir}/sysmonitor/ +install -m 500 script/check_dbus.sh %{buildroot}%{_libexecdir}/sysmonitor/ install -m 600 conf/rsyslog.d/sysmonitor.conf %{buildroot}/etc/rsyslog.d/sysmonitor.conf -install -m 500 script/check_syslog.sh %{buildroot}/usr/libexec/sysmonitor/ -install -m 600 conf/logrotate.d/sysmonitor-logrotate %{buildroot}/usr/libexec/sysmonitor/sysmonitor-logrotate -install -m 500 script/sysmonitor_log_dump.sh %{buildroot}/usr/libexec/sysmonitor/ -install -m 500 script/check_cron.sh %{buildroot}/usr/libexec/sysmonitor/ +install -m 500 script/check_syslog.sh %{buildroot}%{_libexecdir}/sysmonitor/ +install -m 600 conf/logrotate.d/sysmonitor-logrotate %{buildroot}%{_libexecdir}/sysmonitor/sysmonitor-logrotate +install -m 500 script/sysmonitor_log_dump.sh %{buildroot}%{_libexecdir}/sysmonitor/ +install -m 500 script/check_cron.sh %{buildroot}%{_libexecdir}/sysmonitor/ install -m 600 conf/clock_transition %{buildroot}%{_sysconfdir}/sysmonitor.d/clock_transition -install -m 500 script/clocktransition.py %{buildroot}/usr/libexec/sysmonitor/ -install -m 500 script/ko.sh %{buildroot}/usr/libexec/sysmonitor/ -install -m 500 script/rm_duplicat_conf.sh %{buildroot}/usr/libexec/sysmonitor/ -install -m 500 script/process_clock_data.sh %{buildroot}/usr/libexec/sysmonitor/ -install -m 500 script/iomonitor_daemon %{buildroot}/usr/sbin/ +install -m 500 script/clocktransition.py %{buildroot}%{_libexecdir}/sysmonitor/ +install -m 500 script/ko.sh %{buildroot}%{_libexecdir}/sysmonitor/ +install -m 500 script/rm_duplicat_conf.sh %{buildroot}%{_libexecdir}/sysmonitor/ +install -m 500 script/process_clock_data.sh %{buildroot}%{_libexecdir}/sysmonitor/ +install -m 500 script/iomonitor_daemon %{buildroot}%{_sbindir} install -m 600 conf/io_monitor %{buildroot}/etc/sysmonitor.d/ install -m 600 conf/zombie %{buildroot}%{_sysconfdir}/sysmonitor/zombie -install -m 500 script/getzombieparent.py %{buildroot}/usr/libexec/sysmonitor/ -install -m 500 script/clean_remain_process.sh %{buildroot}/usr/libexec/sysmonitor/ +install -m 500 script/getzombieparent.py %{buildroot}%{_libexecdir}/sysmonitor/ +install -m 500 script/clean_remain_process.sh %{buildroot}%{_libexecdir}/sysmonitor/ -mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system/multi-user.target.wants +mkdir -p $RPM_BUILD_ROOT%{_unitdir}/multi-user.target.wants mkdir -p $RPM_BUILD_ROOT/etc/systemd/ install -m 600 conf/logind_monitor %{buildroot}%{_sysconfdir}/sysmonitor.d/ -install -m 500 script/logind_clear.sh %{buildroot}/usr/libexec/sysmonitor/ +install -m 500 script/logind_clear.sh %{buildroot}%{_libexecdir}/sysmonitor/ -install -m 0600 service/sysmonitor.service $RPM_BUILD_ROOT/usr/lib/systemd/system/sysmonitor.service -ln -s ../sysmonitor.service $RPM_BUILD_ROOT/usr/lib/systemd/system/multi-user.target.wants/sysmonitor.service +install -m 0600 service/sysmonitor.service $RPM_BUILD_ROOT%{_unitdir}/sysmonitor.service +ln -s ../sysmonitor.service $RPM_BUILD_ROOT%{_unitdir}/multi-user.target.wants/sysmonitor.service %post %systemd_post sysmonitor.service @@ -140,40 +140,38 @@ done depmod -a $(uname -r) systemctl daemon-reload 2>/dev/null 1>/dev/null -%clean - %files %defattr(-,root,root) %dir %{_sysconfdir}/sysmonitor %dir %{_sysconfdir}/sysmonitor/process %dir %{_sysconfdir}/sysmonitor.d/ -%dir /usr/libexec/ -%dir /usr/libexec/sysmonitor -%dir /usr/ -%dir %{_sysconfdir}/sysconfig +%dir %{_libexecdir}/sysmonitor %dir %attr(0550,root,root) /lib/modules/sysmonitor %config(noreplace) %{_sysconfdir}/sysconfig/sysmonitor %config(noreplace) %{_sysconfdir}/sysmonitor/* %config(noreplace) %{_sysconfdir}/sysmonitor/process/* -%{_bindir}/sysmonitor - -/usr/libexec/sysmonitor/* -%attr(0500,root,root) /usr/libexec/sysmonitor/sysmonitor_log_dump.sh -%config(noreplace) %attr(0600,root,root) /usr/libexec/sysmonitor/sysmonitor-logrotate -%exclude /usr/libexec/sysmonitor/*.pyc -%exclude /usr/libexec/sysmonitor/*.pyo -%dir %attr(0700,root,root) /usr/libexec/sysmonitor/data +%attr(0500,root,root) %{_bindir}/sysmonitor + +%{_libexecdir}/sysmonitor/* +%attr(0500,root,root) %{_libexecdir}/sysmonitor/sysmonitor_log_dump.sh +%config(noreplace) %attr(0600,root,root) %{_libexecdir}/sysmonitor/sysmonitor-logrotate +%exclude %{_libexecdir}/sysmonitor/*.pyc +%exclude %{_libexecdir}/sysmonitor/*.pyo +%dir %attr(0700,root,root) %{_libexecdir}/sysmonitor/data %attr(0400,root,root) /lib/modules/sysmonitor/sysmonitor.ko %config(noreplace) /etc/rsyslog.d/sysmonitor.conf -%attr(0500,root,root) /usr/sbin/iomonitor_daemon +%attr(0500,root,root) %{_sbindir}/iomonitor_daemon %attr(0600,root,root) /etc/sysmonitor.d/io_monitor %config(noreplace) %{_sysconfdir}/sysmonitor.d/* -/usr/lib/systemd/system/sysmonitor.service -/usr/lib/systemd/system/multi-user.target.wants/sysmonitor.service +%{_unitdir}/sysmonitor.service +%{_unitdir}/multi-user.target.wants/sysmonitor.service %changelog +* Thu Nov 21 2024 Funda Wang - 1.3.2-1.8 +- adopt to new cmake macro + * Sun Sep 22 2024 guo-zhicheng666<1678717630@qq.com> - 1.3.2-1.7 - Type:bugfix - CVE:NA