summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-12-10 14:15:01 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-12-10 14:15:01 +0000
commit8caa290d894c02de92ca3a98c3a40a18ef0d3854 (patch)
tree516891a1b85dc33725a28b6343bce2569e7482d4
parent13ee301416eccc5f3b2803301a128bf7a1d83c88 (diff)
downloadpoky-8caa290d894c02de92ca3a98c3a40a18ef0d3854.tar.gz
rpm: Update for python 2.6
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/rpm/rpm_4.4.2.3.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/packages/rpm/rpm_4.4.2.3.bb b/meta/packages/rpm/rpm_4.4.2.3.bb
index cd1c42888b..6efa87bb00 100644
--- a/meta/packages/rpm/rpm_4.4.2.3.bb
+++ b/meta/packages/rpm/rpm_4.4.2.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The RPM Package Manager."
2HOMEPAGE = "http://rpm.org/" 2HOMEPAGE = "http://rpm.org/"
3LICENSE = "LGPL GPL" 3LICENSE = "LGPL GPL"
4DEPENDS = "zlib beecrypt file popt python" 4DEPENDS = "zlib beecrypt file popt python"
5PR = "r15" 5PR = "r16"
6 6
7SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \ 7SRC_URI = "http://www.rpm.org/releases/rpm-4.4.x/rpm-4.4.2.3.tar.gz \
8 file://external-tools.patch;patch=1 \ 8 file://external-tools.patch;patch=1 \
@@ -102,6 +102,7 @@ do_install_append () {
102def rpm_python_version(d): 102def rpm_python_version(d):
103 import os, bb 103 import os, bb
104 staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 ) 104 staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
105 if os.path.exists( "%s/python2.6" % staging_incdir ): return "2.6"
105 if os.path.exists( "%s/python2.5" % staging_incdir ): return "2.5" 106 if os.path.exists( "%s/python2.5" % staging_incdir ): return "2.5"
106 if os.path.exists( "%s/python2.4" % staging_incdir ): return "2.4" 107 if os.path.exists( "%s/python2.4" % staging_incdir ): return "2.4"
107 if os.path.exists( "%s/python2.3" % staging_incdir ): return "2.3" 108 if os.path.exists( "%s/python2.3" % staging_incdir ): return "2.3"