classes: Various staging improvement fixups
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
d7399bd56c
commit
379bc4788f
|
@ -177,7 +177,6 @@ autotools_stage_libdir() {
|
|||
sysroot_stage_libdir $1 ${STAGE_TEMP_PREFIX}$2
|
||||
}
|
||||
|
||||
|
||||
autotools_stage_all() {
|
||||
if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
|
||||
then
|
||||
|
@ -186,8 +185,11 @@ autotools_stage_all() {
|
|||
rm -rf ${STAGE_TEMP}
|
||||
mkdir -p ${STAGE_TEMP}
|
||||
oe_runmake DESTDIR="${STAGE_TEMP}" install
|
||||
|
||||
rm -rf ${STAGE_TEMP}/${mandir} || true
|
||||
rm -rf ${STAGE_TEMP}/${infodir} || true
|
||||
sysroot_stage_dirs ${STAGE_TEMP} ${STAGE_TEMP_PREFIX}
|
||||
rm -rf ${STAGE_TEMP}
|
||||
}
|
||||
|
||||
EXPORT_FUNCTIONS do_configure do_install
|
||||
|
||||
|
|
|
@ -626,8 +626,6 @@ base_do_buildall() {
|
|||
:
|
||||
}
|
||||
|
||||
|
||||
|
||||
def subprocess_setup():
|
||||
import signal
|
||||
# Python installs a SIGPIPE handler by default. This is usually not what
|
||||
|
@ -981,6 +979,7 @@ sysroot_stage_all() {
|
|||
}
|
||||
|
||||
def is_legacy_staging(d):
|
||||
import bb
|
||||
stagefunc = bb.data.getVar('do_stage', d, True)
|
||||
legacy = True
|
||||
if stagefunc is None:
|
||||
|
@ -1016,7 +1015,7 @@ python populate_staging_posthook () {
|
|||
return
|
||||
}
|
||||
|
||||
packagedstageing_fastpath () {
|
||||
packagedstaging_fastpath () {
|
||||
:
|
||||
}
|
||||
|
||||
|
@ -1052,10 +1051,10 @@ python do_populate_staging () {
|
|||
#os.system('cp -pPR %s/* %s/' % (dest, sysrootdest))
|
||||
for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split():
|
||||
bb.build.exec_func(f, d)
|
||||
bb.build.exec_func("packagedstageing_fastpath", d)
|
||||
bb.build.exec_func("packagedstaging_fastpath", d)
|
||||
|
||||
lock = bb.utils.lockfile(lockfile)
|
||||
os.system('cp -pPR %s/* /' % (sysrootdest))
|
||||
os.system(bb.data.expand('cp -pPR ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}/* ${STAGING_DIR_TARGET}/', d))
|
||||
bb.utils.unlockfile(lock)
|
||||
}
|
||||
|
||||
|
|
|
@ -297,7 +297,7 @@ populate_staging_postamble () {
|
|||
fi
|
||||
}
|
||||
|
||||
packagedstageing_fastpath () {
|
||||
packagedstaging_fastpath () {
|
||||
if [ "$PSTAGING_ACTIVE" = "1" ]; then
|
||||
mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/
|
||||
mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/
|
||||
|
|
Loading…
Reference in New Issue