[OE-core] [oe-commits] [openembedded-core] 02/09: glib-2.0: add missing locale dependencies to PN-ptest

[richard.purdie at linuxfoundation.org]

On Sat, 2018-10-13 at 23:16 +0200, Martin Jansa wrote:
> I was checking my builds and here is what I've found.

Thanks for digging into this, it has highlighted a few important
issues. I've queued the patches.

> $ grep locale-base env.bash
> $
> 
> And in the build without the bbappend:
> 
> # $RDEPENDS_bash-ptest [3 operations]
> #   rename from RDEPENDS_${PN}-ptest data.py:116 [expandKeys]
> #     " make"
> #   override[class-native]:rename from RDEPENDS_${PN}-ptest_class-
> native data_smart.py:641 [renameVar]
> #     ""
> #   override[class-nativesdk]:rename from RDEPENDS_${PN}-ptest_class-
> nativesdk data_smart.py:641 [renameVar]
> #     ""
> # pre-expansion value:
> #   " make locale-base-fr-fr locale-base-de-de"
> RDEPENDS_bash-ptest=" make locale-base-fr-fr locale-base-de-de"
> 
> but also without the RDEPENDS_${PN}-ptest history:
> 
> $ grep RDEPENDS.*ptest env.bash
> #   override[bash-ptest]:rename from RDEPENDS_${PN}-ptest data.py:116
> [expandKeys]
> #   override[bash-ptest_class-native]:rename from RDEPENDS_${PN}-
> ptest_class-native data_smart.py:641 [renameVar]
> #   override[bash-ptest_class-nativesdk]:rename from RDEPENDS_${PN}-
> ptest_class-nativesdk data_smart.py:641 [renameVar]
> # $RDEPENDS_bash-ptest [3 operations]
> #   rename from RDEPENDS_${PN}-ptest data.py:116 [expandKeys]
> #   override[class-native]:rename from RDEPENDS_${PN}-ptest_class-
> native data_smart.py:641 [renameVar]
> #   override[class-nativesdk]:rename from RDEPENDS_${PN}-ptest_class-
> nativesdk data_smart.py:641 [renameVar]
> RDEPENDS_bash-ptest=" make locale-base-fr-fr locale-base-de-de"
> # $RDEPENDS_bash-ptest_class-native
> #   rename from RDEPENDS_${PN}-ptest_class-native data_smart.py:641
> [renameVar]
> RDEPENDS_bash-ptest_class-native=""
> # $RDEPENDS_bash-ptest_class-nativesdk
> #   rename from RDEPENDS_${PN}-ptest_class-nativesdk
> data_smart.py:641 [renameVar]
> RDEPENDS_bash-ptest_class-nativesdk=""
> 
> $ grep locale-base env.bash
> #   " make locale-base-fr-fr locale-base-de-de"
> RDEPENDS_bash-ptest=" make locale-base-fr-fr locale-base-de-de"
[...]
> It just magically appears in pre-expansion value.
> 
> Shouldn't bitbake -e show that "locale-base-fr-fr locale-base-de-de"
> were appended (and in the build with bbappend that they were appended
> and then removed)? That would help me to find out what's going on
> much faster.

Agreed, bitbake needs to do better here. I had a quick poke around and
came up with this:

diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 7b09af5cf1b..4434142a02e 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -267,6 +267,16 @@ class VariableHistory(object):
             return
         self.variables[var].append(loginfo.copy())
 
+    def rename_variable_hist(self, oldvar, newvar):
+        if not self.dataroot._tracking:
+            return
+        if oldvar not in self.variables:
+            return
+        if newvar not in self.variables:
+            self.variables[newvar] = []
+        for i in self.variables[oldvar]:
+            self.variables[newvar].append(i.copy())
+
     def variable(self, var):
         remote_connector = self.dataroot.getVar('_remote_data', False)
         if remote_connector:
@@ -619,6 +629,7 @@ class DataSmart(MutableMapping):
 
         val = self.getVar(key, 0, parsing=True)
         if val is not None:
+            self.varhistory.rename_variable_hist(key, newkey)
             loginfo['variable'] = newkey
             loginfo['op'] = 'rename from %s' % key
             loginfo['detail'] = val


which now shows:

# $RDEPENDS_bash-ptest [8 operations]
#   append /media/build1/poky/meta/recipes-extended/bash/bash.inc:26
#     "make"
#   _append[libc-glibc] /media/build1/poky/meta/recipes-extended/bash/bash.inc:29
#     " locale-base-fr-fr locale-base-de-de"
#   _remove[libc-glibc] /media/build1/poky/meta/recipes-extended/bash/bash_4.4.18.bb:43
#     "locale-base-fr-fr locale-base-de-de"
#   rename from RDEPENDS_${PN}-ptest data.py:116 [expandKeys]
#     "make"
#   override[class-native]:set /media/build1/poky/meta/classes/ptest.bbclass:13
#     ""
#   override[class-native]:rename from RDEPENDS_${PN}-ptest_class-native data_smart.py:652 [renameVar]
#     ""
#   override[class-nativesdk]:set /media/build1/poky/meta/classes/ptest.bbclass:14
#     ""
#   override[class-nativesdk]:rename from RDEPENDS_${PN}-ptest_class-nativesdk data_smart.py:652 [renameVar]
#     ""
# pre-expansion value:
#   "make"
RDEPENDS_bash-ptest="make"

which is better but I'm confused why there are the "rename from" for
the overrides which aren't being applied (this is for bash, not bash-
native or bash-nativesdk).

So more investigation is needed...

Cheers,

Richard