summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass6
-rw-r--r--meta/classes/debian.bbclass4
-rw-r--r--meta/classes/image_ipk.bbclass5
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/classes/rootfs_ipk.bbclass1
5 files changed, 14 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 2cd6ef4c0..bb6171f19 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -337,7 +337,7 @@ python base_do_mrproper() {
addtask fetch
do_fetch[dirs] = "${DL_DIR}"
-do_fetch[nostamp] = "1"
+#do_fetch[nostamp] = "1"
python base_do_fetch() {
import sys
@@ -557,7 +557,8 @@ python base_eventhandler() {
msg += messages.get(name[5:]) or name[5:]
elif name == "UnsatisfiedDep":
msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower())
- note(msg)
+ if msg:
+ note(msg)
if name.startswith("BuildStarted"):
bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
@@ -598,6 +599,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/meta/classes/debian.bbclass b/meta/classes/debian.bbclass
index 5688dad93..698d917b5 100644
--- a/meta/classes/debian.bbclass
+++ b/meta/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/meta/classes/image_ipk.bbclass b/meta/classes/image_ipk.bbclass
index c2f1c8d68..6c47e29f6 100644
--- a/meta/classes/image_ipk.bbclass
+++ b/meta/classes/image_ipk.bbclass
@@ -1,13 +1,16 @@
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"
USE_DEVFS ?= "0"
+PR = "${DATE}-${TIME}"
+
DEPENDS += "makedevs-native"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index e67fb749f..c7f366e19 100644
--- a/meta/classes/package.bbclass
+++ b/meta/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
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 8f9fddde1..393ad320c 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -10,7 +10,6 @@ DEPENDS_append=" ${EXTRA_IMAGEDEPENDS}"
PACKAGES = ""
-do_rootfs[nostamp] = 1
do_rootfs[dirs] = ${TOPDIR}
do_build[nostamp] = 1