summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-09-21 20:55:33 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-22 05:07:00 +0100
commit3ac49c3a521555b390266ec1aead3b140edde0bf (patch)
treef402fa81d2fca253ccd0f8f993b6ac0f32d7703b /meta/recipes-devtools/python/python
parente4c57fa3d87517ceb3f298745d7f88d7310483cd (diff)
downloadast2050-yocto-poky-3ac49c3a521555b390266ec1aead3b140edde0bf.zip
ast2050-yocto-poky-3ac49c3a521555b390266ec1aead3b140edde0bf.tar.gz
python: Fix cgi.py runtime issue
By default cgi.py attempts to use /usr/local/bin/python as its interpreter. However, on my Linux systems, including OE-Core, python is installed into {bindir}. Adjust this one file based on the comment at the top of the upstream file. This resolves an issue where a runtime dependency discovered during RPM packaging breaks the rootfs construction. (From OE-Core rev: 1da01664963b9c6a6df171dcd0fbb1406544035b) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python')
-rw-r--r--meta/recipes-devtools/python/python/cgi_py.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python/cgi_py.patch b/meta/recipes-devtools/python/python/cgi_py.patch
new file mode 100644
index 0000000..de504f9
--- /dev/null
+++ b/meta/recipes-devtools/python/python/cgi_py.patch
@@ -0,0 +1,23 @@
+Lib/cgi.py: Update the script as mentioned in the comment
+
+Upstream-Status: Inappropriate [distribution]
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+
+--- Python-2.6.6/Lib/cgi.py.orig 2010-08-01 22:14:27.000000000 -0500
++++ Python-2.6.6/Lib/cgi.py 2011-09-21 15:28:40.478208631 -0500
+@@ -1,13 +1,4 @@
+-#! /usr/local/bin/python
+-
+-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
+-# intentionally NOT "/usr/bin/env python". On many systems
+-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
+-# scripts, and /usr/local/bin is the default directory where Python is
+-# installed, so /usr/bin/env would be unable to find python. Granted,
+-# binary installations by Linux vendors often install Python in
+-# /usr/bin. So let those vendors patch cgi.py to match their choice
+-# of installation.
++#! /usr/bin/env python
+
+ """Support module for CGI (Common Gateway Interface) scripts.
+
OpenPOWER on IntegriCloud