From 4a35cdda31fe083ae465423b76b06fb9bdaa691d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Apr 2011 23:49:29 +0100 Subject: Rename poky-image.bbclass to core-image.bbclass Signed-off-by: Richard Purdie --- meta/classes/core-image.bbclass | 110 +++++++++++++++++++++ meta/classes/poky-image.bbclass | 110 --------------------- meta/conf/local.conf.sample | 2 +- meta/recipes-core/images/core-image-base.bb | 2 +- meta/recipes-core/images/core-image-core.bb | 2 +- meta/recipes-core/images/core-image-minimal-dev.bb | 2 +- .../images/core-image-minimal-initramfs.bb | 2 +- meta/recipes-core/images/core-image-minimal.bb | 2 +- meta/recipes-extended/images/core-image-basic.bb | 2 +- meta/recipes-extended/images/core-image-lsb-dev.bb | 2 +- meta/recipes-extended/images/core-image-lsb-sdk.bb | 2 +- meta/recipes-extended/images/core-image-lsb.bb | 2 +- meta/recipes-graphics/images/core-image-clutter.bb | 2 +- meta/recipes-sato/images/core-image-sato-dev.bb | 2 +- meta/recipes-sato/images/core-image-sato-sdk.bb | 2 +- meta/recipes-sato/images/core-image-sato.bb | 2 +- 16 files changed, 124 insertions(+), 124 deletions(-) create mode 100644 meta/classes/core-image.bbclass delete mode 100644 meta/classes/poky-image.bbclass diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass new file mode 100644 index 000000000..832319a5a --- /dev/null +++ b/meta/classes/core-image.bbclass @@ -0,0 +1,110 @@ +# Common for Poky images +# +# Copyright (C) 2007 OpenedHand LTD + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +# IMAGE_FEATURES control content of images built with Poky. +# +# By default we install task-core-boot and task-base packages - this gives us +# working (console only) rootfs. +# +# Available IMAGE_FEATURES: +# +# - apps-console-core +# - x11-base - X11 server + minimal desktop +# - x11-sato - OpenedHand Sato environment +# - x11-netbook - Metacity based environment for netbooks +# - apps-x11-core - X Terminal, file manager, file editor +# - apps-x11-games +# - apps-x11-pimlico - OpenedHand Pimlico apps +# - tools-sdk - SDK +# - tools-debug - debugging tools +# - tools-profile - profiling tools +# - tools-testapps - tools usable to make some device tests +# - nfs-server - NFS server (exports / over NFS to everybody) +# - ssh-server-dropbear - SSH server (dropbear) +# - ssh-server-openssh - SSH server (openssh) +# - dev-pkgs - development packages +# - dbg-pkgs - debug packages +# + +POKY_BASE_INSTALL = '\ + task-core-boot \ + task-base-extended \ + ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-core-boot-dbg task-base-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-core-boot-dev task-base-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-core-apps-console", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-core-apps-console-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-core-apps-console-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "x11-base", "task-core-x11-base", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-core-x11-base-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-core-x11-base-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-core-x11-sato", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-core-x11-sato-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-core-x11-sato-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-core-x11-netbook", "", d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-core-x11-netbook-dbg", "", d)} \ + ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-core-x11-netbook-dev", "", d)} \ + ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-core-apps-x11-core", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-core-apps-x11-core-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-core-apps-x11-core-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-core-apps-x11-games", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-core-apps-x11-games-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-core-apps-x11-games-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-core-apps-x11-pimlico", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-core-apps-x11-pimlico-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-core-apps-x11-pimlico-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "tools-debug", "task-core-tools-debug", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"], "task-core-tools-debug-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"], "task-core-tools-debug-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "tools-profile", "task-core-tools-profile", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"], "task-core-tools-profile-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"], "task-core-tools-profile-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "tools-testapps", "task-core-tools-testapps", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"], "task-core-tools-testapps-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"], "task-core-tools-testapps-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "tools-sdk", "task-core-sdk task-core-standalone-sdk-target", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"], "task-core-sdk-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"], "task-core-sdk-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-core-nfs-server", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-core-nfs-server-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-core-nfs-server-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "ssh-server-dropbear", "task-core-ssh-dropbear", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dbg-pkgs"], "task-core-ssh-dropbear-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dev-pkgs"], "task-core-ssh-dropbear-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "ssh-server-openssh", "task-core-ssh-openssh", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dbg-pkgs"], "task-core-ssh-openssh-dbg", "",d)} \ + ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dev-pkgs"], "task-core-ssh-openssh-dev", "",d)} \ + \ + ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \ + ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-core-qt-demos", "",d)} \ + ${POKY_EXTRA_INSTALL} \ + ' + +POKY_EXTRA_INSTALL ?= "" + +IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}" + +X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" +ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" +SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear" + +inherit image + +# Create /etc/timestamp during image construction to give a reasonably sane default time setting +ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " diff --git a/meta/classes/poky-image.bbclass b/meta/classes/poky-image.bbclass deleted file mode 100644 index 832319a5a..000000000 --- a/meta/classes/poky-image.bbclass +++ /dev/null @@ -1,110 +0,0 @@ -# Common for Poky images -# -# Copyright (C) 2007 OpenedHand LTD - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -# IMAGE_FEATURES control content of images built with Poky. -# -# By default we install task-core-boot and task-base packages - this gives us -# working (console only) rootfs. -# -# Available IMAGE_FEATURES: -# -# - apps-console-core -# - x11-base - X11 server + minimal desktop -# - x11-sato - OpenedHand Sato environment -# - x11-netbook - Metacity based environment for netbooks -# - apps-x11-core - X Terminal, file manager, file editor -# - apps-x11-games -# - apps-x11-pimlico - OpenedHand Pimlico apps -# - tools-sdk - SDK -# - tools-debug - debugging tools -# - tools-profile - profiling tools -# - tools-testapps - tools usable to make some device tests -# - nfs-server - NFS server (exports / over NFS to everybody) -# - ssh-server-dropbear - SSH server (dropbear) -# - ssh-server-openssh - SSH server (openssh) -# - dev-pkgs - development packages -# - dbg-pkgs - debug packages -# - -POKY_BASE_INSTALL = '\ - task-core-boot \ - task-base-extended \ - ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-core-boot-dbg task-base-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-core-boot-dev task-base-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "apps-console-core", "task-core-apps-console", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dbg-pkgs"], "task-core-apps-console-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-console-core", "dev-pkgs"], "task-core-apps-console-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "x11-base", "task-core-x11-base", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-base", "dbg-pkgs"], "task-core-x11-base-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-base", "dev-pkgs"], "task-core-x11-base-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "x11-sato", "task-core-x11-sato", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dbg-pkgs"], "task-core-x11-sato-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-sato", "dev-pkgs"], "task-core-x11-sato-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "x11-netbook", "task-core-x11-netbook", "", d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dbg-pkgs"], "task-core-x11-netbook-dbg", "", d)} \ - ${@base_contains("IMAGE_FEATURES", ["x11-netbook", "dev-pkgs"], "task-core-x11-netbook-dev", "", d)} \ - ${@base_contains("IMAGE_FEATURES", "apps-x11-core", "task-core-apps-x11-core", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dbg-pkgs"], "task-core-apps-x11-core-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-core", "dev-pkgs"], "task-core-apps-x11-core-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "apps-x11-games", "task-core-apps-x11-games", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dbg-pkgs"], "task-core-apps-x11-games-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-games", "dev-pkgs"], "task-core-apps-x11-games-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "apps-x11-pimlico", "task-core-apps-x11-pimlico", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dbg-pkgs"], "task-core-apps-x11-pimlico-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["apps-x11-pimlico", "dev-pkgs"], "task-core-apps-x11-pimlico-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "tools-debug", "task-core-tools-debug", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dbg-pkgs"], "task-core-tools-debug-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-debug", "dev-pkgs"], "task-core-tools-debug-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "tools-profile", "task-core-tools-profile", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dbg-pkgs"], "task-core-tools-profile-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-profile", "dev-pkgs"], "task-core-tools-profile-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "tools-testapps", "task-core-tools-testapps", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dbg-pkgs"], "task-core-tools-testapps-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-testapps", "dev-pkgs"], "task-core-tools-testapps-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "tools-sdk", "task-core-sdk task-core-standalone-sdk-target", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dbg-pkgs"], "task-core-sdk-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["tools-sdk", "dev-pkgs"], "task-core-sdk-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "nfs-server", "task-core-nfs-server", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dbg-pkgs"], "task-core-nfs-server-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["nfs-server", "dev-pkgs"], "task-core-nfs-server-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "ssh-server-dropbear", "task-core-ssh-dropbear", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dbg-pkgs"], "task-core-ssh-dropbear-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-dropbear", "dev-pkgs"], "task-core-ssh-dropbear-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "ssh-server-openssh", "task-core-ssh-openssh", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dbg-pkgs"], "task-core-ssh-openssh-dbg", "",d)} \ - ${@base_contains("IMAGE_FEATURES", ["ssh-server-openssh", "dev-pkgs"], "task-core-ssh-openssh-dev", "",d)} \ - \ - ${@base_contains("IMAGE_FEATURES", "package-management", "${ROOTFS_PKGMANAGE}", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \ - ${@base_contains("IMAGE_FEATURES", "qt4-pkgs", "task-core-qt-demos", "",d)} \ - ${POKY_EXTRA_INSTALL} \ - ' - -POKY_EXTRA_INSTALL ?= "" - -IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}" - -X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management" -ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management" -SATO_IMAGE_FEATURES = "${ENHANCED_IMAGE_FEATURES} x11-sato ssh-server-dropbear" - -inherit image - -# Create /etc/timestamp during image construction to give a reasonably sane default time setting -ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample index 6d9e4074f..5ba1b06f2 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 461b805b6..13a76508a 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 c232ccdc5..57ff0850d 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 248d29f03..89ec9f883 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 3da4a952f..21aaa6c70 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 3aae04edd..aa00e67c1 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 86972c366..ba71cd091 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 86baf23de..9ef85ff8a 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 74ad1d2d8..f6de73cdc 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 63180f561..22eb7f48e 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 66839f4f9..7d5040561 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 429095e19..7322b4afb 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 9f8eef9a5..ee9d799c3 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 35d1a53c3..3465174a5 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 -- cgit v1.2.3