summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Bergin <peter.bergin@windriver.com>2023-05-02 12:37:20 +0200
committerSteve Sakoman <steve@sakoman.com>2023-05-12 04:04:52 -1000
commit53e8446fe79e2aaee33ce8f882db5e2a20fe8197 (patch)
tree3a2693c04d6be252bdacdff65a9b671190d347a0
parent115d07b2d4f702fc569d47b64deb95d1fcb994a0 (diff)
downloadpoky-53e8446fe79e2aaee33ce8f882db5e2a20fe8197.tar.gz
update-alternatives.bbclass: fix old override syntax
Function 'gen_updatealternativesvardeps' still used old override syntax when fetching variable flags. Update to use ':' instead to match recipe meta data. This was found by review and no real issue encountered but it is a bug that affects variable dependencies and can affect rebuilds as task hashes might not be accurate. (From OE-Core rev: d5fd577c066fa2fddbd16c286f2dde2883cc7828) Signed-off-by: Peter Bergin <peter.bergin@windriver.com> Signed-off-by: Peter Bergin <peter@berginkonsult.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 5691f554b2cd50f256a8cbb1d96781e9eb6b930e) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/classes/update-alternatives.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index 7581a70439..2804299fc4 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -80,10 +80,10 @@ def gen_updatealternativesvardeps(d):
80 80
81 for p in pkgs: 81 for p in pkgs:
82 for v in vars: 82 for v in vars:
83 for flag in sorted((d.getVarFlags("%s_%s" % (v,p)) or {}).keys()): 83 for flag in sorted((d.getVarFlags("%s:%s" % (v,p)) or {}).keys()):
84 if flag == "doc" or flag == "vardeps" or flag == "vardepsexp": 84 if flag == "doc" or flag == "vardeps" or flag == "vardepsexp":
85 continue 85 continue
86 d.appendVar('%s_VARDEPS_%s' % (v,p), ' %s:%s' % (flag, d.getVarFlag('%s_%s' % (v,p), flag, False))) 86 d.appendVar('%s_VARDEPS_%s' % (v,p), ' %s:%s' % (flag, d.getVarFlag('%s:%s' % (v,p), flag, False)))
87 87
88def ua_extend_depends(d): 88def ua_extend_depends(d):
89 if not 'virtual/update-alternatives' in d.getVar('PROVIDES'): 89 if not 'virtual/update-alternatives' in d.getVar('PROVIDES'):