Move PACKAGE_ARCH frobbing from package.oeclass to base.oeclass.
authorChris Larson <clarson@kergoth.com>
Wed, 1 Dec 2004 03:13:14 +0000 (03:13 +0000)
committerChris Larson <clarson@kergoth.com>
Wed, 1 Dec 2004 03:13:14 +0000 (03:13 +0000)
BKrev: 41ad36cacR1Y78r2mvkhyWLkqoHG6Q

classes/base.oeclass
classes/package.oeclass

index 35c7fbe..22447b3 100644 (file)
@@ -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
index db95b27..fbd3fbb 100644 (file)
@@ -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