summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2017-03-24 17:03:19 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-27 08:15:06 +0100
commitd2278fe7b39998bcf388e996cea9708c50a7aff4 (patch)
tree31cf5be1b8851006876311b95d231ced563555ec
parent85293a044f7056a64eeec5096858783788aa3db9 (diff)
downloadpoky-d2278fe7b39998bcf388e996cea9708c50a7aff4.tar.gz
valgrind: vg_regtest.in: fix perl script
@PERL@ in vg_regtest.in causes recipe specific sysroot based perl to be present in the vg_regtest script, making it unusable in the target. Use /usr/bin/perl instead of @PERL@ to fix it. (From OE-Core rev: 7a0caa23965185ac8268ae1da2f61fc7ca6de682) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch33
1 files changed, 29 insertions, 4 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
index b054d05f7f..b431d3356e 100644
--- a/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
+++ b/meta/recipes-devtools/valgrind/valgrind/fixed-perl-path.patch
@@ -1,3 +1,8 @@
1From 67e7a690107efb16d6d5aebfe420b64a552accdf Mon Sep 17 00:00:00 2001
2From: Qing He <qing.he@intel.com>
3Date: Tue, 31 Aug 2010 22:51:58 +0800
4Subject: [PATCH] valgrind: fix perl scripts
5
1this is a temporary patch to workaround cross compilation. 6this is a temporary patch to workaround cross compilation.
2otherwise @PERL@ will be replaced to perl-native binary, 7otherwise @PERL@ will be replaced to perl-native binary,
3this creates unusable scripts and fails FILERDEPENDS mechanism 8this creates unusable scripts and fails FILERDEPENDS mechanism
@@ -11,8 +16,16 @@ a better fix would need:
11 16
12Upstream-Status: Inappropriate [configuration] 17Upstream-Status: Inappropriate [configuration]
13 18
19Signed-off-by: Maxin B. John <maxin.john@intel.com>
20---
21 cachegrind/cg_annotate.in | 2 +-
22 cachegrind/cg_diff.in | 2 +-
23 massif/ms_print.in | 2 +-
24 perf/vg_perf.in | 2 +-
25 4 files changed, 4 insertions(+), 4 deletions(-)
26
14diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in 27diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in
15index 9dc9565..cc4ef05 100644 28index 69365e8..978265d 100644
16--- a/cachegrind/cg_annotate.in 29--- a/cachegrind/cg_annotate.in
17+++ b/cachegrind/cg_annotate.in 30+++ b/cachegrind/cg_annotate.in
18@@ -1,4 +1,4 @@ 31@@ -1,4 +1,4 @@
@@ -22,7 +35,7 @@ index 9dc9565..cc4ef05 100644
22 ##--------------------------------------------------------------------## 35 ##--------------------------------------------------------------------##
23 ##--- Cachegrind's annotator. cg_annotate.in ---## 36 ##--- Cachegrind's annotator. cg_annotate.in ---##
24diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in 37diff --git a/cachegrind/cg_diff.in b/cachegrind/cg_diff.in
25index 951066e..84c2dde 100644 38index 395460b..05873cc 100755
26--- a/cachegrind/cg_diff.in 39--- a/cachegrind/cg_diff.in
27+++ b/cachegrind/cg_diff.in 40+++ b/cachegrind/cg_diff.in
28@@ -1,4 +1,4 @@ 41@@ -1,4 +1,4 @@
@@ -32,7 +45,7 @@ index 951066e..84c2dde 100644
32 ##--------------------------------------------------------------------## 45 ##--------------------------------------------------------------------##
33 ##--- Cachegrind's differencer. cg_diff.in ---## 46 ##--- Cachegrind's differencer. cg_diff.in ---##
34diff --git a/massif/ms_print.in b/massif/ms_print.in 47diff --git a/massif/ms_print.in b/massif/ms_print.in
35index e6ffdbf..fb45906 100755 48index e6fae89..3b85b40 100755
36--- a/massif/ms_print.in 49--- a/massif/ms_print.in
37+++ b/massif/ms_print.in 50+++ b/massif/ms_print.in
38@@ -1,4 +1,4 @@ 51@@ -1,4 +1,4 @@
@@ -42,7 +55,7 @@ index e6ffdbf..fb45906 100755
42 ##--------------------------------------------------------------------## 55 ##--------------------------------------------------------------------##
43 ##--- Massif's results printer ms_print.in ---## 56 ##--- Massif's results printer ms_print.in ---##
44diff --git a/perf/vg_perf.in b/perf/vg_perf.in 57diff --git a/perf/vg_perf.in b/perf/vg_perf.in
45index 2188a31..83ad024 100644 58index 7a80cb0..28f6156 100644
46--- a/perf/vg_perf.in 59--- a/perf/vg_perf.in
47+++ b/perf/vg_perf.in 60+++ b/perf/vg_perf.in
48@@ -1,4 +1,4 @@ 61@@ -1,4 +1,4 @@
@@ -51,3 +64,15 @@ index 2188a31..83ad024 100644
51 ##--------------------------------------------------------------------## 64 ##--------------------------------------------------------------------##
52 ##--- Valgrind performance testing script vg_perf ---## 65 ##--- Valgrind performance testing script vg_perf ---##
53 ##--------------------------------------------------------------------## 66 ##--------------------------------------------------------------------##
67diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
68index cb05b52..032e947 100755
69--- a/tests/vg_regtest.in
70+++ b/tests/vg_regtest.in
71@@ -1,4 +1,4 @@
72-#! @PERL@
73+#! /usr/bin/perl
74 ##--------------------------------------------------------------------##
75 ##--- Valgrind regression testing script vg_regtest ---##
76 ##--------------------------------------------------------------------##
77---
782.4.0