From 918646ca803d56004fb0ab7c21e86cc9cb14513d Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 11 Jul 2016 12:43:09 +0300 Subject: sstate.bbclass: make PV to depend on PV variable value Currently PV is defined in meta/conf/bitbake.conf as a python expression: "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1] or '1.0'}". As FILE is whitelisted it causes PV to not depend on it. This causes sstate code to not detect that PV changes when recipe filename changes. Making PV to explicitly depend on PV variable value overrides default behaviour. Instead of depending on python expression bitbake depends on evaluated value of PV variable, which should fix the above mentioned issue. [YOCTO #9806] Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- meta/classes/sstate.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/classes/sstate.bbclass') diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 621dc37d70..d706d75581 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -17,6 +17,9 @@ SSTATE_EXTRAPATH = "" SSTATE_EXTRAPATHWILDCARD = "" SSTATE_PATHSPEC = "${SSTATE_DIR}/${SSTATE_EXTRAPATHWILDCARD}*/${SSTATE_PKGSPEC}" +# explicitly make PV to depend on evaluated value of PV variable +PV[vardepvalue] = "${PV}" + # We don't want the sstate to depend on things like the distro string # of the system, we let the sstate paths take care of this. SSTATE_EXTRAPATH[vardepvalue] = "" -- cgit 1.2.3-korg