Skip to contentSkip to conversation

PULL: fixes to bug 961, 964

PATCH In review Dexuan Cui 3 participants 6 messages Apr 8, 2011 – Apr 11, 2011

lore
Share & tools
lore

Dexuan Cui

author
#0 lore raw

cover PULL: fixes to bug 961, 964

From: Dexuan Cui <[email protected]>

[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 <[email protected]>
---

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(-)
Signature · 1 line
1.7.2
author
#1 lore raw

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

From: Dexuan Cui <[email protected]>

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 <[email protected]>
---
 meta/classes/sstate.bbclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
meta/classes/sstate.bbclass +4 -2
index cc0b866..be650c4 100644
@@ -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)
Signature · 1 line
1.7.2
#2 lore raw

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

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

Quoted 59 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Dexuan Cui
Sent: Friday, April 08, 2011 6:00 PM
To: [email protected]
Subject: [OE-core] [PATCH 1/2] sstate: ensure an ordered mapping between SSTATETASKS and SSTATETASKNAMES

From: Dexuan Cui <[email protected]>

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 <[email protected]>
---
 meta/classes/sstate.bbclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
meta/classes/sstate.bbclass +4 -3
index cc0b866..be650c4 100644
@@ -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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

author
#3 lore raw

PATCH 2/2 lsbsetup: Fix LIC_FILE_CHKSUM

In reply to Dexuan Cui

From: Dexuan Cui <[email protected]>

Fix [YOCTO #961]

Signed-off-by Dexuan Cui <[email protected]>
---
 meta/recipes-extended/lsb/lsbsetup_0.9.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-extended/lsb/lsbsetup_0.9.bb +1 -1
index 08e1d99..8cbaf1e 100644
@@ -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"
Signature · 1 line
1.7.2
author
#4 lore raw
In reply to Dexuan Cui
Quoted 15 lines · Dexuan Cui

From: Dexuan Cui <[email protected]>

[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.

Quoted 4 lines

[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

#5 lore raw
Quoted 16 lines · Dexuan
Quoted 15 lines · Dexuan Cui

From: Dexuan Cui <[email protected]>

[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.

Quoted 7 lines
Quoted 4 lines

[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