summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-08-20 22:07:17 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-08-20 22:07:17 +0000
commit959a8d0369208ec82a46f14e265dd8ab58668ef9 (patch)
treeb7238d6e3bbeb0338f4a929daad393cdf0fa07f2 /classes
parenteeb54f606de6ef294b91394df97da3b0f90bdefc (diff)
classes: Add task dependencies expressions, as required for the new multithreading version of bitbake. Also, set BB_DEFAULT_TASK to specify the default task (build) rather than hardcode into bitbake.
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass2
-rw-r--r--classes/debian.bbclass4
-rw-r--r--classes/image_ipk.bbclass3
-rw-r--r--classes/package.bbclass2
4 files changed, 10 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index e36c3e3aa3..7e526e17da 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -1,3 +1,4 @@
+BB_DEFAULT_TASK = "build"
PATCHES_DIR="${S}"
def base_dep_prepend(d):
@@ -584,6 +585,7 @@ python base_eventhandler() {
addtask configure after do_unpack do_patch
do_configure[dirs] = "${S} ${B}"
do_configure[bbdepcmd] = "do_populate_staging"
+do_configure[deptask] = "do_populate_staging"
base_do_configure() {
:
}
diff --git a/classes/debian.bbclass b/classes/debian.bbclass
index 5688dad93b..698d917b51 100644
--- a/classes/debian.bbclass
+++ b/classes/debian.bbclass
@@ -6,6 +6,10 @@ STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian"
# depends are correct
BUILD_ALL_DEPS = "1"
+# Better expressed as ensure all RDEPENDS package before we package
+# This means we can't have circular RDEPENDS/RRECOMMENDS
+do_package[rdeptask] = "do_package"
+
python debian_package_name_hook () {
import glob, copy, stat, errno, re
diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass
index d3923f06a2..83e9acf315 100644
--- a/classes/image_ipk.bbclass
+++ b/classes/image_ipk.bbclass
@@ -1,7 +1,8 @@
inherit rootfs_ipk
-# We need to follow RDEPENDS and RRECOMMENDS for images
+# We need to recursively follow RDEPENDS and RRECOMMENDS for images
BUILD_ALL_DEPS = "1"
+do_rootfs[recrdeptask] = "do_package"
# Images are generally built explicitly, do not need to be part of world.
EXCLUDE_FROM_WORLD = "1"
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 2791e4bcfa..0d6a7734af 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -734,6 +734,8 @@ python package_do_package () {
}
do_package[dirs] = "${D}"
+# shlibs requires any DEPENDS to have already packaged for the *.list files
+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