diff --git a/Do-not-create-an-rc.d-entry-or-re-start-the-service.patch b/Do-not-create-an-rc.d-entry-or-re-start-the-service.patch new file mode 100644 index 0000000000000000000000000000000000000000..901efd5abf9ab49a90f233b3c03ca9d708803272 --- /dev/null +++ b/Do-not-create-an-rc.d-entry-or-re-start-the-service.patch @@ -0,0 +1,40 @@ +From c8804765e6137cf4bb209d19efb6af7fb4592cf2 Mon Sep 17 00:00:00 2001 +From: Guo Ce +Date: Thu, 17 Oct 2024 14:43:51 +0800 +Subject: [PATCH] Do not create an rc.d entry or (re)start the service during + the install phase + +--- + Makefile | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/Makefile b/Makefile +index 2742e55..e2afc6d 100644 +--- a/Makefile ++++ b/Makefile +@@ -45,18 +45,10 @@ RANLIB ?= ranlib + # BB_FIXME MANPAGES := numa.3 numactl.8 numastat.8 migratepages.8 migspeed.8 + + install: numad +- mkdir -p $(DESTDIR)/etc/default +- mkdir -p $(DESTDIR)/etc/logrotate.d +- mkdir -p $(DESTDIR)/etc/init.d +- mkdir -p $(DESTDIR)${prefix}/bin +- mkdir -p $(DESTDIR)${prefix}/share/man/man8 +- install -m 0755 numad $(DESTDIR)${prefix}/bin +- install -m 0644 numad.8 $(DESTDIR)${prefix}/share/man/man8 +- install -m 0644 numad.conf $(DESTDIR)/etc/default/numad +- install -m 0755 numad.init $(DESTDIR)/etc/init.d/numad +- install -m 0644 numad.logrotate $(DESTDIR)/etc/logrotate.d/numad +- update-rc.d numad defaults +- service numad restart ++ mkdir -p ${prefix}/bin ++ mkdir -p ${prefix}/share/man/man8 ++ install -m 0755 numad ${prefix}/bin ++ install -m 0644 numad.8 ${prefix}/share/man/man8 + + clean: + rm -f ${CLEANFILES} +-- +2.33.0 + diff --git a/numad-0.5git-m-option.patch b/numad-0.5git-m-option.patch deleted file mode 100644 index 8fee75f9ec82c5c8bf99d8b5cc414f65b036ec7f..0000000000000000000000000000000000000000 --- a/numad-0.5git-m-option.patch +++ /dev/null @@ -1,21 +0,0 @@ -Resolves: #1506477 - -commit cf6c2c029edc9c288122bcd603a72eb7f6d042d2 -Author: Jan Synacek -Date: Mon Oct 30 11:37:45 2017 +0100 - - recognize -m option correctly - -diff --git a/numad.c b/numad.c -index 4c85486..0721af4 100644 ---- a/numad.c -+++ b/numad.c -@@ -2395,7 +2395,7 @@ int main(int argc, char *argv[]) { - int x_flag = 0; - int tmp_int = 0; - long list_pid = 0; -- while ((opt = getopt(argc, argv, "C:dD:hH:i:K:l:p:r:R:S:t:u:vVw:x:")) != -1) { -+ while ((opt = getopt(argc, argv, "C:dD:hH:i:K:l:m:p:r:R:S:t:u:vVw:x:")) != -1) { - switch (opt) { - case 'C': - C_flag = 1; diff --git a/numad-0.5git.tar.xz b/numad-0.5git.tar.xz deleted file mode 100644 index 859f533640c8ec3830486dcfcfe299be893d9d01..0000000000000000000000000000000000000000 Binary files a/numad-0.5git.tar.xz and /dev/null differ diff --git a/numad-0.7.1.tar.gz b/numad-0.7.1.tar.gz new file mode 100755 index 0000000000000000000000000000000000000000..cc067b0ad4085caee3212890a64f0938396d59a9 Binary files /dev/null and b/numad-0.7.1.tar.gz differ diff --git a/numad.spec b/numad.spec index f9db67ac3c93f0a01fa9b90df0ebefccdc32af73..82de208fd85696ae7854dc9ef0ad4a4c75ac8649 100644 --- a/numad.spec +++ b/numad.spec @@ -1,10 +1,10 @@ Name: numad -Version: 0.5 -Release: 33 +Version: 0.7.1 +Release: 1 Summary: NUMA user daemon License: LGPLv2 URL: https://pagure.io/numad -Source0: %{name}-%{version}git.tar.xz +Source0: %{name}-%{version}.tar.gz Recommends: %{name}-help = %{version}-%{release} BuildRequires: systemd-units gcc git @@ -12,8 +12,8 @@ Requires: systemd-units Requires(post): systemd-units Requires(preun): systemd-units -Patch0: numad-0.5git-m-option.patch -Patch1: avoid-array-index-out-of-bounds.patch +Patch0: avoid-array-index-out-of-bounds.patch +Patch1: Do-not-create-an-rc.d-entry-or-re-start-the-service.patch %description Numad is a deamon that monitors NUMA topology and usage and distributes @@ -27,7 +27,7 @@ BuildArch: noarch Help files for %{name}. %prep -%autosetup -n %{name}-%{version}git -p1 +%autosetup -n %{name}-%{version} -p1 %build make CFLAGS="$RPM_OPT_FLAGS -std=gnu99" LDFLAGS="$RPM_LD_FLAGS -lpthread -lrt -lm" @@ -57,6 +57,10 @@ install -m 644 numad.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %systemd_postun numad.service %changelog +* Thu Jul 25 2024 GuoCe - 0.7.1-1 +- Adjust logrotate script. +- Don't order service after syslog target. + * Thu Sep 1 2022 Chunsheng Luo - 0.5-33 - Add help for Recommends