From 6d8fe9af617b951c1e0674fda2f806ae90cbfc8955695f06057213cbeca57010 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 12 Feb 2010 05:56:15 +0000 Subject: [PATCH 1/8] Accepting request 32191 from home:jengelh:sparc Copy from home:jengelh:sparc/numactl via accept of submit request 32191 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/32191 OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=11 --- baselibs.conf | 4 ---- numactl.changes | 7 +++++++ numactl.spec | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 4ce5585..6299bcd 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -5,7 +5,3 @@ arch ppc package libnuma-devel requires -numactl1- requires -libnuma- requires "numactl- = " -arch sparcv9 package libnuma-devel - requires -numactl1- - requires -libnuma- - requires "numactl- = " diff --git a/numactl.changes b/numactl.changes index 2f5e961..6a41f70 100644 --- a/numactl.changes +++ b/numactl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 11 01:31:44 UTC 2010 - jengelh@medozas.de + +- workaround broken Makefile which uses uname -m to detect bitness + and libdir +- remove sparcv9 from special-casing in baselibs.conf + ------------------------------------------------------------------- Wed Dec 16 00:27:34 CET 2009 - jengelh@medozas.de diff --git a/numactl.spec b/numactl.spec index 0bafc5e..1de9f69 100644 --- a/numactl.spec +++ b/numactl.spec @@ -98,7 +98,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man3 install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man5 install -d -m 755 $RPM_BUILD_ROOT%{_libdir} install -d -m 755 $RPM_BUILD_ROOT/usr/include -make prefix=${RPM_BUILD_ROOT}/usr install +make prefix="%buildroot/%_prefix" libdir="%buildroot/%_libdir" install rm -f $RPM_BUILD_ROOT/%{_libdir}/lib*a %clean From 8c7a91736e6295c62d891f654bc6f87626e158b4d9d97fce9039decc578478ac Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 26 Feb 2010 12:19:49 +0000 Subject: [PATCH 2/8] sync with O:F OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=13 --- numactl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/numactl.spec b/numactl.spec index 1de9f69..ab1b1b8 100644 --- a/numactl.spec +++ b/numactl.spec @@ -23,7 +23,7 @@ Name: numactl License: GPLv2 ; GPLv2+ Summary: NUMA Policy Control Version: 2.0.4.rc1 -Release: 2 +Release: 3 %define origversion 2.0.4-rc1 AutoReqProv: on # bug437293 From 9f01a4a21321824ae8e996c4530a7b2b7f068353cfd951bfbdb2ba7616c9ff51 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 18 Mar 2010 15:12:00 +0000 Subject: [PATCH 3/8] Updating link to change in openSUSE:Factory/numactl revision 23.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=0a8e53e8f8f9086afbbc1475ca03b1a0 --- ready | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ready diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From f4e80c8db00e19ff22b709f8ba70436b8d9b88ecd32dc8081276ac2a15fe73e9 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Thu, 20 May 2010 12:07:35 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=14 --- numactl-2.0.4-rc1.tar.bz2 | 3 --- numactl-2.0.4-rc2.tar.bz2 | 3 +++ numactl.changes | 5 +++++ numactl.spec | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 numactl-2.0.4-rc1.tar.bz2 create mode 100644 numactl-2.0.4-rc2.tar.bz2 diff --git a/numactl-2.0.4-rc1.tar.bz2 b/numactl-2.0.4-rc1.tar.bz2 deleted file mode 100644 index 2c5ccf0..0000000 --- a/numactl-2.0.4-rc1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41a1809e79c4381745e11dafb19a3a1f2c62a9a3e60f374594d935a5aba6f708 -size 66851 diff --git a/numactl-2.0.4-rc2.tar.bz2 b/numactl-2.0.4-rc2.tar.bz2 new file mode 100644 index 0000000..eeb89a4 --- /dev/null +++ b/numactl-2.0.4-rc2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc6f9630b58c56cfbe62f157d37be7c9c76d3bd7f1f6884d2af7b5f663a5b812 +size 78062 diff --git a/numactl.changes b/numactl.changes index 6a41f70..6acd286 100644 --- a/numactl.changes +++ b/numactl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 20 12:07:19 UTC 2010 - trenn@novell.com + +- Update to version 2.0.4-rc2 + ------------------------------------------------------------------- Thu Feb 11 01:31:44 UTC 2010 - jengelh@medozas.de diff --git a/numactl.spec b/numactl.spec index ab1b1b8..3e7c959 100644 --- a/numactl.spec +++ b/numactl.spec @@ -24,7 +24,7 @@ License: GPLv2 ; GPLv2+ Summary: NUMA Policy Control Version: 2.0.4.rc1 Release: 3 -%define origversion 2.0.4-rc1 +%define origversion 2.0.4-rc2 AutoReqProv: on # bug437293 %ifarch ppc64 From 4f51b529f2cb65d9315a187a9cd14b7d250a6d4cece66f073428e9803b4ff02d Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Wed, 9 Jun 2010 09:31:38 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=15 --- numactl-2.0.4-rc2.tar.bz2 | 4 ++-- numactl.changes | 5 +++++ numactl.spec | 2 ++ numactl_fix_mem_corrup_numa_init.patch | 28 ++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 numactl_fix_mem_corrup_numa_init.patch diff --git a/numactl-2.0.4-rc2.tar.bz2 b/numactl-2.0.4-rc2.tar.bz2 index eeb89a4..304ca91 100644 --- a/numactl-2.0.4-rc2.tar.bz2 +++ b/numactl-2.0.4-rc2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc6f9630b58c56cfbe62f157d37be7c9c76d3bd7f1f6884d2af7b5f663a5b812 -size 78062 +oid sha256:2f4881223fb43a4c88eb761c3b171d41974e17fa3d141477b26260288db1d502 +size 66616 diff --git a/numactl.changes b/numactl.changes index 6acd286..c3c908c 100644 --- a/numactl.changes +++ b/numactl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 9 09:32:15 UTC 2010 - trenn@novell.com + +- Fixed corrupt tar.bz2 and added a mem corruption fix from Jan. + ------------------------------------------------------------------- Thu May 20 12:07:19 UTC 2010 - trenn@novell.com diff --git a/numactl.spec b/numactl.spec index 3e7c959..98d2f1a 100644 --- a/numactl.spec +++ b/numactl.spec @@ -34,6 +34,7 @@ Obsoletes: numactl-64bit Source: numactl-%{origversion}.tar.bz2 Source2: baselibs.conf Patch0: numactl_install_all_manpages +Patch1: numactl_fix_mem_corrup_numa_init.patch Group: System/Management BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ia64 x86_64 ppc64 ppc %sparc @@ -88,6 +89,7 @@ Authors: %prep %setup -n %{name}-%{origversion} %patch0 -p1 +%patch1 -p1 %build make %{?jobs:-j%jobs} CFLAGS="${RPM_OPT_FLAGS}" diff --git a/numactl_fix_mem_corrup_numa_init.patch b/numactl_fix_mem_corrup_numa_init.patch new file mode 100644 index 0000000..21cf8cf --- /dev/null +++ b/numactl_fix_mem_corrup_numa_init.patch @@ -0,0 +1,28 @@ +From: Jan Beulich + +--- + libnuma.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +Index: numactl-2.0.4-rc2/libnuma.c +=================================================================== +--- numactl-2.0.4-rc2.orig/libnuma.c ++++ numactl-2.0.4-rc2/libnuma.c +@@ -461,10 +461,13 @@ set_task_constraints(void) + read_mask(mask, numa_all_nodes_ptr); + } + if (strncmp(buffer,"Mems_allowed_list:",18) == 0) { +- nodes_allowed_list = malloc(strlen(buffer)-18); +- strncpy(nodes_allowed_list, buffer + 19, +- strlen(buffer) - 19); +- nodes_allowed_list[strlen(nodes_allowed_list)-1] = '\0'; ++ size_t len = strlen(mask); ++ ++ nodes_allowed_list = malloc(len); ++ if (nodes_allowed_list) { ++ memcpy(nodes_allowed_list, mask, len-1); ++ nodes_allowed_list[len-1] = '\0'; ++ } + } + } + fclose(f); From 9d648d5b88c242836ecbc42b9a3f100652b1c0a5dac7b0681a019329a97112f2 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Mon, 21 Jun 2010 17:14:41 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=16 --- numactl.changes | 5 +++++ numactl.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/numactl.changes b/numactl.changes index c3c908c..a394bb9 100644 --- a/numactl.changes +++ b/numactl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 21 17:17:17 UTC 2010 - trenn@novell.com + +- Forgot to increase the version string from 2.0.4-rc1 to 2.0.4-rc2 + ------------------------------------------------------------------- Wed Jun 9 09:32:15 UTC 2010 - trenn@novell.com diff --git a/numactl.spec b/numactl.spec index 98d2f1a..c472424 100644 --- a/numactl.spec +++ b/numactl.spec @@ -22,7 +22,7 @@ Url: http://oss.sgi.com/projects/libnuma/ Name: numactl License: GPLv2 ; GPLv2+ Summary: NUMA Policy Control -Version: 2.0.4.rc1 +Version: 2.0.4.rc2 Release: 3 %define origversion 2.0.4-rc2 AutoReqProv: on From 70894ee96564ac7b26394894a9af718c40913ba669a2eb45e28ac84abc3e2b1a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 24 Jun 2010 11:42:43 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=18 --- numactl.spec | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/numactl.spec b/numactl.spec index c472424..e551bd2 100644 --- a/numactl.spec +++ b/numactl.spec @@ -20,7 +20,7 @@ Url: http://oss.sgi.com/projects/libnuma/ Name: numactl -License: GPLv2 ; GPLv2+ +License: GPLv2+ Summary: NUMA Policy Control Version: 2.0.4.rc2 Release: 3 @@ -44,13 +44,6 @@ Requires: perl Control NUMA policy for individual processes. Offer libnuma for individual NUMA policy in applications. - - -Authors: --------- - Andi Kleen (ak@suse.de) - Cliff Wickman (cpw@sgi.com) - %package -n libnuma1 License: GPLv2+ Summary: NUMA Policy Control @@ -61,13 +54,6 @@ AutoReqProv: on Control NUMA policy for individual processes. Offer libnuma for individual NUMA policy in applications. - - -Authors: --------- - Andi Kleen (ak@suse.de) - Cliff Wickman (cpw@sgi.com) - %package -n libnuma-devel License: GPLv2+ Summary: NUMA Policy Control @@ -79,13 +65,6 @@ Requires: libnuma1 = %{version} Control NUMA policy for individual processes. Offer libnuma for individual NUMA policy in applications. - - -Authors: --------- - Andi Kleen (ak@suse.de) - Cliff Wickman (cpw@sgi.com) - %prep %setup -n %{name}-%{origversion} %patch0 -p1 From 9ec32c000df55e31a9b9744dd27cb693b774ee41cf408c8c848411182ddd1c57 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 28 Jun 2010 10:47:15 +0000 Subject: [PATCH 8/8] Accepting request 42008 from Base:System checked in (request 42008) OBS-URL: https://build.opensuse.org/request/show/42008 OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=19 --- numactl.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/numactl.spec b/numactl.spec index e551bd2..a643d2e 100644 --- a/numactl.spec +++ b/numactl.spec @@ -1,5 +1,5 @@ # -# spec file for package numactl (Version 2.0.4.rc1) +# spec file for package numactl (Version 2.0.4.rc2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Name: numactl License: GPLv2+ Summary: NUMA Policy Control Version: 2.0.4.rc2 -Release: 3 +Release: 1 %define origversion 2.0.4-rc2 AutoReqProv: on # bug437293