diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-10-31 13:46:47 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-31 13:46:47 +0000 |
| commit | 44cbb9985f111ce87e6990061c89e2e061b6c6ea (patch) | |
| tree | f26c7f7df66d468547e5b5cc8ba8dc328c44f08d /classes/base.bbclass | |
| parent | 43b6ecbcb39354a32e0b8dd7c02ec8789be0ab9a (diff) | |
| parent | 821528ad116a72c2323d88d21e979614c78f1b41 (diff) | |
propagate from branch 'org.openembedded.dev' (head a6b798a43c05aef43ed650ab880f3edd386d0aa3)
to branch 'org.openembedded.dev.avr32' (head 77e1041de2eef682f183f3f5199826818cb9c5b1)
Diffstat (limited to 'classes/base.bbclass')
| -rw-r--r-- | classes/base.bbclass | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 2cf205fbe9..c504f78283 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -387,9 +387,6 @@ oe_machinstall() { fi } -# Remove and re-create ${D} so that is it guaranteed to be empty -do_install[cleandirs] = "${D}" - addtask listtasks do_listtasks[nostamp] = "1" python do_listtasks() { @@ -687,10 +684,10 @@ base_do_stage () { : } -do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${TARGET_SYS}/lib \ - ${STAGING_DIR}/${TARGET_SYS}/include \ - ${STAGING_DIR}/${BUILD_SYS}/bin ${STAGING_DIR}/${BUILD_SYS}/lib \ - ${STAGING_DIR}/${BUILD_SYS}/include \ +do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/bin ${STAGING_DIR_TARGET}/lib \ + ${STAGING_DIR_TARGET}/include \ + ${STAGING_BINDIR_NATIVE} ${STAGING_LIBDIR_NATIVE} \ + ${STAGING_INCDIR_NATIVE} \ ${STAGING_DATADIR} \ ${S} ${B}" @@ -703,6 +700,8 @@ python do_populate_staging () { addtask install after do_compile do_install[dirs] = "${D} ${S} ${B}" +# Remove and re-create ${D} so that is it guaranteed to be empty +do_install[cleandirs] = "${D}" base_do_install() { : |