aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-06-03 12:14:39 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-03 16:53:34 +0100
commit2b6c5cc41c55e11509d5c1268dc1baab0a975d59 (patch)
tree3185f70ba70102905d622245c73215678d08435f
parent81fa61c94a99100daf2955bc699aaa213d35af94 (diff)
downloadopenembedded-core-contrib-2b6c5cc41c55e11509d5c1268dc1baab0a975d59.tar.gz
rt-tests, hwlatdetect: upgrade to 2.0
0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch has been merged upstream Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch30
-rw-r--r--meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb (renamed from meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb)0
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests.inc3
-rw-r--r--meta/recipes-rt/rt-tests/rt-tests_2.0.bb (renamed from meta/recipes-rt/rt-tests/rt-tests_0.96.bb)2
4 files changed, 2 insertions, 33 deletions
diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch
deleted file mode 100644
index 00fcc7d7222..00000000000
--- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9640dde4241e1314b8e8ea35b0c8dab0b30ae51f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 3 Jan 2016 10:50:56 -0800
-Subject: [PATCH] Makefile: Set CC/AR variable only if it doesn't have a value
-
-This helps it compile with clang or any other compilers besides gcc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Submitted
-
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1e4b7d1..2c2d396 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- VERSION = 0.96
--CC=$(CROSS_COMPILE)gcc
--AR=$(CROSS_COMPILE)ar
-+CC?=$(CROSS_COMPILE)gcc
-+AR?=$(CROSS_COMPILE)ar
-
- OBJDIR = bld
-
---
-2.6.4
-
diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb b/meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb
index 012b2dd0a7d..012b2dd0a7d 100644
--- a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
+++ b/meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc
index 76f9b3a3418..fd6500bfad1 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,6 +1,5 @@
# Version v0.96
-PV = "0.96"
-SRCREV = "24f8c0175e04bab78e7555698e34d7002b01c87f"
+SRCREV = "e1b1537a20b35af75a49bf55dcf70296f8a62467"
SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git"
diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.96.bb b/meta/recipes-rt/rt-tests/rt-tests_2.0.bb
index 2f96fea9b5b..21780d19edd 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_0.96.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_2.0.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
require rt-tests.inc
inherit ptest
-SRC_URI += "file://0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch \
+SRC_URI += " \
file://run-ptest \
file://rt_bmark.py \
"