From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [RC2 PULL 05/13] task-core: split into task-core-console and task-core-x11
Date: Wed, 14 Sep 2011 20:14:54 -0700 [thread overview]
Message-ID: <3fdb63b7e46b70d79d4c08e1a0936ed0efaef791.1316056194.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1316056194.git.sgw@linux.intel.com>
In-Reply-To: <cover.1316056194.git.sgw@linux.intel.com>
From: Paul Eggleton <paul.eggleton@linux.intel.com>
[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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 10 +++++--
meta/conf/multilib.conf | 3 +-
meta/recipes-core/tasks/task-core-console.bb | 28 ++++++++++++++++++++
.../tasks/{task-core.bb => task-core-x11.bb} | 17 ++----------
4 files changed, 40 insertions(+), 18 deletions(-)
create mode 100644 meta/recipes-core/tasks/task-core-console.bb
rename meta/recipes-sato/tasks/{task-core.bb => task-core-x11.bb} (79%)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index a7fc011..9dfa6a9 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 16db375..3133bf1 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 0000000..cb22732
--- /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
similarity index 79%
rename from meta/recipes-sato/tasks/task-core.bb
rename to meta/recipes-sato/tasks/task-core-x11.bb
index a595ad7..26d550a 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 \
--
1.7.6
next prev parent reply other threads:[~2011-09-15 3:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
2011-09-15 3:14 ` [RC2 PULL 01/13] Uprev to latest version of prelink_git, fixing TLS issues Saul Wold
2011-09-15 3:14 ` [RC2 PULL 02/13] package_deb.bbclass, populate_sdk_deb.bbclass: fix meta-toolchain-gmae build Saul Wold
2011-09-15 3:14 ` [RC2 PULL 03/13] qt4: add blacklist-diginotar-certs patch Saul Wold
2011-09-15 3:14 ` [RC2 PULL 04/13] distro_tracking_field: add distro checking field Saul Wold
2011-09-15 3:14 ` Saul Wold [this message]
2011-09-15 3:14 ` [RC2 PULL 06/13] linux-yocto: move common tasks to a common location Saul Wold
2011-09-15 3:14 ` [RC2 PULL 07/13] linux-yocto: split e100 and e1000 support Saul Wold
2011-09-15 3:14 ` [RC2 PULL 08/13] linux-yocto-rt: correct 3.0.3->3.0.4 mismerge for, stop_machine.c Saul Wold
2011-09-15 3:14 ` [RC2 PULL 09/13] initramfs-live-install: add support for grub2 Saul Wold
2011-09-15 3:14 ` [RC2 PULL 10/13] grub2: new recipe Saul Wold
2011-09-15 3:15 ` [RC2 PULL 11/13] task-core-sdk: change task-core -> task-core-console Saul Wold
2011-09-15 3:15 ` [RC2 PULL 12/13] distro_tracking: update package alias Saul Wold
2011-09-15 3:15 ` [RC2 PULL 13/13] distro-tracking: Update alias Saul Wold
2011-09-15 10:28 ` [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3fdb63b7e46b70d79d4c08e1a0936ed0efaef791.1316056194.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox