summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2012-06-05 21:51:17 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-05 23:05:00 +0100
commitdf8f55a919b3cc602ce1f1c51630c7edf6e36b55 (patch)
tree343b51a73aa45a5f4ad71cd7a141fa9c048838d4
parenta1925696c412d0df425d8dae41f1a845532f1bfd (diff)
downloadpoky-df8f55a919b3cc602ce1f1c51630c7edf6e36b55.tar.gz
ltp: Add patch to correct failing build
ltp makefile does not interpret correctly the result of git describe command and assumes that it is working with a git repo, while in fact working with a source code archive. Added a patch to corect makefile system. (From OE-Core rev: 13e52fafae0fb06b26d179a5cac6898babbadc51) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch13
-rw-r--r--meta/recipes-extended/ltp/ltp_20120401.bb4
2 files changed, 15 insertions, 2 deletions
diff --git a/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch
new file mode 100644
index 0000000000..a8064cfd79
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch
@@ -0,0 +1,13 @@
1Index: ltp-20120401/Makefile
2===================================================================
3--- ltp-20120401.orig/Makefile
4+++ ltp-20120401/Makefile
5@@ -173,7 +173,7 @@ SRCDIR_INSTALL_TARGETS := $(SRCDIR_INSTA
6 #
7 .PHONY: Version
8 Version:
9- if git describe &> /dev/null; then \
10+ if git describe > /dev/null 2>&1; then \
11 git describe > "$@"; \
12 else \
13 cp VERSION "$@"; \
diff --git a/meta/recipes-extended/ltp/ltp_20120401.bb b/meta/recipes-extended/ltp/ltp_20120401.bb
index 912d6d906b..563bd58bf8 100644
--- a/meta/recipes-extended/ltp/ltp_20120401.bb
+++ b/meta/recipes-extended/ltp/ltp_20120401.bb
@@ -21,10 +21,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
21 21
22DEPENDS = "attr" 22DEPENDS = "attr"
23 23
24PR = "r3" 24PR = "r4"
25 25
26SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \ 26SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \
27 " 27 file://fix_building_fom_archive.patch"
28 28
29SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d" 29SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d"
30SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1" 30SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1"