summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-08-25 18:14:28 +0000
committerKoen Kooi <koen@openembedded.org>2006-08-25 18:14:28 +0000
commit6bdb98734e08cf7f1adb65a39ddfc108b1e85b45 (patch)
treef2976624ce9ad11f731bd041570916c243c3a4f8 /classes
parentb3556207e1db3ecae008038a3d837959de12bc22 (diff)
classes: run do_package before do_stage so we can populate staging with package if we want
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass6
-rw-r--r--classes/package.bbclass2
2 files changed, 3 insertions, 5 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 6f8468b119..f936dff870 100644
--- 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 0d6a7734af..d6f50fb49d 100644
--- 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