[PATCH 0/2] PULL: fixes to bug 961, 964

[PATCH 0/2] PULL: fixes to bug 961, 964

[Dexuan Cui]

From: Dexuan Cui <dexuan.cui@intel.com>

[YOCTO #964]:
A recent commit 25a6e5f9(sstate: use only unique set of SSTATETASK) breaks
the ordered mapping between SSTATETASKS and SSTATETASKNAMES. As a result,
in sstate_cleanall, the line
taskname = tasks[namemap.index(name)]
gets an incorrect result, and "bitbake -c cleanall" doesn't really remove
the files populalted by do_populate_sysroot.

BTW: the bernard branch doesn't need this fix since commit 25a6e5f9 wasn't
pulled into it.



[YOCTO #961]:
lsbsetup: Fix LIC_FILE_CHKSUM
We need to pull this fix asap since nightly's lsb builds have been
blocked by this for 2 days.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: dcui/master
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/master

Thanks,
    Dexuan Cui <dexuan.cui@intel.com>
---


Dexuan Cui (2):
  sstate: ensure an ordered mapping between SSTATETASKS and
    SSTATETASKNAMES
  lsbsetup: Fix LIC_FILE_CHKSUM

 meta/classes/sstate.bbclass               |    6 ++++--
 meta/recipes-extended/lsb/lsbsetup_0.9.bb |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

-- 
1.7.2

[PATCH 1/2] sstate: ensure an ordered mapping between SSTATETASKS and SSTATETASKNAMES

[Dexuan Cui]

From: Dexuan Cui <dexuan.cui@intel.com>

Fix [YOCTO #964]

A recent commit 25a6e5f9(sstate: use only unique set of SSTATETASK) breaks
the ordered mapping between SSTATETASKS and SSTATETASKNAMES. As a result,
in sstate_cleanall, the line
taskname = tasks[namemap.index(name)]
gets an incorrect result, and "bitbake -c cleanall" doesn't really remove
the files populalted by do_populate_sysroot.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/classes/sstate.bbclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index cc0b866..be650c4 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -39,8 +39,10 @@ python () {
         scan_cmd = "grep -Irl ${STAGING_DIR} ${SSTATE_BUILDDIR}"
         bb.data.setVar('SSTATE_SCAN_CMD', scan_cmd, d)
 
+    unique_tasks = set((bb.data.getVar('SSTATETASKS', d, True) or "").split())
+    d.setVar('SSTATETASKS', " ".join(unique_tasks))
     namemap = []
-    for task in set((bb.data.getVar('SSTATETASKS', d, True) or "").split()):
+    for task in unique_tasks:
         namemap.append(bb.data.getVarFlag(task, 'sstate-name', d))
         funcs = bb.data.getVarFlag(task, 'prefuncs', d) or ""
         funcs = "sstate_task_prefunc " + funcs
@@ -200,7 +202,7 @@ def sstate_clean_cachefile(ss, d):
     oe.path.remove(sstatepkgfile)
 
 def sstate_clean_cachefiles(d):
-    for task in set((bb.data.getVar('SSTATETASKS', d, True) or "").split()):
+    for task in (bb.data.getVar('SSTATETASKS', d, True) or "").split():
         ss = sstate_state_fromvars(d, task[3:])
         sstate_clean_cachefile(ss, d)
 
-- 
1.7.2

[PATCH 2/2] lsbsetup: Fix LIC_FILE_CHKSUM

[Dexuan Cui]

From: Dexuan Cui <dexuan.cui@intel.com>

Fix [YOCTO #961]

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/recipes-extended/lsb/lsbsetup_0.9.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsbsetup_0.9.bb b/meta/recipes-extended/lsb/lsbsetup_0.9.bb
index 08e1d99..8cbaf1e 100644
--- a/meta/recipes-extended/lsb/lsbsetup_0.9.bb
+++ b/meta/recipes-extended/lsb/lsbsetup_0.9.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPLv2"
 PR = "r0"
 
-LIC_FILES_CHKSUM = "file://LSB_Setup.sh;md5=9cc166e6ee4b327fb94d6da63af9556c"
+LIC_FILES_CHKSUM = "file://LSB_Setup.sh;md5=7391be3e70a02d44e1b183fa103b0585"
 
 SRC_URI = "file://LSB_Setup.sh"
 
-- 
1.7.2

Re: [PATCH 0/2] PULL: fixes to bug 961, 964

[Cui, Dexuan]

Dexuan Cui wrote:
> From: Dexuan Cui <dexuan.cui@intel.com>
> 
> [YOCTO #964]:
> A recent commit 25a6e5f9(sstate: use only unique set of SSTATETASK)
> breaks the ordered mapping between SSTATETASKS and SSTATETASKNAMES.
> As a result, in sstate_cleanall, the line
> taskname = tasks[namemap.index(name)]
> gets an incorrect result, and "bitbake -c cleanall" doesn't really
> remove the files populalted by do_populate_sysroot.
> 
> BTW: the bernard branch doesn't need this fix since commit 25a6e5f9
> wasn't pulled into it.
> 
> 
> 
> [YOCTO #961]:
> lsbsetup: Fix LIC_FILE_CHKSUM
> We need to pull this fix asap since nightly's lsb builds have been
> blocked by this for 2 days.

Sorry, I didn't notice Saul had sent out a fix for this (bug #961). :-)
Please ignore mine. 

Thanks,
-- Dexuan

Re: [PATCH 0/2] PULL: fixes to bug 961, 964

[Richard Purdie]

On Fri, 2011-04-08 at 18:04 +0800, Cui, Dexuan wrote:
> Dexuan Cui wrote:
> > From: Dexuan Cui <dexuan.cui@intel.com>
> > 
> > [YOCTO #964]:
> > A recent commit 25a6e5f9(sstate: use only unique set of SSTATETASK)
> > breaks the ordered mapping between SSTATETASKS and SSTATETASKNAMES.
> > As a result, in sstate_cleanall, the line
> > taskname = tasks[namemap.index(name)]
> > gets an incorrect result, and "bitbake -c cleanall" doesn't really
> > remove the files populalted by do_populate_sysroot.
> > 
> > BTW: the bernard branch doesn't need this fix since commit 25a6e5f9
> > wasn't pulled into it.
> > 
> > 
> > 
> > [YOCTO #961]:
> > lsbsetup: Fix LIC_FILE_CHKSUM
> > We need to pull this fix asap since nightly's lsb builds have been
> > blocked by this for 2 days.
> 
> Sorry, I didn't notice Saul had sent out a fix for this (bug #961). :-)
> Please ignore mine. 

I've pulled the sstate patch into master, thanks!

Richard

Re: [PATCH 1/2] sstate: ensure an ordered mapping between SSTATETASKS and SSTATETASKNAMES

[Tian, Kevin]

good work to track this tricky stuff down. :-)

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Dexuan Cui
> Sent: Friday, April 08, 2011 6:00 PM
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 1/2] sstate: ensure an ordered mapping between
> SSTATETASKS and SSTATETASKNAMES
> 
> From: Dexuan Cui <dexuan.cui@intel.com>
> 
> Fix [YOCTO #964]
> 
> A recent commit 25a6e5f9(sstate: use only unique set of SSTATETASK) breaks
> the ordered mapping between SSTATETASKS and SSTATETASKNAMES. As a
> result,
> in sstate_cleanall, the line
> taskname = tasks[namemap.index(name)]
> gets an incorrect result, and "bitbake -c cleanall" doesn't really remove
> the files populalted by do_populate_sysroot.
> 
> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
> ---
>  meta/classes/sstate.bbclass |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
> index cc0b866..be650c4 100644
> --- a/meta/classes/sstate.bbclass
> +++ b/meta/classes/sstate.bbclass
> @@ -39,8 +39,10 @@ python () {
>          scan_cmd = "grep -Irl ${STAGING_DIR} ${SSTATE_BUILDDIR}"
>          bb.data.setVar('SSTATE_SCAN_CMD', scan_cmd, d)
> 
> +    unique_tasks = set((bb.data.getVar('SSTATETASKS', d, True) or "").split())
> +    d.setVar('SSTATETASKS', " ".join(unique_tasks))
>      namemap = []
> -    for task in set((bb.data.getVar('SSTATETASKS', d, True) or "").split()):
> +    for task in unique_tasks:
>          namemap.append(bb.data.getVarFlag(task, 'sstate-name', d))
>          funcs = bb.data.getVarFlag(task, 'prefuncs', d) or ""
>          funcs = "sstate_task_prefunc " + funcs
> @@ -200,7 +202,7 @@ def sstate_clean_cachefile(ss, d):
>      oe.path.remove(sstatepkgfile)
> 
>  def sstate_clean_cachefiles(d):
> -    for task in set((bb.data.getVar('SSTATETASKS', d, True) or "").split()):
> +    for task in (bb.data.getVar('SSTATETASKS', d, True) or "").split():
>          ss = sstate_state_fromvars(d, task[3:])
>          sstate_clean_cachefile(ss, d)
> 
> --
> 1.7.2
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core