mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: bitbake: cooker: Split file collections per multiconfig

Browse Source 
Splits the cooker to track a collection per multiconfig instead of a
single collection for all multiconfigs. Practically speaking, this
allows each multiconfigs to each have different BBMASKs that apply to it
instead of each one using the mask specified in the base configuration.

(Bitbake rev: dd6d8eca2027f8d9be8a734a493227b440075e49)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Watt
2020-06-05 22:15:29 -05:00
committed by Richard Purdie
parent f08d269c48
commit b9fdb6a426
7 changed files with 144 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bblayers/action.py
+15 -7
View File
@@ -143,11 +143,12 @@ build results (as the layer priority order has effectively changed).
applied_appends = []
for layer in layers:
overlayed = []
for f in self.tinfoil.cooker.collection.overlayed.keys():
for of in self.tinfoil.cooker.collection.overlayed[f]:
if of.startswith(layer):
overlayed.append(of)
overlayed = set()
for mc in self.tinfoil.cooker.multiconfigs:
for f in self.tinfoil.cooker.collections[mc].overlayed.keys():
for of in self.tinfoil.cooker.collections[mc].overlayed[f]:
if of.startswith(layer):
overlayed.add(of)
logger.plain('Copying files from %s...' % layer )
for root, dirs, files in os.walk(layer):
@@ -174,14 +175,21 @@ build results (as the layer priority order has effectively changed).
logger.warning('Overwriting file %s', fdest)
bb.utils.copyfile(f1full, fdest)
if ext == '.bb':
for append in self.tinfoil.cooker.collection.get_file_appends(f1full):
appends = set()
for mc in self.tinfoil.cooker.multiconfigs:
appends |= set(self.tinfoil.cooker.collections[mc].get_file_appends(f1full))
for append in appends:
if layer_path_match(append):
logger.plain(' Applying append %s to %s' % (append, fdest))
self.apply_append(append, fdest)
applied_appends.append(append)
# Take care of when some layers are excluded and yet we have included bbappends for those recipes
for b in self.tinfoil.cooker.collection.bbappends:
bbappends = set()
for mc in self.tinfoil.cooker.multiconfigs:
bbappends |= set(self.tinfoil.cooker.collections[mc].bbappends)
for b in bbappends:
(recipename, appendname) = b
if appendname not in applied_appends:
first_append = None
bitbake/lib/bblayers/query.py
+2 -2
View File
@@ -320,12 +320,12 @@ Lists recipes with the bbappends that apply to them as subitems.
def get_appends_for_files(self, filenames):
appended, notappended = [], []
for filename in filenames:
_, cls, _ = bb.cache.virtualfn2realfn(filename)
_, cls, mc = bb.cache.virtualfn2realfn(filename)
if cls:
continue
basename = os.path.basename(filename)
appends = self.tinfoil.cooker.collection.get_file_appends(basename)
appends = self.tinfoil.cooker.collections[mc].get_file_appends(basename)
if appends:
appended.append((basename, list(appends)))
else: