--- numactl-2.0.10.orig/debian/README.debian +++ numactl-2.0.10/debian/README.debian @@ -0,0 +1,12 @@ +numactl for Debian +---------------------- + +Note the example applications, memhog and numademo, are installed in +/usr/share/doc/numctl/examples. The upstream source code comes with a +small test suite which is not included in the Debian package. You may +like to investigate this if you are having problems. + +This code is not finalised as yet, so please be sure to report any +bugs or other mis-behaviour. + +We ship a static library where upstream does not, see #423182 --- numactl-2.0.10.orig/debian/changelog +++ numactl-2.0.10/debian/changelog @@ -0,0 +1,387 @@ +numactl (2.0.10-1ubuntu2.1) vivid-proposed; urgency=medium + + * d/p/libnuma-ppc64el-cpu-number-not-contiguous - patch from Thierry FAUCK + (LP: #1358835) + + -- Serge Hallyn Thu, 21 May 2015 15:15:21 -0700 + +numactl (2.0.10-1ubuntu2) vivid; urgency=medium + + * d/patches/from-git-6a7c2cf3-fix-uninitialised-mask.patch: Fix libnuma SEGV + due to uninitialised mask. (LP: #1441388) + + -- Daniel J Blueman Wed, 08 Apr 2015 05:30:55 +0200 + +numactl (2.0.10-1ubuntu1) vivid; urgency=medium + + * cherrypick add-check-for-return-value-of-node-to-cpus.patch from + upstream to fix warning when cpu_index > 79 (LP: #1358835) + + -- Serge Hallyn Tue, 24 Feb 2015 23:03:30 -0600 + +numactl (2.0.10-1) unstable; urgency=medium + + * Update to 2.0.10 final + * Upstream now uses autoconf/make; modify rules file + to use autotools cdbs class + * Update standards to 3.9.6 (no changes) + * Add hppa too (Closes: #764665) + + -- Ian Wienand Wed, 22 Oct 2014 21:45:46 +1100 + +numactl (2.0.10~rc2-3) unstable; urgency=medium + + * Turns out that kernel headers aren't generic enough to work anywhere. + Return arch to "i386 amd64 ia64 mips mipsel mipsn32 mipsn32el mips64 + mips64el powerpc powerpcspe x32 ppc64 ppc64el arm64 sparc" + (Closes: #762449) + + -- Ian Wienand Sat, 27 Sep 2014 13:53:11 +1000 + +numactl (2.0.10~rc2-2) unstable; urgency=medium + + * Change architecture to "any". There is no reason this can't build + everywhere. (Closes: #739725) + + -- Ian Wienand Mon, 22 Sep 2014 09:21:33 +1000 + +numactl (2.0.10~rc2-1) unstable; urgency=medium + + * Upgrade to 2.0.10-rc2 + * Remove 001_no_numa.patch; fixed upstream + + -- Ian Wienand Tue, 09 Sep 2014 21:33:32 +1000 + +numactl (2.0.9-1) unstable; urgency=low + + * Upgrade to 2.0.9 + * Upgrade standards to 3.9.5 (no change) + * Add 001_no_numa.patch to avoid crash when no NUMA present (Closes: + #712692) + + -- Ian Wienand Sat, 21 Jun 2014 12:34:13 +1000 + +numactl (2.0.9~rc5-1) unstable; urgency=low + + * Upgrade to 2.0.9~rc5 + * Include multi-arch patch, thanks Eleanor Chen ! + (Closes: #719953) + * Various updates to multi-arch to make it compliant + * Remove debian/*.dirs as upstream makes directories + * Update to compat 9 so dh_strip generates debug pkg with build-id + + -- Ian Wienand Thu, 19 Sep 2013 13:45:43 +1000 + +numactl (2.0.8-3) unstable; urgency=low + + * Add x32 & ppc64 to supported arch list (Closes: #714001) + + -- Ian Wienand Wed, 26 Jun 2013 19:38:58 +1000 + +numactl (2.0.8-2) unstable; urgency=low + + * Add powerpcspe to support arch list (Closes: #711883) + * Update standards version to 3.9.4 (no changes) + + -- Ian Wienand Tue, 11 Jun 2013 20:54:58 +1000 + +numactl (2.0.8-1) unstable; urgency=low + + * New upstream + + -- Ian Wienand Thu, 15 Nov 2012 12:20:29 -0800 + +numactl (2.0.8~rc4-1) unstable; urgency=low + + * New upstream + + -- Ian Wienand Sun, 01 Jul 2012 00:11:37 -0700 + +numactl (2.0.8~rc3-1) unstable; urgency=low + + * New upstream + + -- Ian Wienand Fri, 03 Feb 2012 09:50:36 -0800 + +numactl (2.0.8~rc2-1) unstable; urgency=low + + * New upstream (Closes: #548030) + * Update standards to 3.9.2 + * No patches so remove from rules + + -- Ian Wienand Thu, 15 Sep 2011 20:56:50 -0700 + +numactl (2.0.5-1) unstable; urgency=low + + * New upstream + * Update standards to 3.9.1 + * Update debhelper compat to 7 + * Remove libnuma1.shlibs; should be covered by -V to + dh_makeshlibs (Closes: #570201) + + -- Ian Wienand Wed, 11 Aug 2010 22:32:39 -0700 + +numactl (2.0.4~rc2-1) unstable; urgency=low + + * New upstream + * Update standards version, no changes + * Make dev & dbg packages depend on the exact binary version (Closes: + #570201) + + -- Ian Wienand Thu, 11 Feb 2010 15:20:37 -0800 + +numactl (2.0.3-1) unstable; urgency=low + + * New upstream + * Upstream URL in copyright is fixed (Closes: #499425) + + -- Ian Wienand Fri, 19 Jun 2009 11:18:56 -0700 + +numactl (2.0.3~rc3-1) unstable; urgency=low + + * New upstream (Closes: #525014) + * Move libnuma-dbg to debug section + * Add ${misc:Depends} deps to packages + * Update to standards version to 3.8.1 + + -- Ian Wienand Thu, 30 Apr 2009 08:04:32 -0700 + +numactl (2.0.3~rc2-1) unstable; urgency=low + + * New upstream + + -- Ian Wienand Tue, 21 Apr 2009 07:32:53 -0700 + +numactl (2.0.3~rc1-2) unstable; urgency=low + + * While I'm at it, fix up the upstream location in copyright file + (Closes: #499425) + + -- Ian Wienand Wed, 24 Dec 2008 10:21:22 -0800 + +numactl (2.0.3~rc1-1) unstable; urgency=low + + * New upstream + + -- Ian Wienand Wed, 24 Dec 2008 09:03:30 -0800 + +numactl (2.0.2+release-1) unstable; urgency=low + + * New upstream, 2.0.2 + * Accidentally used -rcN for the versions below, when I shouldn't have + put the hyphen in there. Hence the funny Debian revision - will be + sure to avoid when upstream moves to 2.0.3... + + -- Ian Wienand Wed, 13 Aug 2008 22:08:19 -0700 + +numactl (2.0.2-rc2) unstable; urgency=low + + * New upstream (Closes: #487954) + + -- Ian Wienand Sun, 13 Jul 2008 16:27:55 -0700 + +numactl (2.0.2-rc1) unstable; urgency=low + + * New upstream + * Add versioned depends for numactl on >= 2.0.1 due to API changes + + -- Ian Wienand Sat, 28 Jun 2008 15:43:21 -0700 + +numactl (2.0.1+20080610-1) unstable; urgency=low + + * New upstream (no upstrem version number change, stamped with date) + * All patches now accepted upstream + * Closes: #485398 -- fixed upstream; thanks for reporting Daniel + + -- Ian Wienand Mon, 09 Jun 2008 22:51:15 -0700 + +numactl (2.0.1-1) unstable; urgency=low + + * New upstream + * patches/static-lib.patch: update + * debian/watch: update to new SGI location + + -- Ian Wienand Sat, 07 Jun 2008 14:18:22 -0700 + +numactl (1.0.2-1) unstable; urgency=low + + * New upstream + * Closes: #442690 -- Add to rules a hack to remove libnuma.a after + unpatching + * Update README.debian + + -- Ian Wienand Wed, 03 Oct 2007 21:49:27 +1000 + +numactl (1.0.1-1) unstable; urgency=low + + * New upstream + * Remove patches/powerpc.patch: fixed upstream + + -- Ian Wienand Tue, 21 Aug 2007 15:08:14 +1000 + +numactl (0.9.11-4) unstable; urgency=low + + * Closes: #423771 -- drop hppa and s390 due to no kernel support, add + mipsel, thanks Steve Langasek + * Closes: #423182 -- Install static library; add + patches/static-lib.patch, update libnuma-dev.install. Thanks Samuel + Thibault + + -- Ian Wienand Tue, 15 May 2007 21:57:55 +1000 + +numactl (0.9.11-3) unstable; urgency=low + + * Closes: #419054 -- add migratepages app/man [Anton Blanchard] + + -- Ian Wienand Mon, 16 Apr 2007 15:06:29 +1000 + +numactl (0.9.11-2) unstable; urgency=low + + * add powerpc.patch; fix FTBFS due to typo on PowerPC + + -- Ian Wienand Fri, 3 Nov 2006 10:31:24 +1100 + +numactl (0.9.11-1) unstable; urgency=medium + + * New upstream + * remove previous patch; now in upstream + + -- Ian Wienand Thu, 2 Nov 2006 09:56:10 +1100 + +numactl (0.9.10-2) unstable; urgency=low + + * add patches/powerpc.patch with migrate_pages syscall. I am told this + will be the right number now (see: + http://lists.debian.org/debian-powerpc/2006/10/msg00329.html) + + -- Ian Wienand Mon, 30 Oct 2006 17:04:58 +1100 + +numactl (0.9.10-1) unstable; urgency=low + + * New upstream + * Closes: #392316 -- restrict build architectures to i386 amd64 ia64 + s390 mips hppa, as these are the architectures that have all the NUMA + syscalls wired-up in the current kernel (2.6.18). Note PowerPC is + special cased in the code but not enabled -- this is because the + syscall numbers bewteen libnuma and the kernel don't match up. + + -- Ian Wienand Mon, 16 Oct 2006 10:09:37 +1000 + +numactl (0.9.9-2) unstable; urgency=low + + * Closes: #381318 -- add patch to make sure maths lib included + + -- Ian Wienand Fri, 4 Aug 2006 10:34:54 +1000 + +numactl (0.9.9-1) unstable; urgency=low + + * New upstream + * Change maintiner email to ianw@debian.org + + -- Ian Wienand Mon, 10 Jul 2006 12:28:52 +1000 + +numactl (0.9.8-1) unstable; urgency=low + + * New upstream + * Closes: #363450 -- add patch for HPPA support + * Closes: #372132 -- get_mempolicy man page not around any more + + -- Ian Wienand Tue, 25 Apr 2006 15:21:51 -0700 + +numactl (0.9.7-1) unstable; urgency=low + + * New upstream + * remove mkdir patch + * Closes: #357468 -- add patch for MIPS support + + -- Ian Wienand Fri, 31 Mar 2006 08:34:33 +1100 + +numactl (0.9.6-1) unstable; urgency=low + + * New upstream + * syscall manpages removed; in man-pages >= 2.27 + * add -dbg package + + -- Ian Wienand Wed, 29 Mar 2006 22:12:42 +1100 + +numactl (0.9.3-2) unstable; urgency=low + + * Add libdir target in rules to override upstream biarch detection + + -- Ian Wienand Mon, 20 Feb 2006 10:47:02 +1100 + +numactl (0.9.3-1) unstable; urgency=low + + * New upstream + * Remove __thread detection patch (fixed upstream) + + -- Ian Wienand Mon, 13 Feb 2006 21:26:09 +1100 + +numactl (0.9.2-1) unstable; urgency=low + + * New upstream + * Closes: #350596 -- check for __thread support + * Upstream handles /lib64 better; remove patch we had to deal with that. + * Add a patch to work around a problem with __thread detection + + -- Ian Wienand Mon, 13 Feb 2006 11:38:46 +1100 + +numactl (0.9-1) unstable; urgency=low + + * New upstream + * Most patches accepted into upstream; see upstream changelog or + debian/patches/README in source package for history + + -- Ian Wienand Wed, 4 Jan 2006 10:25:27 +1100 + +numactl (0.8-1) unstable; urgency=low + + * New upstream + * don't install numamon + + -- Ian Wienand Mon, 19 Dec 2005 21:06:46 +1100 + +numactl (0.7pre2-6) unstable; urgency=low + + * Closes: #329755 -- add expansion of NUMA acronym in control + * Closes: #343490 -- add patch to assume only one node for SMP + (patch from Samuel Thibault ) + + -- Ian Wienand Fri, 16 Dec 2005 10:02:58 +1100 + +numactl (0.7pre2-5) unstable; urgency=low + + * patches/man-section.diff : fix up man sections to stop lintian + * move .so out of non-dev package + * don't autogenerate control file; done by external scripts now + + -- Ian Wienand Fri, 25 Nov 2005 17:04:25 +1100 + +numactl (0.7pre2-4) unstable; urgency=medium + + * update build infrastructre; more patches less modifying upstream + * Closes: #338358 -- fix typo to put includes in right directory + + -- Ian Wienand Thu, 10 Nov 2005 10:14:45 +1100 + +numactl (0.7pre2-3) unstable; urgency=low + + * upload into unstable + * update standards version + * workaround for bug#323285 to fix FTBS (see TODO) + + -- Al Stone Sat, 10 Sep 2005 15:52:02 -0600 + +numactl (0.7pre2-2) experimental; urgency=low + + * add patches/cpubind.diff to fix up --cpubind argument + * let cdbs handle build deps + + -- Ian Wienand Wed, 10 Aug 2005 18:58:03 +0000 + +numactl (0.7pre2-1) experimental; urgency=low + + * Initial release. + * Closes: bug#283443 -- ITP libnuma + + -- Ian Wienand Wed, 15 Dec 2004 15:44:20 +1100 --- numactl-2.0.10.orig/debian/compat +++ numactl-2.0.10/debian/compat @@ -0,0 +1 @@ +9 --- numactl-2.0.10.orig/debian/control +++ numactl-2.0.10/debian/control @@ -0,0 +1,53 @@ +Source: numactl +Section: admin +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ian Wienand +Uploaders: Al Stone +Standards-Version: 3.9.6 +Build-Depends: cdbs, + autotools-dev, + debhelper (>= 9~), + dh-buildinfo, debhelper (>= 9) + +Package: numactl +Multi-Arch: foreign +Architecture: i386 amd64 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc powerpcspe x32 ppc64 ppc64el arm64 sparc hppa +Depends: ${shlibs:Depends}, ${misc:Depends}, libnuma1 (>= 2.0.1) +Description: NUMA scheduling and memory placement tool + numactl runs processes with a specific NUMA (Non-Uniform Memory + Architecture) scheduling or memory placement policy. In addition it + can set persistent policy for shared memory segments or files. + +Package: libnuma1 +Section: libs +Priority: optional +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Architecture: i386 amd64 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc powerpcspe x32 ppc64 ppc64el arm64 sparc hppa +Description: Libraries for controlling NUMA policy + Library to control specific NUMA (Non-Uniform Memory Architecture) + scheduling or memory placement policies. + +Package: libnuma-dev +Section: libdevel +Priority: extra +Multi-Arch: same +Depends: ${misc:Depends}, libnuma1 (= ${binary:Version}), libc6-dev | libc-dev +Architecture: any +Description: Development files for libnuma + Library to control specific NUMA (Non-Uniform Memory Architecture) + scheduling or memory placement policies. This package contains + headers and manual pages relating to the library. + +Package: libnuma-dbg +Section: debug +Priority: extra +Multi-Arch: same +Depends: ${misc:Depends}, libnuma1 (= ${binary:Version}), libc6-dev | libc-dev +Architecture: i386 amd64 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc powerpcspe x32 ppc64 ppc64el arm64 sparc hppa +Description: Debug package for libnuma + Library to control specific NUMA (Non-Uniform Memory Architecture) + scheduling or memory placement policies. This package contains + headers and manual pages relating to the library. --- numactl-2.0.10.orig/debian/control.in +++ numactl-2.0.10/debian/control.in @@ -0,0 +1,50 @@ +Source: numactl +Section: admin +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ian Wienand +Uploaders: Al Stone +Standards-Version: 3.9.6 +Build-Depends: @cdbs@, debhelper (>= 9) + +Package: numactl +Multi-Arch: foreign +Architecture: i386 amd64 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc powerpcspe x32 ppc64 ppc64el arm64 sparc hppa +Depends: ${shlibs:Depends}, ${misc:Depends}, libnuma1 (>= 2.0.1) +Description: NUMA scheduling and memory placement tool + numactl runs processes with a specific NUMA (Non-Uniform Memory + Architecture) scheduling or memory placement policy. In addition it + can set persistent policy for shared memory segments or files. + +Package: libnuma1 +Section: libs +Priority: optional +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Architecture: i386 amd64 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc powerpcspe x32 ppc64 ppc64el arm64 sparc hppa +Description: Libraries for controlling NUMA policy + Library to control specific NUMA (Non-Uniform Memory Architecture) + scheduling or memory placement policies. + +Package: libnuma-dev +Section: libdevel +Priority: extra +Multi-Arch: same +Depends: ${misc:Depends}, libnuma1 (= ${binary:Version}), libc6-dev | libc-dev +Architecture: any +Description: Development files for libnuma + Library to control specific NUMA (Non-Uniform Memory Architecture) + scheduling or memory placement policies. This package contains + headers and manual pages relating to the library. + +Package: libnuma-dbg +Section: debug +Priority: extra +Multi-Arch: same +Depends: ${misc:Depends}, libnuma1 (= ${binary:Version}), libc6-dev | libc-dev +Architecture: i386 amd64 ia64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc powerpcspe x32 ppc64 ppc64el arm64 sparc hppa +Description: Debug package for libnuma + Library to control specific NUMA (Non-Uniform Memory Architecture) + scheduling or memory placement policies. This package contains + headers and manual pages relating to the library. --- numactl-2.0.10.orig/debian/copyright +++ numactl-2.0.10/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by Ian Wienand +on Wed, 15 Dec 2004. + +libnuma sources are available from +http://oss.sgi.com/projects/libnuma/ + +Upstream Authors: +Andi Kleen + +Copyright (C) 2004 Andi Kleen + +numactl and the demo programs are under the GNU General Public License, v.2 +libnuma is under the GNU Lesser General Public License, v2.1. +The manpages are under the same license as the Linux manpages (see the files) + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published +by the Free Software Foundation; either version 2 of the License, +or (at your option) any later version. The full text of the License +may be found in /usr/share/common-licenses/GPL. + +The redistribution of portions of this program are controlled by +the GNU Lesser General Public License as published by the Free +Software Foundation. The full text of the License may be found in +/usr/share/common-licenses/LGPL. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +Parts of the numademo program are derived from the STREAM benchmark, +available from + +http://www.cs.virginia.edu/stream/ --- numactl-2.0.10.orig/debian/libnuma-dev.install +++ numactl-2.0.10/debian/libnuma-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/include/ +debian/tmp/usr/lib/*/libnuma.so +debian/tmp/usr/lib/*/libnuma.a \ No newline at end of file --- numactl-2.0.10.orig/debian/libnuma-dev.links +++ numactl-2.0.10/debian/libnuma-dev.links @@ -0,0 +1,33 @@ +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_all_nodes.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_alloc.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_alloc_interleaved.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_alloc_interleaved_subset.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_alloc_local.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_alloc_onnode.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_available.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_bind.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_error.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_exit_on_error.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_free.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_get_interleave_mask.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_get_interleave_node.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_get_membind.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_get_run_node_mask.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_interleave_memory.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_max_node.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_node_size.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_node_to_cpus.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_no_nodes.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_police_memory.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_preferred.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_run_on_node.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_run_on_node_mask.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_set_bind_policy.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_set_interleave_mask.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_set_localalloc.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_setlocal_memory.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_set_membind.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_set_preferred.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_set_strict.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_tonodemask_memory.3.gz +/usr/share/man/man3/numa.3.gz /usr/share/man/man3/numa_tonode_memory.3.gz --- numactl-2.0.10.orig/debian/libnuma-dev.manpages +++ numactl-2.0.10/debian/libnuma-dev.manpages @@ -0,0 +1 @@ +numa.3 --- numactl-2.0.10.orig/debian/libnuma1.install +++ numactl-2.0.10/debian/libnuma1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/*/libnuma.so.* --- numactl-2.0.10.orig/debian/numactl.docs +++ numactl-2.0.10/debian/numactl.docs @@ -0,0 +1,2 @@ +CHANGES +DESIGN --- numactl-2.0.10.orig/debian/numactl.files +++ numactl-2.0.10/debian/numactl.files @@ -0,0 +1 @@ +debian/tmp/usr/bin/numactl --- numactl-2.0.10.orig/debian/numactl.install +++ numactl-2.0.10/debian/numactl.install @@ -0,0 +1,3 @@ +debian/tmp/usr/bin/numactl +debian/tmp/usr/bin/numastat +debian/tmp/usr/bin/migratepages \ No newline at end of file --- numactl-2.0.10.orig/debian/numactl.manpages +++ numactl-2.0.10/debian/numactl.manpages @@ -0,0 +1,3 @@ +numactl.8 +numastat.8 +migratepages.8 \ No newline at end of file --- numactl-2.0.10.orig/debian/patches/README +++ numactl-2.0.10/debian/patches/README @@ -0,0 +1,25 @@ +patches +======= +add-check-for-return-value-of-node-to-cpus.patch +from-git-6a7c2cf3-fix-uninitialised-mask.patch +libnuma-ppc64el-cpu-number-not-contiguous + +old patches +=========== +numastatman.diff : add man page for numastat - removed 0.8 +cpubind.diff : fix up operation of cpubind argument - removed 0.8 (fixed with new arguments upstream) +numamonman.diff : add a man page for numamon - not considered ready for release (personal email with upstream) +numamon-install.diff : install the numamon program (as above) +cflags.diff : override CFLAGS to include -I. - removed 0.9 (upstream) +man-section.diff : fix up man section of some pages to stop linitan warning - removed 0.9 (upstream) +node-default.diff : make libnuma assume 1 node with multiple CPUS for SMP case - removed for 0.9 (upstream) +clean-files.diff : clean extra files - remove for 0.9 (upstream) +lib64.diff : don't create extra lib64 directories -- upstream now check for specific architectures with `uname -m` before installing in lib64 +thread.diff : check for __thread -- fixed in 0.9.3 +mkdirs.diff : make directories before installing, for .deb -- fixed in 0.9.7 +powerpc.patch : fix for future powerpc migrate_pages syscall -- fixed 0.9.11 +mips.patch : fixup for MIPS support -- fixed 2.0.1 +hppa.patch : fix for hppa syscalls (applies ontop of mips.patch) -- fixed 2.0.1 +lm-override.patch : make sure -lm for numademo -- fixed 2.0.1 +static-lib.patch : build a static library -- fixed 2.0.1 +001_no-numa.patch : workaround crash on systems with no numa -- fixed 2.0.10-rc2 --- numactl-2.0.10.orig/debian/patches/add-check-for-return-value-of-node-to-cpus.patch +++ numactl-2.0.10/debian/patches/add-check-for-return-value-of-node-to-cpus.patch @@ -0,0 +1,49 @@ +commit 32075635db57c3d5efe12f8fb569af857e01ccad +Author: Petr Holasek +Date: Wed Jan 14 09:53:47 2015 +0100 + + libnuma: add check for return value of numa_node_to_cpus + + When numa_node_to_cpu() has been called on machine with non-contiguous + nodes, it returned the first node which wasn't present on machine. + Now, return code is checked and code skips over non-existing nodes to + the right one. + + Also, caching of numa_node_to_cpus_v2() result while non-zero error had + been returned was disabled. + + Signed-off-by: Petr Holasek + + Tested by Cliff Wickman (on attica.sgi.com) + +diff --git a/libnuma.c b/libnuma.c +index 91425ae..8d7bf13 100644 +--- a/libnuma.c ++++ b/libnuma.c +@@ -1382,8 +1382,12 @@ numa_node_to_cpus_v2(int node, struct bitmask *buffer) + if (mask != buffer) + numa_bitmask_free(mask); + } else { +- node_cpu_mask_v2[node] = mask; +- } ++ /* we don't want to cache faulty result */ ++ if (!err) ++ node_cpu_mask_v2[node] = mask; ++ else ++ numa_bitmask_free(mask); ++ } + return err; + } + __asm__(".symver numa_node_to_cpus_v2,numa_node_to_cpus@@libnuma_1.2"); +@@ -1405,7 +1409,10 @@ int numa_node_of_cpu(int cpu) + bmp = numa_bitmask_alloc(ncpus); + nnodes = numa_max_node(); + for (node = 0; node <= nnodes; node++){ +- numa_node_to_cpus_v2_int(node, bmp); ++ if (numa_node_to_cpus_v2_int(node, bmp) < 0) { ++ /* It's possible for the node to not exist */ ++ continue; ++ } + if (numa_bitmask_isbitset(bmp, cpu)){ + ret = node; + goto end; --- numactl-2.0.10.orig/debian/patches/from-git-6a7c2cf3-fix-uninitialised-mask.patch +++ numactl-2.0.10/debian/patches/from-git-6a7c2cf3-fix-uninitialised-mask.patch @@ -0,0 +1,35 @@ +commit 6a7c2cf3f00e32082a1ada300cc585740e2b4bbd +Author: Daniel J Blueman +Date: Wed, 08 Apr 2015 05:30:55 +0200 + + SEGV due to uninitialised mask + + As node_cpu_mask_v2 is not defined as local to the compilation unit with + 'static', it is not guaranteed to be initialised to zero (ie in the .bss). + This was leading to some SEGVs we've seen. + + Also mark another internal function local to the compilation unit. + + Signed-off-by: Daniel J Blueman + +diff -Nur -x '*.orig' -x '*~' numactl-2.0.10/libnuma.c numactl-2.0.10.new/libnuma.c +--- numactl-2.0.10/libnuma.c 2015-04-10 13:06:03.878415799 +0200 ++++ numactl-2.0.10.new/libnuma.c 2015-04-10 13:06:28.650585381 +0200 +@@ -58,7 +58,7 @@ + struct bitmask *numa_nodes_ptr = NULL; + static struct bitmask *numa_memnode_ptr = NULL; + static unsigned long *node_cpu_mask_v1[NUMA_NUM_NODES]; +-struct bitmask **node_cpu_mask_v2; ++static struct bitmask **node_cpu_mask_v2; + + WEAK void numa_error(char *where); + +@@ -1233,7 +1233,7 @@ + } + __asm__(".symver numa_parse_bitmap_v2,numa_parse_bitmap@@libnuma_1.2"); + +-void ++static void + init_node_cpu_mask_v2(void) + { + int nnodes = numa_max_possible_node_v2_int() + 1; --- numactl-2.0.10.orig/debian/patches/libnuma-ppc64el-cpu-number-not-contiguous.patch +++ numactl-2.0.10/debian/patches/libnuma-ppc64el-cpu-number-not-contiguous.patch @@ -0,0 +1,60 @@ +From 573609fb2711b6c09090cc3fef9a771ae9eb246b Mon Sep 17 00:00:00 2001 +From: Thierry FAUCK - IBM LTC +Date: Tue, 7 Apr 2015 17:53:34 +0200 +Subject: [PATCH] libnuma.so On ppc64el, cpu number are not contigous + +Commit 32075635db57c3d5efe12f8fb569af857e01ccad issuea warning message +/sys not mounted when it find a non existent cpu number, and that's the + default for multinode on ppc64el bare metal installed system. This patch +removes the message when the /sys entry doesn't exist, but use the return +code. + +Signed-off-by: Thierry FAUCK - IBM LTC + + modified: libnuma.c +--- + libnuma.c | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +Index: numactl-2.0.10/libnuma.c +=================================================================== +--- numactl-2.0.10.orig/libnuma.c ++++ numactl-2.0.10/libnuma.c +@@ -1276,11 +1276,13 @@ 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)); +- numa_warn(W_nosysfs2, +- "(cannot open or correctly parse %s)", fn); ++ 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); ++ } + bitmask.maskp = (unsigned long *)mask; + bitmask.size = buflen_needed * 8; + numa_bitmask_setall(&bitmask); +@@ -1355,11 +1357,13 @@ 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); ++ 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; + } --- numactl-2.0.10.orig/debian/rules +++ numactl-2.0.10/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk +# Including this file gets us a simple patch system. You can just +# drop patches in debian/patches, and they will be automatically +# applied and unapplied. +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + --- numactl-2.0.10.orig/debian/watch +++ numactl-2.0.10/debian/watch @@ -0,0 +1,2 @@ +version=3 +opts=passive ftp://oss.sgi.com/www/projects/libnuma/download/numactl-(.*)\.tar\.gz