From 0d8f2ed39efc018b231bd1bd340b285bad2348b0 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 19 Aug 2021 23:59:31 -0700 Subject: package_rpm/update-alternatives: fix package's provides Currently we have: $ rpm -qp --provides tmp/deploy/rpm/core2_64/bash-5.1.8-r0.core2_64.rpm bash = 5.1.8-r0 This is incorrect as bash provides /bin/bash and /bin/sh. This is caused by incomplete conversion of new override syntax, which breaks the per-file parsing of package_rpm. With this patch, we have: $ rpm -qp --provides tmp/deploy/rpm/core2_64/bash-5.1.8-r0.core2_64.rpm /bin/bash /bin/sh bash = 5.1.8-r0 (From OE-Core rev: f186d32ff8bf176ad0bd8d49e47cdb017c701a46) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/classes/update-alternatives.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes/update-alternatives.bbclass') diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 81ca05de0e..fc1ffd828c 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -321,7 +321,7 @@ def apply_update_alternative_provides(d): # Add file provide trans_target = oe.package.file_translate(alt_target) - d.appendVar('FILERPROVIDES_%s_%s' % (trans_target, pkg), " " + alt_link) - if not trans_target in (d.getVar('FILERPROVIDESFLIST_%s' % pkg) or ""): - d.appendVar('FILERPROVIDESFLIST_%s' % pkg, " " + trans_target) + d.appendVar('FILERPROVIDES:%s:%s' % (trans_target, pkg), " " + alt_link) + if not trans_target in (d.getVar('FILERPROVIDESFLIST:%s' % pkg) or ""): + d.appendVar('FILERPROVIDESFLIST:%s' % pkg, " " + trans_target) -- cgit v1.2.3-54-g00ecf