[PATCH 0/2] Fix bitbake-layers errors

[PATCH 0/2] Fix bitbake-layers errors

[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-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(-)

-- 
1.7.4.1

[PATCH 1/2] bitbake-layers: fix sorting by package name for cooker change

[Paul Eggleton]

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.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 bitbake/bin/bitbake-layers |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
index 5abf26c..bdfa4b6 100755
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -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)
 
-- 
1.7.4.1

[PATCH 2/2] bitbake-layers: fix error on startup caused by recent cooker change

[Paul Eggleton]

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

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 bitbake/bin/bitbake-layers |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
index bdfa4b6..1c48c8c 100755
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -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)
 
-- 
1.7.4.1

Re: [PATCH 0/2] Fix bitbake-layers errors

[Richard Purdie]

On Tue, 2011-07-05 at 14:25 +0100, Paul Eggleton wrote:
> 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

Merged to master, thanks.

Richard