Patchwork [meta-oe,1/3] libhugetlbfs: install static 4G-edge testcases

login
register
mail settings
Submitter chunrong guo
Date Oct. 12, 2013, 8:59 a.m.
Message ID <1381568383-18676-1-git-send-email-b40290@freescale.com>
Download mbox | patch
Permalink /patch/59727/
State Accepted, archived
Commit 90cd9eab6622f72a25b60e7510e76b59378767b8
Headers show

Comments

chunrong guo - Oct. 12, 2013, 8:59 a.m.
From: Chunrong Guo <B40290@freescale.com>

   *TESTS_64 is empty, install will fail due to missing file operand.

Signed-off-by: Chunrong Guo <B40290@freescale.com>
---
 .../libhugetlbfs/files/install64-fix.patch         |   20 --------------------
 ...Makefile-install-static-4G-edge-testcases.patch |   17 +++++++++++++++++
 .../libhugetlbfs/libhugetlbfs_git.bb               |    2 +-
 3 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/install64-fix.patch
 create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch

Patch

diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/install64-fix.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/install64-fix.patch
deleted file mode 100644
index 9652c3d..0000000
--- a/meta-oe/recipes-benchmark/libhugetlbfs/files/install64-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@ 
-Upstream-Status: Inappropriate [oe-core specific]
-
-TESTS_64 is empty, install will fail due to missing file operand
-
-
-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:
- 	$(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 run_tests.py $(DESTDIR)$(INST_TESTSDIR64)
- 
- install: $(OBJDIRS:%=%/install)
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch
new file mode 100644
index 0000000..249f6e1
--- /dev/null
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch
@@ -0,0 +1,17 @@ 
+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 @@
+ 	$(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_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 7835300..475c502 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"