From 0614b9aa62a46f81d334ca4230080cc707347f3c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 30 Aug 2011 14:22:21 +0100 Subject: package.bbclass: Ensure task's variable dependencies are correctly caputred in the sstate checksum [YOCTO #1388] This change is needed to correctly add the dependencies for the do_package task which bitbake is unable to automatically detect itself. Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'meta/classes/package.bbclass') diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 15c414274..73e8f6365 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1620,6 +1620,19 @@ python package_depchains() { pkg_addrrecs(pkg, base, suffix, func, rdeps, d) } +# Since bitbake can't determine which variables are accessed during package +# iteration, we need to list them here: +PACKAGEVARS = "FILES RDEPENDS RRECOMMENDS SUMMARY DESCRIPTION RSUGGESTS RPROVIDES RCONFLICTS PKG ALLOW_EMPTY pkg_postinst pkg_postrm INITSCRIPT_NAME INITSCRIPT_PARAMS" + +def gen_packagevar(d): + ret = [] + pkgs = (d.getVar("PACKAGES", True) or "").split() + vars = (d.getVar("PACKAGEVARS", True) or "").split() + for p in pkgs: + for v in vars: + ret.append(v + "_" + p) + return " ".join(ret) + PACKAGE_PREPROCESS_FUNCS ?= "" PACKAGEFUNCS ?= "package_get_auto_pr \ perform_packagecopy \ @@ -1656,6 +1669,7 @@ python do_package () { } do_package[dirs] = "${SHLIBSWORKDIR} ${PKGDESTWORK} ${D}" +do_package[vardeps] += "${PACKAGEFUNCS} ${@gen_packagevar(d)}" addtask package before do_build after do_install PACKAGELOCK = "${STAGING_DIR}/package-output.lock" -- cgit v1.2.3