diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-11-06 15:16:38 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-11-06 15:16:38 +0000 |
| commit | f0eb3fa507e436d44b943bedfcd8afa5ff760971 (patch) | |
| tree | 15a57fffc1a01825821f35508fc84ce2a08fd93e /classes/base.bbclass | |
| parent | 51d30ada0db9ff322925628fe9d965687685f52d (diff) | |
| parent | b8a64f32a1bd74900ef43067e40fa1153c5f27cc (diff) | |
merge of 'c5d7d939915c058ea8efba4e6e2fa2e5f1648626'
and 'd6978786d6310b56cb0f5a93790659cd481ca0d5'
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() { : |