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>

diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended
index 0c3197d7f7befcb60c07d807a83c885d582534fa..e9935ce95807f804c6dca8d3ca656dcc612e005b 100644 (file)
--- 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 48b78da79bf509d068341384fd8f87fce528d6f8..14726d253743ac0c4042a5272a853c58c75cdc56 100644 (file)
--- 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 ?= ""