From d5fd577c066fa2fddbd16c286f2dde2883cc7828 Mon Sep 17 00:00:00 2001 From: Peter Bergin Date: Tue, 2 May 2023 12:37:20 +0200 Subject: 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. Signed-off-by: Peter Bergin Signed-off-by: Peter Bergin Signed-off-by: Richard Purdie (cherry picked from commit 5691f554b2cd50f256a8cbb1d96781e9eb6b930e) Signed-off-by: Steve Sakoman --- meta/classes/update-alternatives.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') 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): for p in pkgs: for v in vars: - for flag in sorted((d.getVarFlags("%s_%s" % (v,p)) or {}).keys()): + for flag in sorted((d.getVarFlags("%s:%s" % (v,p)) or {}).keys()): if flag == "doc" or flag == "vardeps" or flag == "vardepsexp": continue - d.appendVar('%s_VARDEPS_%s' % (v,p), ' %s:%s' % (flag, d.getVarFlag('%s_%s' % (v,p), flag, False))) + d.appendVar('%s_VARDEPS_%s' % (v,p), ' %s:%s' % (flag, d.getVarFlag('%s:%s' % (v,p), flag, False))) def ua_extend_depends(d): if not 'virtual/update-alternatives' in d.getVar('PROVIDES'): -- cgit 1.2.3-korg