mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
BBFILES: use a set to remove duplicates when collecting.
(Bitbake rev: b1b06133da4ca379a60775552d481f7fbf77e999) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
committed by
Richard Purdie
parent
adbfce3958
commit
19d5f2b067
@@ -852,23 +852,23 @@ class BBCooker:
|
|||||||
bb.msg.error(bb.msg.domain.Collection, "no recipe files to build, check your BBPATH and BBFILES?")
|
bb.msg.error(bb.msg.domain.Collection, "no recipe files to build, check your BBPATH and BBFILES?")
|
||||||
bb.event.fire(CookerExit(), self.configuration.event_data)
|
bb.event.fire(CookerExit(), self.configuration.event_data)
|
||||||
|
|
||||||
newfiles = []
|
newfiles = set()
|
||||||
for f in files:
|
for f in files:
|
||||||
if os.path.isdir(f):
|
if os.path.isdir(f):
|
||||||
dirfiles = self.find_bbfiles(f)
|
dirfiles = self.find_bbfiles(f)
|
||||||
if dirfiles:
|
if dirfiles:
|
||||||
newfiles += dirfiles
|
newfiles.update(dirfiles)
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
globbed = glob.glob(f)
|
globbed = glob.glob(f)
|
||||||
if not globbed and os.path.exists(f):
|
if not globbed and os.path.exists(f):
|
||||||
globbed = [f]
|
globbed = [f]
|
||||||
newfiles += globbed
|
newfiles.update(globbed)
|
||||||
|
|
||||||
bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1)
|
bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1)
|
||||||
|
|
||||||
if not bbmask:
|
if not bbmask:
|
||||||
return (newfiles, 0)
|
return (list(newfiles), 0)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
bbmask_compiled = re.compile(bbmask)
|
bbmask_compiled = re.compile(bbmask)
|
||||||
|
|||||||
Reference in New Issue
Block a user