Patchwork [1/1] task-core-boot.bb: Add PACKAGE definition to facilitate multilib

login
register
mail settings
Submitter Dongxiao Xu
Date Aug. 5, 2011, 5:48 a.m.
Message ID <acf0ee2a4a18f8a50bcb7dc81dfec290bf8d6656.1312522526.git.dongxiao.xu@intel.com>
Download mbox | patch
Permalink /patch/9345/
State New, archived
Headers show

Comments

Dongxiao Xu - Aug. 5, 2011, 5:48 a.m.
If there is no PACKAGES defined in bb file, its default definition would
be "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-locale".
In multilib case, ${PN} is extended with ${MLPREFIX}, so there is no
rename occurred for the PACKAGES. Therefore for task-core-boot,
RDEPENDS_lib32-task-core-boot will be empty, resulting busybox,
tinylogin, etc. are not bulit out.

This fixed the issue that /bin/sh is not provided while do_rootfs.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/recipes-core/tasks/task-core-boot.bb |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
Richard Purdie - Aug. 5, 2011, 4:28 p.m.
On Fri, 2011-08-05 at 13:48 +0800, Dongxiao Xu wrote:
> If there is no PACKAGES defined in bb file, its default definition would
> be "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-locale".
> In multilib case, ${PN} is extended with ${MLPREFIX}, so there is no
> rename occurred for the PACKAGES. Therefore for task-core-boot,
> RDEPENDS_lib32-task-core-boot will be empty, resulting busybox,
> tinylogin, etc. are not bulit out.
> 
> This fixed the issue that /bin/sh is not provided while do_rootfs.
> 
> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> ---
>  meta/recipes-core/tasks/task-core-boot.bb |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb
index 5aea771..eb2b548 100644
--- a/meta/recipes-core/tasks/task-core-boot.bb
+++ b/meta/recipes-core/tasks/task-core-boot.bb
@@ -9,7 +9,7 @@  LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY = "1"
-PR = "r7"
+PR = "r8"
 
 #
 # Set by the machine configuration with packages essential for device bootup
@@ -17,6 +17,12 @@  PR = "r7"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
+PACKAGES = "\
+    task-core-boot \
+    task-core-boot-dbg \
+    task-core-boot-dev \
+"
+
 RDEPENDS_task-core-boot = "\
     base-files \
     base-passwd \