summaryrefslogtreecommitdiffstats
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-04 14:13:33 +0100
commit2d97d6978073a4626074e82b8a6c5b003f003136 (patch)
tree117c4ace127183e51312d33d0d819259c51e7ed6
parent9e29916a9f06db3bbb42847ad04ead2a2dc06e6f (diff)
downloadpoky-2d97d6978073a4626074e82b8a6c5b003f003136.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 (From OE-Core rev: 2b6c5cc41c55e11509d5c1268dc1baab0a975d59) 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 00fcc7d722..0000000000
--- 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 @@
1From 9640dde4241e1314b8e8ea35b0c8dab0b30ae51f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Jan 2016 10:50:56 -0800
4Subject: [PATCH] Makefile: Set CC/AR variable only if it doesn't have a value
5
6This helps it compile with clang or any other compilers besides gcc
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Submitted
11
12 Makefile | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/Makefile b/Makefile
16index 1e4b7d1..2c2d396 100644
17--- a/Makefile
18+++ b/Makefile
19@@ -1,6 +1,6 @@
20 VERSION = 0.96
21-CC=$(CROSS_COMPILE)gcc
22-AR=$(CROSS_COMPILE)ar
23+CC?=$(CROSS_COMPILE)gcc
24+AR?=$(CROSS_COMPILE)ar
25
26 OBJDIR = bld
27
28--
292.6.4
30
diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb b/meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb
index 012b2dd0a7..012b2dd0a7 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 76f9b3a341..fd6500bfad 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,6 +1,5 @@
1# Version v0.96 1# Version v0.96
2PV = "0.96" 2SRCREV = "e1b1537a20b35af75a49bf55dcf70296f8a62467"
3SRCREV = "24f8c0175e04bab78e7555698e34d7002b01c87f"
4 3
5SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git" 4SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git"
6 5
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 2f96fea9b5..21780d19ed 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 \
10require rt-tests.inc 10require rt-tests.inc
11inherit ptest 11inherit ptest
12 12
13SRC_URI += "file://0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch \ 13SRC_URI += " \
14 file://run-ptest \ 14 file://run-ptest \
15 file://rt_bmark.py \ 15 file://rt_bmark.py \
16 " 16 "