From 8c310ee0a94a7e15d815a2719272ffc704e857b0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 14 Sep 2011 17:19:55 +0100 Subject: task-core: split into task-core-console and task-core-x11 [YOCTO #1481] Since tasks are referred to almost exclusively via RDEPENDS, and bitbake will build an entire task recipe when only one of its task packages are actually needed, building a console-only image that uses task-core-apps-console (or less directly, has apps-console in its IMAGE_FEATURES) will cause a build of a whole list of X11 applications that aren't needed. Splitting the task-core recipe into X11 and console portions prevents this issue. (From OE-Core rev: 07407baafb728c5ae1bb283f5b02a2ac773360bc) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- .../conf/distro/include/distro_tracking_fields.inc | 10 ++- meta/conf/multilib.conf | 3 +- meta/recipes-core/tasks/task-core-console.bb | 28 +++++++++ meta/recipes-sato/tasks/task-core-x11.bb | 62 ++++++++++++++++++ meta/recipes-sato/tasks/task-core.bb | 73 ---------------------- 5 files changed, 99 insertions(+), 77 deletions(-) create mode 100644 meta/recipes-core/tasks/task-core-console.bb create mode 100644 meta/recipes-sato/tasks/task-core-x11.bb delete mode 100644 meta/recipes-sato/tasks/task-core.bb 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" RECIPE_MAINTAINER_pn-core-image-sato-sdk = "Dongxiao Xu " 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 " +RECIPE_STATUS_pn-task-core-console = "green" +RECIPE_LATEST_VERSION_pn-task-core-console = "1.0" +RECIPE_MAINTAINER_pn-task-core-console = "Dongxiao Xu " + +RECIPE_STATUS_pn-task-core-x11 = "green" +RECIPE_LATEST_VERSION_pn-task-core-x11 = "1.0" +RECIPE_MAINTAINER_pn-task-core-x11 = "Dongxiao Xu " 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 16db37548a..3133bf1831 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 0000000000..cb2273294f --- /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-x11.bb b/meta/recipes-sato/tasks/task-core-x11.bb new file mode 100644 index 0000000000..26d550add2 --- /dev/null +++ b/meta/recipes-sato/tasks/task-core-x11.bb @@ -0,0 +1,62 @@ +# +# Copyright (C) 2011 Intel Corporation +# + +DESCRIPTION = "Tasks for core X11 applications" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r35" + +PACKAGES = "\ + 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" + +# pcmanfm doesn't work on mips/powerpc +FILEMANAGER ?= "pcmanfm" +FILEMANAGER_mips ?= "" + + +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-core.bb b/meta/recipes-sato/tasks/task-core.bb deleted file mode 100644 index a595ad71ae..0000000000 --- a/meta/recipes-sato/tasks/task-core.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-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" -- cgit v1.2.3-54-g00ecf