summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-08-26 06:06:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-29 15:42:21 +0100
commit964566cd0c9ce88a34207a57eed9a25d4edb852f (patch)
tree41ddd1183eac5063ced59099e59334d5ecb52d60
parentc497908785723f88f3da5a466a2d7a403de9bdc8 (diff)
downloadopenembedded-core-contrib-964566cd0c9ce88a34207a57eed9a25d4edb852f.tar.gz
openembedded-core-contrib-964566cd0c9ce88a34207a57eed9a25d4edb852f.tar.bz2
openembedded-core-contrib-964566cd0c9ce88a34207a57eed9a25d4edb852f.zip
allarch: disable allarch when multilib is used
Some allarch packages rdepends non-allarch packages. When multilib is used, it doesn't expand the dependency chain correctly, e.g. core-image-sato -> ca-certificates(allarch) -> openssl we expect dependency chain for lib32-core-image-sato: lib32-core-image-sato -> ca-certificates(allarch) -> lib32-openssl it should install lib32-openssl for ca-certificates but openssl is still wrongly required. Copy allarch.bbclass to allarch-enabled.bbclass and only inherit allarch-enabled.bbclass when multilib is not used. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/allarch-enabled.bbclass52
-rw-r--r--meta/classes/allarch.bbclass51
-rw-r--r--meta/classes/icecc.bbclass2
-rw-r--r--meta/classes/multilib.bbclass2
-rw-r--r--meta/classes/multilib_global.bbclass2
-rw-r--r--meta/classes/package.bbclass6
6 files changed, 60 insertions, 55 deletions
diff --git a/meta/classes/allarch-enabled.bbclass b/meta/classes/allarch-enabled.bbclass
new file mode 100644
index 0000000000..1eebe0bf2e
--- /dev/null
+++ b/meta/classes/allarch-enabled.bbclass
@@ -0,0 +1,52 @@
+#
+# This class is used for architecture independent recipes/data files (usually scripts)
+#
+
+PACKAGE_ARCH = "all"
+
+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")
+ 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/classes/allarch.bbclass b/meta/classes/allarch.bbclass
index 1eebe0bf2e..0eca076df0 100644
--- a/meta/classes/allarch.bbclass
+++ b/meta/classes/allarch.bbclass
@@ -1,52 +1,5 @@
#
-# This class is used for architecture independent recipes/data files (usually scripts)
+# This class enables allarch only when multilib is not used.
#
-PACKAGE_ARCH = "all"
-
-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")
- 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"))
-}
-
+inherit ${@oe.utils.ifelse(d.getVar('MULTILIB_VARIANTS'), '', 'allarch-enabled')}
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 0ca8de86c2..bb925b8d24 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -171,7 +171,7 @@ def use_icecc(bb,d):
return "yes"
def icecc_is_allarch(bb, d):
- return d.getVar("PACKAGE_ARCH") == "all" or bb.data.inherits_class('allarch', d)
+ return d.getVar("PACKAGE_ARCH") == "all" or bb.data.inherits_class('allarch-enabled', d)
def icecc_is_kernel(bb, d):
return \
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index f2ac8bdfef..c576cd8b40 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -50,7 +50,7 @@ python multilib_virtclass_handler () {
if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
raise bb.parse.SkipRecipe("We can't extend nativesdk recipes")
- if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
+ if bb.data.inherits_class('allarch-enabled', e.data) and not bb.data.inherits_class('packagegroup', e.data):
raise bb.parse.SkipRecipe("Don't extend allarch recipes which are not packagegroups")
# Expand this since this won't work correctly once we set a multilib into place
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index d2ec1adfea..4e2b6718df 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -166,7 +166,7 @@ python multilib_virtclass_handler_global () {
if bb.data.inherits_class('kernel', e.data) or \
bb.data.inherits_class('module-base', e.data) or \
- (bb.data.inherits_class('allarch', e.data) and\
+ (bb.data.inherits_class('allarch-enabled', e.data) and\
not bb.data.inherits_class('packagegroup', e.data)):
variants = (e.data.getVar("MULTILIB_VARIANTS") or "").split()
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 9cfe43cbd1..d48336d008 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -494,7 +494,7 @@ def get_package_mapping (pkg, basepkg, d):
if key in data:
# Have to avoid undoing the write_extra_pkgs(global_variants...)
- if bb.data.inherits_class('allarch', d) and data[key] == basepkg:
+ if bb.data.inherits_class('allarch-enabled', d) and data[key] == basepkg:
return pkg
return data[key]
@@ -1409,7 +1409,7 @@ fi
if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
write_extra_pkgs(variants, pn, packages, pkgdatadir)
- if (bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d)):
+ if (bb.data.inherits_class('allarch-enabled', d) and not bb.data.inherits_class('packagegroup', d)):
write_extra_pkgs(global_variants, pn, packages, pkgdatadir)
workdir = d.getVar('WORKDIR')
@@ -1498,7 +1498,7 @@ fi
if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d):
write_extra_runtime_pkgs(variants, packages, pkgdatadir)
- if bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d):
+ if bb.data.inherits_class('allarch-enabled', d) and not bb.data.inherits_class('packagegroup', d):
write_extra_runtime_pkgs(global_variants, packages, pkgdatadir)
}