diff options
| -rw-r--r-- | meta/conf/distro/include/distro_tracking_fields.inc | 10 | ||||
| -rw-r--r-- | meta/conf/multilib.conf | 3 | ||||
| -rw-r--r-- | meta/recipes-core/tasks/task-core-console.bb | 28 | ||||
| -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 a7fc0112f..9dfa6a9ac 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" RECIPE_MAINTAINER_pn-core-image-sato-sdk = "Dongxiao Xu <dongxiao.xu@intel.com>" DISTRO_PN_ALIAS_pn-core-image-sdk = "OE-Core" -RECIPE_STATUS_pn-task-core = "green" -RECIPE_LATEST_VERSION_pn-task-core = "1.0" -RECIPE_MAINTAINER_pn-task-core = "Dongxiao Xu <dongxiao.xu@intel.com>" +RECIPE_STATUS_pn-task-core-console = "green" +RECIPE_LATEST_VERSION_pn-task-core-console = "1.0" +RECIPE_MAINTAINER_pn-task-core-console = "Dongxiao Xu <dongxiao.xu@intel.com>" + +RECIPE_STATUS_pn-task-core-x11 = "green" +RECIPE_LATEST_VERSION_pn-task-core-x11 = "1.0" +RECIPE_MAINTAINER_pn-task-core-x11 = "Dongxiao Xu <dongxiao.xu@intel.com>" RECIPE_STATUS_pn-task-core-basic = "green" RECIPE_LATEST_VERSION_pn-task-core-basic = "1.0" diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 16db37548..3133bf183 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -368,12 +368,13 @@ BBCLASSEXTEND_append_pn-task-base = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-apps-x11-pimlico = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-basic = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-boot = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-task-core-console = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-lsb = " ${MULTILIBS}" -BBCLASSEXTEND_append_pn-task-core = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-nfs = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-ssh-dropbear = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-ssh-openssh = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-tools = " ${MULTILIBS}" +BBCLASSEXTEND_append_pn-task-core-x11 = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-task-core-x11-sato = " ${MULTILIBS}" BBCLASSEXTEND_append_pn-tasks = " ${MULTILIBS}" BBCLASSEXTEND_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 000000000..cb2273294 --- /dev/null +++ b/meta/recipes-core/tasks/task-core-console.bb @@ -0,0 +1,28 @@ +# +# Copyright (C) 2011 Intel Corporation +# + +DESCRIPTION = "Tasks for core console applications" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r35" + +PACKAGES = "\ + task-core-apps-console \ + task-core-apps-console-dbg \ + task-core-apps-console-dev \ + " + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" + +SPLASH ?= "psplash" + +RDEPENDS_task-core-apps-console = "\ + avahi-daemon \ + dbus \ + portmap \ + ${SPLASH}" + diff --git a/meta/recipes-sato/tasks/task-core.bb b/meta/recipes-sato/tasks/task-core-x11.bb index a595ad71a..26d550add 100644 --- a/meta/recipes-sato/tasks/task-core.bb +++ b/meta/recipes-sato/tasks/task-core-x11.bb @@ -1,17 +1,14 @@ # -# Copyright (C) 2007-2008 OpenedHand Ltd. +# Copyright (C) 2011 Intel Corporation # -DESCRIPTION = "Tasks for OpenedHand Poky" +DESCRIPTION = "Tasks for core X11 applications" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r34" +PR = "r35" 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 \ @@ -29,18 +26,10 @@ 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 \ |