]> code.ossystems Code Review - openembedded-core.git/commitdiff
lib/oe/package_manager.py: put the sdk_provides_dummy_target upfront
authorAlexander Kanavin <alex.kanavin@gmail.com>
Wed, 8 Jan 2020 13:27:48 +0000 (14:27 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 10 Jan 2020 20:32:04 +0000 (20:32 +0000)
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 <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/package_manager.py

index 4ff19cf09c4f319fe4fccefe48ac73f4b50c78d3..e15e3c4a315d4d372620a24af520e420f1907317 100644 (file)
@@ -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))