diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files')
4 files changed, 90 insertions, 7 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-huge_page_setup_helper-use-python3-interpreter.patch b/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-huge_page_setup_helper-use-python3-interpreter.patch new file mode 100644 index 00000000..e45f283b --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-huge_page_setup_helper-use-python3-interpreter.patch @@ -0,0 +1,29 @@ +From b77c61de4d88d2c6e5d31f4f5a5877cc4c61272e Mon Sep 17 00:00:00 2001 +From: Andrey Zhizhikin <andrey.z@gmail.com> +Date: Mon, 27 Jan 2020 17:27:55 +0000 +Subject: [PATCH] huge_page_setup_helper: use python3 interpreter + +Setup helper script is already prepared to be used with python3, use the +interpreter explicitly. This removes dependency to python2 and will not +fail the QA check. + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> +--- + huge_page_setup_helper.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/huge_page_setup_helper.py b/huge_page_setup_helper.py +index a9ba2bf..7ba0c92 100755 +--- a/huge_page_setup_helper.py ++++ b/huge_page_setup_helper.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python3 + + # + # Tool to set up Linux large page support with minimal effort +-- +2.17.1 + diff --git a/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch b/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch index 53f35abb..83934abe 100644 --- a/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch +++ b/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch @@ -10,15 +10,20 @@ Upstream-Status: Submitted Signed-off-by: Ting Liu <b28495@freescale.com> +Update for 2.22. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> + +Update to work for python3 +Signed-off-by: Changqing Li <changqing.li@windriver.com> --- tests/run_tests.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/run_tests.py b/tests/run_tests.py -index 3c95a03..560df6b 100755 +index 018264d..0aabcd1 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py -@@ -234,9 +234,19 @@ def get_pagesizes(): +@@ -245,9 +245,19 @@ def get_pagesizes(): Use libhugetlbfs' hugeadm utility to get a list of page sizes that have active mount points and at least one huge page allocated to the pool. """ @@ -34,8 +39,11 @@ index 3c95a03..560df6b 100755 + return sizes + except OSError: + return sizes -+ out = p.stdout.read().strip() ++ out = p.stdout.read().decode().strip() + - if rc != 0 or out == "": return sizes + if rc != 0 or out == "": + return sizes - for size in out.split("\n"): sizes.add(int(size)) +-- +2.7.4 + diff --git a/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch b/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch new file mode 100644 index 00000000..9d52b908 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch @@ -0,0 +1,41 @@ +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/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch b/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch index 08174200..e736cbc7 100644 --- a/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch +++ b/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch @@ -8,12 +8,14 @@ error: unknown type name 'ino_t'; did you mean 'int'? Signed-off-by: Khem Raj <raj.khem@gmail.com> +Update for 2.22. +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- tests/hugetests.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/hugetests.h b/tests/hugetests.h -index 8b1d8d9..056042c 100644 +index bc4e16a..fbe4dc0 100644 --- a/tests/hugetests.h +++ b/tests/hugetests.h @@ -22,6 +22,7 @@ @@ -21,6 +23,9 @@ index 8b1d8d9..056042c 100644 #include <errno.h> #include <string.h> +#include <dirent.h> + #include <unistd.h> #include "libhugetlbfs_privutils.h" - #include "libhugetlbfs_testprobes.h" +-- +2.7.4 + |