From: Chris Larson <clarson@kergoth.com>
Date: Wed, 1 Dec 2004 03:13:14 +0000 (+0000)
Subject: Move PACKAGE_ARCH frobbing from package.oeclass to base.oeclass.
X-Git-Tag: Release-2010-05/1~15869
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32dc1ee51940e0e57da717e3deda83335e3d46dc;p=openembedded.git

Move PACKAGE_ARCH frobbing from package.oeclass to base.oeclass.

BKrev: 41ad36cacR1Y78r2mvkhyWLkqoHG6Q
---

diff --git a/classes/base.oeclass b/classes/base.oeclass
index 35c7fbecd1..22447b36ce 100644
--- a/classes/base.oeclass
+++ b/classes/base.oeclass
@@ -657,6 +657,29 @@ python __anonymous () {
 		pass
 }
 
+python () {
+	import oe, os
+	machine = oe.data.getVar('MACHINE', d, 1)
+	if not machine:
+		# can't specialise if MACHINE not defined
+		return
+	old_arch = oe.data.getVar('PACKAGE_ARCH', d, 1)
+	if (old_arch == machine):
+		# Nothing to do
+		return
+	paths = []
+	for p in [ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ]:
+		paths.append(oe.data.expand(os.path.join(p, machine), d))
+	for s in oe.data.getVar('SRC_URI', d, 1).split():
+		local = oe.data.expand(oe.fetch.localpath(s, d), d)
+		for mp in paths:
+			if local.startswith(mp):
+#				oe.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, machine))
+				oe.data.setVar('PACKAGE_ARCH', machine, d)
+				return
+}
+
+
 addtask emit_manifest
 python do_emit_manifest () {
 #	FIXME: emit a manifest here
diff --git a/classes/package.oeclass b/classes/package.oeclass
index db95b27e34..fbd3fbb39a 100644
--- a/classes/package.oeclass
+++ b/classes/package.oeclass
@@ -76,28 +76,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 
 	oe.data.setVar('PACKAGES', ' '.join(packages), d)
 
-python () {
-	import oe, os
-	machine = oe.data.getVar('MACHINE', d, 1)
-	if not machine:
-		# can't specialise if MACHINE not defined
-		return
-	old_arch = oe.data.getVar('PACKAGE_ARCH', d, 1)
-	if (old_arch == machine):
-		# Nothing to do
-		return
-	paths = []
-	for p in [ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ]:
-		paths.append(oe.data.expand(os.path.join(p, machine), d))
-	for s in oe.data.getVar('SRC_URI', d, 1).split():
-		local = oe.data.expand(oe.fetch.localpath(s, d), d)
-		for mp in paths:
-			if local.startswith(mp):
-#				oe.note("overriding PACKAGE_ARCH from %s to %s" % (old_arch, machine))
-				oe.data.setVar('PACKAGE_ARCH', machine, d)
-				return
-}
-
 python populate_packages () {
 	import glob, stat, errno, re