diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-11 10:08:58 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-11 11:06:21 +0000 |
| commit | 17e3fcab7ad4c066ca11fa0a942033e5877f7b54 (patch) | |
| tree | bd8cf369139c59879473a1faaf9a1de7627844cb /meta/classes/sstate.bbclass | |
| parent | 14823a0bda4456d376411f4ae519e05484a87e26 (diff) | |
| download | poky-17e3fcab7ad4c066ca11fa0a942033e5877f7b54.tar.gz | |
sstate: Ensure target sstate directory exists if unihash changes
The previous patches meant the mkdir might no longer match the final target
directory. Fix this.
(From OE-Core rev: 7ce42a30a7508e8fcb496ba05cf6967dc04a988e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 0af4dae84099e8632a9ea6a4afdbea2f232bb170)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
| -rw-r--r-- | meta/classes/sstate.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index a46dd2e210..79ae392116 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
| @@ -613,10 +613,8 @@ def sstate_package(ss, d): | |||
| 613 | 613 | ||
| 614 | sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['task']) | 614 | sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['task']) |
| 615 | d.appendVar('SSTATE_PKG', '_'+ ss['task'] + ".tgz") | 615 | d.appendVar('SSTATE_PKG', '_'+ ss['task'] + ".tgz") |
| 616 | sstatepkg = d.getVar('SSTATE_PKG') | ||
| 617 | bb.utils.remove(sstatebuild, recurse=True) | 616 | bb.utils.remove(sstatebuild, recurse=True) |
| 618 | bb.utils.mkdirhier(sstatebuild) | 617 | bb.utils.mkdirhier(sstatebuild) |
| 619 | bb.utils.mkdirhier(os.path.dirname(sstatepkg)) | ||
| 620 | for state in ss['dirs']: | 618 | for state in ss['dirs']: |
| 621 | if not os.path.exists(state[1]): | 619 | if not os.path.exists(state[1]): |
| 622 | continue | 620 | continue |
| @@ -756,6 +754,8 @@ sstate_create_package () { | |||
| 756 | return | 754 | return |
| 757 | fi | 755 | fi |
| 758 | 756 | ||
| 757 | mkdir -p `dirname ${SSTATE_PKG}` | ||
| 758 | |||
| 759 | # Use pigz if available | 759 | # Use pigz if available |
| 760 | OPT="-czS" | 760 | OPT="-czS" |
| 761 | if [ -x "$(command -v pigz)" ]; then | 761 | if [ -x "$(command -v pigz)" ]; then |
