mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-10 10:43:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

numactl: upgrade 2.0.16 -> 2.0.17

Browse Source 
Drop two backported patches, refresh others.

(From OE-Core rev: 63c7bf399f31420374866dc050a52e9c0700cdbd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2024-02-01 17:51:09 +00:00
parent 46f235957b
commit 83134a01ac
5 changed files with 8 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meta/recipes-support/numactl/numactl/0001-configure-Check-for-largefile-support.patch
View File

@@ -1,27 +0,0 @@
From 61f910f5d12d6f6a66223b5af6d74e30ace3a2e1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 15 Dec 2022 12:10:37 -0800
Subject: [PATCH] configure: Check for largefile support
This helps in using 64bit versions of off_t related functions
Upstream-Status: Backport [https://github.com/numactl/numactl/pull/159]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
configure.ac | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure.ac b/configure.ac
index 8510fc5..d74bc6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,9 @@ LT_INIT
AC_PROG_CC
+# Check for enabling LFS support
+AC_SYS_LARGEFILE
+
# Override CFLAGS so that we can specify custom CFLAGS for numademo.
AX_AM_OVERRIDE_VAR([CFLAGS])

7
meta/recipes-support/numactl/numactl/0001-define-run-test-target.patch
View File

@@ -13,10 +13,10 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index b6db339..de176c4 100644
index e84b21e..94a8bff 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 +27,3 @@ index b6db339..de176c4 100644
TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir;
--
1.9.1

64
meta/recipes-support/numactl/numactl/0002-shm.c-Replace-stat64-fstat64-ftruncate64mmap64-with-.patch
View File

@@ -1,64 +0,0 @@
From 8a08d3583d77bebeb1763fb9b378899201ce5afa Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 15 Dec 2022 12:11:13 -0800
Subject: [PATCH] shm.c: Replace stat64/fstat64/ftruncate64mmap64 with normal functions
These functions were needed when _FILE_OFFSET_BITS was not 64, using
AC_SYS_LARGEFILE will detect it correctly and make the normal variants
of these functions behave same as their *64 counterparts.
Upstream-Status: Backport [https://github.com/numactl/numactl/pull/159]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
shm.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/shm.c b/shm.c
index 20537d9..5d0d1ab 100644
--- a/shm.c
+++ b/shm.c
@@ -24,8 +24,8 @@
#include <sys/mman.h>
#include <sys/ipc.h>
#include <sys/shm.h>
-#include <sys/fcntl.h>
#include <sys/stat.h>
+#include <fcntl.h>
#include <stdarg.h>
#include <errno.h>
#include <unistd.h>
@@ -135,7 +135,7 @@ void attach_sysvshm(char *name, char *opt)
/* Attach a shared memory file. */
void attach_shared(char *name, char *opt)
{
- struct stat64 st;
+ struct stat st;
shmfd = open(name, O_RDWR);
if (shmfd < 0) {
@@ -146,14 +146,14 @@ void attach_shared(char *name, char *opt)
if (shmfd < 0)
nerror("cannot create file %s", name);
}
- if (fstat64(shmfd, &st) < 0)
+ if (fstat(shmfd, &st) < 0)
err("shm stat");
/* the file size must be larger than mmap shmlen + shmoffset, otherwise SIGBUS
* will be caused when we access memory, because mmaped memory is no longer in
* the range of the file laster.
*/
if ((shmlen + shmoffset) > st.st_size) {
- if (ftruncate64(shmfd, shmlen + shmoffset) < 0) {
+ if (ftruncate(shmfd, shmlen + shmoffset) < 0) {
/* XXX: we could do it by hand, but it would it
would be impossible to apply policy then.
need to fix that in the kernel. */
@@ -168,7 +168,7 @@ void attach_shared(char *name, char *opt)
/* RED-PEN For shmlen > address space may need to map in pieces.
Left for some poor 32bit soul. */
- shmptr = mmap64(NULL, shmlen, PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, shmoffset);
+ shmptr = mmap(NULL, shmlen, PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, shmoffset);
if (shmptr == (char*)-1)
err("shm mmap");
}

11
meta/recipes-support/numactl/numactl/Fix-the-test-output-format.patch
View File

@@ -14,18 +14,18 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
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 "SKIP: numa regress"
exit 77 # Skip test
exit 77 # Skip test
fi
}
@@ -207,10 +208,9 @@ main()
@@ -209,10 +210,9 @@ main()
rm A B
if [ "$EXIT" = 0 ] ; then
@@ -60,6 +60,3 @@ index aa6ea41..450c510 100755
}
# still broken
--
1.8.4.2

6
meta/recipes-support/numactl/numactl_git.bb
View File

@@ -10,16 +10,14 @@ inherit autotools-brokensep ptest
LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=9f34c3af4ed6f3f5df0da5f3c0835a43"
SRCREV = "10285f1a1bad49306839b2c463936460b604e3ea"
PV = "2.0.16"
SRCREV = "c1165896572b74e971d817909bf652066ddf801a"
PV = "2.0.17"
SRC_URI = "git://github.com/numactl/numactl;branch=master;protocol=https \
file://Fix-the-test-output-format.patch \
file://Makefile \
file://run-ptest \
file://0001-define-run-test-target.patch \
file://0001-configure-Check-for-largefile-support.patch \
file://0002-shm.c-Replace-stat64-fstat64-ftruncate64mmap64-with-.patch \
"
S = "${WORKDIR}/git"