aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChunrong Guo <B40290@freescale.com>2013-10-12 08:59:43 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-15 13:43:53 +0200
commit90cd9eab6622f72a25b60e7510e76b59378767b8 (patch)
treebb50d9d1939a5a673029928159612d2279cc2999
parent5cf24c4e8d2ae69f99f3a562708734167b3ceb2a (diff)
downloadmeta-openembedded-contrib-90cd9eab6622f72a25b60e7510e76b59378767b8.tar.gz
meta-openembedded-contrib-90cd9eab6622f72a25b60e7510e76b59378767b8.tar.bz2
meta-openembedded-contrib-90cd9eab6622f72a25b60e7510e76b59378767b8.zip
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.bb2
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 9652c3debd..249f6e1e23 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 @@
-Upstream-Status: Inappropriate [oe-core specific]
+Upstream-Status: Submitted
TESTS_64 is empty, install will fail due to missing file operand
+Signed-off-by: Ting Liu <b28495@freescale.com>
-Signed-off-by: Chunrong Guo <B40290@freescale.com>
-
-Index: git/tests/Makefile
-===================================================================
---- git.orig/tests/Makefile
-+++ git/tests/Makefile
-@@ -292,7 +292,7 @@ obj64/install:
+--- 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 @@
$(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
- $(INSTALL) -m 755 $(TESTS_64:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64
-+# $(INSTALL) -m 755 $(TESTS_64:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64
++ $(INSTALL) -m 755 $(TESTS_64_STATIC:%=obj64/%_static) $(DESTDIR)$(INST_TESTSDIR64)/obj64
$(INSTALL) -m 755 run_tests.py $(DESTDIR)$(INST_TESTSDIR64)
install: $(OBJDIRS:%=%/install)
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index 7835300795..475c502c6f 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 \
file://aarch64-support.patch \
file://aarch64-unit-test-fixes.patch \
file://add-PROT-NONE-to-the-mprotest-test.patch \
- file://install64-fix.patch \
file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \
file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \
file://fix-lib64-can-not-be-shiped-in-64bit-target.patch \
+ file://tests-Makefile-install-static-4G-edge-testcases.patch \
"
S = "${WORKDIR}/git"