From bc19e915fbbb932f7ad7bb8a0b7fb3227f94562f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 9 May 2014 13:29:13 +0100 Subject: classes/lib/oe: Fix cross/crosssdk references With the renaming of the cross packages, its no longer possible to use endswith("-cross") and similar to detect cross packages. Replace these references with other techniques. This resolves certain build from sstate failures which were due to the system believing cross packages were target packages and therefore dependency handling was altered. (From OE-Core rev: 91edf4cac223298e50a4b8e59dd19f1b272e3418) Signed-off-by: Richard Purdie Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 6 +++--- meta/classes/native.bbclass | 2 +- meta/classes/sstate.bbclass | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 8a74d6e578..c0d2c8ec88 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -182,7 +182,7 @@ def preferred_ml_updates(d): for prov in providers: val = d.getVar(prov, False) pkg = prov.replace("PREFERRED_PROVIDER_", "") - if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith(("nativesdk-", "virtual/nativesdk-")): + if pkg.endswith("-native") or "-crosssdk-" in pkg or pkg.startswith(("nativesdk-", "virtual/nativesdk-")): continue if 'cross-canadian' in pkg: for p in prefixes: @@ -229,7 +229,7 @@ def preferred_ml_updates(d): mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() extramp = [] for p in mp: - if p.endswith(("-native", "-crosssdk")) or p.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in p: + if p.endswith("-native") or "-crosssdk-" in p or p.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in p: continue virt = "" if p.startswith("virtual/"): @@ -413,7 +413,7 @@ python () { appends = bb.utils.explode_deps(d.expand(" ".join(appends))) newappends = [] for a in appends: - if a.endswith("-native") or a.endswith("-cross"): + if a.endswith("-native") or ("-cross-" in a): newappends.append(a) elif a.startswith("virtual/"): subs = a.split("/", 1)[1] diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 2d182f0ebc..31f1c41ac6 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -125,7 +125,7 @@ python native_virtclass_handler () { deps = bb.utils.explode_deps(deps) newdeps = [] for dep in deps: - if dep.endswith("-cross"): + if "-cross-" in dep: newdeps.append(dep.replace("-cross", "-native")) elif not dep.endswith("-native"): newdeps.append(dep + "-native") diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 46cc2677d6..796c1a9f60 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -715,7 +715,7 @@ def setscene_depvalid(task, taskdependees, notneeded, d): bb.debug(2, "Considering setscene task: %s" % (str(taskdependees[task]))) def isNativeCross(x): - return x.endswith("-native") or x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-crosssdk") or x.endswith("-crosssdk-initial") + return x.endswith("-native") or "-cross-" in x or "-crosssdk" in x def isPostInstDep(x): if x in ["qemu-native", "gdk-pixbuf-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native", "gtk-update-icon-cache-native"]: @@ -750,7 +750,7 @@ def setscene_depvalid(task, taskdependees, notneeded, d): if taskdependees[dep][0].endswith(("base-passwd", "shadow-sysroot")): continue # Nothing need depend on libc-initial/gcc-cross-initial - if taskdependees[task][0].endswith("-initial"): + if "-initial" in taskdependees[task][0]: continue # Native/Cross populate_sysroot need their dependencies if isNativeCross(taskdependees[task][0]) and isNativeCross(taskdependees[dep][0]): -- cgit v1.2.3-54-g00ecf