Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH] ltp: Add patch to correct failing build
@ 2012-06-01  7:52 Cristian Iorga
  2012-06-02 16:59 ` Flanagan, Elizabeth
  0 siblings, 1 reply; 9+ messages in thread
From: Cristian Iorga @ 2012-06-01  7:52 UTC (permalink / raw)
  To: openembedded-core

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.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 .../ltp/ltp/fix_building_fom_archive.patch         |   23 ++++++++++++++++++++
 meta/recipes-extended/ltp/ltp_20120401.bb          |    4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch

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 0000000..c0ecc86
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch
@@ -0,0 +1,23 @@
+ltp package build system is broken if building from archive
+
+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.
+
+Upstream-Status: Pending
+Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
+
+Index: ltp-20120401/Makefile
+===================================================================
+--- ltp-20120401.orig/Makefile
++++ ltp-20120401/Makefile
+@@ -173,7 +173,8 @@ SRCDIR_INSTALL_TARGETS	:= $(SRCDIR_INSTA
+ #
+ .PHONY: Version
+ Version:
+-	if git describe &> /dev/null; then \
++	git describe &> /dev/null
++	if [ $? -eq 0 ]; then \
+ 		git describe > "$@"; \
+ 	else \
+ 		cp VERSION "$@"; \
diff --git a/meta/recipes-extended/ltp/ltp_20120401.bb b/meta/recipes-extended/ltp/ltp_20120401.bb
index 912d6d9..563bd58 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 \
 
 DEPENDS = "attr"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \
-          "
+           file://fix_building_fom_archive.patch"
 
 SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d"
 SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1"
-- 
1.7.9.5




^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH] ltp: Add patch to correct failing build
@ 2012-06-05 18:51 Cristian Iorga
  2012-06-05 22:01 ` Richard Purdie
  0 siblings, 1 reply; 9+ messages in thread
From: Cristian Iorga @ 2012-06-05 18:51 UTC (permalink / raw)
  To: openembedded-core

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.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 .../ltp/ltp/fix_building_fom_archive.patch         |   13 +++++++++++++
 meta/recipes-extended/ltp/ltp_20120401.bb          |    4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch

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 0000000..a8064cf
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch
@@ -0,0 +1,13 @@
+Index: ltp-20120401/Makefile
+===================================================================
+--- ltp-20120401.orig/Makefile
++++ ltp-20120401/Makefile
+@@ -173,7 +173,7 @@ SRCDIR_INSTALL_TARGETS	:= $(SRCDIR_INSTA
+ #
+ .PHONY: Version
+ Version:
+-	if git describe &> /dev/null; then \
++	if git describe > /dev/null 2>&1; then \
+ 		git describe > "$@"; \
+ 	else \
+ 		cp VERSION "$@"; \
diff --git a/meta/recipes-extended/ltp/ltp_20120401.bb b/meta/recipes-extended/ltp/ltp_20120401.bb
index 912d6d9..563bd58 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 \
 
 DEPENDS = "attr"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \
-          "
+           file://fix_building_fom_archive.patch"
 
 SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d"
 SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1"
-- 
1.7.9.5




^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2012-06-10 22:07 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-01  7:52 [PATCH] ltp: Add patch to correct failing build Cristian Iorga
2012-06-02 16:59 ` Flanagan, Elizabeth
2012-06-04 17:51   ` Andrei Gherzan
2012-06-05  0:19   ` Saul Wold
2012-06-05  7:30     ` Iorga, Cristian
2012-06-05 13:29       ` Iorga, Cristian
2012-06-10 21:57         ` Paul Eggleton
  -- strict thread matches above, loose matches on Subject: below --
2012-06-05 18:51 Cristian Iorga
2012-06-05 22:01 ` Richard Purdie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox