From 90cd9eab6622f72a25b60e7510e76b59378767b8 Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Sat, 12 Oct 2013 08:59:43 +0000 Subject: libhugetlbfs: install static 4G-edge testcases *TESTS_64 is empty, install will fail due to missing file operand. Signed-off-by: Chunrong Guo Signed-off-by: Martin Jansa --- .../libhugetlbfs/files/install64-fix.patch | 20 -------------------- ...s-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 (limited to 'meta-oe') 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 9652c3debd..0000000000 --- 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 - -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 0000000000..249f6e1e23 --- /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 + +--- 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 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" -- cgit 1.2.3-korg