numactl: upgrade 2.0.9 -> 2.0.10

1) Update Fix-the-test-output-format.patch,since the contents
has been changed.

2) Update the checksum, beginline and endline of LICENSE file,
but the LICENSE has not been changed.

3) Remove "libdir=${D}/${libdir}" to avoid build Warning:
QA Issue: numactl: Files/directories were installed but not shipped in any package

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Li xin
2015-07-24 15:43:05 +08:00
committed by Martin Jansa
parent 2b79d6b4ee
commit 1d645a437a
2 changed files with 27 additions and 22 deletions
@@ -1,26 +1,30 @@
[PATCH] Fix the test output format 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 Upstream-Status: Pending
Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
--- ---
test/regress | 6 +++--- test/regress | 6 +++---
test/regress2 | 9 ++++----- test/regress2 | 11 +++++------
2 files changed, 7 insertions(+), 8 deletions(-) 2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/test/regress b/test/regress diff --git a/test/regress b/test/regress
index 05eff5b..10d72f7 100755 index 2ce1705..d086a47 100755
--- a/test/regress --- a/test/regress
+++ b/test/regress +++ b/test/regress
@@ -73,6 +73,7 @@ probe_hardware() @@ -74,6 +74,7 @@ probe_hardware()
if [ $numnodes -lt 2 ] ; then if [ $numnodes -lt 2 ] ; then
echo "need at least two nodes with at least $NEEDPAGES each of" echo "need at least two nodes with at least $NEEDPAGES each of"
echo "free memory for mempolicy regression tests" echo "free memory for mempolicy regression tests"
+ echo "FAIL: numa regress" + echo "FAIL: numa regress"
exit 1 exit 77 # Skip test
fi fi
} }
@@ -206,10 +207,9 @@ main() @@ -207,10 +208,9 @@ main()
rm A B rm A B
if [ "$EXIT" = 0 ] ; then if [ "$EXIT" = 0 ] ; then
@@ -34,26 +38,27 @@ index 05eff5b..10d72f7 100755
} }
diff --git a/test/regress2 b/test/regress2 diff --git a/test/regress2 b/test/regress2
index 6a254fa..9c97943 100755 index aa6ea41..450c510 100755
--- a/test/regress2 --- a/test/regress2
+++ b/test/regress2 +++ b/test/regress2
@@ -6,12 +6,11 @@ VALGRIND=${VALGRIND:-} @@ -9,12 +9,11 @@ testdir=`dirname "$0"`
export LD_LIBRARY_PATH=`pwd`/.. export PATH=${builddir}:$PATH
T() { T() {
- echo "$@" - echo "$@"
- if ! $VALGRIND "$@" ; then - if ! $VALGRIND "$@" ; then
- echo $1 FAILED!!!! - echo $1 FAILED!!!!
- exit 1 - exit 1
+ if ! $VALGRIND "$@" 2>&1 1>/dev/null; then - fi
+ echo "FAIL: $1"
+ else
+ echo "PASS: $1"
fi
- echo - echo
+ if ! $VALGRIND "$@" 2>&1 1>/dev/null; then
+ echo "FAIL: $1"
+ else
+ echo "PASS: $1"
+ fi
} }
# various tests # still broken
-- --
1.7.10.4 1.8.4.2
@@ -8,9 +8,7 @@ RDEPENDS_${PN} = "perl"
inherit autotools-brokensep ptest inherit autotools-brokensep ptest
LIC_FILES_CHKSUM = "file://README;beginline=19;endline=32;md5=5644cc3851cb2499f6c48e52fe198bd9" LIC_FILES_CHKSUM = "file://README;beginline=19;endline=32;md5=00b9fb4504ff2afcb7fb2a518780f412"
SRC_URI[md5sum] = "136685c8eaf9d6569c351fe1d453b30c"
SRC_URI[sha256sum] = "9ca033e6c14c0f26c20379b0cf9299429fd5a354a79c3c7880fd41ef69f7751c"
SRC_URI = "ftp://oss.sgi.com/www/projects/libnuma/download/${BPN}-${PV}.tar.gz \ SRC_URI = "ftp://oss.sgi.com/www/projects/libnuma/download/${BPN}-${PV}.tar.gz \
file://fix-null-pointer.patch \ file://fix-null-pointer.patch \
@@ -18,12 +16,14 @@ SRC_URI = "ftp://oss.sgi.com/www/projects/libnuma/download/${BPN}-${PV}.tar.gz \
file://Makefile \ file://Makefile \
file://run-ptest \ file://run-ptest \
" "
SRC_URI[md5sum] = "682c38305b2596967881f3d77bc3fc9c"
SRC_URI[sha256sum] = "dbdac8fe74f13b2e2864bba352f1597ab1d3345c8c485d7805f58d66f414db61"
# ARM does not currently support NUMA # ARM does not currently support NUMA
COMPATIBLE_HOST = "^((?!arm).*)$" COMPATIBLE_HOST = "^((?!arm).*)$"
do_install() { do_install() {
oe_runmake DESTDIR=${D} prefix=${D}/usr libdir=${D}/${libdir} install oe_runmake DESTDIR=${D} prefix=${D}/usr install
#remove the empty man2 directory #remove the empty man2 directory
rm -r ${D}${mandir}/man2 rm -r ${D}${mandir}/man2
} }