[oe-commits] org.oe.dev classes: run do_package before do_stage so we can populate staging with package if we want

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: d6f3bb8607dabe43539791a91bd897b0f9089cf2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d6f3bb8607dabe43539791a91bd897b0f9089cf2
Files:
1
classes/base.bbclass
classes/package.bbclass
Diffs:

#
# mt diff -r5cca4bb7c1bd065bd0287c8f55c06d7ed9b6e42f -rd6f3bb8607dabe43539791a91bd897b0f9089cf2
#
# 
# 
# patch "classes/base.bbclass"
#  from [4d428844c1693f67fb33bc7c876c1ab96af0725a]
#    to [f26b8b2c6209a332a58ab50a0fef6843f0ab959b]
# 
# patch "classes/package.bbclass"
#  from [a46a04647863c34bbe64ec6550b02ab2ae2e3093]
#    to [f357e0718ac3153b32e6644b56fa44edae3c9346]
# 
============================================================
--- classes/base.bbclass	4d428844c1693f67fb33bc7c876c1ab96af0725a
+++ classes/base.bbclass	f26b8b2c6209a332a58ab50a0fef6843f0ab959b
@@ -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_D
 			     ${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() {
============================================================
--- classes/package.bbclass	a46a04647863c34bbe64ec6550b02ab2ae2e3093
+++ classes/package.bbclass	f357e0718ac3153b32e6644b56fa44edae3c9346
@@ -738,4 +738,4 @@ EXPORT_FUNCTIONS do_package do_shlibs do
 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_install
-addtask package before do_build after do_populate_staging