From 6e95cb246f39e4d49d46761b9a7d51c858ac7e9d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Apr 2011 17:25:23 +0100 Subject: Rename poky-image-* -> core-image-* and task-poky-* -> task-core-* (From OE-Core rev: 560b04181d8f51d189b99f01a72f17210dadf7a3) Signed-off-by: Richard Purdie --- meta/recipes-sato/images/core-image-sato-dev.bb | 9 +++ .../images/core-image-sato-directdisk.bb | 9 +++ meta/recipes-sato/images/core-image-sato-live.bb | 11 ++++ .../images/core-image-sato-sdk-directdisk.bb | 9 +++ .../images/core-image-sato-sdk-live.bb | 11 ++++ meta/recipes-sato/images/core-image-sato-sdk.bb | 9 +++ meta/recipes-sato/images/core-image-sato.bb | 9 +++ meta/recipes-sato/images/poky-image-sato-dev.bb | 9 --- .../images/poky-image-sato-directdisk.bb | 9 --- meta/recipes-sato/images/poky-image-sato-live.bb | 11 ---- .../images/poky-image-sato-sdk-directdisk.bb | 9 --- .../images/poky-image-sato-sdk-live.bb | 11 ---- meta/recipes-sato/images/poky-image-sato-sdk.bb | 9 --- meta/recipes-sato/images/poky-image-sato.bb | 9 --- .../tasks/task-core-apps-x11-pimlico.bb | 34 ++++++++++ meta/recipes-sato/tasks/task-core-x11-sato.bb | 34 ++++++++++ meta/recipes-sato/tasks/task-core.bb | 73 ++++++++++++++++++++++ .../tasks/task-poky-apps-x11-pimlico.bb | 34 ---------- meta/recipes-sato/tasks/task-poky-x11-sato.bb | 34 ---------- meta/recipes-sato/tasks/task-poky.bb | 73 ---------------------- 20 files changed, 208 insertions(+), 208 deletions(-) create mode 100644 meta/recipes-sato/images/core-image-sato-dev.bb create mode 100644 meta/recipes-sato/images/core-image-sato-directdisk.bb create mode 100644 meta/recipes-sato/images/core-image-sato-live.bb create mode 100644 meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb create mode 100644 meta/recipes-sato/images/core-image-sato-sdk-live.bb create mode 100644 meta/recipes-sato/images/core-image-sato-sdk.bb create mode 100644 meta/recipes-sato/images/core-image-sato.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-dev.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-directdisk.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-live.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-sdk-directdisk.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-sdk-live.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato-sdk.bb delete mode 100644 meta/recipes-sato/images/poky-image-sato.bb create mode 100644 meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb create mode 100644 meta/recipes-sato/tasks/task-core-x11-sato.bb create mode 100644 meta/recipes-sato/tasks/task-core.bb delete mode 100644 meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb delete mode 100644 meta/recipes-sato/tasks/task-poky-x11-sato.bb delete mode 100644 meta/recipes-sato/tasks/task-poky.bb (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/images/core-image-sato-dev.bb b/meta/recipes-sato/images/core-image-sato-dev.bb new file mode 100644 index 0000000000..429095e19e --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-dev.bb @@ -0,0 +1,9 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs" + +LICENSE = "MIT" + +inherit poky-image diff --git a/meta/recipes-sato/images/core-image-sato-directdisk.bb b/meta/recipes-sato/images/core-image-sato-directdisk.bb new file mode 100644 index 0000000000..1e6aa66832 --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-directdisk.bb @@ -0,0 +1,9 @@ +require recipes-core/images/core-image-directdisk.inc + +DESCRIPTION = "Sato Direct Disk Image" + +LICENSE = "MIT" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-${MACHINE}.ext3" + +do_bootdirectdisk[depends] += "core-image-sato:do_rootfs" diff --git a/meta/recipes-sato/images/core-image-sato-live.bb b/meta/recipes-sato/images/core-image-sato-live.bb new file mode 100644 index 0000000000..9511ca6e74 --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-live.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Sato Bootable Live Image" + +require recipes-core/images/core-image-live.inc + +LABELS += "boot install" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootimg[depends] += "core-image-sato:do_rootfs" diff --git a/meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb b/meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb new file mode 100644 index 0000000000..4c1535a44c --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-sdk-directdisk.bb @@ -0,0 +1,9 @@ +require recipes-core/images/core-image-directdisk.inc + +DESCRIPTION = "Sato SDK Direct Disk Image" + +LICENSE = "MIT" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-sdk-${MACHINE}.ext3" + +do_bootdirectdisk[depends] += "core-image-sato-sdk:do_rootfs" diff --git a/meta/recipes-sato/images/core-image-sato-sdk-live.bb b/meta/recipes-sato/images/core-image-sato-sdk-live.bb new file mode 100644 index 0000000000..f11d895f7e --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-sdk-live.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Bootable Live Sato SDK Image" + +require recipes-core/images/core-image-live.inc + +LABELS += "boot install" + +ROOTFS = "${DEPLOY_DIR_IMAGE}/core-image-sato-sdk-${MACHINE}.ext3" + +LICENSE = "MIT" + +do_bootimg[depends] += "core-image-sato-sdk:do_rootfs" diff --git a/meta/recipes-sato/images/core-image-sato-sdk.bb b/meta/recipes-sato/images/core-image-sato-sdk.bb new file mode 100644 index 0000000000..9f8eef9a52 --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato-sdk.bb @@ -0,0 +1,9 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs qt4-pkgs" + +LICENSE = "MIT" + +inherit poky-image diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb new file mode 100644 index 0000000000..35d1a53c32 --- /dev/null +++ b/meta/recipes-sato/images/core-image-sato.bb @@ -0,0 +1,9 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" + +LICENSE = "MIT" + +inherit poky-image diff --git a/meta/recipes-sato/images/poky-image-sato-dev.bb b/meta/recipes-sato/images/poky-image-sato-dev.bb deleted file mode 100644 index 429095e19e..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-dev.bb +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} dev-pkgs" - -LICENSE = "MIT" - -inherit poky-image diff --git a/meta/recipes-sato/images/poky-image-sato-directdisk.bb b/meta/recipes-sato/images/poky-image-sato-directdisk.bb deleted file mode 100644 index 9b6b96eebe..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-directdisk.bb +++ /dev/null @@ -1,9 +0,0 @@ -require recipes-core/images/poky-image-directdisk.inc - -DESCRIPTION = "Sato Direct Disk Image" - -LICENSE = "MIT" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3" - -do_bootdirectdisk[depends] += "poky-image-sato:do_rootfs" diff --git a/meta/recipes-sato/images/poky-image-sato-live.bb b/meta/recipes-sato/images/poky-image-sato-live.bb deleted file mode 100644 index 20f7bf81a0..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-live.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Sato Bootable Live Image" - -require recipes-core/images/poky-image-live.inc - -LABELS += "boot install" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_bootimg[depends] += "poky-image-sato:do_rootfs" diff --git a/meta/recipes-sato/images/poky-image-sato-sdk-directdisk.bb b/meta/recipes-sato/images/poky-image-sato-sdk-directdisk.bb deleted file mode 100644 index b69780fa03..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-sdk-directdisk.bb +++ /dev/null @@ -1,9 +0,0 @@ -require recipes-core/images/poky-image-directdisk.inc - -DESCRIPTION = "Sato SDK Direct Disk Image" - -LICENSE = "MIT" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-sdk-${MACHINE}.ext3" - -do_bootdirectdisk[depends] += "poky-image-sato-sdk:do_rootfs" diff --git a/meta/recipes-sato/images/poky-image-sato-sdk-live.bb b/meta/recipes-sato/images/poky-image-sato-sdk-live.bb deleted file mode 100644 index b5e786e983..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-sdk-live.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Bootable Live Sato SDK Image" - -require recipes-core/images/poky-image-live.inc - -LABELS += "boot install" - -ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-sdk-${MACHINE}.ext3" - -LICENSE = "MIT" - -do_bootimg[depends] += "poky-image-sato-sdk:do_rootfs" diff --git a/meta/recipes-sato/images/poky-image-sato-sdk.bb b/meta/recipes-sato/images/poky-image-sato-sdk.bb deleted file mode 100644 index 9f8eef9a52..0000000000 --- a/meta/recipes-sato/images/poky-image-sato-sdk.bb +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES} tools-debug tools-profile tools-sdk dev-pkgs qt4-pkgs" - -LICENSE = "MIT" - -inherit poky-image diff --git a/meta/recipes-sato/images/poky-image-sato.bb b/meta/recipes-sato/images/poky-image-sato.bb deleted file mode 100644 index 35d1a53c32..0000000000 --- a/meta/recipes-sato/images/poky-image-sato.bb +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}" - -LICENSE = "MIT" - -inherit poky-image diff --git a/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb new file mode 100644 index 0000000000..2f9d6a6c10 --- /dev/null +++ b/meta/recipes-sato/tasks/task-core-apps-x11-pimlico.bb @@ -0,0 +1,34 @@ +# +# Copyright (C) 2007-2008 OpenedHand Ltd. +# + +DESCRIPTION = "X11 Pimlico Appications List" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r27" + +PACKAGES = "\ + task-core-apps-x11-pimlico \ + task-core-apps-x11-pimlico-dbg \ + task-core-apps-x11-pimlico-dev \ + " + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" + +WEB ?= "" +#WEB = "web-webkit" +# WebKit takes too much space to fit on some devices +# List here for now... +#WEB_c7x0 = "" +#WEB_mx31ads = "" + +RDEPENDS_task-core-apps-x11-pimlico = "\ + eds-dbus \ + contacts \ + dates \ + tasks \ + gaku \ + ${WEB}" diff --git a/meta/recipes-sato/tasks/task-core-x11-sato.bb b/meta/recipes-sato/tasks/task-core-x11-sato.bb new file mode 100644 index 0000000000..43b24d2c9c --- /dev/null +++ b/meta/recipes-sato/tasks/task-core-x11-sato.bb @@ -0,0 +1,34 @@ +# +# Copyright (C) 2007-2008 OpenedHand Ltd. +# + +DESCRIPTION = "Sato Tasks for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r30" + +PACKAGES = "\ + task-core-x11-sato \ + task-core-x11-sato-dbg \ + task-core-x11-sato-dev \ + " + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" + +NETWORK_MANAGER ?= "connman-gnome" +RDEPENDS_task-core-x11-sato = "\ + matchbox-desktop \ + matchbox-session-sato \ + matchbox-keyboard \ + matchbox-stroke \ + matchbox-config-gtk \ + xcursor-transparent-theme \ + sato-icon-theme \ + settings-daemon \ + gtk-sato-engine \ + gthumb \ + x11vnc \ + ${NETWORK_MANAGER}" diff --git a/meta/recipes-sato/tasks/task-core.bb b/meta/recipes-sato/tasks/task-core.bb new file mode 100644 index 0000000000..a595ad71ae --- /dev/null +++ b/meta/recipes-sato/tasks/task-core.bb @@ -0,0 +1,73 @@ +# +# Copyright (C) 2007-2008 OpenedHand Ltd. +# + +DESCRIPTION = "Tasks for OpenedHand Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r34" + +PACKAGES = "\ + task-core-apps-console \ + task-core-apps-console-dbg \ + task-core-apps-console-dev \ + task-core-apps-x11-core \ + task-core-apps-x11-core-dbg \ + task-core-apps-x11-core-dev \ + task-core-apps-x11-games \ + task-core-apps-x11-games-dbg \ + task-core-apps-x11-games-dev \ + task-core-x11-base \ + task-core-x11-base-dbg \ + task-core-x11-base-dev \ + " + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +XSERVER ?= "xserver-kdrive-fbdev" + +ALLOW_EMPTY = "1" + +SPLASH ?= "psplash" + +# pcmanfm doesn't work on mips/powerpc +FILEMANAGER ?= "pcmanfm" +FILEMANAGER_mips ?= "" + +RDEPENDS_task-core-apps-console = "\ + avahi-daemon \ + dbus \ + portmap \ + ${SPLASH}" + + +RDEPENDS_task-core-x11-base = "\ + dbus \ + pointercal \ + matchbox-wm \ + matchbox-keyboard \ + matchbox-keyboard-applet \ + matchbox-keyboard-im \ + matchbox-panel-2 \ + matchbox-desktop \ + matchbox-session \ + ${XSERVER} \ + x11-common \ + xserver-nodm-init \ + liberation-fonts \ + xauth \ + xhost \ + xset \ + xrandr" + + +RDEPENDS_task-core-apps-x11-core = "\ + leafpad \ + ${FILEMANAGER} \ + matchbox-terminal \ + screenshot" + + +RDEPENDS_task-core-apps-x11-games = "\ + oh-puzzles" diff --git a/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb b/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb deleted file mode 100644 index 7bb26fc04c..0000000000 --- a/meta/recipes-sato/tasks/task-poky-apps-x11-pimlico.bb +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenedHand Ltd. -# - -DESCRIPTION = "X11 Pimlico Appications List" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r27" - -PACKAGES = "\ - task-poky-apps-x11-pimlico \ - task-poky-apps-x11-pimlico-dbg \ - task-poky-apps-x11-pimlico-dev \ - " - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" - -WEB ?= "" -#WEB = "web-webkit" -# WebKit takes too much space to fit on some devices -# List here for now... -#WEB_c7x0 = "" -#WEB_mx31ads = "" - -RDEPENDS_task-poky-apps-x11-pimlico = "\ - eds-dbus \ - contacts \ - dates \ - tasks \ - gaku \ - ${WEB}" diff --git a/meta/recipes-sato/tasks/task-poky-x11-sato.bb b/meta/recipes-sato/tasks/task-poky-x11-sato.bb deleted file mode 100644 index c10a32a45d..0000000000 --- a/meta/recipes-sato/tasks/task-poky-x11-sato.bb +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenedHand Ltd. -# - -DESCRIPTION = "Sato Tasks for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r30" - -PACKAGES = "\ - task-poky-x11-sato \ - task-poky-x11-sato-dbg \ - task-poky-x11-sato-dev \ - " - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" - -NETWORK_MANAGER ?= "connman-gnome" -RDEPENDS_task-poky-x11-sato = "\ - matchbox-desktop \ - matchbox-session-sato \ - matchbox-keyboard \ - matchbox-stroke \ - matchbox-config-gtk \ - xcursor-transparent-theme \ - sato-icon-theme \ - settings-daemon \ - gtk-sato-engine \ - gthumb \ - x11vnc \ - ${NETWORK_MANAGER}" diff --git a/meta/recipes-sato/tasks/task-poky.bb b/meta/recipes-sato/tasks/task-poky.bb deleted file mode 100644 index 4f7bc3d31e..0000000000 --- a/meta/recipes-sato/tasks/task-poky.bb +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenedHand Ltd. -# - -DESCRIPTION = "Tasks for OpenedHand Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r34" - -PACKAGES = "\ - task-poky-apps-console \ - task-poky-apps-console-dbg \ - task-poky-apps-console-dev \ - task-poky-apps-x11-core \ - task-poky-apps-x11-core-dbg \ - task-poky-apps-x11-core-dev \ - task-poky-apps-x11-games \ - task-poky-apps-x11-games-dbg \ - task-poky-apps-x11-games-dev \ - task-poky-x11-base \ - task-poky-x11-base-dbg \ - task-poky-x11-base-dev \ - " - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -XSERVER ?= "xserver-kdrive-fbdev" - -ALLOW_EMPTY = "1" - -SPLASH ?= "psplash" - -# pcmanfm doesn't work on mips/powerpc -FILEMANAGER ?= "pcmanfm" -FILEMANAGER_mips ?= "" - -RDEPENDS_task-poky-apps-console = "\ - avahi-daemon \ - dbus \ - portmap \ - ${SPLASH}" - - -RDEPENDS_task-poky-x11-base = "\ - dbus \ - pointercal \ - matchbox-wm \ - matchbox-keyboard \ - matchbox-keyboard-applet \ - matchbox-keyboard-im \ - matchbox-panel-2 \ - matchbox-desktop \ - matchbox-session \ - ${XSERVER} \ - x11-common \ - xserver-nodm-init \ - liberation-fonts \ - xauth \ - xhost \ - xset \ - xrandr" - - -RDEPENDS_task-poky-apps-x11-core = "\ - leafpad \ - ${FILEMANAGER} \ - matchbox-terminal \ - screenshot" - - -RDEPENDS_task-poky-apps-x11-games = "\ - oh-puzzles" -- cgit v1.2.3-54-g00ecf