diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-01 17:51:09 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-03 21:43:35 +0000 |
commit | 83134a01ac51b316bd1f02bc83d0c8b24fd68edc (patch) | |
tree | e475afdf4b3a757107af8a13564c84f69b5969d4 /meta/recipes-support | |
parent | 46f235957b58f05ad31493d7ac14224562484053 (diff) | |
download | poky-83134a01ac51b316bd1f02bc83d0c8b24fd68edc.tar.gz |
numactl: upgrade 2.0.16 -> 2.0.17
Drop two backported patches, refresh others.
(From OE-Core rev: 63c7bf399f31420374866dc050a52e9c0700cdbd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
5 files changed, 8 insertions, 107 deletions
diff --git a/meta/recipes-support/numactl/numactl/0001-configure-Check-for-largefile-support.patch b/meta/recipes-support/numactl/numactl/0001-configure-Check-for-largefile-support.patch deleted file mode 100644 index 152eb2807b..0000000000 --- a/meta/recipes-support/numactl/numactl/0001-configure-Check-for-largefile-support.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 61f910f5d12d6f6a66223b5af6d74e30ace3a2e1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 15 Dec 2022 12:10:37 -0800 | ||
4 | Subject: [PATCH] configure: Check for largefile support | ||
5 | |||
6 | This helps in using 64bit versions of off_t related functions | ||
7 | |||
8 | Upstream-Status: Backport [https://github.com/numactl/numactl/pull/159] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | configure.ac | 3 +++ | ||
12 | 1 file changed, 3 insertions(+) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 8510fc5..d74bc6e 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -14,6 +14,9 @@ LT_INIT | ||
19 | |||
20 | AC_PROG_CC | ||
21 | |||
22 | +# Check for enabling LFS support | ||
23 | +AC_SYS_LARGEFILE | ||
24 | + | ||
25 | # Override CFLAGS so that we can specify custom CFLAGS for numademo. | ||
26 | AX_AM_OVERRIDE_VAR([CFLAGS]) | ||
27 | |||
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 9e65a45133..185dcb3e2d 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 | |||
@@ -13,10 +13,10 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> | |||
13 | 1 file changed, 3 insertions(+), 1 deletion(-) | 13 | 1 file changed, 3 insertions(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/Makefile.am b/Makefile.am | 15 | diff --git a/Makefile.am b/Makefile.am |
16 | index b6db339..de176c4 100644 | 16 | index e84b21e..94a8bff 100644 |
17 | --- a/Makefile.am | 17 | --- a/Makefile.am |
18 | +++ b/Makefile.am | 18 | +++ b/Makefile.am |
19 | @@ -124,7 +124,9 @@ regress2: $(check_PROGRAMS) | 19 | @@ -126,7 +126,9 @@ regress2: $(check_PROGRAMS) |
20 | test_numademo: numademo | 20 | test_numademo: numademo |
21 | ./numademo -t -e 10M | 21 | ./numademo -t -e 10M |
22 | 22 | ||
@@ -27,6 +27,3 @@ index b6db339..de176c4 100644 | |||
27 | 27 | ||
28 | TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir; | 28 | TESTS_ENVIRONMENT = builddir='$(builddir)'; export builddir; |
29 | 29 | ||
30 | -- | ||
31 | 1.9.1 | ||
32 | |||
diff --git a/meta/recipes-support/numactl/numactl/0002-shm.c-Replace-stat64-fstat64-ftruncate64mmap64-with-.patch b/meta/recipes-support/numactl/numactl/0002-shm.c-Replace-stat64-fstat64-ftruncate64mmap64-with-.patch deleted file mode 100644 index 03b98e0a2c..0000000000 --- a/meta/recipes-support/numactl/numactl/0002-shm.c-Replace-stat64-fstat64-ftruncate64mmap64-with-.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 8a08d3583d77bebeb1763fb9b378899201ce5afa Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 15 Dec 2022 12:11:13 -0800 | ||
4 | Subject: [PATCH] shm.c: Replace stat64/fstat64/ftruncate64mmap64 with normal functions | ||
5 | |||
6 | These functions were needed when _FILE_OFFSET_BITS was not 64, using | ||
7 | AC_SYS_LARGEFILE will detect it correctly and make the normal variants | ||
8 | of these functions behave same as their *64 counterparts. | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/numactl/numactl/pull/159] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | shm.c | 10 +++++----- | ||
14 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
15 | |||
16 | diff --git a/shm.c b/shm.c | ||
17 | index 20537d9..5d0d1ab 100644 | ||
18 | --- a/shm.c | ||
19 | +++ b/shm.c | ||
20 | @@ -24,8 +24,8 @@ | ||
21 | #include <sys/mman.h> | ||
22 | #include <sys/ipc.h> | ||
23 | #include <sys/shm.h> | ||
24 | -#include <sys/fcntl.h> | ||
25 | #include <sys/stat.h> | ||
26 | +#include <fcntl.h> | ||
27 | #include <stdarg.h> | ||
28 | #include <errno.h> | ||
29 | #include <unistd.h> | ||
30 | @@ -135,7 +135,7 @@ void attach_sysvshm(char *name, char *opt) | ||
31 | /* Attach a shared memory file. */ | ||
32 | void attach_shared(char *name, char *opt) | ||
33 | { | ||
34 | - struct stat64 st; | ||
35 | + struct stat st; | ||
36 | |||
37 | shmfd = open(name, O_RDWR); | ||
38 | if (shmfd < 0) { | ||
39 | @@ -146,14 +146,14 @@ void attach_shared(char *name, char *opt) | ||
40 | if (shmfd < 0) | ||
41 | nerror("cannot create file %s", name); | ||
42 | } | ||
43 | - if (fstat64(shmfd, &st) < 0) | ||
44 | + if (fstat(shmfd, &st) < 0) | ||
45 | err("shm stat"); | ||
46 | /* the file size must be larger than mmap shmlen + shmoffset, otherwise SIGBUS | ||
47 | * will be caused when we access memory, because mmaped memory is no longer in | ||
48 | * the range of the file laster. | ||
49 | */ | ||
50 | if ((shmlen + shmoffset) > st.st_size) { | ||
51 | - if (ftruncate64(shmfd, shmlen + shmoffset) < 0) { | ||
52 | + if (ftruncate(shmfd, shmlen + shmoffset) < 0) { | ||
53 | /* XXX: we could do it by hand, but it would it | ||
54 | would be impossible to apply policy then. | ||
55 | need to fix that in the kernel. */ | ||
56 | @@ -168,7 +168,7 @@ void attach_shared(char *name, char *opt) | ||
57 | |||
58 | /* RED-PEN For shmlen > address space may need to map in pieces. | ||
59 | Left for some poor 32bit soul. */ | ||
60 | - shmptr = mmap64(NULL, shmlen, PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, shmoffset); | ||
61 | + shmptr = mmap(NULL, shmlen, PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, shmoffset); | ||
62 | if (shmptr == (char*)-1) | ||
63 | err("shm mmap"); | ||
64 | } | ||
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 a7bc8d322e..00c4f9dfcb 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 | |||
@@ -14,18 +14,18 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> | |||
14 | 2 files changed, 8 insertions(+), 9 deletions(-) | 14 | 2 files changed, 8 insertions(+), 9 deletions(-) |
15 | 15 | ||
16 | diff --git a/test/regress b/test/regress | 16 | diff --git a/test/regress b/test/regress |
17 | index 2ce1705..d086a47 100755 | 17 | index f06b22f..2fdfacb 100755 |
18 | --- a/test/regress | 18 | --- a/test/regress |
19 | +++ b/test/regress | 19 | +++ b/test/regress |
20 | @@ -74,6 +74,7 @@ probe_hardware() | 20 | @@ -78,6 +78,7 @@ probe_hardware() |
21 | if [ $numnodes -lt 2 ] ; then | 21 | if [ $numnodes -lt 2 ] ; then |
22 | echo "need at least two nodes with at least $NEEDPAGES each of" | 22 | echo "need at least two nodes with at least $NEEDPAGES each of" |
23 | echo "free memory for mempolicy regression tests" | 23 | echo "free memory for mempolicy regression tests" |
24 | + echo "SKIP: numa regress" | 24 | + echo "SKIP: numa regress" |
25 | exit 77 # Skip test | 25 | exit 77 # Skip test |
26 | fi | 26 | fi |
27 | } | 27 | } |
28 | @@ -207,10 +208,9 @@ main() | 28 | @@ -209,10 +210,9 @@ main() |
29 | rm A B | 29 | rm A B |
30 | 30 | ||
31 | if [ "$EXIT" = 0 ] ; then | 31 | if [ "$EXIT" = 0 ] ; then |
@@ -60,6 +60,3 @@ index aa6ea41..450c510 100755 | |||
60 | } | 60 | } |
61 | 61 | ||
62 | # still broken | 62 | # still broken |
63 | -- | ||
64 | 1.8.4.2 | ||
65 | |||
diff --git a/meta/recipes-support/numactl/numactl_git.bb b/meta/recipes-support/numactl/numactl_git.bb index 0f71258bc3..bc5b09fc82 100644 --- a/meta/recipes-support/numactl/numactl_git.bb +++ b/meta/recipes-support/numactl/numactl_git.bb | |||
@@ -10,16 +10,14 @@ inherit autotools-brokensep ptest | |||
10 | 10 | ||
11 | LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=9f34c3af4ed6f3f5df0da5f3c0835a43" | 11 | LIC_FILES_CHKSUM = "file://README.md;beginline=19;endline=32;md5=9f34c3af4ed6f3f5df0da5f3c0835a43" |
12 | 12 | ||
13 | SRCREV = "10285f1a1bad49306839b2c463936460b604e3ea" | 13 | SRCREV = "c1165896572b74e971d817909bf652066ddf801a" |
14 | PV = "2.0.16" | 14 | PV = "2.0.17" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/numactl/numactl;branch=master;protocol=https \ | 16 | SRC_URI = "git://github.com/numactl/numactl;branch=master;protocol=https \ |
17 | file://Fix-the-test-output-format.patch \ | 17 | file://Fix-the-test-output-format.patch \ |
18 | file://Makefile \ | 18 | file://Makefile \ |
19 | file://run-ptest \ | 19 | file://run-ptest \ |
20 | file://0001-define-run-test-target.patch \ | 20 | file://0001-define-run-test-target.patch \ |
21 | file://0001-configure-Check-for-largefile-support.patch \ | ||
22 | file://0002-shm.c-Replace-stat64-fstat64-ftruncate64mmap64-with-.patch \ | ||
23 | " | 21 | " |
24 | 22 | ||
25 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |