summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/classes/autotools.bbclass8
-rw-r--r--meta/classes/base.bbclass19
-rw-r--r--meta/classes/packaged-staging.bbclass2
3 files changed, 15 insertions, 14 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index bd88184a7..4946222f7 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -170,14 +170,13 @@ autotools_stage_includes() {
}
autotools_stage_dir() {
- sysroot_stage_dir $1 ${STAGE_TEMP_PREFIX}$2
+ sysroot_stage_dir $1 ${STAGE_TEMP_PREFIX}$2
}
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
+
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 086a6d05d..f0142add3 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -626,14 +626,12 @@ base_do_buildall() {
:
}
-
-
def subprocess_setup():
- import signal
- # Python installs a SIGPIPE handler by default. This is usually not what
- # non-Python subprocesses expect.
- # SIGPIPE errors are known issues with gzip/bash
- signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+ import signal
+ # Python installs a SIGPIPE handler by default. This is usually not what
+ # non-Python subprocesses expect.
+ # SIGPIPE errors are known issues with gzip/bash
+ signal.signal(signal.SIGPIPE, signal.SIG_DFL)
def oe_unpack_file(file, data, url = None):
import bb, os, subprocess
@@ -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)
}
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 44f657a2c..b9d59bbd8 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -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/