diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes-recipe/image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes-recipe/rootfs_ipk.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oe/package_manager/ipk/rootfs.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index 7231fad940..6bdddc0134 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass | |||
@@ -609,7 +609,7 @@ python create_symlinks() { | |||
609 | bb.note("Skipping symlink, source does not exist: %s -> %s" % (dst, src)) | 609 | bb.note("Skipping symlink, source does not exist: %s -> %s" % (dst, src)) |
610 | } | 610 | } |
611 | 611 | ||
612 | MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|/lib/modules/[^/]*/modules.*|" | 612 | MULTILIBRE_ALLOW_REP += "${base_bindir} ${base_sbindir} ${bindir} ${sbindir} ${libexecdir} ${sysconfdir} ${nonarch_base_libdir}/udev /lib/modules/[^/]*/modules.*" |
613 | MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py" | 613 | MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py" |
614 | MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib" | 614 | MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib" |
615 | 615 | ||
diff --git a/meta/classes-recipe/rootfs_ipk.bbclass b/meta/classes-recipe/rootfs_ipk.bbclass index a48ad07dfc..87fff53a58 100644 --- a/meta/classes-recipe/rootfs_ipk.bbclass +++ b/meta/classes-recipe/rootfs_ipk.bbclass | |||
@@ -29,7 +29,7 @@ OPKG_POSTPROCESS_COMMANDS = "" | |||
29 | 29 | ||
30 | OPKGLIBDIR ??= "${localstatedir}/lib" | 30 | OPKGLIBDIR ??= "${localstatedir}/lib" |
31 | 31 | ||
32 | MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg|/usr/lib/opkg" | 32 | MULTILIBRE_ALLOW_REP += "${OPKGLIBDIR}/opkg /usr/lib/opkg" |
33 | 33 | ||
34 | python () { | 34 | python () { |
35 | 35 | ||
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 | ||