summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-12 10:31:04 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-12 10:32:26 +0000
commitfe9ff4fa1f8edf885ee1a9089366079fa6729a03 (patch)
treef5409aaf8b6cfcfc37d250219c374a69a0e44fe0 /classes
parent9ca33390ef79332f5611a80fb4ea2bf62a721b61 (diff)
base.bbclass: Fix legacy staging package generation as pre hook was called too late. Also allow legacy staging to be forced with FORCE_LEGACY_STAGING
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index e4fc2ac34f..9d063f2151 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -1041,6 +1041,8 @@ def is_legacy_staging(d):
legacy = False
if bb.data.getVar('PSTAGE_BROKEN_DESTDIR', d, 1) == "1":
legacy = True
+ if bb.data.getVar('FORCE_LEGACY_STAGING', d, 1) == "1":
+ legacy = True
return legacy
do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \
@@ -1088,8 +1090,8 @@ python do_populate_staging () {
if bb.data.getVarFlags('do_stage', d) is None:
bb.fatal("This recipe (%s) has a do_stage_prepend or do_stage_append and do_stage now doesn't exist. Please rename this to do_stage()" % bb.data.getVar("FILE", d, True))
lock = bb.utils.lockfile(lockfile)
- bb.build.exec_func('do_stage', d)
bb.build.exec_func('populate_staging_prehook', d)
+ bb.build.exec_func('do_stage', d)
for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split():
bb.build.exec_func(f, d)
bb.build.exec_func('populate_staging_posthook', d)