summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2011-11-07 13:20:04 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-08 21:48:18 +0000
commit4115f94f221a8b88493a6a4b99262b83016496f5 (patch)
tree75a47dce4c4d0c4032a9ed952559f76a1c7407a4
parent261d611cbef1c2542fc03eed442e8a2238c3841b (diff)
downloadpoky-4115f94f221a8b88493a6a4b99262b83016496f5.tar.gz
poky-4115f94f221a8b88493a6a4b99262b83016496f5.tar.bz2
poky-4115f94f221a8b88493a6a4b99262b83016496f5.zip
Add new IMAGE_CLASSES variable for classes for image generation
Allows us to import classes only for images and not to the global namespace (From OE-Core rev: 49dcb301ab39327554d86d23cf6f8d435d7a7351) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto/conf/local.conf.sample.extended6
-rw-r--r--meta/classes/image.bbclass3
2 files changed, 8 insertions, 1 deletions
diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended
index 0c3197d7f7..e9935ce958 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/meta-yocto/conf/local.conf.sample.extended
@@ -114,3 +114,9 @@
# The network based PR service host and port
#PRSERV_HOST = "localhost"
#PRSERV_PORT = "8585"
+
+# Additional image generation features
+#
+# The following is a list of classes to import to use in the generation of images
+# currently an example class is image_types_uboot
+# IMAGE_CLASSES = " image_types_uboot"
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 48b78da79b..14726d2537 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -109,7 +109,8 @@ def get_devtable_list(d):
str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
return str
-inherit image_types
+IMAGE_CLASSES ?= "image_types"
+inherit ${IMAGE_CLASSES}
IMAGE_POSTPROCESS_COMMAND ?= ""
MACHINE_POSTPROCESS_COMMAND ?= ""