ltp: update to version 20120614

Update ltp to version 20120614 and update license files at same time.
Remove the patch because it has been merged.

(From OE-Core rev: 6b3c2aa5a32d7d21f9ac760dc7aa18829c03a875)

Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 5 insertions, 20 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
deleted file mode 100644
index a8064cfd79..0000000000
--- a/meta/recipes-extended/ltp/ltp/fix_building_fom_archive.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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_20120614.bb
index 31babf9d3d..a01399f6f1 100644
--- a/meta/recipes-extended/ltp/ltp_20120401.bb
+++ b/meta/recipes-extended/ltp/ltp_20120614.bb
@@ -5,13 +5,13 @@ SECTION = "console/utils"
 
 LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-                    file://testcases/kernel/mce-test/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://testcases/kernel/controllers/freezer/run_freezer.sh;startline=5;endline=17;md5=aeac3f7691caa2e76fd5a732fbd6510d \
                     file://testcases/kernel/fs/ext4-new-features/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \
                     file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \
                     file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \
                     file://testcases/open_posix_testsuite/COPYING;md5=216e43b72efbe4ed9017cc19c4c68b01 \
+                    file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
                     file://tools/netpipe-2.4/COPYING;md5=18810669f13b87348459e611d31ab760 \
                     file://tools/netpipe-2.4-ipv6/COPYING;md5=18810669f13b87348459e611d31ab760 \
                     file://tools/top-LTP/proc/COPYING;md5=6e29c688d912da12b66b73e32b03d812 \
@@ -21,13 +21,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 
 DEPENDS = "attr"
 
-PR = "r4"
+PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 \
-           file://fix_building_fom_archive.patch"
+SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2"
 
-SRC_URI[md5sum] = "e1d0acf1a6b6da0cb30dc1b0dcf5f26d"
-SRC_URI[sha256sum] = "f0f5845f9666f61332fdf0b7e396fc647f9372db0902a829af2cf9402b807bd1"
+SRC_URI[md5sum] = "1078160b1f962a22f1598edad17293c5"
+SRC_URI[sha256sum] = "cbc00dd63226a4cde06fa506be4c71ddedcaf20dde474681db7ebeea1c1fb643"
 
 export prefix = "/opt/ltp"
 export exec_prefix = "/opt/ltp"
@@ -74,4 +73,3 @@ do_install(){
 
 # Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails
 INHIBIT_PACKAGE_STRIP = "1"
-