aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2020-09-11 21:25:46 +0800
committerKhem Raj <raj.khem@gmail.com>2020-09-10 21:20:23 -0700
commitf36c1ba1ca36f18bdf28211f1952666a2a85a0d7 (patch)
tree068a56513e5aa4b0d9b7efcdd813a88ad228f9da
parent58bf61e6bcca1d10728b707113f32792d6f443be (diff)
downloadmeta-openembedded-contrib-f36c1ba1ca36f18bdf28211f1952666a2a85a0d7.tar.gz
libhugetlbfs: upgrade 2.22 -> 2.23
0001-tests-add-explicit-permissions-to-open-call.patch Removed since this is included in 2.23 Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch41
-rw-r--r--meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb5
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 @@
-From d07d2f9601b49bb72cd4b36838f0c238bd1b0fc1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 15 Jan 2020 18:45:09 -0800
-Subject: [PATCH] tests: add explicit permissions to open() call
-
-Fixes
-gethugepagesizes.c:227:35: error: open with O_CREAT in second argument needs 3 arguments
-| fd = open(fname, O_WRONLY|O_CREAT);
-| ^
-
-Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/libhugetlbfs/anNtDXbQKro]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- tests/gethugepagesizes.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/gethugepagesizes.c b/tests/gethugepagesizes.c
-index 9551b38..5777265 100644
---- a/tests/gethugepagesizes.c
-+++ b/tests/gethugepagesizes.c
-@@ -223,7 +223,7 @@ void setup_fake_data(long sizes[], int n_elem)
- FAIL("mkdtemp: %s", strerror(errno));
-
- sprintf(fname, "%s/meminfo-none", fake_meminfo);
-- fd = open(fname, O_WRONLY|O_CREAT);
-+ fd = open(fname, O_WRONLY|O_CREAT, 0600);
- if (fd < 0)
- FAIL("open: %s", strerror(errno));
- if (write(fd, meminfo_base,
-@@ -233,7 +233,7 @@ void setup_fake_data(long sizes[], int n_elem)
- FAIL("close: %s", strerror(errno));
-
- sprintf(fname, "%s/meminfo-hugepages", fake_meminfo);
-- fd = open(fname, O_WRONLY|O_CREAT);
-+ fd = open(fname, O_WRONLY|O_CREAT, 0600);
- if (fd < 0)
- FAIL("open: %s", strerror(errno));
- if (write(fd, meminfo_base,
---
-2.25.0
-
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"
RDEPENDS_${PN} += "bash python3-core"
RDEPENDS_${PN}-tests += "bash python3-core"
-PV = "2.22"
+PV = "2.23"
PE = "1"
-SRCREV = "e6499ff92b4a7dcffbd131d1f5d24933e48c3f20"
+SRCREV = "6b126a4d7da9490fa40fe7e1b962edcb939feddc"
SRC_URI = " \
git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \
file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \
@@ -24,7 +24,6 @@ SRC_URI = " \
file://0004-shm.c-Mark-glibc-specific-changes-so.patch \
file://0005-Include-dirent.h-for-ino_t.patch \
file://0006-include-limits.h-for-PATH_MAX.patch \
- file://0001-tests-add-explicit-permissions-to-open-call.patch \
file://0001-huge_page_setup_helper-use-python3-interpreter.patch \
"