summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2024-01-02 17:22:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-01-18 10:15:58 +0000
commit12619deabd1f85d88ff14d7c3861e23eeb58bf1b (patch)
tree845e727c6709eec6038373eceb40cf2fac97d817 /meta/lib/oe
parent55eaa3eb3f87fb900f4ea6e387ffbad73d78580c (diff)
downloadpoky-12619deabd1f85d88ff14d7c3861e23eeb58bf1b.tar.gz
rootfs: Fix MULTILIB_RE_ALLOW to be inherit order independent
This variable is only used by the ipk backend with multilibs. In order to make it work correctly regardless of inherit order, change the string to be space delimeted, set using += and add in the regex '|' sperator at the end of processing. (From OE-Core rev: 72befdb12568fbc642022ef0a23b269c5b37a638) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/package_manager/ipk/rootfs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py b/meta/lib/oe/package_manager/ipk/rootfs.py
index 1f74f7e39a..ba93eb62ea 100644
--- a/meta/lib/oe/package_manager/ipk/rootfs.py
+++ b/meta/lib/oe/package_manager/ipk/rootfs.py
@@ -165,7 +165,7 @@ class PkgRootfs(DpkgOpkgRootfs):
165 """ 165 """
166 def _multilib_sanity_test(self, dirs): 166 def _multilib_sanity_test(self, dirs):
167 167
168 allow_replace = self.d.getVar("MULTILIBRE_ALLOW_REP") 168 allow_replace = "|".join((self.d.getVar("MULTILIBRE_ALLOW_REP") or "").split())
169 if allow_replace is None: 169 if allow_replace is None:
170 allow_replace = "" 170 allow_replace = ""
171 171