aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-09-02 00:16:17 -0700
committerRobert Yang <liezhi.yang@windriver.com>2014-09-18 19:56:33 -0700
commita9b197787220059dc3ae7e7e3361df9839bcefe7 (patch)
tree367312202936a8509d480897a528f0efcca1ab3d
parent0fd9520fb6255867a1dc089593b839e26b84c55e (diff)
downloadmeta-openembedded-contrib-rbt/rdeps.tar.gz
meta-openembedded-contrib-rbt/rdeps.tar.bz2
meta-openembedded-contrib-rbt/rdeps.zip
webmin: fix hardcode of python2.3rbt/rdeps
Use "/usr/bin/env python" to fix it. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch25
-rw-r--r--meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb4
2 files changed, 28 insertions, 1 deletions
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 0000000000..75e5bd1eaf
--- /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@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@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 45d635e099..2a363cbcf2 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"