diff options
-rw-r--r-- | meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch | 41 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 5 |
2 files changed, 2 insertions, 44 deletions
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch deleted file mode 100644 index 9d52b908e9..0000000000 --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From d07d2f9601b49bb72cd4b36838f0c238bd1b0fc1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 15 Jan 2020 18:45:09 -0800 | ||
4 | Subject: [PATCH] tests: add explicit permissions to open() call | ||
5 | |||
6 | Fixes | ||
7 | gethugepagesizes.c:227:35: error: open with O_CREAT in second argument needs 3 arguments | ||
8 | | fd = open(fname, O_WRONLY|O_CREAT); | ||
9 | | ^ | ||
10 | |||
11 | Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/libhugetlbfs/anNtDXbQKro] | ||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | tests/gethugepagesizes.c | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/tests/gethugepagesizes.c b/tests/gethugepagesizes.c | ||
18 | index 9551b38..5777265 100644 | ||
19 | --- a/tests/gethugepagesizes.c | ||
20 | +++ b/tests/gethugepagesizes.c | ||
21 | @@ -223,7 +223,7 @@ void setup_fake_data(long sizes[], int n_elem) | ||
22 | FAIL("mkdtemp: %s", strerror(errno)); | ||
23 | |||
24 | sprintf(fname, "%s/meminfo-none", fake_meminfo); | ||
25 | - fd = open(fname, O_WRONLY|O_CREAT); | ||
26 | + fd = open(fname, O_WRONLY|O_CREAT, 0600); | ||
27 | if (fd < 0) | ||
28 | FAIL("open: %s", strerror(errno)); | ||
29 | if (write(fd, meminfo_base, | ||
30 | @@ -233,7 +233,7 @@ void setup_fake_data(long sizes[], int n_elem) | ||
31 | FAIL("close: %s", strerror(errno)); | ||
32 | |||
33 | sprintf(fname, "%s/meminfo-hugepages", fake_meminfo); | ||
34 | - fd = open(fname, O_WRONLY|O_CREAT); | ||
35 | + fd = open(fname, O_WRONLY|O_CREAT, 0600); | ||
36 | if (fd < 0) | ||
37 | FAIL("open: %s", strerror(errno)); | ||
38 | if (write(fd, meminfo_base, | ||
39 | -- | ||
40 | 2.25.0 | ||
41 | |||
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 4768d7b63a..b349096ec2 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | |||
@@ -7,10 +7,10 @@ DEPENDS = "sysfsutils" | |||
7 | RDEPENDS_${PN} += "bash python3-core" | 7 | RDEPENDS_${PN} += "bash python3-core" |
8 | RDEPENDS_${PN}-tests += "bash python3-core" | 8 | RDEPENDS_${PN}-tests += "bash python3-core" |
9 | 9 | ||
10 | PV = "2.22" | 10 | PV = "2.23" |
11 | PE = "1" | 11 | PE = "1" |
12 | 12 | ||
13 | SRCREV = "e6499ff92b4a7dcffbd131d1f5d24933e48c3f20" | 13 | SRCREV = "6b126a4d7da9490fa40fe7e1b962edcb939feddc" |
14 | SRC_URI = " \ | 14 | SRC_URI = " \ |
15 | git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ | 15 | git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ |
16 | file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ | 16 | file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ |
@@ -24,7 +24,6 @@ SRC_URI = " \ | |||
24 | file://0004-shm.c-Mark-glibc-specific-changes-so.patch \ | 24 | file://0004-shm.c-Mark-glibc-specific-changes-so.patch \ |
25 | file://0005-Include-dirent.h-for-ino_t.patch \ | 25 | file://0005-Include-dirent.h-for-ino_t.patch \ |
26 | file://0006-include-limits.h-for-PATH_MAX.patch \ | 26 | file://0006-include-limits.h-for-PATH_MAX.patch \ |
27 | file://0001-tests-add-explicit-permissions-to-open-call.patch \ | ||
28 | file://0001-huge_page_setup_helper-use-python3-interpreter.patch \ | 27 | file://0001-huge_page_setup_helper-use-python3-interpreter.patch \ |
29 | " | 28 | " |
30 | 29 | ||