[1.18][PATCH 0/2] Bitbake changes for 1.18 branch

[1.18][PATCH 0/2] Bitbake changes for 1.18 branch

[Paul Eggleton]

This includes one backport from master and one Hob change which applies
only to 1.18 (implementation in master is different.)

The following BitBake changes (against poky dylan, but apply cleanly
against the bitbake 1.18 branch with -p2) are available in the git
repository at:

  git://git.yoctoproject.org/poky-contrib paule/dylan-next-bb
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/dylan-next-bb

Cristiana Voicu (1):
  hob: save the base image name for the customized images

Richard Purdie (1):
  bitbake: data_smart: Ensure variable flags are accounted for in config
    data hash

 bitbake/lib/bb/data_smart.py                     | 6 ++++++
 bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 1 +
 2 files changed, 7 insertions(+)

-- 
1.8.1.2

[1.18][PATCH 1/2] hob: save the base image name for the customized images

[Paul Eggleton]

From: Cristiana Voicu <cristiana.voicu@intel.com>

Building an image, after customizing it, was failing because the base
image was not saved.

[YOCTO #4751]
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
---
 bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
index 66cb7ff..8452273 100755
--- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
@@ -288,6 +288,7 @@ class PackageSelectionPage (HobPage):
         self.refresh_selection()
         if not self.builder.customized:
             self.builder.customized = True
+            self.builder.configuration.initial_selected_image = self.builder.configuration.selected_image
             self.builder.configuration.selected_image = self.recipe_model.__custom_image__
             self.builder.rcppkglist_populated()
 
-- 
1.8.1.2

[1.18][PATCH 2/2] bitbake: data_smart: Ensure variable flags are accounted for in config data hash

[Paul Eggleton]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

Currently if the flags set against a variable in the base data store
change, it doesn't automatically trigger a reparse when it really
should. For example with the blacklist class setting:

PNBLACKLIST[qemu] = "bar"
PNBLACKLIST[bash] = "foo"

will not trigger a reparse if only one entry is changed and a
blacklisted recipe can still be built.

I did consider using BB_SIGNATURE_EXCLUDE_FLAGS in here however it
doesn't make sense, we want to trigger a reparse when any of the
flags change too (which is different to the sstate signatures which
we wouldn't want to change in those cases).

[YOCTO #4627]

(Bitbake master rev: ed74ea50043f6feb698c891e571feda2b9f8513d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 bitbake/lib/bb/data_smart.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 2fd8ccd..fa7811e 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -738,6 +738,12 @@ class DataSmart(MutableMapping):
             value = d.getVar(key, False) or ""
             data.update({key:value})
 
+            varflags = d.getVarFlags(key)
+            if not varflags:
+                continue
+            for f in varflags:
+                data.update({'%s[%s]' % (key, f):varflags[f]})
+
         for key in ["__BBTASKS", "__BBANONFUNCS", "__BBHANDLERS"]:
             bb_list = d.getVar(key, False) or []
             bb_list.sort()
-- 
1.8.1.2