diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs')
13 files changed, 254 insertions, 141 deletions
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch new file mode 100644 index 000000000..a84414c02 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch @@ -0,0 +1,23 @@ +From 351d1de09dd80049b7a2cb02c5750635d0389873 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Jun 2018 19:25:57 -0700 +Subject: [PATCH] include stddef.h for ptrdiff_t + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + morecore.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/morecore.c b/morecore.c +index 6563bbd..0eef782 100644 +--- a/morecore.c ++++ b/morecore.c +@@ -19,6 +19,7 @@ + + #define _GNU_SOURCE + ++#include <stddef.h> + #include <stdio.h> + #include <stdlib.h> + #include <malloc.h> diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch index 3082d7ef5..53f35abb7 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch @@ -1,4 +1,4 @@ -From a85fc43243f8bfad12d306a4a0e230fb8b3e828a Mon Sep 17 00:00:00 2001 +From 0077532b07e268347cb8557be6d70148d5f0e840 Mon Sep 17 00:00:00 2001 From: Ting Liu <b28495@freescale.com> Date: Wed, 21 Aug 2013 15:44:57 +0800 Subject: [PATCH] run_test.py: not use hard coded path ../obj/hugeadm @@ -9,15 +9,16 @@ After 'make install', we can use hugeadm utility under DESTDIR. Upstream-Status: Submitted Signed-off-by: Ting Liu <b28495@freescale.com> + --- - tests/run_tests.py | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) + 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 d9a6b35..a9bab8f 100755 +index 3c95a03..560df6b 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py -@@ -232,9 +232,19 @@ def get_pagesizes(): +@@ -234,9 +234,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. """ @@ -38,6 +39,3 @@ index d9a6b35..a9bab8f 100755 if rc != 0 or out == "": return sizes for size in out.split("\n"): sizes.add(int(size)) --- -1.7.3.4 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch new file mode 100644 index 000000000..8cb184a65 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch @@ -0,0 +1,37 @@ +From 0f548286848c70aa325c6748d80e8651389b4938 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Jun 2018 19:32:59 -0700 +Subject: [PATCH] Mark glibc specific code so + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + morecore.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/morecore.c b/morecore.c +index 0eef782..d48509c 100644 +--- a/morecore.c ++++ b/morecore.c +@@ -364,6 +364,7 @@ void hugetlbfs_setup_morecore(void) + + INFO("setup_morecore(): heapaddr = 0x%lx\n", heapaddr); + ++#ifdef __GLIBC__ + heaptop = heapbase = (void *)heapaddr; + if (__hugetlb_opts.thp_morecore) + __morecore = &thp_morecore; +@@ -371,7 +372,6 @@ void hugetlbfs_setup_morecore(void) + __morecore = &hugetlbfs_morecore; + + /* Set some allocator options more appropriate for hugepages */ +- + if (__hugetlb_opts.shrink_ok) + mallopt(M_TRIM_THRESHOLD, hpage_size + hpage_size / 2); + else +@@ -381,4 +381,5 @@ void hugetlbfs_setup_morecore(void) + * This doesn't appear to prohibit malloc() from falling back + * to mmap() if we run out of hugepages. */ + mallopt(M_MMAP_MAX, 0); ++#endif + } diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch new file mode 100644 index 000000000..aca7e803d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch @@ -0,0 +1,46 @@ +From 9ff04d7acc700387e3837f8ab11a41efea5ee8b0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Jun 2018 19:44:26 -0700 +Subject: [PATCH] alloc.c: Avoid sysconf(_SC_LEVEL2_CACHE_LINESIZE) on linux + +musl does not have it + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + alloc.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/alloc.c b/alloc.c +index bce9464..cf7eb40 100644 +--- a/alloc.c ++++ b/alloc.c +@@ -245,6 +245,19 @@ void free_huge_pages(void *ptr) + __free_huge_pages(ptr, 1); + } + ++static size_t get_cacheline_size() { ++#if defined(__linux__) ++ FILE * fp = fopen("/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size", "r"); ++ unsigned int line_size = 0; ++ if (fp) { ++ fscanf(fp, "%d", &line_size); ++ fclose(fp); ++ } ++ return line_size; ++#else ++ return sysconf(_SC_LEVEL2_CACHE_LINESIZE); ++#endif ++} + /* + * Offset the buffer using bytes wasted due to alignment to avoid using the + * same cache lines for the start of every buffer returned by +@@ -261,7 +274,7 @@ void *cachecolor(void *buf, size_t len, size_t color_bytes) + + /* Lookup our cacheline size once */ + if (cacheline_size == 0) { +- cacheline_size = sysconf(_SC_LEVEL2_CACHE_LINESIZE); ++ cacheline_size = get_cacheline_size(); + linemod = time(NULL); + } + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch new file mode 100644 index 000000000..58776e871 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch @@ -0,0 +1,28 @@ +From 9ce323432a7f4d99f617970c7e35b607b9bbf843 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Jun 2018 19:48:04 -0700 +Subject: [PATCH] shm.c: Mark glibc specific changes so + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + shm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/shm.c b/shm.c +index 1f82cab..9447b63 100644 +--- a/shm.c ++++ b/shm.c +@@ -48,10 +48,11 @@ + * system shmget() may be performed without worry as there is no dynamic + * call chain. + */ ++#ifdef __GLIBC__ + extern void *dlsym (void *__restrict __handle, __const char *__restrict __name) + __attribute__((weak)) __THROW __nonnull ((2)); + extern char *dlerror (void) __attribute__((weak)) __THROW; +- ++#endif + + /* call syscall shmget through the generic syscall mechanism */ + static int syscall_shmget(key_t key, size_t size, int shmflg) diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch new file mode 100644 index 000000000..08174200d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch @@ -0,0 +1,26 @@ +From bb8c370aaaf25b1fe1fbf984e73177018026cb91 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Jun 2018 19:51:02 -0700 +Subject: [PATCH] Include dirent.h for ino_t + +Fixes +error: unknown type name 'ino_t'; did you mean 'int'? + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + tests/hugetests.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/hugetests.h b/tests/hugetests.h +index 8b1d8d9..056042c 100644 +--- a/tests/hugetests.h ++++ b/tests/hugetests.h +@@ -22,6 +22,7 @@ + + #include <errno.h> + #include <string.h> ++#include <dirent.h> + + #include "libhugetlbfs_privutils.h" + #include "libhugetlbfs_testprobes.h" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch new file mode 100644 index 000000000..2ead21fb4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch @@ -0,0 +1,40 @@ +From 5f64aa8c47c2d3a155a97e262f89cc47394a69eb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Jun 2018 19:58:53 -0700 +Subject: [PATCH] include limits.h for PATH_MAX + +Fixes + +error: 'PATH_MAX' undeclared + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + hugeadm.c | 1 + + tests/gethugepagesizes.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/hugeadm.c b/hugeadm.c +index fe4211d..8db274c 100644 +--- a/hugeadm.c ++++ b/hugeadm.c +@@ -33,6 +33,7 @@ + #include <grp.h> + #include <pwd.h> + #include <fcntl.h> ++#include <limits.h> + + #include <sys/stat.h> + #include <sys/types.h> +diff --git a/tests/gethugepagesizes.c b/tests/gethugepagesizes.c +index 9551b38..2645e3f 100644 +--- a/tests/gethugepagesizes.c ++++ b/tests/gethugepagesizes.c +@@ -29,6 +29,7 @@ + #include <fcntl.h> + #include <stdarg.h> + #include <hugetlbfs.h> ++#include <limits.h> + + #include "hugetests.h" + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch deleted file mode 100644 index ce6974d7c..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 3c6f8d0e3c0694f79244ec6ad5ad9ba3ca26bc0a Mon Sep 17 00:00:00 2001 -From: Yang Shi <yang.shi@linaro.org> -Date: Mon, 7 Dec 2015 14:12:13 -0800 -Subject: [PATCH] Force text segment alignment to 0x08000000 for i386 with gold - linker - -Upstream-Status: Backport - -When build libhugetlbfs tests with gold linker for i386, the below error occurs: - -i586-oe-linux-gcc -m32 -march=i586 -Wl,-O1 -Wl,--hash-style=gnu --Wl,--as-needed ---sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86 -I.. --O2 --Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c -| i586-oe-linux-gcc -m32 -march=i586 -Wl,-O1 -Wl,--hash-style=gnu --Wl,--as-needed ---sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86 --B./obj32 --Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,noexecstack -ldl --L../obj32 --o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl -lhugetlbfs_privutils --Wl,--hugetlbfs-align obj32/linkhuge_rw.o obj32/testutils.o -| i586-oe-linux-ld: internal error in do_write, at -/home/jenkins/oe/world/shr-core/tmp-glibc/work/x86_64-oe-linux/binutils-cross-i586/2.25-r0/git/gold/output.cc:464 -| collect2: error: ld returned 1 exit status - -But, it works well with GNU linker. --hugetlbfs-align flag passes -"-zcommon-page-size=$SLICE_SIZE -zmax-page-size=$SLICE_SIZE", that are supported by gold linker too. -But, it looks gold linker deal with them in a different way from gnu linker for i586. - -The readelf shows the below result with GNU linker: - -Elf file type is EXEC (Executable file) -Entry point 0x8048fbd -There are 8 program headers, starting at offset 52 - -Program Headers: - Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align - PHDR 0x000034 0x08000034 0x08000034 0x00100 0x00100 R E 0x4 - INTERP 0x048134 0x08048134 0x08048134 0x00013 0x00013 R 0x1 - [Requesting program interpreter: /lib/ld-linux.so.2] - LOAD 0x000000 0x08000000 0x08000000 0x5a5bc 0x5a5bc R E 0x400000 - LOAD 0x05a5bc 0x0845a5bc 0x0845a5bc 0x1028c 0x202cc RW 0x400000 - DYNAMIC 0x05a5d0 0x0845a5d0 0x0845a5d0 0x000e8 0x000e8 RW 0x4 - NOTE 0x048148 0x08048148 0x08048148 0x00044 0x00044 R 0x4 - GNU_EH_FRAME 0x059e5c 0x08059e5c 0x08059e5c 0x0009c 0x0009c R 0x4 - GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 - -"--relax" linker option doesn't solve this problem. -Forced textsegment alignment to 0x08000000 with gold linker, the build will pass and -readelf shows the same result with GNU linker: - -Elf file type is EXEC (Executable file) -Entry point 0x8048fbd -There are 8 program headers, starting at offset 52 - -Program Headers: - Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align - PHDR 0x000034 0x08000034 0x08000034 0x00100 0x00100 R E 0x4 - INTERP 0x048134 0x08048134 0x08048134 0x00013 0x00013 R 0x1 - [Requesting program interpreter: /lib/ld-linux.so.2] - LOAD 0x000000 0x08000000 0x08000000 0x5a5bc 0x5a5bc R E 0x400000 - LOAD 0x05a5bc 0x0845a5bc 0x0845a5bc 0x1028c 0x202cc RW 0x400000 - DYNAMIC 0x05a5d0 0x0845a5d0 0x0845a5d0 0x000e8 0x000e8 RW 0x4 - NOTE 0x048148 0x08048148 0x08048148 0x00044 0x00044 R 0x4 - GNU_EH_FRAME 0x059e5c 0x08059e5c 0x08059e5c 0x0009c 0x0009c R 0x4 - GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 - -The fix just have impact on hugelink_rw test case, which needs --hugetlbfs-align flag. - -Signed-off-by: Yang Shi <yang.shi@linaro.org> -Signed-off-by: Eric B Munson <emunson@mgebm.net> ---- - ld.hugetlbfs | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ld.hugetlbfs b/ld.hugetlbfs -index 4417442..32bc6fb 100755 ---- a/ld.hugetlbfs -+++ b/ld.hugetlbfs -@@ -98,6 +98,7 @@ if [ "$HTLB_ALIGN" == "slice" ]; then - # otherwise it will be NULL. - case "$EMU" in - armelf*_linux_eabi) HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;; -+ elf_i386) HTLBOPTS="$HTLBOPTS -Ttext-segment=0x08000000" ;; - esac - fi - --- -2.0.2 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch index b3fd84312..f95e9e85a 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch @@ -1,19 +1,20 @@ -From 0a2877400a086e9d6ddd32a80462b7a931921dc2 Mon Sep 17 00:00:00 2001 +From 82a4f60ab24dff121f5f9d3bbcd9a8a28bb7caef Mon Sep 17 00:00:00 2001 From: Chunrong Guo <B40290@freescale.com> Date: Sun, 8 Sep 2013 23:21:49 -0500 -Subject: [PATCH] libhugetlbfs: avoid search host library path for cross +Subject: [PATCH] libhugetlbfs: avoid search host library path for cross compilation Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Chunrong Guo <B40290@freescale.com> + --- - ldscripts/elf32ppclinux.xB | 2 +- - ldscripts/elf32ppclinux.xBDT | 2 +- - ldscripts/elf64ppc.xB | 2 +- - ldscripts/elf64ppc.xBDT | 2 +- - ldscripts/elf_x86_64.xB | 2 +- - ldscripts/elf_x86_64.xBDT | 2 +- + ldscripts/elf32ppclinux.xB | 2 +- + ldscripts/elf32ppclinux.xBDT | 2 +- + ldscripts/elf64ppc.xB | 2 +- + ldscripts/elf64ppc.xBDT | 2 +- + ldscripts/elf_x86_64.xB | 2 +- + ldscripts/elf_x86_64.xBDT | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ldscripts/elf32ppclinux.xB b/ldscripts/elf32ppclinux.xB @@ -94,6 +95,3 @@ index 1855202..c62d245 100644 INPUT(-lhugetlbfs); /* Do we need any of these for elf? __DYNAMIC = 0; */ --- -1.7.9.7 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch index 15664884b..7cc180a4b 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch @@ -1,14 +1,16 @@ -From 889e52753d30179ba4ac940023cb4ed561436ab8 Mon Sep 17 00:00:00 2001 +From b5887693d90c430291b644c2f5713b5fdd1777ce Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Tue, 4 Nov 2014 00:49:11 -0800 -Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for cross compilation +Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for + cross compilation Upstream-Status: Inappropriate [cross compile specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- - ldscripts/elf_i386.xB | 1 - - ldscripts/elf_i386.xBDT | 1 - + ldscripts/elf_i386.xB | 1 - + ldscripts/elf_i386.xBDT | 1 - 2 files changed, 2 deletions(-) diff --git a/ldscripts/elf_i386.xB b/ldscripts/elf_i386.xB @@ -35,6 +37,3 @@ index d72aebe..3bac1b1 100644 INPUT(-lhugetlbfs); /* Do we need any of these for elf? __DYNAMIC = 0; */ --- -1.7.9.5 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch index 07a99719b..a13c5389f 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch @@ -1,17 +1,20 @@ -From 355c014573de7f95202cc7c819f81f0f230e4a1a Mon Sep 17 00:00:00 2001 +From 183a4dafe141197de5840f2e48c266ef209307aa Mon Sep 17 00:00:00 2001 From: Ting Liu <b28495@freescale.com> Date: Mon, 18 Jun 2012 16:37:05 +0800 Subject: [PATCH] skip checking LIB32 and LIB64 if they point to the same place Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Ting Liu <b28495@freescale.com> + --- + Makefile | 1 - + 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile -index 91502e1..bfb3414 100644 +index 51e41f0..373df3c 100644 --- a/Makefile +++ b/Makefile -@@ -167,7 +167,6 @@ REALLIB32 = $(realpath $(PREFIX)/$(LIB32)) +@@ -177,7 +177,6 @@ REALLIB32 = $(realpath $(PREFIX)/$(LIB32)) REALLIB64 = $(realpath $(PREFIX)/$(LIB64)) ifneq ($(realpath $(PREFIX)),) ifeq ($(REALLIB32),$(REALLIB64)) @@ -19,5 +22,3 @@ index 91502e1..bfb3414 100644 endif endif --- -1.9.2 diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch index 249f6e1e2..b8b2f8e6f 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch @@ -1,12 +1,23 @@ +From f1ad8ff887f16daee8d06eca3df0f2541bfdaac0 Mon Sep 17 00:00:00 2001 +From: Ting Liu <b28495@freescale.com> +Date: Mon, 23 Sep 2013 08:00:55 +0000 +Subject: [PATCH] libhugetlbfs: add recipe + Upstream-Status: Submitted TESTS_64 is empty, install will fail due to missing file operand Signed-off-by: Ting Liu <b28495@freescale.com> ---- a/tests/Makefileold 2013-10-12 02:32:55.262391998 -0500 -+++ b/tests/Makefile 2013-10-12 02:33:45.929394722 -0500 -@@ -292,7 +292,7 @@ +--- + tests/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Makefile b/tests/Makefile +index 073df96..0ca3716 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -295,7 +295,7 @@ obj64/install: $(INSTALL) -m 755 wrapper-utils.sh $(DESTDIR)$(INST_TESTSDIR64)/obj64 $(INSTALL) -m 755 $(HELPERS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 $(INSTALL) -m 755 $(HELPER_LIBS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index a63494a62..66fd8e21d 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -3,14 +3,14 @@ HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" -DEPENDS = "sysfsutils perl" -RDEPENDS_${PN} += "bash perl python python-io python-lang python-subprocess python-resource ${PN}-perl" +DEPENDS = "sysfsutils" +RDEPENDS_${PN} += "bash python python-io python-lang python-subprocess python-resource" RDEPENDS_${PN}-tests += "bash" -PV = "2.20" +PV = "2.21" PE = "1" -SRCREV = "e44180072b796c0e28e53c4d01ef6279caaa2a99" +SRCREV = "73d06e69108f231696e9c5c44f4b42690fc5d752" SRC_URI = " \ git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ @@ -18,9 +18,16 @@ SRC_URI = " \ file://tests-Makefile-install-static-4G-edge-testcases.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://Force-text-segment-alignment-to-0x08000000-for-i386-.patch \ + file://0001-include-stddef.h-for-ptrdiff_t.patch \ + file://0002-Mark-glibc-specific-code-so.patch \ + file://0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \ + 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 \ " +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/git" COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" @@ -43,14 +50,6 @@ do_configure() { if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile fi - - # fixup perl module directory hardcoded to perl5 - sed -i 's/perl5/perl/g' Makefile - - # fixup to install perl module under $(LIBDIR)/perl/${@get_perl_version(d)}/TLBC - # to avoid below error - # Can't locate TLBC/OpCollect.pm in @INC - sed -i '/^PMDIR/ s:perl:perl/${@get_perl_version(d)}:g' Makefile } do_install() { @@ -61,11 +60,10 @@ do_install() { } -PACKAGES =+ "${PN}-perl ${PN}-tests " +PACKAGES =+ "${PN}-tests " FILES_${PN} += "${libdir}/*.so" FILES_${PN}-dev = "${includedir}" FILES_${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug" -FILES_${PN}-perl = "${libdir}/perl" FILES_${PN}-tests += "${libdir}/libhugetlbfs/tests" INSANE_SKIP_${PN} = "dev-so" |