Allow _prepend/_append/_delete variable flags to flow from unexpanded variable names to expanded ones (e.g. FILES_${PN} -> FILES_packagename)

1 files changed, 10 insertions, 0 deletions

diff --git a/bin/oe/data.py b/bin/oe/data.py
index 9d55bd3d8..9853ec161 100644
--- a/bin/oe/data.py
+++ b/bin/oe/data.py
@@ -244,8 +244,18 @@ def expandKeys(alterdata = _data, readdata = None):
         val = getVar(key, alterdata)
         if val is None:
             continue
+#        import copy
+#        setVarFlags(ekey, copy.copy(getVarFlags(key, readdata)), alterdata)
         setVar(ekey, val, alterdata)
 
+        for i in ('_append', '_prepend', '_delete'):
+            dest = getVarFlag(ekey, i, alterdata) or []
+            src = getVarFlag(key, i, readdata) or []
+            dest.extend(src)
+            setVarFlag(ekey, i, dest, alterdata)
+
+        delVar(key, alterdata)
+
 def expandData(alterdata = _data, readdata = None):
     """For each variable in alterdata, expand it, and update the var contents.
        Replacements use data from readdata.