summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-10-28 15:22:37 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-10-28 15:22:37 +0000
commit83a64003f85fe6e157bd0c38f5500b24fba9e392 (patch)
treea072ca2ead7d76f3a8c102bb7370223456e7bc18 /meta
parentc078d4c0d31f606ecb3650f525728f110a6287fc (diff)
downloadpoky-83a64003f85fe6e157bd0c38f5500b24fba9e392.tar.gz
packaged-staging: Whitelist the empty base_do_stage function as it does nothing and locks need not be held
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/packaged-staging.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 4246d04b51..7ad8b4b724 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -73,15 +73,18 @@ python () {
73 stagefunc = bb.data.getVar('do_stage', d, 1).strip() 73 stagefunc = bb.data.getVar('do_stage', d, 1).strip()
74 if stagefunc == "autotools_stage_all": 74 if stagefunc == "autotools_stage_all":
75 fastpath = True 75 fastpath = True
76 elif stagefunc == "base_do_stage":
77 fastpath = True
76 elif stagefunc == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1": 78 elif stagefunc == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":
77 fastpath = True 79 fastpath = True
78 if bb.data.getVar('PSTAGE_BROKEN_DESTDIR', d, 1) == "1": 80 if bb.data.getVar('PSTAGE_BROKEN_DESTDIR', d, 1) == "1":
79 fastpath = False 81 fastpath = False
80 if fastpath: 82 if fastpath:
81 #bb.note("Can optimise " + bb.data.getVar('FILE', d, 1)) 83 #bb.note("Optimised for staging: " + bb.data.getVar('FILE', d, 1))
82 bb.data.setVar("PSTAGING_NEEDSTAMP", "0", d) 84 bb.data.setVar("PSTAGING_NEEDSTAMP", "0", d)
83 bb.data.setVar("STAGE_TEMP_PREFIX", "${WORKDIR}/temp-staging-pstage", d) 85 bb.data.setVar("STAGE_TEMP_PREFIX", "${WORKDIR}/temp-staging-pstage", d)
84 else: 86 else:
87 #bb.note("Can optimise staging better: " + bb.data.getVar('FILE', d, 1))
85 bb.data.setVar("PSTAGING_NEEDSTAMP", "1", d) 88 bb.data.setVar("PSTAGING_NEEDSTAMP", "1", d)
86 else: 89 else:
87 bb.data.setVar("PSTAGING_ACTIVE", "0", d) 90 bb.data.setVar("PSTAGING_ACTIVE", "0", d)