From: Alexander Kanavin Date: Wed, 8 Jan 2020 13:27:48 +0000 (+0100) Subject: lib/oe/package_manager.py: put the sdk_provides_dummy_target upfront X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~12301 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a807d54655d7377ef8ac49abd5ab428303831663;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git lib/oe/package_manager.py: put the sdk_provides_dummy_target upfront Otherwise, the package utilizing this architecure does not get properly prioritized by rpm/dnf. This isn't seen single-lib builds (as the architecture ends up upfront anyway), but is triggered in multulib where the architecture may end up in the middle of the list due to multilib expansion/trimming duplicates. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 4ff19cf09c4..e15e3c4a315 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -768,6 +768,8 @@ class RpmPM(PackageManager): # This prevents accidental matching against libsolv's built-in policies if len(archs) <= 1: archs = archs + ["bogusarch"] + # This architecture needs to be upfront so that packages using it are properly prioritized + archs = ["sdk_provides_dummy_target"] + archs confdir = "%s/%s" %(self.target_rootfs, "etc/dnf/vars/") bb.utils.mkdirhier(confdir) open(confdir + "arch", 'w').write(":".join(archs))