Open
adopt to new cmake macro #30
Funda WangAdd on Nov 21, 2024
adopt to new cmake macro #30
Open
Merged fromrefs/pull/30/headintomaster
Total: 1 files changed+40-42
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | %define kmod_name sysmonitor | 8 | %define kmod_name sysmonitor |
| 9 | %define version 1.3.2 | 9 | %define version 1.3.2 |
| 10 | -%define releaseversion 1.8 | 10 | +%define releaseversion 1.9 |
| 11 | Summary: System Monitor Daemon | 11 | Summary: System Monitor Daemon |
| 12 | Name: %{kmod_name}-kmod | 12 | Name: %{kmod_name}-kmod |
| 13 | Version: %{version} | 13 | Version: %{version} |
| @@ -15,7 +15,6 @@ Release: %{releaseversion} | |||
| 15 | License: GPLv2 and Mulan PSL v2 | 15 | License: GPLv2 and Mulan PSL v2 |
| 16 | Group: System Environment/Daemons | 16 | Group: System Environment/Daemons |
| 17 | Source0: %{kmod_name}-%{version}.tar.bz2 | 17 | Source0: %{kmod_name}-%{version}.tar.bz2 |
| 18 | -BuildRoot: %{_builddir}/%{kmod_name}-root | ||
| 19 | BuildRequires: libboundscheck | 18 | BuildRequires: libboundscheck |
| 20 | Requires: systemd | 19 | Requires: systemd |
| 21 | BuildRequires: module-init-tools | 20 | BuildRequires: module-init-tools |
| @@ -34,6 +33,7 @@ Requires: kernel >= 3.10.0-514.44.5.10 | |||
| 34 | Requires: iotop | 33 | Requires: iotop |
| 35 | Requires: python3 | 34 | Requires: python3 |
| 36 | Provides: sysmonitor | 35 | Provides: sysmonitor |
| 36 | +%{?systemd_requires} | ||
| 37 | 37 | ||
| 38 | Patch1: bugfix-fix-signal-monitor-err.patch | 38 | Patch1: bugfix-fix-signal-monitor-err.patch |
| 39 | Patch2: bugfix-fix-fd-path-failed-to-open.patch | 39 | Patch2: bugfix-fix-fd-path-failed-to-open.patch |
| @@ -49,8 +49,8 @@ System Monitor Daemon | |||
| 49 | %autosetup -n %{kmod_name}-%{version} -p1 | 49 | %autosetup -n %{kmod_name}-%{version} -p1 |
| 50 | 50 | ||
| 51 | %build | 51 | %build |
| 52 | -cmake . | 52 | +%cmake |
| 53 | -make %{?_smp_mflags} | 53 | +%cmake_build |
| 54 | cd module | 54 | cd module |
| 55 | make KDIR=/lib/modules/`uname -r`/build | 55 | make KDIR=/lib/modules/`uname -r`/build |
| 56 | strip -g sysmonitor.ko | 56 | strip -g sysmonitor.ko |
| @@ -61,23 +61,23 @@ strip -g sysmonitor.ko | |||
| 61 | dos2unix %_builddir/%{kmod_name}-%{version}/script/iomonitor_daemon | 61 | dos2unix %_builddir/%{kmod_name}-%{version}/script/iomonitor_daemon |
| 62 | dos2unix %_builddir/%{kmod_name}-%{version}/conf/io_monitor | 62 | dos2unix %_builddir/%{kmod_name}-%{version}/conf/io_monitor |
| 63 | 63 | ||
| 64 | -mkdir -p %{buildroot}/usr/sbin/ | 64 | +mkdir -p %{buildroot}%{_sbindir} |
| 65 | mkdir -p %{buildroot}/etc/sysmonitor.d/ | 65 | mkdir -p %{buildroot}/etc/sysmonitor.d/ |
| 66 | 66 | ||
| 67 | install -d %{buildroot}%{_bindir} | 67 | install -d %{buildroot}%{_bindir} |
| 68 | install -d %{buildroot}%{_sysconfdir}/sysconfig | 68 | install -d %{buildroot}%{_sysconfdir}/sysconfig |
| 69 | install -d -m 700 %{buildroot}%{_sysconfdir}/sysmonitor/ | 69 | install -d -m 700 %{buildroot}%{_sysconfdir}/sysmonitor/ |
| 70 | install -d -m 700 %{buildroot}%{_sysconfdir}/sysmonitor/process | 70 | install -d -m 700 %{buildroot}%{_sysconfdir}/sysmonitor/process |
| 71 | -install -d -m 700 %{buildroot}/usr/libexec/sysmonitor | 71 | +install -d -m 700 %{buildroot}%{_libexecdir}/sysmonitor |
| 72 | install -d -m 700 %{buildroot}%{_sysconfdir}/sysmonitor.d/ | 72 | install -d -m 700 %{buildroot}%{_sysconfdir}/sysmonitor.d/ |
| 73 | install -d %{buildroot}/etc/rsyslog.d/ | 73 | install -d %{buildroot}/etc/rsyslog.d/ |
| 74 | install -d -m 750 %{buildroot}/lib/modules/sysmonitor | 74 | install -d -m 750 %{buildroot}/lib/modules/sysmonitor |
| 75 | -install -d -m 750 %{buildroot}/usr/libexec/sysmonitor/data | 75 | +install -d -m 750 %{buildroot}%{_libexecdir}/sysmonitor/data |
| 76 | 76 | ||
| 77 | install -m 600 conf/process/* %{buildroot}%{_sysconfdir}/sysmonitor/process | 77 | install -m 600 conf/process/* %{buildroot}%{_sysconfdir}/sysmonitor/process |
| 78 | install -m 600 conf/signal %{buildroot}%{_sysconfdir}/sysmonitor | 78 | install -m 600 conf/signal %{buildroot}%{_sysconfdir}/sysmonitor |
| 79 | install -m 600 conf/network %{buildroot}%{_sysconfdir}/sysmonitor | 79 | install -m 600 conf/network %{buildroot}%{_sysconfdir}/sysmonitor |
 | |||
| 80 | -install -m 500 src/sysmonitor %{buildroot}%{_bindir} | 80 | +install -m 700 %{__cmake_builddir}/src/sysmonitor %{buildroot}%{_bindir} |
| 81 | install -m 600 conf/sysmonitor %{buildroot}%{_sysconfdir}/sysconfig/sysmonitor | 81 | install -m 600 conf/sysmonitor %{buildroot}%{_sysconfdir}/sysconfig/sysmonitor |
| 82 | install -m 640 module/sysmonitor.ko %{buildroot}/lib/modules/sysmonitor | 82 | install -m 640 module/sysmonitor.ko %{buildroot}/lib/modules/sysmonitor |
| 83 | install -m 600 conf/disk %{buildroot}%{_sysconfdir}/sysmonitor/disk | 83 | install -m 600 conf/disk %{buildroot}%{_sysconfdir}/sysmonitor/disk |
| @@ -90,32 +90,32 @@ install -m 600 conf/iodelay %{buildroot}%{_sysconfdir}/sysmonitor/iodelay | |||
| 90 | install -m 600 conf/process_fd_conf %{buildroot}%{_sysconfdir}/sysmonitor/process_fd_conf | 90 | install -m 600 conf/process_fd_conf %{buildroot}%{_sysconfdir}/sysmonitor/process_fd_conf |
| 91 | install -m 600 conf/sys_fd_conf %{buildroot}%{_sysconfdir}/sysmonitor/sys_fd_conf | 91 | install -m 600 conf/sys_fd_conf %{buildroot}%{_sysconfdir}/sysmonitor/sys_fd_conf |
| 92 | install -m 600 conf/w_log_conf %{buildroot}%{_sysconfdir}/sysmonitor/w_log_conf | 92 | install -m 600 conf/w_log_conf %{buildroot}%{_sysconfdir}/sysmonitor/w_log_conf |
| 93 | -install -m 500 script/get_local_disk.sh %{buildroot}/usr/libexec/sysmonitor/ | 93 | +install -m 500 script/get_local_disk.sh %{buildroot}%{_libexecdir}/sysmonitor/ |
| 94 | -install -m 500 script/check_sshd.sh %{buildroot}/usr/libexec/sysmonitor/ | 94 | +install -m 500 script/check_sshd.sh %{buildroot}%{_libexecdir}/sysmonitor/ |
| 95 | -install -m 500 script/check_dbus.sh %{buildroot}/usr/libexec/sysmonitor/ | 95 | +install -m 500 script/check_dbus.sh %{buildroot}%{_libexecdir}/sysmonitor/ |
| 96 | install -m 600 conf/rsyslog.d/sysmonitor.conf %{buildroot}/etc/rsyslog.d/sysmonitor.conf | 96 | install -m 600 conf/rsyslog.d/sysmonitor.conf %{buildroot}/etc/rsyslog.d/sysmonitor.conf |
| 97 | -install -m 500 script/check_syslog.sh %{buildroot}/usr/libexec/sysmonitor/ | 97 | +install -m 500 script/check_syslog.sh %{buildroot}%{_libexecdir}/sysmonitor/ |
| 98 | -install -m 600 conf/logrotate.d/sysmonitor-logrotate %{buildroot}/usr/libexec/sysmonitor/sysmonitor-logrotate | 98 | +install -m 600 conf/logrotate.d/sysmonitor-logrotate %{buildroot}%{_libexecdir}/sysmonitor/sysmonitor-logrotate |
| 99 | -install -m 500 script/sysmonitor_log_dump.sh %{buildroot}/usr/libexec/sysmonitor/ | 99 | +install -m 500 script/sysmonitor_log_dump.sh %{buildroot}%{_libexecdir}/sysmonitor/ |
| 100 | -install -m 500 script/check_cron.sh %{buildroot}/usr/libexec/sysmonitor/ | 100 | +install -m 500 script/check_cron.sh %{buildroot}%{_libexecdir}/sysmonitor/ |
| 101 | install -m 600 conf/clock_transition %{buildroot}%{_sysconfdir}/sysmonitor.d/clock_transition | 101 | install -m 600 conf/clock_transition %{buildroot}%{_sysconfdir}/sysmonitor.d/clock_transition |
| 102 | -install -m 500 script/clocktransition.py %{buildroot}/usr/libexec/sysmonitor/ | 102 | +install -m 500 script/clocktransition.py %{buildroot}%{_libexecdir}/sysmonitor/ |
| 103 | -install -m 500 script/ko.sh %{buildroot}/usr/libexec/sysmonitor/ | 103 | +install -m 500 script/ko.sh %{buildroot}%{_libexecdir}/sysmonitor/ |
| 104 | -install -m 500 script/rm_duplicat_conf.sh %{buildroot}/usr/libexec/sysmonitor/ | 104 | +install -m 500 script/rm_duplicat_conf.sh %{buildroot}%{_libexecdir}/sysmonitor/ |
| 105 | -install -m 500 script/process_clock_data.sh %{buildroot}/usr/libexec/sysmonitor/ | 105 | +install -m 500 script/process_clock_data.sh %{buildroot}%{_libexecdir}/sysmonitor/ |
| 106 | -install -m 500 script/iomonitor_daemon %{buildroot}/usr/sbin/ | 106 | +install -m 500 script/iomonitor_daemon %{buildroot}%{_sbindir} |
| 107 | install -m 600 conf/io_monitor %{buildroot}/etc/sysmonitor.d/ | 107 | install -m 600 conf/io_monitor %{buildroot}/etc/sysmonitor.d/ |
| 108 | install -m 600 conf/zombie %{buildroot}%{_sysconfdir}/sysmonitor/zombie | 108 | install -m 600 conf/zombie %{buildroot}%{_sysconfdir}/sysmonitor/zombie |
| 109 | -install -m 500 script/getzombieparent.py %{buildroot}/usr/libexec/sysmonitor/ | 109 | +install -m 500 script/getzombieparent.py %{buildroot}%{_libexecdir}/sysmonitor/ |
| 110 | -install -m 500 script/clean_remain_process.sh %{buildroot}/usr/libexec/sysmonitor/ | 110 | +install -m 500 script/clean_remain_process.sh %{buildroot}%{_libexecdir}/sysmonitor/ |
| 111 | 111 | ||
| 112 | -mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system/multi-user.target.wants | 112 | +mkdir -p $RPM_BUILD_ROOT%{_unitdir}/multi-user.target.wants |
| 113 | mkdir -p $RPM_BUILD_ROOT/etc/systemd/ | 113 | mkdir -p $RPM_BUILD_ROOT/etc/systemd/ |
| 114 | install -m 600 conf/logind_monitor %{buildroot}%{_sysconfdir}/sysmonitor.d/ | 114 | install -m 600 conf/logind_monitor %{buildroot}%{_sysconfdir}/sysmonitor.d/ |
| 115 | -install -m 500 script/logind_clear.sh %{buildroot}/usr/libexec/sysmonitor/ | 115 | +install -m 500 script/logind_clear.sh %{buildroot}%{_libexecdir}/sysmonitor/ |
| 116 | 116 | ||
| 117 | -install -m 0600 service/sysmonitor.service $RPM_BUILD_ROOT/usr/lib/systemd/system/sysmonitor.service | 117 | +install -m 0600 service/sysmonitor.service $RPM_BUILD_ROOT%{_unitdir}/sysmonitor.service |
| 118 | -ln -s ../sysmonitor.service $RPM_BUILD_ROOT/usr/lib/systemd/system/multi-user.target.wants/sysmonitor.service | 118 | +ln -s ../sysmonitor.service $RPM_BUILD_ROOT%{_unitdir}/multi-user.target.wants/sysmonitor.service |
| 119 | 119 | ||
| 120 | %post | 120 | %post |
| 121 | %systemd_post sysmonitor.service | 121 | %systemd_post sysmonitor.service |
| @@ -141,40 +141,38 @@ done | |||
| 141 | depmod -a $(uname -r) | 141 | depmod -a $(uname -r) |
| 142 | systemctl daemon-reload 2>/dev/null 1>/dev/null | 142 | systemctl daemon-reload 2>/dev/null 1>/dev/null |
| 143 | 143 | ||
| 144 | -%clean | ||
| 145 | - | ||
| 146 | %files | 144 | %files |
| 147 | %defattr(-,root,root) | 145 | %defattr(-,root,root) |
| 148 | %dir %{_sysconfdir}/sysmonitor | 146 | %dir %{_sysconfdir}/sysmonitor |
| 149 | %dir %{_sysconfdir}/sysmonitor/process | 147 | %dir %{_sysconfdir}/sysmonitor/process |
| 150 | %dir %{_sysconfdir}/sysmonitor.d/ | 148 | %dir %{_sysconfdir}/sysmonitor.d/ |
| 151 | -%dir /usr/libexec/ | 149 | +%dir %{_libexecdir}/sysmonitor |
| 152 | -%dir /usr/libexec/sysmonitor | ||
| 153 | -%dir /usr/ | ||
| 154 | -%dir %{_sysconfdir}/sysconfig | ||
| 155 | %dir %attr(0550,root,root) /lib/modules/sysmonitor | 150 | %dir %attr(0550,root,root) /lib/modules/sysmonitor |
| 156 | %config(noreplace) %{_sysconfdir}/sysconfig/sysmonitor | 151 | %config(noreplace) %{_sysconfdir}/sysconfig/sysmonitor |
| 157 | %config(noreplace) %{_sysconfdir}/sysmonitor/* | 152 | %config(noreplace) %{_sysconfdir}/sysmonitor/* |
| 158 | %config(noreplace) %{_sysconfdir}/sysmonitor/process/* | 153 | %config(noreplace) %{_sysconfdir}/sysmonitor/process/* |
| 159 | -%{_bindir}/sysmonitor | 154 | +%attr(0500,root,root) %{_bindir}/sysmonitor |
| 160 | 155 | ||
| 161 | -/usr/libexec/sysmonitor/* | 156 | +%{_libexecdir}/sysmonitor/* |
| 162 | -%attr(0500,root,root) /usr/libexec/sysmonitor/sysmonitor_log_dump.sh | 157 | +%attr(0500,root,root) %{_libexecdir}/sysmonitor/sysmonitor_log_dump.sh |
| 163 | -%config(noreplace) %attr(0600,root,root) /usr/libexec/sysmonitor/sysmonitor-logrotate | 158 | +%config(noreplace) %attr(0600,root,root) %{_libexecdir}/sysmonitor/sysmonitor-logrotate |
| 164 | -%exclude /usr/libexec/sysmonitor/*.pyc | 159 | +%exclude %{_libexecdir}/sysmonitor/*.pyc |
| 165 | -%exclude /usr/libexec/sysmonitor/*.pyo | 160 | +%exclude %{_libexecdir}/sysmonitor/*.pyo |
| 166 | -%dir %attr(0700,root,root) /usr/libexec/sysmonitor/data | 161 | +%dir %attr(0700,root,root) %{_libexecdir}/sysmonitor/data |
| 167 | %attr(0400,root,root) /lib/modules/sysmonitor/sysmonitor.ko | 162 | %attr(0400,root,root) /lib/modules/sysmonitor/sysmonitor.ko |
| 168 | 163 | ||
| 169 | %config(noreplace) /etc/rsyslog.d/sysmonitor.conf | 164 | %config(noreplace) /etc/rsyslog.d/sysmonitor.conf |
| 170 | -%attr(0500,root,root) /usr/sbin/iomonitor_daemon | 165 | +%attr(0500,root,root) %{_sbindir}/iomonitor_daemon |
| 171 | %attr(0600,root,root) /etc/sysmonitor.d/io_monitor | 166 | %attr(0600,root,root) /etc/sysmonitor.d/io_monitor |
| 172 | 167 | ||
| 173 | %config(noreplace) %{_sysconfdir}/sysmonitor.d/* | 168 | %config(noreplace) %{_sysconfdir}/sysmonitor.d/* |
| 174 | -/usr/lib/systemd/system/sysmonitor.service | 169 | +%{_unitdir}/sysmonitor.service |
| 175 | -/usr/lib/systemd/system/multi-user.target.wants/sysmonitor.service | 170 | +%{_unitdir}/multi-user.target.wants/sysmonitor.service |
| 176 | 171 | ||
| 177 | %changelog | 172 | %changelog |
| 173 | +* Tue Sep 02 2025 Funda Wang <fundawang@yeah.net> - 1.3.2-1.9 | ||
| 174 | +- adopt to new cmake macro | ||
| 175 | + | ||
| 178 | * Wed Mar 12 2025 laokz <zhangkai@iscas.ac.cn> - 1.3.2-1.8 | 176 | * Wed Mar 12 2025 laokz <zhangkai@iscas.ac.cn> - 1.3.2-1.8 |
| 179 | - Type:update | 177 | - Type:update |
| 180 | - CVE:NA | 178 | - CVE:NA |
打包最后阶段，要对文件进行 strip，500将会由于权限不足而报错。后面文件列表中已经另外指定了权限。