diff options
author | Yuan Chao <yuanc.fnst@cn.fujitsu.com> | 2019-09-05 15:35:13 +0900 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-09-05 18:13:44 -0700 |
commit | ca1cc870c5eb34646f73e241667b22463ebd65fd (patch) | |
tree | ad7645a6754252518df81994b388d80bf0696ff8 /meta-oe/recipes-support/numactl | |
parent | 517bd23da6cac1dd10adc3100cb82446d6c3e089 (diff) | |
download | meta-openembedded-contrib-ca1cc870c5eb34646f73e241667b22463ebd65fd.tar.gz |
numactl: upgrade 2.0.12 -> 2.0.13
Remove patch: 0001-fix-NULL-pointer-problem.patch
since this is included in 2.0.13
Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/numactl')
-rw-r--r-- | meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch | 35 | ||||
-rw-r--r-- | meta-oe/recipes-support/numactl/numactl_git.bb | 5 |
2 files changed, 2 insertions, 38 deletions
diff --git a/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch b/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch deleted file mode 100644 index 0497613dda..0000000000 --- a/meta-oe/recipes-support/numactl/numactl/0001-fix-NULL-pointer-problem.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5c16beff9909b28f55f25f48ed7ddbf98d8b1d5c Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> -Date: Wed, 18 Jul 2018 09:43:55 +0800 -Subject: [PATCH] fix NULL pointer problem - -return 0 if distance_table is NULL - -Upstream-Status: Pending - -read_distance_table() maybe return 0, but distance_table is not set, -if distance_table is used, and will lead to SEGFAULT - -Signed-off-by: Roy Li <rongqing.li@windriver.com> - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - distance.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/distance.c b/distance.c -index 8d472af..6a6e886 100644 ---- a/distance.c -+++ b/distance.c -@@ -113,6 +113,8 @@ int numa_distance(int a, int b) - int err = read_distance_table(); - if (err < 0) - return 0; -+ if(!distance_table) -+ return 0; - } - if ((unsigned)a >= distance_numnodes || (unsigned)b >= distance_numnodes) - return 0; --- -2.7.4 - diff --git a/meta-oe/recipes-support/numactl/numactl_git.bb b/meta-oe/recipes-support/numactl/numactl_git.bb index 279ac04156..f13b1795f1 100644 --- a/meta-oe/recipes-support/numactl/numactl_git.bb +++ b/meta-oe/recipes-support/numactl/numactl_git.bb @@ -10,11 +10,10 @@ inherit autotools-brokensep ptest LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=f8ff2391624f28e481299f3f677b21bb" -SRCREV = "841253d1313b01a968c380cae4f498f20c46e5aa" -PV = "2.0.12+git${SRCPV}" +SRCREV = "5d9f16722e3df49dc618a9f361bd482559695db7" +PV = "2.0.13+git${SRCPV}" SRC_URI = "git://github.com/numactl/numactl \ - file://0001-fix-NULL-pointer-problem.patch \ file://Fix-the-test-output-format.patch \ file://Makefile \ file://run-ptest \ |