From: Yu Ke Date: Mon, 27 Dec 2010 08:20:34 +0000 (+0800) Subject: Fetcher: only set __BB_DONT_CACHE when SRCREV = "${AUTOREV}" X-Git-Tag: yocto-4.0~42633 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b2dbf76126650750cb8a6778b837af6fe4c8b21;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git Fetcher: only set __BB_DONT_CACHE when SRCREV = "${AUTOREV}" we should cache SRCREV whenever possible, the only exception is when SREREV is auto rev. so change the logic to only set __BB_DONT_CACHE at SRCREV = "${AUTOREV}" case Signed-off-by: Yu Ke --- diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index b9cca91684b..751e514121e 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -359,6 +359,9 @@ def localpaths(d): return local def get_autorev(d): + # only not cache src rev in autorev case + if bb.data.getVar('BB_SRCREV_POLICY', d, True) != "cache": + bb.data.setVar('__BB_DONT_CACHE', '1', d) return "AUTOINC" def get_srcrev(d): @@ -385,9 +388,6 @@ def get_srcrev(d): logger.error("SRCREV was used yet no valid SCM was found in SRC_URI") raise ParameterError - if bb.data.getVar('BB_SRCREV_POLICY', d, True) != "cache": - bb.data.setVar('__BB_DONT_CACHE', '1', d) - if len(scms) == 1: return urldata[scms[0]].method.sortable_revision(scms[0], urldata[scms[0]], d)