[poky] [PATCH 5/5] python-dir bbclass: use PYTHON_BASEVERSION instead of non-deterministic python code

[Koen Kooi]

See https://lists.yoctoproject.org/pipermail/poky/2011-January/002320.html for some background info

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
 meta/classes/python-dir.bbclass |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/meta/classes/python-dir.bbclass b/meta/classes/python-dir.bbclass
index 7b0b809..a072a93 100644
--- a/meta/classes/python-dir.bbclass
+++ b/meta/classes/python-dir.bbclass
@@ -1,11 +1,2 @@
-def python_dir(d):
-	import os, bb
-	staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
-	for majmin in "2.6 2.5 2.4 2.3".split():
-		if os.path.exists( "%s/python%s" % ( staging_incdir, majmin ) ): return "python%s" % majmin
-	if not "python-native" in bb.data.getVar( "DEPENDS", d, 1 ).split():
-		raise Exception("No Python in STAGING_INCDIR. Forgot to build python-native?")
-	return "INVALID"
-
-PYTHON_DIR = "${@python_dir(d)}"
+PYTHON_DIR = "python${PYTHON_BASEVERSION}"
 PYTHON_SITEPACKAGES_DIR = "${libdir}/${PYTHON_DIR}/site-packages"
-- 
1.6.6.1