python: Fix cgi.py runtime issue

PATCH New Mark Hatle 1 participant 1 message Sep 22, 2011 1 message not in the archive

lore

Share & tools

lore

Mark Hatle

author

2011-09-22 01:58 UTC #1 lore raw

PATCH v2 1/6 python: Fix cgi.py runtime issue

In reply to a message not in the archive

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 <[email protected]>

---
 meta/recipes-devtools/python/python/cgi_py.patch |   23 ++++++++++++++++++++++
 meta/recipes-devtools/python/python_2.6.6.bb     |    3 +-
 2 files changed, 25 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python/cgi_py.patch

meta/recipes-devtools/python/python/cgi_py.patch new file +23 -0

new file mode 100644
index 0000000..de504f9
@@ -0,0 +1,23 @@
+Lib/cgi.py: Update the script as mentioned in the comment
+
+Upstream-Status: Inappropriate [distribution]
+
+Signed-off-by: Mark Hatle <[email protected]>
+
+--- 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.
+

meta/recipes-devtools/python/python_2.6.6.bb +2 -1

index c9c1a13..aa7ec3c 100644
@@ -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"

Signature · 1 line

1.7.3.4