[PATCH 0/1][PULL] fix /bin/sh missing in multilib case

[PATCH 0/1][PULL] fix /bin/sh missing in multilib case

[Dongxiao Xu]

Hi Richard,

This pull request fixes the /bin/sh missing issue in doing multilib rootfs of
lib32-core-image-sato.

multilib.bbclass will check whether PACKAGES are begin with MLPREFIX. If not,
it will tries to rename variables like: FILES_pkg, RDEPENDS_pkg, etc.

Recipe task-core-boot RDEPENDS some key recipes like busybox, tinylogin, etc,
while it doesn't have PACKAGES defined, so it will use default PACKAGES
definition in bitbake:

"${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-locale".

${PN} is begin with MLPREFIX, therefore for PACKAGES of task-core-boot, no
rename occurred, resulting that RDEPENDS_lib32-task-core-boot is empty.
busybox, tinylogin, etc. are not built out, which caused the missing of /bin/sh.

Like the other task-core-xxx.bb files, this commit explicitly defines PACKAGES
in task-core-boot.bb to fix this issue.

Thanks,
Dongxiao

The following changes since commit 8a731122e7811275f20065ba27645b97fadf362d:

  eglibc: Fix patch merge breakage (2011-08-04 15:41:08 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dxu4/ml2
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ml2

Dongxiao Xu (1):
  task-core-boot.bb: Add PACKAGE definition to facilitate multilib

 meta/recipes-core/tasks/task-core-boot.bb |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

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

[Dongxiao Xu]

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(-)

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 \
-- 
1.7.1

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

[Richard Purdie]

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