diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-02-01 17:27:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-05 09:22:18 +0000 |
commit | faa2823801b77c3ba399deecc3068b2d2b7b6c7f (patch) | |
tree | ec68a48e8e47b97fcadf1fd30ccac56280d63c1f /meta | |
parent | 67ed7f76dd5dc5a2920f1a824514dcbd996db7b5 (diff) | |
download | poky-faa2823801b77c3ba399deecc3068b2d2b7b6c7f.tar.gz |
image: rename image-wic -> image_types_wic
Make name of the wic image type class consistent with
existing naming scheme for image types.
(From OE-Core rev: 4aab1b77d5f9403cbb3fae790069ef54821491fb)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/image.bbclass | 5 | ||||
-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): | |||
151 | IMAGE_TYPE_uboot = "${@build_uboot(d)}" | 151 | IMAGE_TYPE_uboot = "${@build_uboot(d)}" |
152 | inherit ${IMAGE_TYPE_uboot} | 152 | inherit ${IMAGE_TYPE_uboot} |
153 | 153 | ||
154 | IMAGE_TYPE_wic = "image_types_wic" | ||
155 | inherit ${IMAGE_TYPE_wic} | ||
156 | |||
154 | python () { | 157 | python () { |
155 | deps = " " + imagetypes_getdepends(d) | 158 | deps = " " + imagetypes_getdepends(d) |
156 | d.appendVarFlag('do_rootfs', 'depends', deps) | 159 | d.appendVarFlag('do_rootfs', 'depends', deps) |
@@ -187,8 +190,6 @@ python () { | |||
187 | IMAGE_CLASSES += "image_types" | 190 | IMAGE_CLASSES += "image_types" |
188 | inherit ${IMAGE_CLASSES} | 191 | inherit ${IMAGE_CLASSES} |
189 | 192 | ||
190 | inherit image-wic | ||
191 | |||
192 | IMAGE_POSTPROCESS_COMMAND ?= "" | 193 | IMAGE_POSTPROCESS_COMMAND ?= "" |
193 | 194 | ||
194 | # some default locales | 195 | # 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 | |||