Compare commits
57 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
4f5555fd93 | ||
|
41810c0183 | ||
|
80d26cc25d | ||
|
b55a2bf582 | ||
|
f8aba22277 | ||
|
546e5df3f8 | ||
|
d94c41b073 | ||
|
73865d1b19 | ||
|
c5260c37ca | ||
|
75238a36b6 | ||
|
d5b6ba4459 | ||
|
f82432f5b8 | ||
|
8ef0b12494 | ||
|
3401e7590b | ||
|
96e360bbd3 | ||
|
db4e6050c3 | ||
|
0ce69dd0af | ||
|
f5b5dd13ab | ||
|
ce96093692 | ||
|
15feb4bf91 | ||
|
22ece095ba | ||
|
4f670473bc | ||
|
fc5f7661b7 | ||
|
0673f33a6c | ||
|
321a201444 | ||
|
9d877ecfb4 | ||
|
a5202f3722 | ||
|
b6596df4db | ||
|
64a9642399 | ||
|
d57a115ed2 | ||
|
485ebbfc07 | ||
|
6f2496dfd9 | ||
|
162bc1b6d2 | ||
|
bcca29d235 | ||
|
daf9de84de | ||
|
b1b8dfa59c | ||
|
342afd8d76 | ||
|
55f858ba19 | ||
|
b3e4b739a6 | ||
|
065d0a39a9 | ||
|
cc9c366586 | ||
|
11f5651a66 | ||
|
267ede3def | ||
|
0bca0ad2b5 | ||
|
43c21699a0 | ||
|
e1255466db | ||
|
52d7a43757 | ||
|
25af0aa37d | ||
|
ce248208b3 | ||
|
cb198ee2d9 | ||
|
216f17b101 | ||
|
03ed0da483 | ||
|
fae4fed9ba | ||
|
765f1c8ba2 | ||
|
a30b57283d | ||
|
631001330c | ||
|
a27d58639d |
9
.gitignore
vendored
9
.gitignore
vendored
@ -1,6 +1,3 @@
|
||||
numactl-2.0.2.tar.gz
|
||||
numactl-2.0.3-rc3.tar.gz
|
||||
numactl-2.0.3.tar.gz
|
||||
/numactl-2.0.5.tar.gz
|
||||
/numactl-2.0.6.tar.gz
|
||||
/numactl-2.0.7.tar.gz
|
||||
/numactl-[2-9]*
|
||||
/.build-[2-9]*.log
|
||||
/x86_64/
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -up numactl-2.0.2/clearcache.c.orig numactl-2.0.2/clearcache.c
|
||||
--- numactl-2.0.2/clearcache.c.orig 2008-09-29 16:08:38.000000000 -0400
|
||||
+++ numactl-2.0.2/clearcache.c 2008-09-29 16:08:49.000000000 -0400
|
||||
@@ -57,7 +57,7 @@ void clearcache(unsigned char *mem, unsi
|
||||
#if defined(__i386__) || defined(__x86_64__)
|
||||
unsigned i, cl, eax, feat;
|
||||
/* get clflush unit and feature */
|
||||
- asm("cpuid" : "=a" (eax), "=b" (cl), "=d" (feat) : "0" (1) : "cx");
|
||||
+ asm("cpuid" : "=a" (eax), "=r" (cl), "=d" (feat) : "0" (1) : "cx");
|
||||
if (!(feat & (1 << 19)))
|
||||
fallback_clearcache();
|
||||
cl = ((cl >> 8) & 0xff) * 8;
|
@ -1,35 +0,0 @@
|
||||
diff -up numactl-2.0.3/libnuma.c.orig numactl-2.0.3/libnuma.c
|
||||
--- numactl-2.0.3/libnuma.c.orig 2009-08-10 09:59:24.000000000 -0400
|
||||
+++ numactl-2.0.3/libnuma.c 2009-08-10 10:00:40.000000000 -0400
|
||||
@@ -95,6 +95,19 @@ numa_init(void)
|
||||
memset(&numa_no_nodes, 0, sizeof(numa_no_nodes));
|
||||
}
|
||||
|
||||
+void
|
||||
+numa_fini(void)
|
||||
+{
|
||||
+ if (numa_all_cpus_ptr)
|
||||
+ numa_bitmask_free(numa_all_cpus_ptr);
|
||||
+ if (numa_all_nodes_ptr)
|
||||
+ numa_bitmask_free(numa_all_nodes_ptr);
|
||||
+ if (numa_no_nodes_ptr)
|
||||
+ numa_bitmask_free(numa_no_nodes_ptr);
|
||||
+ if (nodes_allowed_list)
|
||||
+ free(nodes_allowed_list);
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* The following bitmask declarations, bitmask_*() routines, and associated
|
||||
* _setbit() and _getbit() routines are:
|
||||
diff -up numactl-2.0.3/Makefile.orig numactl-2.0.3/Makefile
|
||||
--- numactl-2.0.3/Makefile.orig 2009-06-10 08:30:03.000000000 -0400
|
||||
+++ numactl-2.0.3/Makefile 2009-08-10 10:00:00.000000000 -0400
|
||||
@@ -81,7 +81,7 @@ stream_main.o: stream_main.c
|
||||
libnuma.so.1: versions.ldscript
|
||||
|
||||
libnuma.so.1: libnuma.o syscall.o distance.o
|
||||
- ${CC} ${LDFLAGS} -shared -Wl,-soname=libnuma.so.1 -Wl,--version-script,versions.ldscript -Wl,-init,numa_init -o libnuma.so.1 $(filter-out versions.ldscript,$^)
|
||||
+ ${CC} ${LDFLAGS} -shared -Wl,-soname=libnuma.so.1 -Wl,--version-script,versions.ldscript -Wl,-init,numa_init -Wl,-fini,numa_fini -o libnuma.so.1 $(filter-out versions.ldscript,$^)
|
||||
|
||||
libnuma.so: libnuma.so.1
|
||||
ln -sf libnuma.so.1 libnuma.so
|
@ -1,40 +0,0 @@
|
||||
diff -up numactl-2.0.6/libnuma.c.orig numactl-2.0.6/libnuma.c
|
||||
--- numactl-2.0.6/libnuma.c.orig 2010-12-29 08:23:11.000000000 -0500
|
||||
+++ numactl-2.0.6/libnuma.c 2011-01-04 16:10:58.514024338 -0500
|
||||
@@ -1263,9 +1263,10 @@ numa_node_to_cpus_v1(int node, unsigned
|
||||
sprintf(fn, "/sys/devices/system/node/node%d/cpumap", node);
|
||||
f = fopen(fn, "r");
|
||||
if (!f || getdelim(&line, &len, '\n', f) < 1) {
|
||||
- numa_warn(W_nosysfs2,
|
||||
- "/sys not mounted or invalid. Assuming one node: %s",
|
||||
- strerror(errno));
|
||||
+ if (f)
|
||||
+ numa_warn(W_nosysfs2,
|
||||
+ "/sys not mounted or invalid. Assuming one node: %s",
|
||||
+ strerror(errno));
|
||||
bitmask.maskp = (unsigned long *)mask;
|
||||
bitmask.size = buflen_needed * 8;
|
||||
numa_bitmask_setall(&bitmask);
|
||||
@@ -1341,13 +1342,15 @@ numa_node_to_cpus_v2(int node, struct bi
|
||||
sprintf(fn, "/sys/devices/system/node/node%d/cpumap", node);
|
||||
f = fopen(fn, "r");
|
||||
if (!f || getdelim(&line, &len, '\n', f) < 1) {
|
||||
- numa_warn(W_nosysfs2,
|
||||
- "/sys not mounted or invalid. Assuming one node: %s",
|
||||
- strerror(errno));
|
||||
- numa_warn(W_nosysfs2,
|
||||
- "(cannot open or correctly parse %s)", fn);
|
||||
- numa_bitmask_setall(mask);
|
||||
- err = -1;
|
||||
+ if (f) {
|
||||
+ numa_warn(W_nosysfs2,
|
||||
+ "/sys not mounted or invalid. Assuming one node: %s",
|
||||
+ strerror(errno));
|
||||
+ numa_warn(W_nosysfs2,
|
||||
+ "(cannot open or correctly parse %s)", fn);
|
||||
+ numa_bitmask_setall(mask);
|
||||
+ err = -1;
|
||||
+ }
|
||||
}
|
||||
if (f)
|
||||
fclose(f);
|
197
numactl.spec
197
numactl.spec
@ -1,56 +1,55 @@
|
||||
Name: numactl
|
||||
Summary: Library for tuning for Non Uniform Memory Access machines
|
||||
Version: 2.0.7
|
||||
Release: 2%{dist}
|
||||
License: LGPLv2/GPLv2
|
||||
Group: System Environment/Base
|
||||
URL: ftp://oss.sgi.com/www/projects/libnuma/download
|
||||
Source0: ftp://oss.sgi.com/www/projects/libnuma/download/numactl-%{version}.tar.gz
|
||||
Buildroot: %{_tmppath}/%{name}-buildroot
|
||||
Version: 2.0.16
|
||||
Release: 2%{dist}
|
||||
# libnuma is LGPLv2 and GPLv2
|
||||
# numactl binaries are GPLv2 only
|
||||
License: GPLv2
|
||||
URL: https://github.com/numactl/numactl
|
||||
Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch1: numactl-2.0.3-rc3-no-nodes-warning.patch
|
||||
BuildRequires: make
|
||||
BuildRequires: libtool automake autoconf
|
||||
|
||||
ExcludeArch: s390 s390x %{arm}
|
||||
ExcludeArch: s390 %{arm}
|
||||
|
||||
%description
|
||||
Simple NUMA policy support. It consists of a numactl program to run
|
||||
other programs with a specific NUMA policy and a libnuma to do
|
||||
allocations with NUMA policy in applications.
|
||||
other programs with a specific NUMA policy.
|
||||
|
||||
%package libs
|
||||
Summary: libnuma libraries
|
||||
# There is a tiny bit of GPLv2 code in libnuma.c
|
||||
License: LGPLv2 and GPLv2
|
||||
|
||||
%description libs
|
||||
numactl-libs provides libnuma, a library to do allocations with
|
||||
NUMA policy in applications.
|
||||
|
||||
%package devel
|
||||
Summary: Development package for building Applications that use numa
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
License: LGPLv2 and GPLv2
|
||||
|
||||
%description devel
|
||||
Provides development headers for numa library calls
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch1 -p1
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
make CFLAGS="$RPM_OPT_FLAGS -I."
|
||||
%configure --prefix=/usr --libdir=%{_libdir}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_libdir}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_includedir}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
|
||||
%make_install
|
||||
|
||||
make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets
|
||||
%ldconfig_scriptlets libs
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libnuma.so.1
|
||||
%doc README.md
|
||||
%{_bindir}/numactl
|
||||
%{_bindir}/numademo
|
||||
%{_bindir}/numastat
|
||||
@ -58,17 +57,151 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/migspeed
|
||||
%{_bindir}/migratepages
|
||||
%{_mandir}/man8/*.8*
|
||||
%exclude %{_mandir}/man2/*.2*
|
||||
|
||||
%files libs
|
||||
%{_libdir}/libnuma.so.1.0.0
|
||||
%{_libdir}/libnuma.so.1
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libnuma.so
|
||||
%exclude %{_libdir}/libnuma.a
|
||||
%{_libdir}/pkgconfig/numa.pc
|
||||
%{_includedir}/numa.h
|
||||
%{_includedir}/numaif.h
|
||||
%{_includedir}/numacompat1.h
|
||||
%{_mandir}/man3/*.3*
|
||||
|
||||
%changelog
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.16-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Oct 08 2022 Filipe Brandenburger <filbranden@gmail.com> - 2.0.16-1
|
||||
- Upgrade to 2.0.16
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Nov 11 2020 Florian Weimer <fweimer@redhat.com> - 2.0.14-2
|
||||
- Trigger rebuild to avoid DT_INIT/DT_FINI with zero values
|
||||
|
||||
* Thu Sep 17 2020 Filipe Brandenburger <filbranden@gmail.com> - 2.0.14-1
|
||||
- Upgrade to 2.0.14
|
||||
- Re-enabled LTO, now that upstream has been fixed to support it.
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 2.0.12-5
|
||||
- Disable LTO
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Jul 25 2018 Filipe Brandenburger <filbranden@gmail.com> - 2.0.12-1
|
||||
- Rebased to version 2.0.12
|
||||
|
||||
* Wed Jul 25 2018 Filipe Brandenburger <filbranden@gmail.com>
|
||||
- Fix check-rpaths warning about including /usr/lib64 in RPATH of the binaries.
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Sat Mar 24 2018 Richard W.M. Jones <rjones@redhat.com> - 2.0.11-9%{dist}
|
||||
- Fix major/minor macros on glibc 2.27.
|
||||
- Update config.{guess,sub} with versions which understand riscv64.
|
||||
- Remove obsolete Buildroot tag.
|
||||
|
||||
* Sat Feb 24 2018 Florian Weimer <fweimer@redhat.com> - 2.0.11-8%{dist}
|
||||
- Use LDFLAGS from redhat-rpm-config
|
||||
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.0.11-7
|
||||
- Escape macros in %%changelog
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Mon Feb 06 2017 Petr Holasek <holasekp@gmail.com> - 2.0.11-3
|
||||
- s390x arch enabled (bz1419064)
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Mon Dec 14 2015 Petr Holasek <pholasek@redhat.com> - 2.0.11-1
|
||||
- Rebased to version 2.0.11 (bz1290941)
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.10-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Oct 13 2014 Petr Holasek <pholasek@redhat.com> 2.0.10-2
|
||||
- Fixing package conflict with man-pages (bz1151552)
|
||||
|
||||
* Wed Oct 08 2014 Petr Holasek <pholasek@redhat.com> 2.0.10-1
|
||||
- Rebased to version 2.0.10 (bz1150511)
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.9-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Thu Jul 31 2014 Petr Holasek <pholasek@redhat.com> 2.0.9-3
|
||||
- fixed segfault on non-NUMA systems (bz1080421)
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed Oct 09 2013 Petr Holasek <pholasek@redhat.com> 2.0.9-1
|
||||
- rebased to version 2.0.9
|
||||
|
||||
* Fri Aug 02 2013 Karsten Hopp <karsten@redhat.com> 2.0.8-4
|
||||
- rebuild in F20 to fix some dependency issues on PPC
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Tue Jan 22 2013 Petr Holasek <pholasek@redhat.com> - 2.0.8-3
|
||||
- deleted empty numastat file
|
||||
|
||||
* Thu Nov 1 2012 Tom Callaway <spot@fedoraproject.org> - 2.0.8-2
|
||||
- fix license issues
|
||||
|
||||
* Fri Oct 26 2012 Petr Holasek <pholasek@redhat.com> - 2.0.8-1
|
||||
- Rebased to version 2.0.8
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.7-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sat May 19 2012 Petr Holasek <pholasek@redhat.com> - 2.0.7-6
|
||||
- numademo segfault fix (bz823125, bz823127)
|
||||
|
||||
* Sun Apr 15 2012 Petr Holasek <pholasek@redhat.com> - 2.0.7-5
|
||||
- Library splitted out of numactl package to numactl-libs
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.7-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Jan 02 2012 Anton Arapov <anton@redhat.com> - 2.0.7-3
|
||||
- Include missing manpages
|
||||
|
||||
* Sat Jun 18 2011 Peter Robinson <pbrobinson@gmail.com> - 2.0.7-2
|
||||
- Exclude ARM platforms
|
||||
|
||||
@ -146,7 +279,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
* Fri Jan 12 2007 Neil Horman <nhorman@redhat.com> - 0.9.8-2
|
||||
- Properly fixed bz 221982
|
||||
- Updated revision string to include %{dist}
|
||||
- Updated revision string to include %%{dist}
|
||||
|
||||
* Thu Jan 11 2007 Neil Horman <nhorman@redhat.com> - 0.9.8-1.38
|
||||
- Fixed -devel to depend on base package so libnuma.so resolves
|
||||
|
Loading…
Reference in New Issue
Block a user