bitbake-layers: fix sorting of show_appends output
Sort packages alphabetically but ensure appends are left in their original order (layer priority). (Bitbake rev: edacf98cceb2fe1275042595d3fce6822fa411ca) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
1164b76983
commit
deb14487d1
|
@ -149,7 +149,9 @@ class Commands(cmd.Cmd):
|
||||||
|
|
||||||
logger.info('State of append files:')
|
logger.info('State of append files:')
|
||||||
|
|
||||||
for pn in self.cooker_data.pkg_pn:
|
pnlist = list(self.cooker_data.pkg_pn.keys())
|
||||||
|
pnlist.sort( key=lambda item: item.pn )
|
||||||
|
for pn in pnlist:
|
||||||
self.show_appends_for_pn(pn)
|
self.show_appends_for_pn(pn)
|
||||||
|
|
||||||
self.show_appends_for_skipped()
|
self.show_appends_for_skipped()
|
||||||
|
@ -188,7 +190,7 @@ class Commands(cmd.Cmd):
|
||||||
|
|
||||||
|
|
||||||
def get_appends_for_files(self, filenames):
|
def get_appends_for_files(self, filenames):
|
||||||
appended, notappended = set(), set()
|
appended, notappended = [], []
|
||||||
for filename in filenames:
|
for filename in filenames:
|
||||||
_, cls = bb.cache.Cache.virtualfn2realfn(filename)
|
_, cls = bb.cache.Cache.virtualfn2realfn(filename)
|
||||||
if cls:
|
if cls:
|
||||||
|
@ -197,9 +199,9 @@ class Commands(cmd.Cmd):
|
||||||
basename = os.path.basename(filename)
|
basename = os.path.basename(filename)
|
||||||
appends = self.cooker_data.appends.get(basename)
|
appends = self.cooker_data.appends.get(basename)
|
||||||
if appends:
|
if appends:
|
||||||
appended.add((basename, frozenset(appends)))
|
appended.append((basename, list(appends)))
|
||||||
else:
|
else:
|
||||||
notappended.add(basename)
|
notappended.append(basename)
|
||||||
return appended, notappended
|
return appended, notappended
|
||||||
|
|
||||||
def show_appends_with_no_recipes(self):
|
def show_appends_with_no_recipes(self):
|
||||||
|
|
Loading…
Reference in New Issue