helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-10-02 14:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

libhugetlbfs: 1.19 -> 1.20

Browse Source 
Upgrade libhugetlbfs from 1.19 to 1.20.

* Remove libhugetlbfs-avoid-using-restrict-as-var-name.patch which is
  fixed in upstream.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Kai Kang 2016-11-09 15:58:52 +08:00 committed by Martin Jansa
parent ce306bbec1
commit 3c5b7a841a
2 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-using-restrict-as-var-name.patch
View File

@ -1,34 +0,0 @@
Avoid using keyword restrict as variable name which causes error with gcc 5.x:
| hugeutils.c: In function '__lh_hugetlbfs_setup_env':
| hugeutils.c:304:40: error: expected identifier or '(' before 'restrict'
| char *p, *tok, *exe, buf[MAX_EXE+1], restrict[MAX_EXE];
| ^
Upstream-Status: Pending
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
diff --git a/hugeutils.c b/hugeutils.c
index 53a7fbd..b9d7001 100644
--- a/hugeutils.c
+++ b/hugeutils.c
@@ -301,14 +301,14 @@ void hugetlbfs_setup_env()
env = getenv("HUGETLB_RESTRICT_EXE");
if (env) {
- char *p, *tok, *exe, buf[MAX_EXE+1], restrict[MAX_EXE];
+ char *p, *tok, *exe, buf[MAX_EXE+1], restricted[MAX_EXE];
int found = 0;
exe = get_exe_name(buf, sizeof buf);
DEBUG("Found HUGETLB_RESTRICT_EXE, this exe is \"%s\"\n", exe);
- strncpy(restrict, env, sizeof restrict);
- restrict[sizeof(restrict)-1] = 0;
- for (p = restrict; (tok = strtok(p, ":")) != NULL; p = NULL) {
+ strncpy(restricted, env, sizeof restricted);
+ restricted[sizeof(restricted)-1] = 0;
+ for (p = restricted; (tok = strtok(p, ":")) != NULL; p = NULL) {
DEBUG(" ...check exe match for \"%s\"\n", tok);
if (strcmp(tok, exe) == 0) {
found = 1;

5
meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
View File

@ -7,10 +7,10 @@ DEPENDS = "sysfsutils perl"
RDEPENDS_${PN} += "bash perl python python-io python-lang python-subprocess python-resource ${PN}-perl" RDEPENDS_${PN} += "bash perl python python-io python-lang python-subprocess python-resource ${PN}-perl"
RDEPENDS_${PN}-tests += "bash" RDEPENDS_${PN}-tests += "bash"
PV = "2.19" PV = "2.20"
PE = "1" PE = "1"
SRCREV = "426c22d65415fcb8927f68fbc5887e075a8dc40a" SRCREV = "e44180072b796c0e28e53c4d01ef6279caaa2a99"
SRC_URI = " \ SRC_URI = " \
git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \
file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \
@ -18,7 +18,6 @@ SRC_URI = " \
file://tests-Makefile-install-static-4G-edge-testcases.patch \ file://tests-Makefile-install-static-4G-edge-testcases.patch \
file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \ file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \ file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
file://libhugetlbfs-avoid-using-restrict-as-var-name.patch \
file://Force-text-segment-alignment-to-0x08000000-for-i386-.patch \ file://Force-text-segment-alignment-to-0x08000000-for-i386-.patch \
" "