summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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):
151IMAGE_TYPE_uboot = "${@build_uboot(d)}" 151IMAGE_TYPE_uboot = "${@build_uboot(d)}"
152inherit ${IMAGE_TYPE_uboot} 152inherit ${IMAGE_TYPE_uboot}
153 153
154IMAGE_TYPE_wic = "image_types_wic"
155inherit ${IMAGE_TYPE_wic}
156
154python () { 157python () {
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 () {
187IMAGE_CLASSES += "image_types" 190IMAGE_CLASSES += "image_types"
188inherit ${IMAGE_CLASSES} 191inherit ${IMAGE_CLASSES}
189 192
190inherit image-wic
191
192IMAGE_POSTPROCESS_COMMAND ?= "" 193IMAGE_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