classes: Reorder tasks so staging occurs after packaging. Add do_install into the task chain with dirs fix. Changes merged from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@727 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 4 insertions, 5 deletions

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 6faeb979c5..a36829006e 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -548,7 +548,6 @@ base_do_compile() {
 }
 
 
-addtask stage after do_compile
 base_do_stage () {
         :
 }
@@ -560,14 +559,14 @@ do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${T
                              ${STAGING_DATADIR} \
                              ${S} ${B}"
 
-addtask populate_staging after do_compile
+addtask populate_staging after do_package
 
 python do_populate_staging () {
         bb.build.exec_func('do_stage', d)
 }
 
 addtask install after do_compile
-do_install[dirs] = "${S} ${B}"
+do_install[dirs] = "${D} ${S} ${B}"
 
 base_do_install() {
         :
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index c7f366e19b..8a7760724e 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -725,7 +725,7 @@ python package_do_split_locales() {
         bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d)
 }
 
-PACKAGEFUNCS = "do_install package_do_split_locales \
+PACKAGEFUNCS = "package_do_split_locales \
                 populate_packages package_do_shlibs \
                 package_do_pkgconfig read_shlibdeps"
 python package_do_package () {
@@ -738,4 +738,4 @@ do_package[dirs] = "${D}"
 do_package[deptask] = "do_package"
 populate_packages[dirs] = "${D}"
 EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook
-addtask package before do_build after do_populate_staging
+addtask package before do_build after do_install