diff options
| -rw-r--r-- | meta/classes/qemu.bbclass | 8 | ||||
| -rw-r--r-- | scripts/postinst-intercepts/update_font_cache | 4 | ||||
| -rw-r--r-- | scripts/postinst-intercepts/update_pixbuf_cache | 3 |
3 files changed, 3 insertions, 12 deletions
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass index 8b039266b9..0e71d6aaad 100644 --- a/meta/classes/qemu.bbclass +++ b/meta/classes/qemu.bbclass @@ -29,10 +29,4 @@ def qemu_run_binary(data, rootfs_path, binary): if qemu_binary == "qemu-allarch": qemu_binary = "qemuwrapper" - dynamic_loader = rootfs_path + '$(readelf -l ' + rootfs_path + \ - binary + '| grep "Requesting program interpreter"|sed -e \'s/^.*\[.*: \(.*\)\]/\\1/\')' - library_path = rootfs_path + data.getVar("base_libdir", True) + ":" + \ - rootfs_path + data.getVar("libdir", True) - - return "PSEUDO_UNLOAD=1 " + qemu_binary + " " + dynamic_loader + " --library-path " + library_path \ - + " " + rootfs_path + binary + return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path + " " + rootfs_path + binary diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache index 562b5b3cb9..ad1bab32be 100644 --- a/scripts/postinst-intercepts/update_font_cache +++ b/scripts/postinst-intercepts/update_font_cache @@ -1,7 +1,5 @@ #!/bin/sh -PSEUDO_UNLOAD=1 qemuwrapper $D$(readelf -l $D${bindir}/fc-cache| grep "Requesting program interpreter"|sed -e 's/^.*\[.*: \(.*\)\]/\1/') \ - --library-path $D/lib:$D/usr/lib $D${bindir}/fc-cache \ - --sysroot=$D >/dev/null 2>&1 +PSEUDO_UNLOAD=1 qemuwrapper -L $D $D${bindir}/fc-cache --sysroot=$D >/dev/null 2>&1 diff --git a/scripts/postinst-intercepts/update_pixbuf_cache b/scripts/postinst-intercepts/update_pixbuf_cache index 64033dc48a..9134529273 100644 --- a/scripts/postinst-intercepts/update_pixbuf_cache +++ b/scripts/postinst-intercepts/update_pixbuf_cache @@ -2,8 +2,7 @@ export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders -PSEUDO_UNLOAD=1 qemuwrapper $D$(readelf -l $D${bindir}/gdk-pixbuf-query-loaders|grep "Requesting program interpreter"|sed -e 's/^.*\[.*: \(.*\)\]/\1/') \ - --library-path $D/lib:$D/usr/lib $D${bindir}/gdk-pixbuf-query-loaders \ +PSEUDO_UNLOAD=1 qemuwrapper -L $D $D${bindir}/gdk-pixbuf-query-loaders \ >$GDK_PIXBUF_MODULEDIR/../loaders.cache 2>/dev/null && \ sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache |