classes/recipes: remove unnecessary qemu inherit and use qemuwrapper-cross
PATCH v3 1/5 classes/recipes: remove unnecessary qemu inherit and use qemuwrapper-cross
From: Chen Qi <[email protected]>
These classes/recipes inherit qemu.bbclass but do not use anything from it. What they use is qemuwrapper-cross, which is needed at do_rootfs time and needs to be pulled-in by PACKAGE_WRITE_DEPS.
--- meta/classes-recipe/fontcache.bbclass | 3 +-- meta/classes-recipe/gio-module-cache.bbclass | 3 +-- meta/classes-recipe/gtk-immodules-cache.bbclass | 4 +--- meta/classes-recipe/manpages.bbclass | 2 +- meta/classes-recipe/pixbufcache.bbclass | 5 +---- meta/recipes-core/systemd/systemd_257.5.bb | 5 +++-- meta/recipes-core/udev/eudev_3.2.14.bb | 4 ++-- 7 files changed, 10 insertions(+), 16 deletions(-)
meta/classes-recipe/fontcache.bbclass +1 -2
@@ -9,8 +9,7 @@ # packages. # -PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" FONT_PACKAGES ??= "${PN}" FONT_PACKAGES:class-native = ""
meta/classes-recipe/gio-module-cache.bbclass +1 -2
@@ -4,8 +4,7 @@ # SPDX-License-Identifier: MIT # -PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" GIO_MODULE_PACKAGES ??= "${PN}"
meta/classes-recipe/gtk-immodules-cache.bbclass +1 -3
@@ -8,9 +8,7 @@ # # Usage: Set GTKIMMODULES_PACKAGES to the packages that needs to update the inputmethod modules -PACKAGE_WRITE_DEPS += "qemu-native" - -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" GTKIMMODULES_PACKAGES ?= "${PN}"
meta/classes-recipe/manpages.bbclass +1 -1
@@ -10,7 +10,7 @@ # by default. PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'manpages', '', d)}" -inherit qemu +PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'qemuwrapper-cross', '', d)}" # usually manual files are packaged to ${PN}-doc except man-pages MAN_PKG ?= "${PN}-doc"
meta/classes-recipe/pixbufcache.bbclass +1 -4
@@ -9,12 +9,9 @@ # packages. # -DEPENDS:append:class-target = " qemu-native" -inherit qemu - PIXBUF_PACKAGES ??= "${PN}" -PACKAGE_WRITE_DEPS += "qemu-native gdk-pixbuf-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross gdk-pixbuf-native" pixbufcache_common() { if [ "x$D" != "x" ]; then
meta/recipes-core/systemd/systemd_257.5.bb +3 -2
@@ -8,7 +8,7 @@ DEPENDS = "gperf-native libcap util-linux python3-jinja2-native" SECTION = "base/shell" -inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check mime +inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives systemd gettext bash-completion manpages features_check mime # unmerged-usr support is deprecated upstream, taints the system and will be # removed in the near future. Fail the build if it is not enabled.
@@ -932,7 +932,8 @@ pkg_prerm:${PN}:libc-glibc () { fi } -PACKAGE_WRITE_DEPS += "qemu-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" + pkg_postinst:udev-hwdb () { if test -n "$D"; then $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} \
meta/recipes-core/udev/eudev_3.2.14.bb +2 -2
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc192 GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases" -inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases +inherit autotools update-rc.d pkgconfig features_check manpages github-releases CONFLICT_DISTRO_FEATURES = "systemd"
@@ -77,7 +77,7 @@ RDEPENDS:${PN} += "kmod" RPROVIDES:${PN} = "hotplug udev" RPROVIDES:${PN}-hwdb += "udev-hwdb" -PACKAGE_WRITE_DEPS += "qemu-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" pkg_postinst:${PN}-hwdb () { if test -n "$D"; then $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX}
Signature · 1 line
2.49.0
PATCH v3 2/5 cpio: fix ptest-runner dependency
From: Chen Qi <[email protected]>
ptest is only meaningful for target. So we need to specify class-target override to ensure correct dependency.
Also, the above DEPENDS:append:class-targets lacks a leading whitespace, add it.
--- meta/recipes-extended/cpio/cpio_2.15.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-extended/cpio/cpio_2.15.bb +2 -2
@@ -66,8 +66,8 @@ do_install_ptest_base:append() { } # The tests need to run as a non-root user, so pull in the ptest user -DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" -PACKAGE_WRITE_DEPS += "ptest-runner" +DEPENDS:append:class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" +PACKAGE_WRITE_DEPS:append:class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" RDEPENDS:${PN}-ptest += "ptest-runner"
Signature · 1 line
2.49.0
Re: [OE-core][PATCH V3 2/5] cpio: fix ptest-runner dependency
Quoted 2 lines · Chen Qi via lists.openembedded.org
Also, the above DEPENDS:append:class-targets lacks a leading whitespace, add it.
Not strictly true:
meta/recipes-extended/cpio/cpio_2.15.bb do_install_ptest_base:append() { · line 69
Quoted 2 lines
meta/recipes-extended/cpio/cpio_2.15.bb +1
-1-DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" +DEPENDS:append:class-target = " ${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}"
There’s whitespace in the value being added, so if PTEST_ENABLED is false you don’t get whitespace appended for no reason.
Ross
PATCH v3 3/5 nativesdk.bbclass: handle PACKAGE_WRITE_DEPS
In reply to [email protected]From: Chen Qi <[email protected]>
We want nativesdk packages to depend on correct recipes introduced by PACKAGE_WRITE_DEPS, so do the same mapping just as we do for DEPENDS.
Before this change:
nativesdk-glib-2.0 -> qemuwrapper-cross
After this change:
nativesdk-glib-2.0 -> nativesdk-qemuwrapper-cross
This can fix do_populate_sdk failure complaining missing of nativesdk-qemuwrapper. Error message is like below:
NOTE: > Executing update_gio_module_cache-nativesdk intercept ...
NOTE: Exit code 127. Output:
/xxx/lib32-core-image-sato/1.0/intercept_scripts-xxxx/ update_gio_module_cache-nativesdk: 13: nativesdk-qemuwrapper: not found
--- meta/classes-recipe/nativesdk.bbclass | 1 + 1 file changed, 1 insertion(+)
meta/classes-recipe/nativesdk.bbclass +1 -0
@@ -104,6 +104,7 @@ python () { clsextend.rename_package_variables((d.getVar("PACKAGEVARS") or "").split()) clsextend.map_depends_variable("DEPENDS") + clsextend.map_depends_variable("PACKAGE_WRITE_DEPS") clsextend.map_packagevars() clsextend.map_variable("PROVIDES") clsextend.map_regexp_variable("PACKAGES_DYNAMIC")
Signature · 1 line
2.49.0
PATCH v3 4/5 image/populate_sdk.bbclass: drop qemuwrapper-cross from DEPENDS
In reply to [email protected]From: Chen Qi <[email protected]>
For packages that need qemuwrapper-cross, they should have it in PAKAGE_WRITE_DEPS.
Now that we've used 'qemuwrapper-cross' to replace 'qemu-native' for recipes that need qemu-native for their postinsts, and we've now mapped PACKAGE_WRITE_DEPS for nativesdk recipes, these qemuwrapper-cross dependencies can be dropped from image.bbclass and populate_sdk.bbclass.
--- meta/classes-recipe/image.bbclass | 2 +- meta/classes-recipe/populate_sdk_base.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/classes-recipe/image.bbclass +1 -1
@@ -30,7 +30,7 @@ POPULATE_SDK_POST_TARGET_COMMAND += "rootfs_sysroot_relativelinks" LICENSE ?= "MIT" PACKAGES = "" -DEPENDS += "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross depmodwrapper-cross cross-localedef-native" +DEPENDS += "depmodwrapper-cross cross-localedef-native" RDEPENDS += "${PACKAGE_INSTALL} ${LINGUAS_INSTALL} ${IMAGE_INSTALL_DEBUGFS}" RRECOMMENDS += "${PACKAGE_INSTALL_ATTEMPTONLY}" PATH:prepend = "${@":".join(all_multilib_tune_values(d, 'STAGING_BINDIR_CROSS').split())}:"
meta/classes-recipe/populate_sdk_base.bbclass +1 -1
@@ -109,7 +109,7 @@ python () { } SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" -SDK_DEPENDS = "virtual/fakeroot-native ${SDK_ARCHIVE_DEPENDS} cross-localedef-native nativesdk-qemuwrapper-cross ${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross" +SDK_DEPENDS = "virtual/fakeroot-native ${SDK_ARCHIVE_DEPENDS} cross-localedef-native" PATH:prepend = "${WORKDIR}/recipe-sysroot/${SDKPATHNATIVE}${bindir}/crossscripts:${@":".join(all_multilib_tune_values(d, 'STAGING_BINDIR_CROSS').split())}:" SDK_DEPENDS += "nativesdk-glibc-locale"
Signature · 1 line
2.49.0
PATCH v3 5/5 lib/classes/recipes: refactor qemu.bbclass functions into library functions
In reply to [email protected]From: Chen Qi <[email protected]>
Move the functions in qemu.bbclass to meta/lib/oe/qemu.py as they are generally useful. Add a deprecation notice in qemu.bbclass so that we can remove it in the future.
The logic of re-definition of qemu_wrapper_cmdline in allarch.bbclass is moved to qemu_wrapper_cmdine function.
--- meta/classes-recipe/allarch.bbclass | 2 - meta/classes-recipe/cmake-qemu.bbclass | 4 +- meta/classes-recipe/gtk-doc.bbclass | 4 +- meta/classes-recipe/libc-package.bbclass | 4 +- meta/classes-recipe/meson.bbclass | 4 +- meta/classes-recipe/qemu.bbclass | 57 +++---------------- meta/conf/bitbake.conf | 9 +++ meta/lib/oe/__init__.py | 2 +- meta/lib/oe/qemu.py | 54 ++++++++++++++++++ .../glibc/glibc-testsuite_2.41.bb | 4 +- meta/recipes-devtools/gcc/gcc-testsuite.inc | 4 +- .../recipes-devtools/python/python3_3.13.2.bb | 4 +- .../qemu/qemuwrapper-cross_1.0.bb | 4 +- .../gobject-introspection_1.84.0.bb | 4 +- 14 files changed, 87 insertions(+), 73 deletions(-) create mode 100644 meta/lib/oe/qemu.py
meta/classes-recipe/allarch.bbclass +0 -2
@@ -63,8 +63,6 @@ python () { d.appendVarFlag("emit_pkgdata", "vardepsexclude", " MULTILIB_VARIANTS") d.appendVarFlag("write_specfile", "vardepsexclude", " MULTILIBS") d.appendVarFlag("do_package", "vardepsexclude", " package_do_shlibs") - - d.setVar("qemu_wrapper_cmdline", "def qemu_wrapper_cmdline(data, rootfs_path, library_paths):\n return 'false'") elif bb.data.inherits_class('packagegroup', d) and not bb.data.inherits_class('nativesdk', d): bb.error("Please ensure recipe %s sets PACKAGE_ARCH before inherit packagegroup" % d.getVar("FILE")) }
meta/classes-recipe/cmake-qemu.bbclass +2 -2
@@ -14,7 +14,7 @@ # with this use case in mind this works very nicely also out of an IDE # configured to use cmake-native for cross compiling. -inherit qemu cmake +inherit cmake DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}"
@@ -22,7 +22,7 @@ cmake_do_generate_toolchain_file:append:class-target() { if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then # Write out a qemu wrapper that will be used as exe_wrapper so that cmake # can run target helper binaries through that. This also allows to execute ctest. - qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" + qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" echo "#!/bin/sh" > "${WORKDIR}/cmake-qemuwrapper" echo "$qemu_binary \"\$@\"" >> "${WORKDIR}/cmake-qemuwrapper" chmod +x "${WORKDIR}/cmake-qemuwrapper"
meta/classes-recipe/gtk-doc.bbclass +2 -2
@@ -35,14 +35,14 @@ DEPENDS:append = " gtk-doc-native" export STAGING_DIR_HOST -inherit python3native pkgconfig qemu +inherit python3native pkgconfig DEPENDS:append = "${@' qemu-native' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" do_compile:prepend:class-target () { if [ ${GTKDOC_ENABLED} = True ]; then # Write out a qemu wrapper that will be given to gtkdoc-scangobj so that it # can run target helper binaries through that. - qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" + qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" cat > ${B}/gtkdoc-qemuwrapper << EOF #!/bin/sh # Use a modules directory which doesn't exist so we don't load random things
meta/classes-recipe/libc-package.bbclass +1 -3
@@ -94,8 +94,6 @@ do_collect_bins_from_locale_tree() { cross-localedef-hardlink -c -v ${WORKDIR}/locale-tree } -inherit qemu - python package_do_split_gconvs () { import re if (d.getVar('PACKAGE_NO_GCONV') == '1'):
@@ -284,7 +282,7 @@ python package_do_split_gconvs () { cmd = "PATH=\"%s\" I18NPATH=\"%s\" GCONV_PATH=\"%s\" cross-localedef %s" % \ (path, i18npath, gconvpath, localedef_opts) else: # earlier slower qemu way - qemu = qemu_target_binary(d) + qemu = oe.qemu.qemu_target_binary(d) localedef_opts = "--force --no-hard-links --no-archive --prefix=%s \ --inputfile=%s/i18n/locales/%s --charmap=%s %s" \ % (treedir, datadir, locale, encoding, name)
meta/classes-recipe/meson.bbclass +2 -2
@@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -inherit python3native meson-routines qemu +inherit python3native meson-routines DEPENDS:append = " meson-native ninja-native"
@@ -132,7 +132,7 @@ EOF write_qemuwrapper() { # Write out a qemu wrapper that will be used as exe_wrapper so that meson # can run target helper binaries through that. - qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" + qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" cat > ${WORKDIR}/meson-qemuwrapper << EOF #!/bin/sh # Use a modules directory which doesn't exist so we don't load random things
meta/classes-recipe/qemu.bbclass +9 -48
65 lines not on this page · raw message
meta/conf/bitbake.conf +9 -0
@@ -896,6 +896,15 @@ ZSTD_DEFAULTS[vardepsexclude] = "ZSTD_THREADS" # may fallback to using all CPUs export OMP_NUM_THREADS = "${BB_NUMBER_THREADS}" +# QEMU_EXTRAOPTIONS is not meant to be directly used, the extensions are +# PACKAGE_ARCH, *NOT* overrides. +# In some cases (e.g. ppc) simply being arch specific (apparently) isn't good +# enough and a PACKAGE_ARCH specific -cpu option is needed (hence we have to do +# this dance). For others (e.g. arm) a -cpu option is not necessary, since the +# qemu-arm default CPU supports all required architecture levels. +QEMU_OPTIONS = "-r ${OLDEST_KERNEL} ${@d.getVar("QEMU_EXTRAOPTIONS:tune-%s" % d.getVar('TUNE_PKGARCH')) or ""}" +QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS:tune-${TUNE_PKGARCH}" + ################################################################## # Magic Cookie for SANITY CHECK ##################################################################
meta/lib/oe/__init__.py +1 -1
@@ -10,6 +10,6 @@ __path__ = extend_path(__path__, __name__) # Modules with vistorcode need to go first else anything depending on them won't be # processed correctly (e.g. qa) BBIMPORTS = ["qa", "data", "path", "utils", "types", "package", "packagedata", \ - "packagegroup", "sstatesig", "lsb", "cachedpath", "license", \ + "packagegroup", "sstatesig", "lsb", "cachedpath", "license", "qemu", \ "reproducible", "rust", "buildcfg", "go", "spdx30_tasks", "spdx_common", \ "cve_check"]
meta/lib/oe/qemu.py new file +54 -0
54 lines not on this page · raw message
meta/recipes-core/glibc/glibc-testsuite_2.41.bb +1 -3
@@ -1,8 +1,6 @@ require glibc_${PV}.bb require glibc-tests.inc -inherit qemu - SRC_URI += "file://check-test-wrapper" # strip provides
@@ -22,7 +20,7 @@ do_check:append () { oe_runmake -i \ QEMU_SYSROOT="${RECIPE_SYSROOT}" \ - QEMU_OPTIONS="${@qemu_target_binary(d)} ${QEMU_OPTIONS}" \ + QEMU_OPTIONS="${@oe.qemu.qemu_target_binary(d)} ${QEMU_OPTIONS}" \ SSH_HOST="${TOOLCHAIN_TEST_HOST}" \ SSH_HOST_USER="${TOOLCHAIN_TEST_HOST_USER}" \ SSH_HOST_PORT="${TOOLCHAIN_TEST_HOST_PORT}" \
meta/recipes-devtools/gcc/gcc-testsuite.inc +1 -3
@@ -1,5 +1,3 @@ -inherit qemu - TOOLCHAIN_TEST_TARGET ??= "user" TOOLCHAIN_TEST_HOST ??= "localhost" TOOLCHAIN_TEST_HOST_USER ??= "root"
@@ -41,7 +39,7 @@ python check_prepare() { content.append('process_multilib_options ""') # qemu args - qemu_binary = qemu_target_binary(d) + qemu_binary = oe.qemu.qemu_target_binary(d) if not qemu_binary: bb.fatal("Missing target qemu linux-user binary")
meta/recipes-devtools/python/python3_3.13.2.bb +2 -2
@@ -57,7 +57,7 @@ S = "${WORKDIR}/Python-${PV}" BBCLASSEXTEND = "native nativesdk" -inherit autotools pkgconfig qemu ptest multilib_header update-alternatives +inherit autotools pkgconfig ptest multilib_header update-alternatives MULTILIB_SUFFIX = "${@d.getVar('base_libdir',1).split('/')[-1]}"
@@ -168,7 +168,7 @@ write_pgo_wrapper() { cat >pgo-wrapper <<EOF #!/bin/sh cd ${B} -${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}', ['${B}', '${STAGING_DIR_TARGET}/${base_libdir}'])} "\$@" +${@oe.qemu.qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}', ['${B}', '${STAGING_DIR_TARGET}/${base_libdir}'])} "\$@" EOF chmod +x pgo-wrapper fi
meta/recipes-devtools/qemu/qemuwrapper-cross_1.0.bb +1 -3
@@ -7,14 +7,12 @@ UNPACKDIR = "${S}" DEPENDS += "qemu-native" -inherit qemu - do_populate_sysroot[depends] = "" do_install () { install -d ${D}${bindir_crossscripts}/ - qemu_binary=${@qemu_target_binary(d)} + qemu_binary=${@oe.qemu.qemu_target_binary(d)} qemu_options='${QEMU_OPTIONS} -E LD_LIBRARY_PATH=$D${libdir}:$D${base_libdir}' cat >> ${D}${bindir_crossscripts}/${MLPREFIX}qemuwrapper << EOF
meta/recipes-gnome/gobject-introspection/gobject-introspection_1.84.0.bb +2 -2
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "945b57da7ec262e5c266b89e091d14be800cc424277d82a02872b7d794 SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" -inherit meson pkgconfig gtk-doc python3targetconfig qemu gobject-introspection-data upstream-version-is-even multilib_script +inherit meson pkgconfig gtk-doc python3targetconfig gobject-introspection-data upstream-version-is-even multilib_script GTKDOC_MESON_OPTION = "gtk_doc"
@@ -64,7 +64,7 @@ do_configure:prepend:class-native() { do_configure:prepend:class-target() { # Write out a qemu wrapper that will be given to gi-scanner so that it # can run target helper binaries through that. - qemu_binary="${@qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" + qemu_binary="${@oe.qemu.qemu_wrapper_cmdline(d, '$STAGING_DIR_HOST', ['\\$GIR_EXTRA_LIBS_PATH','.libs','$STAGING_DIR_HOST/${libdir}','$STAGING_DIR_HOST/${base_libdir}'])}" cat > ${B}/g-ir-scanner-qemuwrapper << EOF #!/bin/sh # Use a modules directory which doesn't exist so we don't load random things
Signature · 1 line
2.49.0
Quoted 133 lines · Chen Qi via lists.openembedded.org
From: Chen Qi <[email protected]>
These classes/recipes inherit qemu.bbclass but do not use anything from it. What they use is qemuwrapper-cross, which is needed at
do_rootfstime and needs to be pulled-in byPACKAGE_WRITE_DEPS.Signed-off-by Chen Qi <[email protected]>---
meta/classes-recipe/fontcache.bbclass | 3 +-- meta/classes-recipe/gio-module-cache.bbclass | 3 +-- meta/classes-recipe/gtk-immodules-cache.bbclass | 4 +--- meta/classes-recipe/manpages.bbclass | 2 +- meta/classes-recipe/pixbufcache.bbclass | 5 +---- meta/recipes-core/systemd/systemd_257.5.bb | 5 +++-- meta/recipes-core/udev/eudev_3.2.14.bb | 4 ++--7 files changed, 10 insertions(+), 16 deletions(-)meta/classes-recipe/fontcache.bbclass +0
-0@@ -9,8 +9,7 @@ # packages. #meta/classes-recipe/fontcache.bbclass +1
-2-PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross"
FONT_PACKAGES ??= "${PN}"
FONT_PACKAGES:class-native = ""meta/classes-recipe/gio-module-cache.bbclass +0
-0@@ -4,8 +4,7 @@ # SPDX-License-Identifier: MIT #meta/classes-recipe/gio-module-cache.bbclass +1
-2-PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross"
GIO_MODULE_PACKAGES ??= "${PN}"meta/classes-recipe/gtk-immodules-cache.bbclass +0
-0@@ -8,9 +8,7 @@ # # Usage: Set GTKIMMODULES_PACKAGES to the packages that needs to update the inputmethod modulesmeta/classes-recipe/gtk-immodules-cache.bbclass +1
-3-PACKAGE_WRITE_DEPS += "qemu-native" - -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross"
GTKIMMODULES_PACKAGES ?= "${PN}"meta/classes-recipe/manpages.bbclass +0
-0@@ -10,7 +10,7 @@ # by default.PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'manpages', '', d)}"
meta/classes-recipe/manpages.bbclass +1
-1-inherit qemu +PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'qemuwrapper-cross', '', d)}"# usually manual files are packaged to ${PN}-doc except man-pages MAN_PKG ?= "${PN}-doc"meta/classes-recipe/pixbufcache.bbclass +0
-0@@ -9,12 +9,9 @@ # packages. #meta/classes-recipe/pixbufcache.bbclass +0
-3-DEPENDS:append:class-target = " qemu-native" -inherit qemu -PIXBUF_PACKAGES ??= "${PN}"
meta/classes-recipe/pixbufcache.bbclass +1
-1-PACKAGE_WRITE_DEPS += "qemu-native gdk-pixbuf-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross gdk-pixbuf-native"
pixbufcache_common() {
if [ "x$D" != "x" ]; thenmeta/recipes-core/systemd/systemd_257.5.bb +0
-0@@ -8,7 +8,7 @@ DEPENDS = "gperf-native libcap util-linux python3-jinja2-native"
SECTION = "base/shell"meta/recipes-core/systemd/systemd_257.5.bb +1
-1-inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check mime +inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives systemd gettext bash-completion manpages features_check mime# unmerged-usr support is deprecated upstream, taints the system and will be # removed in the near future. Fail the build if it is not enabled.meta/recipes-core/systemd/systemd_257.5.bb +0
-0@@ -932,7 +932,8 @@ pkg_prerm:${PN}:libc-glibc () {fi
}meta/recipes-core/systemd/systemd_257.5.bb +2
-1-PACKAGE_WRITE_DEPS += "qemu-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" +pkg_postinst:udev-hwdb () {
if test -n "$D"; then
$INTERCEPT_DIR/postinst_interceptupdate_udev_hwdb${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} \meta/recipes-core/udev/eudev_3.2.14.bb +0
-0@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc192
GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases"meta/recipes-core/udev/eudev_3.2.14.bb +1
-1-inherit autotools update-rc.d qemu pkgconfig features_check manpages github-releases +inherit autotools update-rc.d pkgconfig features_check manpages github-releases
CONFLICT_DISTRO_FEATURES = "systemd"meta/recipes-core/udev/eudev_3.2.14.bb +0
-0@@ -77,7 +77,7 @@ RDEPENDS:${PN} += "kmod"RPROVIDES:${PN} = "hotplug udev"
RPROVIDES:${PN}-hwdb += "udev-hwdb"meta/recipes-core/udev/eudev_3.2.14.bb +1
-1-PACKAGE_WRITE_DEPS += "qemu-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross"
Quoted 4 lines
pkg_postinst:${PN}-hwdb () {
if test -n "$D"; then
$INTERCEPT_DIR/postinst_interceptupdate_udev_hwdb${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX}
Something in this series is still causing allarch variable dependency problems, as can be seen running "oe-selftest -r sstatetests.SStateHashSameSigs2.test_sstate_allarch_samesigs -j 1".
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/1308
I'm seeing bitbake-diffsigs output of:
basehash changed from dfc2d35677a0412cc783f8b35f24dc6722d84be9f2cddff1adc2ae81dbf707c6 to 723f58407e0fcfae4450cee918fcbe3a8aebe3721eca0de8cf7a48ae4d150171
List of dependencies for variable QEMU_OPTIONS changed from 'frozenset({'QEMU_EXTRAOPTIONS:tune-cortexa15t2hf-neon', 'TUNE_PKGARCH', 'OLDEST_KERNEL'})' to 'frozenset({'TUNE_PKGARCH', 'OLDEST_KERNEL', 'QEMU_EXTRAOPTIONS:tune-core2-64'})' changed items: frozenset({'QEMU_EXTRAOPTIONS:tune-cortexa15t2hf-neon', 'QEMU_EXTRAOPTIONS:tune-core2-64'})
List of dependencies for variable TUNE_PKGARCH changed from 'frozenset({'ARMPKGSFX_THUMB', 'ARMPKGSFX_FPU', 'ARMPKGSFX_ENDIAN', 'ARMPKGARCH', 'ARMPKGSFX_EABI', 'ARMPKGSFX_DSP'})' to 'frozenset({'TUNE_PKGARCH:tune-core2-64', 'DEFAULTTUNE'})' changed items: frozenset({'ARMPKGSFX_THUMB', 'ARMPKGSFX_FPU', 'TUNE_PKGARCH:tune-core2-64', 'DEFAULTTUNE', 'ARMPKGSFX_ENDIAN', 'ARMPKGARCH', 'ARMPKGSFX_EABI', 'ARMPKGSFX_DSP'})
Dependency on variable QEMU_EXTRAOPTIONS:tune-core2-64 was added
Dependency on variable TUNE_PKGARCH:tune-core2-64 was added
Dependency on Variable ARMPKGARCH was removed
Dependency on Variable ARMPKGARCH:tune-cortexa15thf-neon was removed
Dependency on Variable ARMPKGSFX_DSP was removed
Dependency on Variable ARMPKGSFX_EABI was removed
Dependency on Variable ARMPKGSFX_ENDIAN was removed
Dependency on Variable ARMPKGSFX_FPU was removed
Dependency on Variable ARMPKGSFX_THUMB was removed
Dependency on Variable ARM_INSTRUCTION_SET was removed
Dependency on Variable ARM_M_OPT was removed
Dependency on Variable ARM_THUMB_OPT was removed
Dependency on Variable ARM_THUMB_SUFFIX was removed
Dependency on Variable QEMU_EXTRAOPTIONS:tune-cortexa15t2hf-neon was removed
Dependency on Variable TUNE_CCARGS_MFLOAT was removed
Dependency on Variable TUNE_CCARGS_MFPU was removed
Dependency on Variable TUNE_FEATURES was removed
Dependency on Variable TUNE_FEATURES:tune-cortexa15 was removed
Dependency on Variable TUNE_FEATURES:tune-cortexa15-neon was removed
Dependency on Variable TUNE_FEATURES:tune-cortexa15t-neon was removed
Dependency on Variable TUNE_FEATURES:tune-cortexa15thf-neon was removed
Variable DEFAULTTUNE value changed from 'cortexa15thf-neon' to 'core2-64'
Variable OLDEST_KERNEL value changed from '3.3.0' to '5.15'
Variable TUNE_PKGARCH value changed from '${ARMPKGARCH}${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}' to '${TUNE_PKGARCH:tune-${DEFAULTTUNE}}'
for "bitbake-diffsigs ../build-st-1070764/tmp-sstatesamehash*/stamps/all-poky-linux/wayland-protocols/1.42.do_write_configsigdata.*".
Cheers,
Richard
Got it. I'll look into the problem ASAP.
Regards,
Qi
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Thursday, April 17, 2025 12:56 AM
To: Chen, Qi <[email protected]>; [email protected]
Subject: Re: [OE-core][PATCH V3 1/5] classes/recipes: remove unnecessary qemu inherit and use qemuwrapper-cross
Quoted 150 lines · Chen Qi via lists.openembedded.org
From: Chen Qi <[email protected]>
These classes/recipes inherit qemu.bbclass but do not use anything from it. What they use is qemuwrapper-cross, which is needed at
do_rootfstime and needs to be pulled-in byPACKAGE_WRITE_DEPS.Signed-off-by Chen Qi <[email protected]>---
meta/classes-recipe/fontcache.bbclass | 3 +-- meta/classes-recipe/gio-module-cache.bbclass | 3 +-- meta/classes-recipe/gtk-immodules-cache.bbclass | 4 +--- meta/classes-recipe/manpages.bbclass | 2 +- meta/classes-recipe/pixbufcache.bbclass | 5 +---- meta/recipes-core/systemd/systemd_257.5.bb | 5 +++-- meta/recipes-core/udev/eudev_3.2.14.bb | 4 ++--7 files changed, 10 insertions(+), 16 deletions(-)meta/classes-recipe/fontcache.bbclass +0
-0@@ -9,8 +9,7 @@ # packages. #meta/classes-recipe/fontcache.bbclass +1
-2-PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross"
FONT_PACKAGES ??= "${PN}"
FONT_PACKAGES:class-native = ""meta/classes-recipe/gio-module-cache.bbclass +0
-0@@ -4,8 +4,7 @@ # SPDX-License-Identifier: MIT #meta/classes-recipe/gio-module-cache.bbclass +1
-2-PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross"
GIO_MODULE_PACKAGES ??= "${PN}"meta/classes-recipe/gtk-immodules-cache.bbclass +0
-0@@ -8,9 +8,7 @@ # # Usage: Set GTKIMMODULES_PACKAGES to the packages that needs toupdate the inputmethod modules
meta/classes-recipe/gtk-immodules-cache.bbclass +1
-3-PACKAGE_WRITE_DEPS += "qemu-native" - -inherit qemu +PACKAGE_WRITE_DEPS += "qemuwrapper-cross"
GTKIMMODULES_PACKAGES ?= "${PN}"meta/classes-recipe/manpages.bbclass +0
-0@@ -10,7 +10,7 @@ # by default.PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'manpages', '', d)}"
meta/classes-recipe/manpages.bbclass +1
-1-inherit qemu +PACKAGE_WRITE_DEPS += "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'qemuwrapper-cross', '', d)}"# usually manual files are packaged to ${PN}-doc except man-pages MAN_PKG ?= "${PN}-doc"meta/classes-recipe/pixbufcache.bbclass +0
-0@@ -9,12 +9,9 @@ # packages. #meta/classes-recipe/pixbufcache.bbclass +0
-3-DEPENDS:append:class-target = " qemu-native" -inherit qemu -PIXBUF_PACKAGES ??= "${PN}"
meta/classes-recipe/pixbufcache.bbclass +1
-1-PACKAGE_WRITE_DEPS += "qemu-native gdk-pixbuf-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross gdk-pixbuf-native"
pixbufcache_common() {
if [ "x$D" != "x" ]; thenmeta/recipes-core/systemd/systemd_257.5.bb +0
-0@@ -8,7 +8,7 @@ DEPENDS = "gperf-native libcap util-linux python3-jinja2-native"
SECTION = "base/shell"
-inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpagesfeatures_checkmimemeta/recipes-core/systemd/systemd_257.5.bb +3
-0+inherit useradd pkgconfig meson perlnative update-rc.d +update-alternatives systemd gettext bash-completion manpages +features_check mime# unmerged-usr support is deprecated upstream, taints the system and will be # removed in the near future. Fail the build if it is not enabled.meta/recipes-core/systemd/systemd_257.5.bb +0
-0@@ -932,7 +932,8 @@ pkg_prerm:${PN}:libc-glibc () {fi
}meta/recipes-core/systemd/systemd_257.5.bb +2
-1-PACKAGE_WRITE_DEPS += "qemu-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross" +pkg_postinst:udev-hwdb () {
if test -n "$D"; then $INTERCEPT_DIR/postinst_interceptupdate_udev_hwdb${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} \ diff --git a/meta/recipes-core/udev/eudev_3.2.14.bb b/meta/recipes-core/udev/eudev_3.2.14.bb
indexb3e7d092c5..a2d222e655100644meta/recipes-core/udev/eudev_3.2.14.bb +0
-0@@ -20,7 +20,7 @@ SRC_URI[sha256sum] ="
8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc192
GITHUB_BASE_URI = "https://github.com/eudev-project/eudev/releases"
-inherit autotools update-rc.d qemu pkgconfigfeatures_checkmanpages github-releasesmeta/recipes-core/udev/eudev_3.2.14.bb +2
-0+inherit autotools update-rc.d pkgconfig features_check manpages +github-releases
CONFLICT_DISTRO_FEATURES = "systemd"meta/recipes-core/udev/eudev_3.2.14.bb +0
-0@@ -77,7 +77,7 @@ RDEPENDS:${PN} += "kmod"RPROVIDES:${PN} = "hotplug udev"
RPROVIDES:${PN}-hwdb += "udev-hwdb"meta/recipes-core/udev/eudev_3.2.14.bb +1
-1-PACKAGE_WRITE_DEPS += "qemu-native" +PACKAGE_WRITE_DEPS += "qemuwrapper-cross"
Quoted 5 lines
pkg_postinst:${PN}-hwdb () {
if test -n "$D"; then $INTERCEPT_DIR/postinst_interceptupdate_udev_hwdb${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX}
Something in this series is still causing allarch variable dependency problems, as can be seen running "oe-selftest -r sstatetests.SStateHashSameSigs2.test_sstate_allarch_samesigs -j 1".
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/1308
I'm seeing bitbake-diffsigs output of:
basehash changed from dfc2d35677a0412cc783f8b35f24dc6722d84be9f2cddff1adc2ae81dbf707c6 to 723f58407e0fcfae4450cee918fcbe3a8aebe3721eca0de8cf7a48ae4d150171
List of dependencies for variable QEMU_OPTIONS changed from 'frozenset({'QEMU_EXTRAOPTIONS:tune-cortexa15t2hf-neon', 'TUNE_PKGARCH', 'OLDEST_KERNEL'})' to 'frozenset({'TUNE_PKGARCH', 'OLDEST_KERNEL', 'QEMU_EXTRAOPTIONS:tune-core2-64'})'
changed items: frozenset({'QEMU_EXTRAOPTIONS:tune-cortexa15t2hf-neon', 'QEMU_EXTRAOPTIONS:tune-core2-64'})
List of dependencies for variable TUNE_PKGARCH changed from 'frozenset({'ARMPKGSFX_THUMB', 'ARMPKGSFX_FPU', 'ARMPKGSFX_ENDIAN', 'ARMPKGARCH', 'ARMPKGSFX_EABI', 'ARMPKGSFX_DSP'})' to 'frozenset({'TUNE_PKGARCH:tune-core2-64', 'DEFAULTTUNE'})'
changed items: frozenset({'ARMPKGSFX_THUMB', 'ARMPKGSFX_FPU', 'TUNE_PKGARCH:tune-core2-64', 'DEFAULTTUNE', 'ARMPKGSFX_ENDIAN', 'ARMPKGARCH', 'ARMPKGSFX_EABI', 'ARMPKGSFX_DSP'}) Dependency on variable QEMU_EXTRAOPTIONS:tune-core2-64 was added Dependency on variable TUNE_PKGARCH:tune-core2-64 was added Dependency on Variable ARMPKGARCH was removed Dependency on Variable ARMPKGARCH:tune-cortexa15thf-neon was removed Dependency on Variable ARMPKGSFX_DSP was removed Dependency on Variable ARMPKGSFX_EABI was removed Dependency on Variable ARMPKGSFX_ENDIAN was removed Dependency on Variable ARMPKGSFX_FPU was removed Dependency on Variable ARMPKGSFX_THUMB was removed Dependency on Variable ARM_INSTRUCTION_SET was removed Dependency on Variable ARM_M_OPT was removed Dependency on Variable ARM_THUMB_OPT was removed Dependency on Variable ARM_THUMB_SUFFIX was removed Dependency on Variable QEMU_EXTRAOPTIONS:tune-cortexa15t2hf-neon was removed Dependency on Variable TUNE_CCARGS_MFLOAT was removed Dependency on Variable TUNE_CCARGS_MFPU was removed Dependency on Variable TUNE_FEATURES was removed Dependency on Variable TUNE_FEATURES:tune-cortexa15 was removed Dependency on Variable TUNE_FEATURES:tune-cortexa15-neon was removed Dependency on Variable TUNE_FEATURES:tune-cortexa15t-neon was removed Dependency on Variable TUNE_FEATURES:tune-cortexa15thf-neon was removed Variable DEFAULTTUNE value changed from 'cortexa15thf-neon' to 'core2-64' Variable OLDEST_KERNEL value changed from '3.3.0' to '5.15'
Variable TUNE_PKGARCH value changed from '${ARMPKGARCH}${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}' to '${TUNE_PKGARCH:tune-${DEFAULTTUNE}}'
for "bitbake-diffsigs ../build-st-1070764/tmp-sstatesamehash*/stamps/all-poky-linux/wayland-protocols/1.42.do_write_configsigdata.*".
Cheers,
Richard
Quoted 1 line · Qi
Got it. I'll look into the problem ASAP.
I did look into it a bit and the issue seems to be that fontcache recipes are allarch but can call into qemu to run fc-cache. An allarch recipe can't depend on qemuwrapper-cross since that is target specific.
I guess we may need to exclude the dependency in layer.conf.
Cheers,
Richard
Thanks a lot Richard!
I've used your suggestion to fix the qemuwrapper-cross dependency issue (e.g., cantarell-fonts) in Patch 1/5. I've also fixed the meson + allarch issue (e.g., wayland-protocols) in Patch 5/5.
The V4 patchset has been sent out. It has been tested against world build + 'oe-selftest -r sstatetests'.
Regards,
Qi
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Thursday, April 17, 2025 6:11 PM
To: Chen, Qi <[email protected]>; [email protected]
Subject: Re: [OE-core][PATCH V3 1/5] classes/recipes: remove unnecessary qemu inherit and use qemuwrapper-cross
Quoted 1 line · Qi
Got it. I'll look into the problem ASAP.
I did look into it a bit and the issue seems to be that fontcache recipes are allarch but can call into qemu to run fc-cache. An allarch recipe can't depend on qemuwrapper-cross since that is target specific.
I guess we may need to exclude the dependency in layer.conf.
Cheers,
Richard