diff options
Diffstat (limited to 'meta/recipes-support/numactl')
4 files changed, 29 insertions, 25 deletions
diff --git a/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch b/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch index 78ffb22f89..68b3e2491f 100644 --- a/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch +++ b/meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch @@ -1,6 +1,9 @@ -rename test target as run-test +From a5e1fa272f294e739d6caaf629968478796ca53a Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Mon, 19 Oct 2020 14:42:11 -0700 +Subject: [PATCH] rename test target as run-test -Upstream-Statue: Pending +Upstream-Status: 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. @@ -8,15 +11,16 @@ 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 +index da01d27..c738b93 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -124,7 +124,9 @@ regress2: $(check_PROGRAMS) +@@ -126,7 +126,9 @@ regress2: $(check_PROGRAMS) test_numademo: numademo ./numademo -t -e 10M @@ -27,6 +31,3 @@ index b6db339..de176c4 100644 TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir; --- -1.9.1 - diff --git a/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch b/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch index 9812ecc8b3..8345f71d72 100644 --- a/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch +++ b/meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch @@ -1,4 +1,4 @@ -From 59fd750a84bbe5874dec936d2bee9ef11a1b6505 Mon Sep 17 00:00:00 2001 +From 29f811d9d381f2ab54b3c8cef77334e32970ef09 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 @@ -7,24 +7,26 @@ Upstream-Status: Pending Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> +Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.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 +index f06b22f..2fdfacb 100755 --- a/test/regress +++ b/test/regress -@@ -74,6 +74,7 @@ probe_hardware() +@@ -78,6 +78,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 ++ echo "SKIP: numa regress" + exit 77 # Skip test fi } -@@ -207,10 +208,9 @@ main() +@@ -209,10 +210,9 @@ main() rm A B if [ "$EXIT" = 0 ] ; then @@ -59,6 +61,3 @@ index aa6ea41..450c510 100755 } # still broken --- -1.8.4.2 - diff --git a/meta/recipes-support/numactl/numactl/run-ptest b/meta/recipes-support/numactl/numactl/run-ptest index bf269da755..e019b0d364 100755 --- a/meta/recipes-support/numactl/numactl/run-ptest +++ b/meta/recipes-support/numactl/numactl/run-ptest @@ -8,7 +8,11 @@ if ! numactl -s | grep -q "No NUMA support available on this system."; then if numademo -t -e 10M; then echo "PASS: numademo" else - echo "FAIL: numademo" + if [ "$?" = 77 ] ; then + echo "SKIP: numademo" + else + echo "FAIL: numademo" + fi fi else echo "SKIP: ./../test/bind_range" diff --git a/meta/recipes-support/numactl/numactl_git.bb b/meta/recipes-support/numactl/numactl_git.bb index 6c8a667a41..bd16df91ec 100644 --- a/meta/recipes-support/numactl/numactl_git.bb +++ b/meta/recipes-support/numactl/numactl_git.bb @@ -3,17 +3,17 @@ HOMEPAGE = "http://oss.sgi.com/projects/libnuma/" 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." -LICENSE = "GPL-2.0 & LGPL-2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" SECTION = "apps" inherit autotools-brokensep ptest -LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" +LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=9f34c3af4ed6f3f5df0da5f3c0835a43" -SRCREV = "dd6de072c92c892a86e18c0fd0dfa1ba57a9a05d" -PV = "2.0.14" +SRCREV = "3871b1c42fc71bceadafd745d2eff5dddfc2d67e" +PV = "2.0.18" -SRC_URI = "git://github.com/numactl/numactl \ +SRC_URI = "git://github.com/numactl/numactl;branch=master;protocol=https \ file://Fix-the-test-output-format.patch \ file://Makefile \ file://run-ptest \ @@ -22,8 +22,8 @@ SRC_URI = "git://github.com/numactl/numactl \ S = "${WORKDIR}/git" -LDFLAGS_append_riscv64 = " -latomic" -LDFLAGS_append_riscv32 = " -latomic" +LDFLAGS:append:riscv64 = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" do_install() { oe_runmake DESTDIR=${D} prefix=${D}/usr install @@ -56,4 +56,4 @@ do_install_ptest() { install -m 0755 ${B}/.libs/numactl ${D}${PTEST_PATH}/ } -RDEPENDS_${PN}-ptest = "bash" +RDEPENDS:${PN}-ptest = "bash" |