aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2010-11-12 00:00:20 -0500
committerCliff Brake <cbrake@bec-systems.com>2010-11-12 00:00:20 -0500
commit3c6efe8f8abc16668ca5e9cdf7a46665dac87172 (patch)
tree642c13416b99e80f0871cdc6668e832e635dfb48 /classes
parentc400c874f2ac9233b8a43a73309b6e7907289c54 (diff)
parent13fbe7253c95881ede787004a4c3a1c31502e5c6 (diff)
downloadopenembedded-testing.tar.gz
openembedded-testing.tar.bz2
openembedded-testing.zip
Merge branch 'master' into testing-nexttested_2010-11-12testing
Diffstat (limited to 'classes')
-rw-r--r--classes/image.bbclass3
-rw-r--r--classes/meta.bbclass4
-rw-r--r--classes/srctree.bbclass2
3 files changed, 6 insertions, 3 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 583e9c4036..d98ba5cbba 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -33,7 +33,8 @@ IMAGE_BOOT ?= "${IMAGE_INITSCRIPTS} \
IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
LINGUAS_INSTALL = ""
-LINGUAS_INSTALL_linux = "glibc-localedata-i18n"
+LINGUAS_INSTALL_linux = "${@base_ifelse(d.getVar('IMAGE_LINGUAS', True), \
+ 'glibc-localedata-i18n', '')}"
LINGUAS_INSTALL_linux += "${@' '.join(map(lambda s: 'locale-base-%s' % s, '${IMAGE_LINGUAS}'.split()))}"
LINGUAS_INSTALL_linux-gnueabi = "${LINGUAS_INSTALL_linux}"
diff --git a/classes/meta.bbclass b/classes/meta.bbclass
index d35c40bccd..d0626e3ea2 100644
--- a/classes/meta.bbclass
+++ b/classes/meta.bbclass
@@ -1,4 +1,4 @@
-
+EXCLUDE_FROM_WORLD = "1"
PACKAGES = ""
-do_build[recrdeptask] = "do_build" \ No newline at end of file
+do_build[recrdeptask] = "do_build"
diff --git a/classes/srctree.bbclass b/classes/srctree.bbclass
index ca19b82214..4884b6246e 100644
--- a/classes/srctree.bbclass
+++ b/classes/srctree.bbclass
@@ -29,6 +29,8 @@ def remove_tasks(deltasks, d):
deps.remove(preptask)
d.setVarFlag(task, "deps", deps)
+addtask configure after do_setscene
+
def merge_tasks(d):
"""
Merges all of the operations that occur prior to do_populate_sysroot