[oe-commits] Robert Yang : webmin: fix hardcode of python2.3

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 412584f7d0a67d4e2e3f0f21a39eb591c530417a
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=412584f7d0a67d4e2e3f0f21a39eb591c530417a

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Tue Sep  2 00:16:17 2014 -0700

webmin: fix hardcode of python2.3

Use "/usr/bin/env python" to fix it.

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>

---

 .../webmin/files/remove-python2.3.patch            | 25 ++++++++++++++++++++++
 .../recipes-webadmin/webmin/webmin_1.700.bb        |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch b/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
new file mode 100644
index 0000000..75e5bd1
--- /dev/null
+++ b/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
@@ -0,0 +1,25 @@
+From 6f04699d5d417122b67e8118fd1955c769f17e76 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang at windriver.com>
+Date: Tue, 2 Sep 2014 00:11:05 -0700
+Subject: [PATCH] ajaxterm/ajaxterm/qweb.py: fix hardcode of python2.3
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
+---
+ ajaxterm/ajaxterm/qweb.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ajaxterm/ajaxterm/qweb.py b/ajaxterm/ajaxterm/qweb.py
+index 20c5092..c658a6b 100644
+--- a/ajaxterm/ajaxterm/qweb.py
++++ b/ajaxterm/ajaxterm/qweb.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python2.3
++#!/usr/bin/env python
+ #
+ # vim:set et ts=4 fdc=0 fdn=2 fdl=0:
+ #
+-- 
+1.7.9.5
+
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
index 45d635e..2a363cb 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
@@ -15,7 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
            file://samba-config-fix.patch \
            file://proftpd-config-fix.patch \
            file://net-lib.pl.patch \
-           file://media-tomb.patch"
+           file://media-tomb.patch \
+           file://remove-python2.3.patch \
+            "
 
 SRC_URI[md5sum] = "e5261114a6a6ed10caf570d3239ed5b7"
 SRC_URI[sha256sum] = "1a6a8aa62c32c04932b902d17fc1864ee8f3fba03012bd25f709aa65e7e9b0f2"