summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/distro_tracking_fields.inc10
-rw-r--r--meta/conf/multilib.conf3
-rw-r--r--meta/recipes-core/tasks/task-core-console.bb28
-rw-r--r--meta/recipes-sato/tasks/task-core-x11.bb (renamed from meta/recipes-sato/tasks/task-core.bb)17
4 files changed, 40 insertions, 18 deletions
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index a7fc0112ff..9dfa6a9ac9 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2460,9 +2460,13 @@ RECIPE_LATEST_VERSION_pn-core-image-sato-sdk = "1.0"
2460RECIPE_MAINTAINER_pn-core-image-sato-sdk = "Dongxiao Xu <dongxiao.xu@intel.com>" 2460RECIPE_MAINTAINER_pn-core-image-sato-sdk = "Dongxiao Xu <dongxiao.xu@intel.com>"
2461DISTRO_PN_ALIAS_pn-core-image-sdk = "OE-Core" 2461DISTRO_PN_ALIAS_pn-core-image-sdk = "OE-Core"
2462 2462
2463RECIPE_STATUS_pn-task-core = "green" 2463RECIPE_STATUS_pn-task-core-console = "green"
2464RECIPE_LATEST_VERSION_pn-task-core = "1.0" 2464RECIPE_LATEST_VERSION_pn-task-core-console = "1.0"
2465RECIPE_MAINTAINER_pn-task-core = "Dongxiao Xu <dongxiao.xu@intel.com>" 2465RECIPE_MAINTAINER_pn-task-core-console = "Dongxiao Xu <dongxiao.xu@intel.com>"
2466
2467RECIPE_STATUS_pn-task-core-x11 = "green"
2468RECIPE_LATEST_VERSION_pn-task-core-x11 = "1.0"
2469RECIPE_MAINTAINER_pn-task-core-x11 = "Dongxiao Xu <dongxiao.xu@intel.com>"
2466 2470
2467RECIPE_STATUS_pn-task-core-basic = "green" 2471RECIPE_STATUS_pn-task-core-basic = "green"
2468RECIPE_LATEST_VERSION_pn-task-core-basic = "1.0" 2472RECIPE_LATEST_VERSION_pn-task-core-basic = "1.0"
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 16db37548a..3133bf1831 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -368,12 +368,13 @@ BBCLASSEXTEND_append_pn-task-base = " ${MULTILIBS}"
368BBCLASSEXTEND_append_pn-task-core-apps-x11-pimlico = " ${MULTILIBS}" 368BBCLASSEXTEND_append_pn-task-core-apps-x11-pimlico = " ${MULTILIBS}"
369BBCLASSEXTEND_append_pn-task-core-basic = " ${MULTILIBS}" 369BBCLASSEXTEND_append_pn-task-core-basic = " ${MULTILIBS}"
370BBCLASSEXTEND_append_pn-task-core-boot = " ${MULTILIBS}" 370BBCLASSEXTEND_append_pn-task-core-boot = " ${MULTILIBS}"
371BBCLASSEXTEND_append_pn-task-core-console = " ${MULTILIBS}"
371BBCLASSEXTEND_append_pn-task-core-lsb = " ${MULTILIBS}" 372BBCLASSEXTEND_append_pn-task-core-lsb = " ${MULTILIBS}"
372BBCLASSEXTEND_append_pn-task-core = " ${MULTILIBS}"
373BBCLASSEXTEND_append_pn-task-core-nfs = " ${MULTILIBS}" 373BBCLASSEXTEND_append_pn-task-core-nfs = " ${MULTILIBS}"
374BBCLASSEXTEND_append_pn-task-core-ssh-dropbear = " ${MULTILIBS}" 374BBCLASSEXTEND_append_pn-task-core-ssh-dropbear = " ${MULTILIBS}"
375BBCLASSEXTEND_append_pn-task-core-ssh-openssh = " ${MULTILIBS}" 375BBCLASSEXTEND_append_pn-task-core-ssh-openssh = " ${MULTILIBS}"
376BBCLASSEXTEND_append_pn-task-core-tools = " ${MULTILIBS}" 376BBCLASSEXTEND_append_pn-task-core-tools = " ${MULTILIBS}"
377BBCLASSEXTEND_append_pn-task-core-x11 = " ${MULTILIBS}"
377BBCLASSEXTEND_append_pn-task-core-x11-sato = " ${MULTILIBS}" 378BBCLASSEXTEND_append_pn-task-core-x11-sato = " ${MULTILIBS}"
378BBCLASSEXTEND_append_pn-tasks = " ${MULTILIBS}" 379BBCLASSEXTEND_append_pn-tasks = " ${MULTILIBS}"
379BBCLASSEXTEND_append_pn-tcf-agent = " ${MULTILIBS}" 380BBCLASSEXTEND_append_pn-tcf-agent = " ${MULTILIBS}"
diff --git a/meta/recipes-core/tasks/task-core-console.bb b/meta/recipes-core/tasks/task-core-console.bb
new file mode 100644
index 0000000000..cb2273294f
--- /dev/null
+++ b/meta/recipes-core/tasks/task-core-console.bb
@@ -0,0 +1,28 @@
1#
2# Copyright (C) 2011 Intel Corporation
3#
4
5DESCRIPTION = "Tasks for core console applications"
6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9PR = "r35"
10
11PACKAGES = "\
12 task-core-apps-console \
13 task-core-apps-console-dbg \
14 task-core-apps-console-dev \
15 "
16
17PACKAGE_ARCH = "${MACHINE_ARCH}"
18
19ALLOW_EMPTY = "1"
20
21SPLASH ?= "psplash"
22
23RDEPENDS_task-core-apps-console = "\
24 avahi-daemon \
25 dbus \
26 portmap \
27 ${SPLASH}"
28
diff --git a/meta/recipes-sato/tasks/task-core.bb b/meta/recipes-sato/tasks/task-core-x11.bb
index a595ad71ae..26d550add2 100644
--- a/meta/recipes-sato/tasks/task-core.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -1,17 +1,14 @@
1# 1#
2# Copyright (C) 2007-2008 OpenedHand Ltd. 2# Copyright (C) 2011 Intel Corporation
3# 3#
4 4
5DESCRIPTION = "Tasks for OpenedHand Poky" 5DESCRIPTION = "Tasks for core X11 applications"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9PR = "r34" 9PR = "r35"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-core-apps-console \
13 task-core-apps-console-dbg \
14 task-core-apps-console-dev \
15 task-core-apps-x11-core \ 12 task-core-apps-x11-core \
16 task-core-apps-x11-core-dbg \ 13 task-core-apps-x11-core-dbg \
17 task-core-apps-x11-core-dev \ 14 task-core-apps-x11-core-dev \
@@ -29,18 +26,10 @@ XSERVER ?= "xserver-kdrive-fbdev"
29 26
30ALLOW_EMPTY = "1" 27ALLOW_EMPTY = "1"
31 28
32SPLASH ?= "psplash"
33
34# pcmanfm doesn't work on mips/powerpc 29# pcmanfm doesn't work on mips/powerpc
35FILEMANAGER ?= "pcmanfm" 30FILEMANAGER ?= "pcmanfm"
36FILEMANAGER_mips ?= "" 31FILEMANAGER_mips ?= ""
37 32
38RDEPENDS_task-core-apps-console = "\
39 avahi-daemon \
40 dbus \
41 portmap \
42 ${SPLASH}"
43
44 33
45RDEPENDS_task-core-x11-base = "\ 34RDEPENDS_task-core-x11-base = "\
46 dbus \ 35 dbus \