From 33fa4b551d08387932eb6d5797afc9e2436ceba1 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 5 Sep 2012 09:39:42 +0100 Subject: Rename task -> packagegroup This matches the new naming scheme in OE-Core. Signed-off-by: Paul Eggleton --- recipes-opie/images/opie-image-16mb.bb | 16 ++++++++-------- recipes-opie/images/opie-image.bb | 18 +++++++++--------- recipes-opie/images/opie-xqtlauncher-image.bb | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'recipes-opie/images') diff --git a/recipes-opie/images/opie-image-16mb.bb b/recipes-opie/images/opie-image-16mb.bb index 253c005..be06009 100644 --- a/recipes-opie/images/opie-image-16mb.bb +++ b/recipes-opie/images/opie-image-16mb.bb @@ -2,17 +2,17 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 IMAGE_LINGUAS = "" -DEPENDS = "task-boot task-opie-16mb" +DEPENDS = "packagegroup-boot packagegroup-opie-16mb" ANGSTROM_EXTRA_INSTALL ?= "" -IMAGE_INSTALL = "task-boot \ +IMAGE_INSTALL = "packagegroup-core-boot \ dropbear \ - task-opie-16mb-base \ - task-opie-16mb-applets \ - task-opie-16mb-inputmethods \ - task-opie-16mb-settings \ - task-opie-16mb-apps \ - task-opie-16mb-pim \ + packagegroup-opie-16mb-base \ + packagegroup-opie-16mb-applets \ + packagegroup-opie-16mb-inputmethods \ + packagegroup-opie-16mb-settings \ + packagegroup-opie-16mb-apps \ + packagegroup-opie-16mb-pim \ ${ANGSTROM_EXTRA_INSTALL} " inherit image diff --git a/recipes-opie/images/opie-image.bb b/recipes-opie/images/opie-image.bb index f39b108..c73b6fa 100644 --- a/recipes-opie/images/opie-image.bb +++ b/recipes-opie/images/opie-image.bb @@ -2,19 +2,19 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3 IMAGE_LINGUAS = "" -DEPENDS = "task-base task-opie" +DEPENDS = "packagegroup-base packagegroup-opie" IMAGE_FEATURES = "ssh-server-dropbear" ANGSTROM_EXTRA_INSTALL ?= "" -IMAGE_INSTALL = "task-core-boot task-base ${ROOTFS_PKGMANAGE} \ - task-opie-base task-opie-base-applets \ - task-opie-base-inputmethods task-opie-base-apps \ - task-opie-base-settings task-opie-base-decorations \ - task-opie-base-styles task-opie-base-pim \ - task-opie-extra-settings \ - ${@base_contains("COMBINED_FEATURES", "bluetooth", "task-opie-bluetooth", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "irda", "task-opie-irda", "",d)} \ +IMAGE_INSTALL = "packagegroup-core-boot packagegroup-base ${ROOTFS_PKGMANAGE} \ + packagegroup-opie-base packagegroup-opie-base-applets \ + packagegroup-opie-base-inputmethods packagegroup-opie-base-apps \ + packagegroup-opie-base-settings packagegroup-opie-base-decorations \ + packagegroup-opie-base-styles packagegroup-opie-base-pim \ + packagegroup-opie-extra-settings \ + ${@base_contains("COMBINED_FEATURES", "bluetooth", "packagegroup-opie-bluetooth", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "irda", "packagegroup-opie-irda", "",d)} \ ${ANGSTROM_EXTRA_INSTALL} " inherit core-image diff --git a/recipes-opie/images/opie-xqtlauncher-image.bb b/recipes-opie/images/opie-xqtlauncher-image.bb index db32a1e..7840533 100644 --- a/recipes-opie/images/opie-xqtlauncher-image.bb +++ b/recipes-opie/images/opie-xqtlauncher-image.bb @@ -1,7 +1,7 @@ require opie-image.bb -DEPENDS += "task-xqtlauncher" +DEPENDS += "packagegroup-xqtlauncher" export IMAGE_BASENAME = "opie-xqtlauncher-image" -IMAGE_INSTALL += "task-xqtlauncher task-xqtlauncher-blackbox" +IMAGE_INSTALL += "packagegroup-xqtlauncher packagegroup-xqtlauncher-blackbox" -- cgit 1.2.3-korg