Patchwork [1/2,EDISON,1.1.2] image.bbclass: add check for live and convert to ext3

login
register
mail settings
Submitter Saul Wold
Date May 4, 2012, 4:23 p.m.
Message ID <1336148632-5828-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/27077/
State New
Headers show

Comments

Saul Wold - May 4, 2012, 4:23 p.m.
The live image type depends on ext3 which has it's own
dependencies, while the live type has none, this is a
backport change to fix [YOCTO #2246]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/image.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Richard Purdie - May 6, 2012, 8:56 a.m.
On Fri, 2012-05-04 at 09:23 -0700, Saul Wold wrote:
> The live image type depends on ext3 which has it's own
> dependencies, while the live type has none, this is a
> backport change to fix [YOCTO #2246]
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/classes/image.bbclass |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index b8ca370..e9a3aa6 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -76,6 +76,8 @@ inherit image-${IMAGE_TYPE}
>  python () {
>      deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or ""
>      for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split():
> +        if type == "live":
> +            type = "ext3"
>          for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []):
>              deps += " %s:do_populate_sysroot" % dep
>      for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split():

Merged to 2011-1 and master, thanks.

Richard

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index b8ca370..e9a3aa6 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -76,6 +76,8 @@  inherit image-${IMAGE_TYPE}
 python () {
     deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or ""
     for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split():
+        if type == "live":
+            type = "ext3"
         for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []):
             deps += " %s:do_populate_sysroot" % dep
     for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split():