summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-03-04 23:09:10 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-03-04 23:09:10 +0000
commit4eed8953330ec0271dbc366f4f7f619740a8875b (patch)
tree65f3fcd879be6b814dfc03290aa1d2ced8d9f17a
parente6985b5c0b33823d00081c6276da87e9d35b46c5 (diff)
parenta526b2c8b8f286a02ce0045b36ad44b300cb93e7 (diff)
merge of '16f0fa7ec858ba228dd9d241b0cff7a309a42dff'
and '8a98b05914e98533aa6ec6041337074cd4a83fe6'
-rw-r--r--classes/base.bbclass2
-rw-r--r--classes/packaged-staging.bbclass2
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 7609c05851..615d02d07e 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -1,4 +1,4 @@
-BB_DEFAULT_TASK = "build"
+BB_DEFAULT_TASK ?= "build"
# like os.path.join but doesn't treat absolute RHS specially
def base_path_join(a, *p):
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 29ce72d65c..d822a86820 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -225,5 +225,5 @@ python do_package_stage () {
bb.utils.unlockfile(lf)
}
-addtask package_stage after do_package_write_ipk do_package_write_deb do_package_write do_populate_staging before do_build
+addtask package_stage after do_package_write do_populate_staging before do_build