[PATCH 3/5] allarch/lib: Convert core of allarch code into a function

[Richard Purdie <richard.purdie@linuxfoundation.org>]

We need to call the functionality in allarch.bbclass from other contexts
and the current conditionals are problematic enough without further changes
confusing things. Move the code to a funtion in oe.utils so we can call
it as needed.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes-recipe/allarch.bbclass | 41 +------------------------
 meta/lib/oe/utils.py                | 47 +++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/meta/classes-recipe/allarch.bbclass b/meta/classes-recipe/allarch.bbclass
index e429b924370..7cdaa63ae2c 100644
--- a/meta/classes-recipe/allarch.bbclass
+++ b/meta/classes-recipe/allarch.bbclass
@@ -25,46 +25,7 @@ python () {
     # Allow this class to be included but overridden - only set
     # the values if we're still "all" package arch.
     if d.getVar("PACKAGE_ARCH") == "all":
-        # No need for virtual/libc or a cross compiler
-        d.setVar("INHIBIT_DEFAULT_DEPS","1")
-
-        # Set these to a common set of values, we shouldn't be using them other that for WORKDIR directory
-        # naming anyway
-        d.setVar("baselib", "lib")
-        d.setVar("TARGET_ARCH", "allarch")
-        d.setVar("TARGET_OS", "linux")
-        d.setVar("TARGET_CC_ARCH", "none")
-        d.setVar("TARGET_LD_ARCH", "none")
-        d.setVar("TARGET_AS_ARCH", "none")
-        d.setVar("TARGET_FPU", "")
-        d.setVar("TARGET_PREFIX", "")
-        # Expand PACKAGE_EXTRA_ARCHS since the staging code needs this
-        # (this removes any dependencies from the hash perspective)
-        d.setVar("PACKAGE_EXTRA_ARCHS", d.getVar("PACKAGE_EXTRA_ARCHS"))
-        d.setVar("SDK_ARCH", "none")
-        d.setVar("SDK_CC_ARCH", "none")
-        d.setVar("TARGET_CPPFLAGS", "none")
-        d.setVar("TARGET_CFLAGS", "none")
-        d.setVar("TARGET_CXXFLAGS", "none")
-        d.setVar("TARGET_LDFLAGS", "none")
-        d.setVar("POPULATESYSROOTDEPS", "")
-
-        # Avoid this being unnecessarily different due to nuances of
-        # the target machine that aren't important for "all" arch
-        # packages.
-        d.setVar("LDFLAGS", "")
-
-        # No need to do shared library processing or debug symbol handling
-        d.setVar("EXCLUDE_FROM_SHLIBS", "1")
-        d.setVar("INHIBIT_PACKAGE_DEBUG_SPLIT", "1")
-        d.setVar("INHIBIT_PACKAGE_STRIP", "1")
-
-        # These multilib values shouldn't change allarch packages so exclude them
-        d.appendVarFlag("emit_pkgdata", "vardepsexclude", " MULTILIB_VARIANTS")
-        d.appendVarFlag("write_specfile", "vardepsexclude", " MULTILIBS")
-        d.appendVarFlag("do_package", "vardepsexclude", " package_do_shlibs")
-
-        d.setVar("qemu_wrapper_cmdline", "def qemu_wrapper_cmdline(data, rootfs_path, library_paths):\n    return 'false'")
+        oe.utils.make_arch_independent(d)
     elif bb.data.inherits_class('packagegroup', d) and not bb.data.inherits_class('nativesdk', d):
         bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE"))
 }
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 2b39d4e0ddb..afcfeda0c6d 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -511,3 +511,50 @@ def touch(filename):
         # Handle read-only file systems gracefully
         if e.errno != errno.EROFS:
             raise e
+
+#
+# Set datastore variables to convert to an architecture independent state
+# Used by allarch recipes and other cases where arch independence is needed
+#
+def make_arch_independent(d):
+    # No need for virtual/libc or a cross compiler
+    d.setVar("INHIBIT_DEFAULT_DEPS","1")
+
+    # Set these to a common set of values, we shouldn't be using them other that for WORKDIR directory
+    # naming anyway
+    d.setVar("baselib", "lib")
+    d.setVar("TARGET_ARCH", "allarch")
+    d.setVar("TARGET_OS", "linux")
+    d.setVar("TARGET_CC_ARCH", "none")
+    d.setVar("TARGET_LD_ARCH", "none")
+    d.setVar("TARGET_AS_ARCH", "none")
+    d.setVar("TARGET_FPU", "")
+    d.setVar("TARGET_PREFIX", "")
+    # Expand PACKAGE_EXTRA_ARCHS since the staging code needs this
+    # (this removes any dependencies from the hash perspective)
+    d.setVar("PACKAGE_EXTRA_ARCHS", d.getVar("PACKAGE_EXTRA_ARCHS"))
+    d.setVar("SDK_ARCH", "none")
+    d.setVar("SDK_CC_ARCH", "none")
+    d.setVar("TARGET_CPPFLAGS", "none")
+    d.setVar("TARGET_CFLAGS", "none")
+    d.setVar("TARGET_CXXFLAGS", "none")
+    d.setVar("TARGET_LDFLAGS", "none")
+    d.setVar("POPULATESYSROOTDEPS", "")
+
+    # Avoid this being unnecessarily different due to nuances of
+    # the target machine that aren't important for "all" arch
+    # packages.
+    d.setVar("LDFLAGS", "")
+
+    # No need to do shared library processing or debug symbol handling
+    d.setVar("EXCLUDE_FROM_SHLIBS", "1")
+    d.setVar("INHIBIT_PACKAGE_DEBUG_SPLIT", "1")
+    d.setVar("INHIBIT_PACKAGE_STRIP", "1")
+
+    # These multilib values shouldn't change allarch packages so exclude them
+    d.appendVarFlag("emit_pkgdata", "vardepsexclude", " MULTILIB_VARIANTS")
+    d.appendVarFlag("write_specfile", "vardepsexclude", " MULTILIBS")
+    d.appendVarFlag("do_package", "vardepsexclude", " package_do_shlibs")
+
+    d.setVar("qemu_wrapper_cmdline", "def qemu_wrapper_cmdline(data, rootfs_path, library_paths):\n    return 'false'")
+