diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-16 22:38:23 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-16 22:38:23 +0000 |
| commit | 6568a6d8a990a760530a492853d473733691ec02 (patch) | |
| tree | a38916451879bafb4858520ae6a3c4d7183bace3 | |
| parent | 7096a54436a5b5520b85a8077b09fe784ab388ac (diff) | |
| download | openembedded-core-6568a6d8a990a760530a492853d473733691ec02.tar.gz openembedded-core-6568a6d8a990a760530a492853d473733691ec02.tar.bz2 openembedded-core-6568a6d8a990a760530a492853d473733691ec02.tar.xz openembedded-core-6568a6d8a990a760530a492853d473733691ec02.zip | |
base.bbclass: Drop unused PSTAGE_BROKEN_DESTDIR variable and run sysroot_prehook at the right point
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/classes/base.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 7fe12f965..9d3c511ca 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -976,8 +976,6 @@ def is_legacy_staging(d): legacy = False elif bb.data.getVar('NATIVE_INSTALL_WORKS', d, 1) == "1": legacy = False - if bb.data.getVar('PSTAGE_BROKEN_DESTDIR', d, 1) == "1": - legacy = True return legacy do_populate_sysroot[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \ @@ -1024,8 +1022,8 @@ python do_populate_sysroot () { bb.data.setVar("SYSROOT_DESTDIR", "", d) bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True)) lock = bb.utils.lockfile(lockfile) - bb.build.exec_func('do_stage', d) bb.build.exec_func('populate_sysroot_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_sysroot_posthook', d) |