summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-03 22:02:34 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 12:15:23 +0000
commit379bc4788f592f958f358f68c9de9a8a0f400631 (patch)
tree8ca401bfb54feb8f03378ab95c84f5d87bd380b1 /meta/classes
parentd7399bd56c8fc7c58af79ef91dc67382cc23eb47 (diff)
downloadpoky-379bc4788f592f958f358f68c9de9a8a0f400631.tar.gz
classes: Various staging improvement fixups
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes')
-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 bd88184a74..4946222f78 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -170,14 +170,13 @@ autotools_stage_includes() {
170} 170}
171 171
172autotools_stage_dir() { 172autotools_stage_dir() {
173 sysroot_stage_dir $1 ${STAGE_TEMP_PREFIX}$2 173 sysroot_stage_dir $1 ${STAGE_TEMP_PREFIX}$2
174} 174}
175 175
176autotools_stage_libdir() { 176autotools_stage_libdir() {
177 sysroot_stage_libdir $1 ${STAGE_TEMP_PREFIX}$2 177 sysroot_stage_libdir $1 ${STAGE_TEMP_PREFIX}$2
178} 178}
179 179
180
181autotools_stage_all() { 180autotools_stage_all() {
182 if [ "${INHIBIT_AUTO_STAGE}" = "1" ] 181 if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
183 then 182 then
@@ -186,8 +185,11 @@ autotools_stage_all() {
186 rm -rf ${STAGE_TEMP} 185 rm -rf ${STAGE_TEMP}
187 mkdir -p ${STAGE_TEMP} 186 mkdir -p ${STAGE_TEMP}
188 oe_runmake DESTDIR="${STAGE_TEMP}" install 187 oe_runmake DESTDIR="${STAGE_TEMP}" install
189 188 rm -rf ${STAGE_TEMP}/${mandir} || true
189 rm -rf ${STAGE_TEMP}/${infodir} || true
190 sysroot_stage_dirs ${STAGE_TEMP} ${STAGE_TEMP_PREFIX} 190 sysroot_stage_dirs ${STAGE_TEMP} ${STAGE_TEMP_PREFIX}
191 rm -rf ${STAGE_TEMP}
191} 192}
192 193
193EXPORT_FUNCTIONS do_configure do_install 194EXPORT_FUNCTIONS do_configure do_install
195
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 086a6d05d0..f0142add3b 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -626,14 +626,12 @@ base_do_buildall() {
626 : 626 :
627} 627}
628 628
629
630
631def subprocess_setup(): 629def subprocess_setup():
632 import signal 630 import signal
633 # Python installs a SIGPIPE handler by default. This is usually not what 631 # Python installs a SIGPIPE handler by default. This is usually not what
634 # non-Python subprocesses expect. 632 # non-Python subprocesses expect.
635 # SIGPIPE errors are known issues with gzip/bash 633 # SIGPIPE errors are known issues with gzip/bash
636 signal.signal(signal.SIGPIPE, signal.SIG_DFL) 634 signal.signal(signal.SIGPIPE, signal.SIG_DFL)
637 635
638def oe_unpack_file(file, data, url = None): 636def oe_unpack_file(file, data, url = None):
639 import bb, os, subprocess 637 import bb, os, subprocess
@@ -981,6 +979,7 @@ sysroot_stage_all() {
981} 979}
982 980
983def is_legacy_staging(d): 981def is_legacy_staging(d):
982 import bb
984 stagefunc = bb.data.getVar('do_stage', d, True) 983 stagefunc = bb.data.getVar('do_stage', d, True)
985 legacy = True 984 legacy = True
986 if stagefunc is None: 985 if stagefunc is None:
@@ -1016,7 +1015,7 @@ python populate_staging_posthook () {
1016 return 1015 return
1017} 1016}
1018 1017
1019packagedstageing_fastpath () { 1018packagedstaging_fastpath () {
1020 : 1019 :
1021} 1020}
1022 1021
@@ -1052,10 +1051,10 @@ python do_populate_staging () {
1052 #os.system('cp -pPR %s/* %s/' % (dest, sysrootdest)) 1051 #os.system('cp -pPR %s/* %s/' % (dest, sysrootdest))
1053 for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split(): 1052 for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split():
1054 bb.build.exec_func(f, d) 1053 bb.build.exec_func(f, d)
1055 bb.build.exec_func("packagedstageing_fastpath", d) 1054 bb.build.exec_func("packagedstaging_fastpath", d)
1056 1055
1057 lock = bb.utils.lockfile(lockfile) 1056 lock = bb.utils.lockfile(lockfile)
1058 os.system('cp -pPR %s/* /' % (sysrootdest)) 1057 os.system(bb.data.expand('cp -pPR ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}/* ${STAGING_DIR_TARGET}/', d))
1059 bb.utils.unlockfile(lock) 1058 bb.utils.unlockfile(lock)
1060} 1059}
1061 1060
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 44f657a2c0..b9d59bbd8a 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -297,7 +297,7 @@ populate_staging_postamble () {
297 fi 297 fi
298} 298}
299 299
300packagedstageing_fastpath () { 300packagedstaging_fastpath () {
301 if [ "$PSTAGING_ACTIVE" = "1" ]; then 301 if [ "$PSTAGING_ACTIVE" = "1" ]; then
302 mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/ 302 mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/
303 mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/ 303 mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/