summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-16 22:38:23 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-16 22:38:23 +0000
commit6568a6d8a990a760530a492853d473733691ec02 (patch)
treea38916451879bafb4858520ae6a3c4d7183bace3 /meta
parent7096a54436a5b5520b85a8077b09fe784ab388ac (diff)
downloadpoky-6568a6d8a990a760530a492853d473733691ec02.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 7fe12f965f..9d3c511cac 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -976,8 +976,6 @@ def is_legacy_staging(d):
976 legacy = False 976 legacy = False
977 elif bb.data.getVar('NATIVE_INSTALL_WORKS', d, 1) == "1": 977 elif bb.data.getVar('NATIVE_INSTALL_WORKS', d, 1) == "1":
978 legacy = False 978 legacy = False
979 if bb.data.getVar('PSTAGE_BROKEN_DESTDIR', d, 1) == "1":
980 legacy = True
981 return legacy 979 return legacy
982 980
983do_populate_sysroot[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \ 981do_populate_sysroot[dirs] = "${STAGING_DIR_TARGET}/${bindir} ${STAGING_DIR_TARGET}/${libdir} \
@@ -1024,8 +1022,8 @@ python do_populate_sysroot () {
1024 bb.data.setVar("SYSROOT_DESTDIR", "", d) 1022 bb.data.setVar("SYSROOT_DESTDIR", "", d)
1025 bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True)) 1023 bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True))
1026 lock = bb.utils.lockfile(lockfile) 1024 lock = bb.utils.lockfile(lockfile)
1027 bb.build.exec_func('do_stage', d)
1028 bb.build.exec_func('populate_sysroot_prehook', d) 1025 bb.build.exec_func('populate_sysroot_prehook', d)
1026 bb.build.exec_func('do_stage', d)
1029 for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split(): 1027 for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split():
1030 bb.build.exec_func(f, d) 1028 bb.build.exec_func(f, d)
1031 bb.build.exec_func('populate_sysroot_posthook', d) 1029 bb.build.exec_func('populate_sysroot_posthook', d)