Re: [PATCH] lttng-ust: fixed python interpret path

[Saul Wold <sgw@linux.intel.com>]

On 12/02/2013 02:07 AM, Chong.Lu@windriver.com wrote:
> From: Chong Lu <Chong.Lu@windriver.com>
>
> Changed python interpreter path to avoid syntax errors caused by
> older version.
>
> Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
> ---
>   ...002-lttng-ust-fixed-python-interpret-path.patch |   28 ++++++++++++++++++++
>   meta/recipes-kernel/lttng/lttng-ust_2.3.0.bb       |    1 +
>   2 files changed, 29 insertions(+)
>   create mode 100644 meta/recipes-kernel/lttng/lttng-ust/0002-lttng-ust-fixed-python-interpret-path.patch
>
This is not applying cleanly, please ensure you are rebased against 
master, as the lttng-ust recipe has been updated.

Sau!

> diff --git a/meta/recipes-kernel/lttng/lttng-ust/0002-lttng-ust-fixed-python-interpret-path.patch b/meta/recipes-kernel/lttng/lttng-ust/0002-lttng-ust-fixed-python-interpret-path.patch
> new file mode 100644
> index 0000000..abc2c4e
> --- /dev/null
> +++ b/meta/recipes-kernel/lttng/lttng-ust/0002-lttng-ust-fixed-python-interpret-path.patch
> @@ -0,0 +1,28 @@
> +From d91876870f7cda8f9bf757c73d1c287e78d4d7e0 Mon Sep 17 00:00:00 2001
> +From: Lu Chong <Chong.Lu@windriver.com>
> +Date: Mon, 2 Dec 2013 03:18:13 -0500
> +Subject: [PATCH 2/2] lttng-ust: fixed python interpret path
> +
> +Upstream-Status: Pending
> +
> +Changed python interpreter path to avoid syntax errors caused by
> +older version.
> +
> +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.8.2.1
> +
> 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..ae2dd65 100644
> --- a/meta/recipes-kernel/lttng/lttng-ust_2.3.0.bb
> +++ b/meta/recipes-kernel/lttng/lttng-ust_2.3.0.bb
> @@ -24,6 +24,7 @@ PE = "2"
>
>   SRC_URI = "git://git.lttng.org/lttng-ust.git \
>              file://0001-lttng-ust-several-fixes.patch \
> +           file://0002-lttng-ust-fixed-python-interpret-path.patch \
>   	   "
>
>   S = "${WORKDIR}/git"
>