[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4513/8267] image: rename image-wic -> image_types_wic



commit faa2823801b77c3ba399deecc3068b2d2b7b6c7f
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed Feb 1 17:27:49 2017 +0200

    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>

 meta/classes/image.bbclass                         |    5 +++--
 .../{image-wic.bbclass => image_types_wic.bbclass} |    0
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 613cd92..b5a4fb4 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
similarity index 100%
rename from meta/classes/image-wic.bbclass
rename to meta/classes/image_types_wic.bbclass


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]