summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-01-08 14:27:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-10 21:18:21 +0000
commit25fd2bf815fe92b1e45165bd5e8fb4372f6bd0d1 (patch)
tree8d7b8606504cdaf4a1c729d67b5c68e7a7c1f7db /meta/lib/oe
parent843c76478d1b1e4076ee5b4b6bc8086b1922cc94 (diff)
downloadpoky-25fd2bf815fe92b1e45165bd5e8fb4372f6bd0d1.tar.gz
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. (From OE-Core rev: a807d54655d7377ef8ac49abd5ab428303831663) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/package_manager.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 4ff19cf09c..e15e3c4a31 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -768,6 +768,8 @@ class RpmPM(PackageManager):
768 # This prevents accidental matching against libsolv's built-in policies 768 # This prevents accidental matching against libsolv's built-in policies
769 if len(archs) <= 1: 769 if len(archs) <= 1:
770 archs = archs + ["bogusarch"] 770 archs = archs + ["bogusarch"]
771 # This architecture needs to be upfront so that packages using it are properly prioritized
772 archs = ["sdk_provides_dummy_target"] + archs
771 confdir = "%s/%s" %(self.target_rootfs, "etc/dnf/vars/") 773 confdir = "%s/%s" %(self.target_rootfs, "etc/dnf/vars/")
772 bb.utils.mkdirhier(confdir) 774 bb.utils.mkdirhier(confdir)
773 open(confdir + "arch", 'w').write(":".join(archs)) 775 open(confdir + "arch", 'w').write(":".join(archs))