diff options
author | Chunrong Guo <B40290@freescale.com> | 2013-10-12 08:59:43 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-15 13:43:53 +0200 |
commit | 90cd9eab6622f72a25b60e7510e76b59378767b8 (patch) | |
tree | bb50d9d1939a5a673029928159612d2279cc2999 | |
parent | 5cf24c4e8d2ae69f99f3a562708734167b3ceb2a (diff) | |
download | meta-openembedded-90cd9eab6622f72a25b60e7510e76b59378767b8.tar.gz |
libhugetlbfs: install static 4G-edge testcases
*TESTS_64 is empty, install will fail due to missing file operand.
Signed-off-by: Chunrong Guo <B40290@freescale.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch (renamed from meta-oe/recipes-benchmark/libhugetlbfs/files/install64-fix.patch) | 15 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/install64-fix.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch index 9652c3deb..249f6e1e2 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/install64-fix.patch +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch | |||
@@ -1,20 +1,17 @@ | |||
1 | Upstream-Status: Inappropriate [oe-core specific] | 1 | Upstream-Status: Submitted |
2 | 2 | ||
3 | TESTS_64 is empty, install will fail due to missing file operand | 3 | TESTS_64 is empty, install will fail due to missing file operand |
4 | 4 | ||
5 | Signed-off-by: Ting Liu <b28495@freescale.com> | ||
5 | 6 | ||
6 | Signed-off-by: Chunrong Guo <B40290@freescale.com> | 7 | --- a/tests/Makefileold 2013-10-12 02:32:55.262391998 -0500 |
7 | 8 | +++ b/tests/Makefile 2013-10-12 02:33:45.929394722 -0500 | |
8 | Index: git/tests/Makefile | 9 | @@ -292,7 +292,7 @@ |
9 | =================================================================== | ||
10 | --- git.orig/tests/Makefile | ||
11 | +++ git/tests/Makefile | ||
12 | @@ -292,7 +292,7 @@ obj64/install: | ||
13 | $(INSTALL) -m 755 wrapper-utils.sh $(DESTDIR)$(INST_TESTSDIR64)/obj64 | 10 | $(INSTALL) -m 755 wrapper-utils.sh $(DESTDIR)$(INST_TESTSDIR64)/obj64 |
14 | $(INSTALL) -m 755 $(HELPERS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 | 11 | $(INSTALL) -m 755 $(HELPERS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 |
15 | $(INSTALL) -m 755 $(HELPER_LIBS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 | 12 | $(INSTALL) -m 755 $(HELPER_LIBS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 |
16 | - $(INSTALL) -m 755 $(TESTS_64:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 | 13 | - $(INSTALL) -m 755 $(TESTS_64:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 |
17 | +# $(INSTALL) -m 755 $(TESTS_64:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 | 14 | + $(INSTALL) -m 755 $(TESTS_64_STATIC:%=obj64/%_static) $(DESTDIR)$(INST_TESTSDIR64)/obj64 |
18 | $(INSTALL) -m 755 run_tests.py $(DESTDIR)$(INST_TESTSDIR64) | 15 | $(INSTALL) -m 755 run_tests.py $(DESTDIR)$(INST_TESTSDIR64) |
19 | 16 | ||
20 | install: $(OBJDIRS:%=%/install) | 17 | install: $(OBJDIRS:%=%/install) |
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 783530079..475c502c6 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | |||
@@ -10,10 +10,10 @@ SRC_URI = "git://git.code.sf.net/p/libhugetlbfs/code \ | |||
10 | file://aarch64-support.patch \ | 10 | file://aarch64-support.patch \ |
11 | file://aarch64-unit-test-fixes.patch \ | 11 | file://aarch64-unit-test-fixes.patch \ |
12 | file://add-PROT-NONE-to-the-mprotest-test.patch \ | 12 | file://add-PROT-NONE-to-the-mprotest-test.patch \ |
13 | file://install64-fix.patch \ | ||
14 | file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ | 13 | file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ |
15 | file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \ | 14 | file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \ |
16 | file://fix-lib64-can-not-be-shiped-in-64bit-target.patch \ | 15 | file://fix-lib64-can-not-be-shiped-in-64bit-target.patch \ |
16 | file://tests-Makefile-install-static-4G-edge-testcases.patch \ | ||
17 | " | 17 | " |
18 | 18 | ||
19 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |