summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-25 20:23:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-26 10:01:23 +0000
commit668f7e36fe2c681a1b5c7604fe34960956448eec (patch)
tree9efdd9c887630492f2537af3704cb24f0e4c6f2e
parente8be4664313d2c617048ee99e2ef91b8594a6a6e (diff)
downloadpoky-668f7e36fe2c681a1b5c7604fe34960956448eec.tar.gz
allarch: Allow class to be included but overridden
We have cases where we'd like to inherit this class by default but allow special cases to override it. This change makes the code of the class conditional on PACKAGE_ARCH remaining set to "all", allowing it to be overridden. packagegroup usage is one case this is desirable. (From OE-Core rev: 7dd91402b719ac62b51088f234354f82bfa9c4b6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/allarch.bbclass33
1 files changed, 19 insertions, 14 deletions
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
index 21157e5e18..8669470e60 100644
--- a/meta/classes/allarch.bbclass
+++ b/meta/classes/allarch.bbclass
@@ -4,20 +4,25 @@
4 4
5PACKAGE_ARCH = "all" 5PACKAGE_ARCH = "all"
6 6
7# No need for virtual/libc or a cross compiler 7python () {
8INHIBIT_DEFAULT_DEPS = "1" 8 # Allow this class to be included but overridden - only set
9 # the values if we're still "all" package arch.
10 if d.getVar("PACKAGE_ARCH") == "all":
11 # No need for virtual/libc or a cross compiler
12 d.setVar("INHIBIT_DEFAULT_DEPS","1")
9 13
10# Set these to a common set of values, we shouldn't be using them other that for WORKDIR directory 14 # Set these to a common set of values, we shouldn't be using them other that for WORKDIR directory
11# naming anyway 15 # naming anyway
12TARGET_ARCH = "allarch" 16 d.setVar("TARGET_ARCH", "allarch")
13TARGET_OS = "linux" 17 d.setVar("TARGET_OS", "linux")
14TARGET_CC_ARCH = "none" 18 d.setVar("TARGET_CC_ARCH", "none")
15TARGET_LD_ARCH = "none" 19 d.setVar("TARGET_LD_ARCH", "none")
16TARGET_AS_ARCH = "none" 20 d.setVar("TARGET_AS_ARCH", "none")
17PACKAGE_EXTRA_ARCHS = "" 21 d.setVar("PACKAGE_EXTRA_ARCHS", "")
18 22
19# No need to do shared library processing or debug symbol handling 23 # No need to do shared library processing or debug symbol handling
20EXCLUDE_FROM_SHLIBS = "1" 24 d.setVar("EXCLUDE_FROM_SHLIBS", "1")
21INHIBIT_PACKAGE_DEBUG_SPLIT = "1" 25 d.setVar("INHIBIT_PACKAGE_DEBUG_SPLIT", "1")
22INHIBIT_PACKAGE_STRIP = "1" 26 d.setVar("INHIBIT_PACKAGE_STRIP", "1")
27}
23 28