Fix bitbake-layers errors
cover Fix bitbake-layers errors
These patches fix two issues with bitbake-layers caused by interaction between several recent bitbake patches.
The changes are available (against Poky, but apply cleanly against bitbake master with -p2) at:
git://git.pokylinux.org/poky-contrib paule/bitbake-layers-fix
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/bitbake-layers-fix
Paul Eggleton (2):
bitbake-layers: fix sorting by package name for cooker change
bitbake-layers: fix error on startup caused by recent cooker change
bitbake/bin/bitbake-layers | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.4.1
PATCH 1/2 bitbake-layers: fix sorting by package name for cooker change
Structure of cooker was changed since the patch for bitbake commit edacf98cceb2fe1275042595d3fce6822fa411ca was created - cooker.pkg_pn now has string keys, so sort it accordingly.
--- bitbake/bin/bitbake-layers | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
bitbake/bin/bitbake-layers +1 -1
@@ -150,7 +150,7 @@ class Commands(cmd.Cmd): logger.info('State of append files:') pnlist = list(self.cooker_data.pkg_pn.keys()) - pnlist.sort( key=lambda item: item.pn ) + pnlist.sort() for pn in pnlist: self.show_appends_for_pn(pn)
Signature · 1 line
1.7.4.1
PATCH 2/2 bitbake-layers: fix error on startup caused by recent cooker change
In reply to Paul EggletonFix bitbake-layers "TypeError: 'NoneType' object is not iterable" error on startup. Commit f3be8e9a7df13cc11ffc8fc667efaf2db96a7c38 changed to expect prefile and postfile to be populated and no longer expects file.
--- bitbake/bin/bitbake-layers | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
bitbake/bin/bitbake-layers +2 -1
@@ -211,7 +211,8 @@ class Config(object): self.pkgs_to_build = [] self.debug_domains = [] self.extra_assume_provided = [] - self.file = [] + self.prefile = [] + self.postfile = [] self.debug = 0 self.__dict__.update(options)
Signature · 1 line
1.7.4.1
Richard Purdie
AppliedQuoted 11 lines · Paul Eggleton
These patches fix two issues with bitbake-layers caused by interaction between several recent bitbake patches.
The changes are available (against Poky, but apply cleanly against bitbake master with -p2) at:
git://git.pokylinux.org/poky-contribpaule/bitbake-layers-fix
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/bitbake-layers-fixPaul Eggleton (2):
bitbake-layers: fix sorting by package name for cooker change
bitbake-layers: fix error on startup caused by recent cooker change
Merged to master, thanks.
Richard