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-10 04:16:51 -1000
commit60f959a0b0947ffd7abf351698eeed185a94e4d0 (patch)
treea622f7520ae98a3fc1ddd41bb0d127da226afb31
parentd14a46aef2af1e3de888cac76180c428a6ef6ff5 (diff)
downloadpoky-60f959a0b0947ffd7abf351698eeed185a94e4d0.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: 27b4fb60c7c66c245ba50607c8e178390fc41014) 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-recipe/update-alternatives.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes-recipe/update-alternatives.bbclass b/meta/classes-recipe/update-alternatives.bbclass
index 36a7497fec..b153e1b297 100644
--- a/meta/classes-recipe/update-alternatives.bbclass
+++ b/meta/classes-recipe/update-alternatives.bbclass
@@ -86,10 +86,10 @@ def gen_updatealternativesvardeps(d):
86 86
87 for p in pkgs: 87 for p in pkgs:
88 for v in vars: 88 for v in vars:
89 for flag in sorted((d.getVarFlags("%s_%s" % (v,p)) or {}).keys()): 89 for flag in sorted((d.getVarFlags("%s:%s" % (v,p)) or {}).keys()):
90 if flag == "doc" or flag == "vardeps" or flag == "vardepsexp": 90 if flag == "doc" or flag == "vardeps" or flag == "vardepsexp":
91 continue 91 continue
92 d.appendVar('%s_VARDEPS_%s' % (v,p), ' %s:%s' % (flag, d.getVarFlag('%s_%s' % (v,p), flag, False))) 92 d.appendVar('%s_VARDEPS_%s' % (v,p), ' %s:%s' % (flag, d.getVarFlag('%s:%s' % (v,p), flag, False)))
93 93
94def ua_extend_depends(d): 94def ua_extend_depends(d):
95 if not 'virtual/update-alternatives' in d.getVar('PROVIDES'): 95 if not 'virtual/update-alternatives' in d.getVar('PROVIDES'):