summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-02-01 17:27:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-05 09:20:23 +0000
commit4aab1b77d5f9403cbb3fae790069ef54821491fb (patch)
tree77f94345bc8a06313754e65c079b0184461712de
parent3c01367dfd945d528d330b228807da5d1f60ffb0 (diff)
downloadopenembedded-core-contrib-4aab1b77d5f9403cbb3fae790069ef54821491fb.tar.gz
openembedded-core-contrib-4aab1b77d5f9403cbb3fae790069ef54821491fb.tar.bz2
openembedded-core-contrib-4aab1b77d5f9403cbb3fae790069ef54821491fb.zip
image: rename image-wic -> image_types_wic
Make name of the wic image type class consistent with existing naming scheme for image types. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/image.bbclass5
-rw-r--r--meta/classes/image_types_wic.bbclass (renamed from meta/classes/image-wic.bbclass)0
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 613cd92600..b5a4fb4a33 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -151,6 +151,9 @@ def build_uboot(d):
IMAGE_TYPE_uboot = "${@build_uboot(d)}"
inherit ${IMAGE_TYPE_uboot}
+IMAGE_TYPE_wic = "image_types_wic"
+inherit ${IMAGE_TYPE_wic}
+
python () {
deps = " " + imagetypes_getdepends(d)
d.appendVarFlag('do_rootfs', 'depends', deps)
@@ -187,8 +190,6 @@ python () {
IMAGE_CLASSES += "image_types"
inherit ${IMAGE_CLASSES}
-inherit image-wic
-
IMAGE_POSTPROCESS_COMMAND ?= ""
# some default locales
diff --git a/meta/classes/image-wic.bbclass b/meta/classes/image_types_wic.bbclass
index 3e98959ed1..3e98959ed1 100644
--- a/meta/classes/image-wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass