Patchwork [V2,3/3] lttng-ust: fix python interpret path

login
register
mail settings
Submitter Chong.Lu@windriver.com
Date Dec. 5, 2013, 6:14 a.m.
Message ID <1386224059-29263-3-git-send-email-Chong.Lu@windriver.com>
Download mbox | patch
Permalink /patch/62875/
State New
Headers show

Comments

Chong.Lu@windriver.com - Dec. 5, 2013, 6:14 a.m.
From: Chong Lu <Chong.Lu@windriver.com>

Change python interpreter path to avoid syntax errors on CentOS 5.10
which has Python 2.4.x.
Add dependency for python-native.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
 .../0001-lttng-ust-fix-python-interpret-path.patch |   26 ++++++++++++++++++++
 meta/recipes-kernel/lttng/lttng-ust_2.3.0.bb       |    3 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-fix-python-interpret-path.patch

Patch

diff --git a/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-fix-python-interpret-path.patch b/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-fix-python-interpret-path.patch
new file mode 100644
index 0000000..1760244
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-ust/0001-lttng-ust-fix-python-interpret-path.patch
@@ -0,0 +1,26 @@ 
+From 5099ea7a497c719924f59a782ebf23ef8b698de3 Mon Sep 17 00:00:00 2001
+From: Chong Lu <Chong.Lu@windriver.com>
+Date: Thu, 5 Dec 2013 13:24:56 +0800
+Subject: [PATCH] lttng-ust: fix python interpret path
+
+Change python interpreter path to avoid syntax errors on CentOS 5.10
+which has Python 2.4.x.
+
+Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
+---
+ tools/lttng-gen-tp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp
+index 0f6f0b5..dca2e28 100755
+--- a/tools/lttng-gen-tp
++++ b/tools/lttng-gen-tp
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ #
+ # Copyright (c)  2012 Yannick Brosseau <yannick.brosseau@gmail.com>
+ #
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.3.0.bb b/meta/recipes-kernel/lttng/lttng-ust_2.3.0.bb
index cdc834c..39d5049 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.3.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.3.0.bb
@@ -10,7 +10,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \
 
 inherit autotools
 
-DEPENDS = "liburcu util-linux"
+DEPENDS = "liburcu util-linux python-native"
 RDEPENDS_${PN} = "python"
 
 # For backwards compatibility after rename
@@ -24,6 +24,7 @@  PE = "2"
 
 SRC_URI = "git://git.lttng.org/lttng-ust.git \
            file://0001-lttng-ust-several-fixes.patch \
+           file://0001-lttng-ust-fix-python-interpret-path.patch \
 	   "
 
 S = "${WORKDIR}/git"