Patchwork opkg-utils: use /usr/bin/env python

login
register
mail settings
Submitter Christopher Larson
Date Jan. 4, 2012, 6 p.m.
Message ID <1325700000-7646-1-git-send-email-kergoth@gmail.com>
Download mbox | patch
Permalink /patch/18301/
State Accepted
Commit 118cb063b08fc1aeb99c248fde6ef2069496c347
Headers show

Comments

Christopher Larson - Jan. 4, 2012, 6 p.m.
Signed-off-by: Christopher Larson <kergoth@gmail.com>
---
 .../opkg-utils/opkg-utils/shebang.patch            |   46 ++++++++++++++++++++
 meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |    3 +-
 2 files changed, 48 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
Saul Wold - Jan. 5, 2012, 8:13 p.m.
On 01/04/2012 10:00 AM, Christopher Larson wrote:
> Signed-off-by: Christopher Larson<kergoth@gmail.com>
> ---
>   .../opkg-utils/opkg-utils/shebang.patch            |   46 ++++++++++++++++++++
>   meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb |    3 +-
>   2 files changed, 48 insertions(+), 1 deletions(-)
>   create mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
>
Merged into OE-Core

Thanks
	Sau!


> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
> new file mode 100644
> index 0000000..f6a2ef9
> --- /dev/null
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
> @@ -0,0 +1,46 @@
> +Use python via the PATH, rather than hardcoding /usr/bin/python
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Christopher Larson<kergoth@gmail.com>
> +
> +--- opkg-utils.orig/opkg-list-fields
> ++++ opkg-utils/opkg-list-fields
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/python
> ++#!/usr/bin/env python
> +
> + import sys, opkg
> +
> +--- opkg-utils.orig/opkg-make-index
> ++++ opkg-utils/opkg-make-index
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/python
> ++#!/usr/bin/env python
> +
> + import sys, os, posixpath
> + from glob import glob
> +--- opkg-utils.orig/opkg-show-deps
> ++++ opkg-utils/opkg-show-deps
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/python
> ++#!/usr/bin/env python
> +
> + import sys, os, posixpath
> + from glob import glob
> +--- opkg-utils.orig/opkg-unbuild
> ++++ opkg-utils/opkg-unbuild
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/python
> ++#!/usr/bin/env python
> +
> + import sys, os, re
> +
> +--- opkg-utils.orig/opkg-update-index
> ++++ opkg-utils/opkg-update-index
> +@@ -1,4 +1,4 @@
> +-#!/usr/bin/env python2.1
> ++#!/usr/bin/env python
> +
> + import sys, os
> + from glob import glob
> diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
> index 9b94aff..9702131 100644
> --- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
> +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
> @@ -8,13 +8,14 @@ RDEPENDS_${PN} = "python"
>   RDEPENDS_${PN}_virtclass-native = ""
>   SRCREV = "4747"
>   PV = "0.1.8+svnr${SRCPV}"
> -PR = "r6"
> +PR = "r7"
>
>   SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \
>              file://index-ignore-filenotfound.patch \
>              file://mtime-int.patch \
>              file://add-license-field.patch \
>              file://arfile_header_split.patch \
> +           file://shebang.patch \
>              "
>
>   S = "${WORKDIR}/opkg-utils"

Patch

diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
new file mode 100644
index 0000000..f6a2ef9
--- /dev/null
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils/shebang.patch
@@ -0,0 +1,46 @@ 
+Use python via the PATH, rather than hardcoding /usr/bin/python
+
+Upstream-Status: Pending
+
+Signed-off-by: Christopher Larson <kergoth@gmail.com>
+
+--- opkg-utils.orig/opkg-list-fields
++++ opkg-utils/opkg-list-fields
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ 
+ import sys, opkg
+ 
+--- opkg-utils.orig/opkg-make-index
++++ opkg-utils/opkg-make-index
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ 
+ import sys, os, posixpath
+ from glob import glob
+--- opkg-utils.orig/opkg-show-deps
++++ opkg-utils/opkg-show-deps
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ 
+ import sys, os, posixpath
+ from glob import glob
+--- opkg-utils.orig/opkg-unbuild
++++ opkg-utils/opkg-unbuild
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ 
+ import sys, os, re
+ 
+--- opkg-utils.orig/opkg-update-index
++++ opkg-utils/opkg-update-index
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2.1
++#!/usr/bin/env python
+ 
+ import sys, os
+ from glob import glob
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
index 9b94aff..9702131 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_svn.bb
@@ -8,13 +8,14 @@  RDEPENDS_${PN} = "python"
 RDEPENDS_${PN}_virtclass-native = ""
 SRCREV = "4747"
 PV = "0.1.8+svnr${SRCPV}"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \
            file://index-ignore-filenotfound.patch \
            file://mtime-int.patch \
            file://add-license-field.patch \
            file://arfile_header_split.patch \
+           file://shebang.patch \
            "
 
 S = "${WORKDIR}/opkg-utils"