[PATCH 0/1][PULL] Fix bug 1370: IPK will not be built out if package_ipk is not first in PACKAGE_CLASSES

[PATCH 0/1][PULL] Fix bug 1370: IPK will not be built out if package_ipk is not first in PACKAGE_CLASSES

[Dongxiao Xu]

Hi Richard and Saul,

This pull request is to fix bug 1370, please help to review and pull.

Thanks,
Dongxiao

The following changes since commit 445d6426197579a9c0317498cc6919bb63e7f726:

  meta-toolchain/environment: Collected site config files in runtime. (2011-08-24 19:26:01 -0700)

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

Dongxiao Xu (1):
  package.bbclass: Fix recrdeptask of image type recipes

 meta/classes/package.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[PATCH 1/1] package.bbclass: Fix recrdeptask of image type recipes

[Dongxiao Xu]

For image type of recipes, we need to define do_package_write as its
do_build recrdeptask, which ensures that all packaging types listed in
PACKAGE_CLASSES will be built out.

[YOCTO 1370]

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/classes/package.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 96675de..15c4142 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -184,7 +184,7 @@ python () {
         # shlibs requires any DEPENDS to have already packaged for the *.list files
         deps.append("do_package")
         bb.data.setVarFlag('do_package', 'deptask', " ".join(deps), d)
-    else:
+    elif not bb.data.inherits_class('image', d):
         d.setVar("PACKAGERDEPTASK", "")
 }
 
-- 
1.7.1

Re: [PATCH 1/1] package.bbclass: Fix recrdeptask of image type recipes

[Richard Purdie]

On Thu, 2011-08-25 at 11:51 +0800, Dongxiao Xu wrote:
> For image type of recipes, we need to define do_package_write as its
> do_build recrdeptask, which ensures that all packaging types listed in
> PACKAGE_CLASSES will be built out.
> 
> [YOCTO 1370]
> 
> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
> ---
>  meta/classes/package.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard