allarch: Fix interaction with qemu class
PATCH 1/2 allarch: Fix interaction with qemu class
The qemu class declares functions which are architecture specific. If a user such as meson is used in an allarch recipe, this leads to sstate which is machine specific. To fix this, remove the architecture specific part, since there are no binaries in allarch classes, this change shouldn't break anything.
Signed-off-by Richard Purdie <[email protected]>
--- meta/classes/allarch.bbclass | 2 ++ 1 file changed, 2 insertions(+)
meta/classes/allarch.bbclass +2 -0
@@ -61,3 +61,5 @@ python () { bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE")) } +def qemu_wrapper_cmdline(data, rootfs_path, library_paths): + return 'false'
Signature · 1 line
2.32.0
PATCH 2/2 gtk-doc/meson: Fix typos
Fix a couple of function name typos copy and pasted between the classes.
Signed-off-by Richard Purdie <[email protected]>
--- meta/classes/gtk-doc.bbclass | 2 +- meta/classes/meson.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/classes/gtk-doc.bbclass +1 -1
@@ -63,7 +63,7 @@ export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy GIR_EXTRA_LIBS_PATH=\`find ${B} -name *.so -printf "%h\n"|sort|uniq| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH GIR_EXTRA_LIBS_PATH=\`find ${B} -name .libs| tr '\n' ':'\`\$GIR_EXTRA_LIBS_PATH -# meson sets this wrongly (only to libs in build-dir), qemu-wrapper_cmdline() and GIR_EXTRA_LIBS_PATH take care of it properly +# meson sets this wrongly (only to libs in build-dir), qemu_wrapper_cmdline() and GIR_EXTRA_LIBS_PATH take care of it properly unset LD_LIBRARY_PATH if [ -d ".libs" ]; then
meta/classes/meson.bbclass +1 -1
@@ -124,7 +124,7 @@ do_write_config:append:class-target() { # which may then get deleted (or their dependencies) and potentially segfault export GIO_MODULE_DIR=${STAGING_LIBDIR}/gio/modules-dummy -# meson sets this wrongly (only to libs in build-dir), qemu-wrapper_cmdline() and GIR_EXTRA_LIBS_PATH take care of it properly +# meson sets this wrongly (only to libs in build-dir), qemu_wrapper_cmdline() and GIR_EXTRA_LIBS_PATH take care of it properly unset LD_LIBRARY_PATH $qemu_binary "\$@"
Signature · 1 line
2.32.0