summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools/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:06:49 +0100
commit1da01664963b9c6a6df171dcd0fbb1406544035b (patch)
tree44a5b3a1e36bb843c922df05575eaa78f9d86000 /meta/recipes-devtools/python
parent3f24b0f82458bcf15eabc74b9f370d9e774d0f63 (diff)
downloadopenembedded-core-1da01664963b9c6a6df171dcd0fbb1406544035b.tar.gz
openembedded-core-1da01664963b9c6a6df171dcd0fbb1406544035b.tar.bz2
openembedded-core-1da01664963b9c6a6df171dcd0fbb1406544035b.tar.xz
openembedded-core-1da01664963b9c6a6df171dcd0fbb1406544035b.zip
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. 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')
-rw-r--r--meta/recipes-devtools/python/python/cgi_py.patch23
-rw-r--r--meta/recipes-devtools/python/python_2.6.6.bb3
2 files changed, 25 insertions, 1 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 000000000..de504f9dc
--- /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.
+
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index c9c1a13cb..aa7ec3c69 100644
--- a/meta/recipes-devtools/python/python_2.6.6.bb
+++ b/meta/recipes-devtools/python/python_2.6.6.bb
@@ -1,7 +1,7 @@
require python.inc
DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.9"
+PR = "${INC_PR}.10"
LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
@@ -20,6 +20,7 @@ SRC_URI = "\
${DISTRO_SRC_URI} \
file://multilib.patch \
file://security_issue_2254_fix.patch \
+ file://cgi_py.patch \
"
SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14"