classes: run do_package before do_stage so we can populate staging with package if...

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 6f8468b119491b1aa2d171e01275921b1df8fc7d..f936dff870419157b4bd347a7041f285a2f9037d 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -601,8 +601,6 @@ base_do_compile() {
        fi
 }
 
-
-addtask stage after do_compile
 base_do_stage () {
        :
 }
@@ -614,13 +612,13 @@ 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
+addtask install after do_compile 
 do_install[dirs] = "${S} ${B}"
 
 base_do_install() {

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 0d6a7734af0d002c1dffff7795a307a47c6a46d6..d6f50fb49d765cbff548fcbcb75bf78e6dc197e3 100644 (file)
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -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