diff options
| -rw-r--r-- | meta/classes/sstate.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 91f209a9cf..eee04ab3f5 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
| @@ -114,15 +114,16 @@ def sstate_install(ss, d): | |||
| 114 | for state in ss['dirs']: | 114 | for state in ss['dirs']: |
| 115 | oe.path.copytree(state[1], state[2]) | 115 | oe.path.copytree(state[1], state[2]) |
| 116 | for walkroot, dirs, files in os.walk(state[1]): | 116 | for walkroot, dirs, files in os.walk(state[1]): |
| 117 | bb.debug(2, "Staging files from %s to %s" % (state[1], state[2])) | ||
| 117 | for file in files: | 118 | for file in files: |
| 118 | srcpath = os.path.join(walkroot, file) | 119 | srcpath = os.path.join(walkroot, file) |
| 119 | dstpath = srcpath.replace(state[1], state[2]) | 120 | dstpath = srcpath.replace(state[1], state[2]) |
| 120 | bb.debug(2, "Staging %s to %s" % (srcpath, dstpath)) | 121 | #bb.debug(2, "Staging %s to %s" % (srcpath, dstpath)) |
| 121 | sharedfiles.append(dstpath) | 122 | sharedfiles.append(dstpath) |
| 122 | for dir in dirs: | 123 | for dir in dirs: |
| 123 | srcdir = os.path.join(walkroot, dir) | 124 | srcdir = os.path.join(walkroot, dir) |
| 124 | dstdir = srcdir.replace(state[1], state[2]) | 125 | dstdir = srcdir.replace(state[1], state[2]) |
| 125 | bb.debug(2, "Staging %s to %s" % (srcdir, dstdir)) | 126 | #bb.debug(2, "Staging %s to %s" % (srcdir, dstdir)) |
| 126 | if not dstdir.endswith("/"): | 127 | if not dstdir.endswith("/"): |
| 127 | dstdir = dstdir + "/" | 128 | dstdir = dstdir + "/" |
| 128 | shareddirs.append(dstdir) | 129 | shareddirs.append(dstdir) |
| @@ -355,12 +356,12 @@ def sstate_package(ss, d): | |||
| 355 | for file in files: | 356 | for file in files: |
| 356 | srcpath = os.path.join(walkroot, file) | 357 | srcpath = os.path.join(walkroot, file) |
| 357 | dstpath = srcpath.replace(state[1], sstatebuild + state[0]) | 358 | dstpath = srcpath.replace(state[1], sstatebuild + state[0]) |
| 358 | bb.debug(2, "Preparing %s for packaging at %s" % (srcpath, dstpath)) | ||
| 359 | make_relative_symlink(srcpath, dstpath, d) | 359 | make_relative_symlink(srcpath, dstpath, d) |
| 360 | for dir in dirs: | 360 | for dir in dirs: |
| 361 | srcpath = os.path.join(walkroot, dir) | 361 | srcpath = os.path.join(walkroot, dir) |
| 362 | dstpath = srcpath.replace(state[1], sstatebuild + state[0]) | 362 | dstpath = srcpath.replace(state[1], sstatebuild + state[0]) |
| 363 | make_relative_symlink(srcpath, dstpath, d) | 363 | make_relative_symlink(srcpath, dstpath, d) |
| 364 | bb.debug(2, "Preparing tree %s for packaging at %s" % (state[1], sstatebuild + state[0])) | ||
| 364 | oe.path.copytree(state[1], sstatebuild + state[0]) | 365 | oe.path.copytree(state[1], sstatebuild + state[0]) |
| 365 | 366 | ||
| 366 | workdir = bb.data.getVar('WORKDIR', d, True) | 367 | workdir = bb.data.getVar('WORKDIR', d, True) |
