summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-01-20 17:01:49 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-25 10:59:17 +0000
commit46395d4856d11fc135872f8904ce92aa26eec984 (patch)
tree7d3157229c7a74ac4a68b0428534defd8fa0abeb
parent7109712a25762a530e7385bc796c3b9ff0836303 (diff)
downloadopenembedded-core-46395d4856d11fc135872f8904ce92aa26eec984.tar.gz
openembedded-core-46395d4856d11fc135872f8904ce92aa26eec984.tar.bz2
openembedded-core-46395d4856d11fc135872f8904ce92aa26eec984.tar.xz
openembedded-core-46395d4856d11fc135872f8904ce92aa26eec984.zip
sstate.bbclass: allow each step of toolchain bootstrap processes to do populate_sysroot independently
Some steps (like gcc-cross-initial, gcc-cross-intermediate and eglibc-initial) will install to new locations to avoid file overwriting. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
-rw-r--r--meta/classes/sstate.bbclass24
1 files changed, 0 insertions, 24 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index adadbcffc..38f2bb99e 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -90,30 +90,6 @@ def sstate_install(ss, d):
if os.access(manifest, os.R_OK):
bb.fatal("Package already staged (%s)?!" % manifest)
- def checkmanifest(pn, task):
- return os.access(bb.data.expand("${SSTATE_MANFILEBASE}%s.%s" % (pn, task), d), os.R_OK)
-
- skipinst = False
- pn = d.getVar("PN", True)
- if pn == "gcc-cross-initial":
- if checkmanifest("gcc-cross", "populate-sysroot"):
- skipinst = True
- if checkmanifest("gcc-cross-intermediate", "populate-sysroot"):
- skipinst = True
- elif pn == "gcc-cross-intermediate":
- if checkmanifest("gcc-cross", "populate-sysroot"):
- skipinst = True
- elif pn == "glibc-initial":
- if checkmanifest("glibc", "populate-sysroot"):
- skipinst = True
- elif pn == "eglibc-initial":
- if checkmanifest("eglibc", "populate-sysroot"):
- skipinst = True
-
- if skipinst:
- bb.note("Not staging %s.%s as sysroot already contains better functionality" % (pn, ss['name']))
- return
-
locks = []
for lock in ss['lockfiles']:
locks.append(bb.utils.lockfile(lock))