diff options
Diffstat (limited to 'meta-oe/recipes-support/numactl/numactl')
5 files changed, 0 insertions, 212 deletions
diff --git a/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch b/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch deleted file mode 100644 index 78ffb22f89..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/0001-define-run-test-target.patch +++ /dev/null @@ -1,32 +0,0 @@ -rename test target as run-test - -Upstream-Statue: Pending - -test target not only compile the test files, but also run them, which is -not suitable for cross-compile environment, so rename it as run-test. - -and define test target to compile the test files. - -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- - Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index b6db339..de176c4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -124,7 +124,9 @@ regress2: $(check_PROGRAMS) - test_numademo: numademo - ./numademo -t -e 10M - --test: all $(check_PROGRAMS) regress1 regress2 test_numademo -+test: all $(check_PROGRAMS) -+ -+run-test: all $(check_PROGRAMS) regress1 regress2 test_numademo - - TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir; - --- -1.9.1 - diff --git a/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch b/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch deleted file mode 100644 index 506101711a..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/0001-numademo-fix-error-on-32bit-system.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 68485f8516884377e54c623b0deff73f97321d96 Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" <hongzhi.song@windriver.com> -Date: Thu, 19 Sep 2019 04:32:31 -0400 -Subject: [PATCH] numademo: fix error on 32bit system - -Error Info on 32bit: -root@intel-x86:~# numademo -t -e 1M -Configured Nodes does not match available memory nodes - -That's because sizeof(long)=4Word, but sizeof(long long)=8Word -on 32bit. So (long long) assigning to (long) maybe cause overflow. - -long numa_node_size(int node, long *freep) -{ - ... - long sz = numa_node_size64_int(node, &f2); - ~^^~ - return sz; - ... -} -long long numa_node_size64(int node, long long *freep) -~^^ ^^~ -{ - ... -} - -Unify the return type of above functions. - -Upstream-Status: Accepted [next version is after 2.0.13 or 2.0.14] -[https://github.com/numactl/numactl/commit/a7c4bc790a191d3e42b63850b409c1a72b75a4e1] - Submitted [https://github.com/numactl/numactl/pull/79] -[The first patch was merged but has a error, then the second fix it.] - -Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> ---- - libnuma.c | 4 ++-- - numa.h | 2 +- - numademo.c | 2 +- - test/move_pages.c | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libnuma.c b/libnuma.c -index cac8851..8b5c6aa 100644 ---- a/libnuma.c -+++ b/libnuma.c -@@ -791,10 +791,10 @@ long long numa_node_size64(int node, long long *freep) - - make_internal_alias(numa_node_size64); - --long numa_node_size(int node, long *freep) -+long long numa_node_size(int node, long long *freep) - { - long long f2; -- long sz = numa_node_size64_int(node, &f2); -+ long long sz = numa_node_size64_int(node, &f2); - if (freep) - *freep = f2; - return sz; -diff --git a/numa.h b/numa.h -index 3a8c543..268fb1d 100644 ---- a/numa.h -+++ b/numa.h -@@ -143,7 +143,7 @@ int numa_preferred(void); - - /* Return node size and free memory */ - long long numa_node_size64(int node, long long *freep); --long numa_node_size(int node, long *freep); -+long long numa_node_size(int node, long long *freep); - - int numa_pagesize(void); - -diff --git a/numademo.c b/numademo.c -index a720db0..8c56da8 100644 ---- a/numademo.c -+++ b/numademo.c -@@ -301,7 +301,7 @@ int max_node, numnodes; - int get_node_list(void) - { - int a, got_nodes = 0; -- long free_node_sizes; -+ long long free_node_sizes; - - numnodes = numa_num_configured_nodes(); - node_to_use = (int *)malloc(numnodes * sizeof(int)); -diff --git a/test/move_pages.c b/test/move_pages.c -index d1d8436..f8ff25d 100644 ---- a/test/move_pages.c -+++ b/test/move_pages.c -@@ -26,7 +26,7 @@ int *node_to_use; - int get_node_list() - { - int a, got_nodes = 0, max_node, numnodes; -- long free_node_sizes; -+ long long free_node_sizes; - - numnodes = numa_num_configured_nodes(); - node_to_use = (int *)malloc(numnodes * sizeof(int)); --- -2.23.0 - diff --git a/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch deleted file mode 100644 index 9812ecc8b3..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/Fix-the-test-output-format.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 59fd750a84bbe5874dec936d2bee9ef11a1b6505 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Tue, 21 Jul 2015 02:01:22 +0900 -Subject: [PATCH] Fix the test output format - -Upstream-Status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - test/regress | 6 +++--- - test/regress2 | 11 +++++------ - 2 files changed, 8 insertions(+), 9 deletions(-) - -diff --git a/test/regress b/test/regress -index 2ce1705..d086a47 100755 ---- a/test/regress -+++ b/test/regress -@@ -74,6 +74,7 @@ probe_hardware() - if [ $numnodes -lt 2 ] ; then - echo "need at least two nodes with at least $NEEDPAGES each of" - echo "free memory for mempolicy regression tests" -+ echo "FAIL: numa regress" - exit 77 # Skip test - fi - } -@@ -207,10 +208,9 @@ main() - rm A B - - if [ "$EXIT" = 0 ] ; then -- echo '========SUCCESS' -+ echo 'PASS: numactl regress' - else -- echo '========FAILURE' -- exit 1 -+ echo 'FAIL: numactl regress' - fi - } - -diff --git a/test/regress2 b/test/regress2 -index aa6ea41..450c510 100755 ---- a/test/regress2 -+++ b/test/regress2 -@@ -9,12 +9,11 @@ testdir=`dirname "$0"` - export PATH=${builddir}:$PATH - - T() { -- echo "$@" -- if ! $VALGRIND "$@" ; then -- echo $1 FAILED!!!! -- exit 1 -- fi -- echo -+ if ! $VALGRIND "$@" 2>&1 1>/dev/null; then -+ echo "FAIL: $1" -+ else -+ echo "PASS: $1" -+ fi - } - - # still broken --- -1.8.4.2 - diff --git a/meta-oe/recipes-support/numactl/numactl/Makefile b/meta-oe/recipes-support/numactl/numactl/Makefile deleted file mode 100644 index 9a5134c3f2..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -.PHONY: regress1 regress2 - -regress1: - cd test ; ./regress - -regress2: - cd test ; ./regress2 diff --git a/meta-oe/recipes-support/numactl/numactl/run-ptest b/meta-oe/recipes-support/numactl/numactl/run-ptest deleted file mode 100755 index 215f7c25b9..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -make regress1 -make regress2 -if numademo -t -e 10M; then - echo "PASS: numademo" -else - echo "FAIL: numademo" -fi - |