summaryrefslogtreecommitdiffstats
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
parente4c57fa3d87517ceb3f298745d7f88d7310483cd (diff)
downloadpoky-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>
-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 0000000000..de504f9dcf
--- /dev/null
+++ b/meta/recipes-devtools/python/python/cgi_py.patch
@@ -0,0 +1,23 @@
1Lib/cgi.py: Update the script as mentioned in the comment
2
3Upstream-Status: Inappropriate [distribution]
4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6
7--- Python-2.6.6/Lib/cgi.py.orig 2010-08-01 22:14:27.000000000 -0500
8+++ Python-2.6.6/Lib/cgi.py 2011-09-21 15:28:40.478208631 -0500
9@@ -1,13 +1,4 @@
10-#! /usr/local/bin/python
11-
12-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
13-# intentionally NOT "/usr/bin/env python". On many systems
14-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
15-# scripts, and /usr/local/bin is the default directory where Python is
16-# installed, so /usr/bin/env would be unable to find python. Granted,
17-# binary installations by Linux vendors often install Python in
18-# /usr/bin. So let those vendors patch cgi.py to match their choice
19-# of installation.
20+#! /usr/bin/env python
21
22 """Support module for CGI (Common Gateway Interface) scripts.
23
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb
index c9c1a13cbb..aa7ec3c699 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 @@
1require python.inc 1require python.inc
2DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" 2DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
3DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" 3DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
4PR = "${INC_PR}.9" 4PR = "${INC_PR}.10"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
6 6
7DISTRO_SRC_URI ?= "file://sitecustomize.py" 7DISTRO_SRC_URI ?= "file://sitecustomize.py"
@@ -20,6 +20,7 @@ SRC_URI = "\
20 ${DISTRO_SRC_URI} \ 20 ${DISTRO_SRC_URI} \
21 file://multilib.patch \ 21 file://multilib.patch \
22 file://security_issue_2254_fix.patch \ 22 file://security_issue_2254_fix.patch \
23 file://cgi_py.patch \
23" 24"
24 25
25SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" 26SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14"