From 2624d452659c689346c3a1e0e211c3ab47026dd4 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 11 Dec 2019 10:08:58 +0000
Subject: 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: 0af4dae84099e8632a9ea6a4afdbea2f232bb170)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/sstate.bbclass | 4 ++--
 1 file 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):
 
     sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['task'])
     d.appendVar('SSTATE_PKG', '_'+ ss['task'] + ".tgz")
-    sstatepkg = d.getVar('SSTATE_PKG')
     bb.utils.remove(sstatebuild, recurse=True)
     bb.utils.mkdirhier(sstatebuild)
-    bb.utils.mkdirhier(os.path.dirname(sstatepkg))
     for state in ss['dirs']:
         if not os.path.exists(state[1]):
             continue
@@ -756,6 +754,8 @@ sstate_create_package () {
 		return
 	fi
 
+        mkdir -p `dirname ${SSTATE_PKG}`
+
         # Use pigz if available
         OPT="-czS"
         if [ -x "$(command -v pigz)" ]; then
-- 
cgit v1.2.3-54-g00ecf