diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-09-21 20:55:33 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-22 05:07:00 +0100 |
commit | 3ac49c3a521555b390266ec1aead3b140edde0bf (patch) | |
tree | f402fa81d2fca253ccd0f8f993b6ac0f32d7703b /meta/recipes-devtools/python/python_2.6.6.bb | |
parent | e4c57fa3d87517ceb3f298745d7f88d7310483cd (diff) | |
download | 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_2.6.6.bb')
-rw-r--r-- | meta/recipes-devtools/python/python_2.6.6.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ | |||
1 | require python.inc | 1 | require python.inc |
2 | DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" | 2 | DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" |
3 | DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" | 3 | DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" |
4 | PR = "${INC_PR}.9" | 4 | PR = "${INC_PR}.10" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6" |
6 | 6 | ||
7 | DISTRO_SRC_URI ?= "file://sitecustomize.py" | 7 | DISTRO_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 | ||
25 | SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" | 26 | SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14" |