15 files changed, 14 insertions, 14 deletions
diff --git a/meta/classes/poky-image.bbclass b/meta/classes/core-image.bbclass
index 832319a5ae..832319a5ae 100644
--- a/meta/classes/poky-image.bbclass
+++ b/meta/classes/core-image.bbclass
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 6d9e4074fa..5ba1b06f29 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -40,7 +40,7 @@ BBMASK = ""
 # "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
 # "debug-tweaks"   - make an image for suitable of development
 #                    e.g. ssh root access has a blank password
-# There are other application targets too, see meta/classes/poky-image.bbclass 
+# There are other application targets too, see meta/classes/core-image.bbclass 
 # and meta/packages/tasks/task-core.bb for more details.
 
 EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
diff --git a/meta/recipes-core/images/core-image-base.bb b/meta/recipes-core/images/core-image-base.bb
index 461b805b60..13a76508a0 100644
--- a/meta/recipes-core/images/core-image-base.bb
+++ b/meta/recipes-core/images/core-image-base.bb
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core"
 
 LICENSE = "MIT"
 
-inherit poky-image
+inherit core-image
diff --git a/meta/recipes-core/images/core-image-core.bb b/meta/recipes-core/images/core-image-core.bb
index c232ccdc54..57ff0850da 100644
--- a/meta/recipes-core/images/core-image-core.bb
+++ b/meta/recipes-core/images/core-image-core.bb
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${X11_IMAGE_FEATURES}"
 
 LICENSE = "MIT"
 
-inherit poky-image
+inherit core-image
diff --git a/meta/recipes-core/images/core-image-minimal-dev.bb b/meta/recipes-core/images/core-image-minimal-dev.bb
index 248d29f031..89ec9f8833 100644
--- a/meta/recipes-core/images/core-image-minimal-dev.bb
+++ b/meta/recipes-core/images/core-image-minimal-dev.bb
@@ -9,7 +9,7 @@ IMAGE_LINGUAS = " "
 
 LICENSE = "MIT"
 
-inherit poky-image
+inherit core-image
 
 # remove not needed ipkg informations
 ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 3da4a952f7..21aaa6c70e 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -7,4 +7,4 @@ IMAGE_LINGUAS = ""
 
 LICENSE = "MIT"
 
-inherit poky-image
+inherit core-image
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb
index 3aae04edde..aa00e67c1a 100644
--- a/meta/recipes-core/images/core-image-minimal.bb
+++ b/meta/recipes-core/images/core-image-minimal.bb
@@ -7,7 +7,7 @@ IMAGE_LINGUAS = " "
 
 LICENSE = "MIT"
 
-inherit poky-image
+inherit core-image
 
 # remove not needed ipkg informations
 ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; "
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index 86972c3660..ba71cd091e 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -7,4 +7,4 @@ IMAGE_INSTALL = "\
 
 #    ${POKY_BASE_INSTALL} 
 
-inherit poky-image
+inherit core-image
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 86baf23de1..9ef85ff8aa 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -6,4 +6,4 @@ IMAGE_INSTALL = "\
     task-core-lsb \
     "
 
-inherit poky-image
+inherit core-image
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 74ad1d2d8c..f6de73cdca 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -6,4 +6,4 @@ IMAGE_INSTALL = "\
     task-core-lsb \
     "
 
-inherit poky-image
+inherit core-image
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index 63180f5613..22eb7f48e9 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -6,4 +6,4 @@ IMAGE_INSTALL = "\
     task-core-lsb \
     "
 
-inherit poky-image
+inherit core-image
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 66839f4f96..7d50405617 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -8,4 +8,4 @@ IMAGE_INSTALL = "\
     task-core-clutter-tests \
     task-core-clutter-apps"
 
-inherit poky-image
+inherit core-image
diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb
index 429095e19e..7322b4afbe 100644
--- a/meta/recipes-sato/images/core-image-sato-dev.bb
+++ b/meta/recipes-sato/images/core-image-sato-dev.bb
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs"
 
 LICENSE = "MIT"
 
-inherit poky-image
+inherit core-image
diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb
index 9f8eef9a52..ee9d799c31 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk.bb
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-pr
 
 LICENSE = "MIT"
 
-inherit poky-image
+inherit core-image
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
index 35d1a53c32..3465174a5b 100644
--- a/meta/recipes-sato/images/core-image-sato.bb
+++ b/meta/recipes-sato/images/core-image-sato.bb
@@ -6,4 +6,4 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
 
 LICENSE = "MIT"
 
-inherit poky-image
+inherit core-image