classes/recipes: remove unnecessary qemu inherit and qemu-native dependency
PATCH 1/2 classes/recipes: remove unnecessary qemu inherit and qemu-native dependency
From: Chen Qi <[email protected]>
Some classes/recipes inherit qemu.bbclass but does not actually use anything from it. Besides, putting qemu-native in PACKAGE_WRITE_DEPS is not needed because the process of generating package does not need qemu-native.
--- 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.4.bb | 3 +-- meta/recipes-core/udev/eudev_3.2.14.bb | 2 +- 7 files changed, 3 insertions(+), 19 deletions(-)
meta/classes-recipe/fontcache.bbclass +0 -3
@@ -9,9 +9,6 @@ # packages. # -PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu - FONT_PACKAGES ??= "${PN}" FONT_PACKAGES:class-native = "" FONT_EXTRA_RDEPENDS ?= "${MLPREFIX}fontconfig-utils"
meta/classes-recipe/gio-module-cache.bbclass +0 -3
@@ -4,9 +4,6 @@ # SPDX-License-Identifier: MIT # -PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu - GIO_MODULE_PACKAGES ??= "${PN}" gio_module_cache_common() {
meta/classes-recipe/gtk-immodules-cache.bbclass +0 -4
@@ -8,10 +8,6 @@ # # Usage: Set GTKIMMODULES_PACKAGES to the packages that needs to update the inputmethod modules -PACKAGE_WRITE_DEPS += "qemu-native" - -inherit qemu - GTKIMMODULES_PACKAGES ?= "${PN}" gtk_immodule_cache_postinst() {
meta/classes-recipe/manpages.bbclass +0 -2
@@ -10,8 +10,6 @@ # by default. PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'manpages', '', d)}" -inherit qemu - # 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 += "gdk-pixbuf-native" pixbufcache_common() { if [ "x$D" != "x" ]; then
meta/recipes-core/systemd/systemd_257.4.bb +1 -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,6 @@ pkg_prerm:${PN}:libc-glibc () { fi } -PACKAGE_WRITE_DEPS += "qemu-native" 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 +1 -1
@@ -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"
Signature · 1 line
2.49.0
PATCH 2/2 lib/classes/recipes: refactor qemu.bbclass functions into library functions
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.
--- 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,5 +10,5 @@ __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"]
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
Re: [OE-core][PATCH 2/2] lib/classes/recipes: refactor qemu.bbclass functions into library functions
meta/classes-recipe/allarch.bbclass python () { · line 67
Quoted 2 lines · Chen Qi via lists.openembedded.org
meta/classes-recipe/allarch.bbclass +0
-2- - d.setVar("qemu_wrapper_cmdline", "def qemu_wrapper_cmdline(data, rootfs_path, library_paths):\n return 'false'")
(in allarch.bbclass) I wonder about this, is there a reason this was added (perhaps via 'git blame')? Is it ok to simply remove it?
Otherwise looks fine.
Alex
RE: [OE-core][PATCH 2/2] lib/classes/recipes: refactor qemu.bbclass functions into library functions
I moved it to the qemu_wrapper_cmdline function itself in meta/lib/oe/qemu.py. I'll put this info in the commit message in V2.
Regards,
Qi
-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Thursday, April 10, 2025 3:51 PM
To: Chen, Qi <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH 2/2] lib/classes/recipes: refactor qemu.bbclass functions into library functions
meta/classes-recipe/allarch.bbclass python () { · line 67
Quoted 2 lines · Chen Qi via lists.openembedded.org
meta/classes-recipe/allarch.bbclass +0
-2- - d.setVar("qemu_wrapper_cmdline", "def qemu_wrapper_cmdline(data, rootfs_path, library_paths):\n return 'false'")
(in allarch.bbclass) I wonder about this, is there a reason this was added (perhaps via 'git blame')? Is it ok to simply remove it?
Otherwise looks fine.
Alex
Quoted 28 lines · Chen Qi via lists.openembedded.org
From: Chen Qi <[email protected]>
Some classes/recipes inherit qemu.bbclass but does not actually use anything from it. Besides, putting qemu-native in
PACKAGE_WRITE_DEPSis not needed because the process of generating package does not need qemu-native.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.4.bb | 3 +-- meta/recipes-core/udev/eudev_3.2.14.bb | 2 +-7 files changed, 3 insertions(+), 19 deletions(-)meta/classes-recipe/fontcache.bbclass +0
-0@@ -9,9 +9,6 @@ # packages. #meta/classes-recipe/fontcache.bbclass +0
-3-PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu -
Quoted 3 lines
FONT_PACKAGES ??= "${PN}" FONT_PACKAGES:class-native = ""
FONT_EXTRA_RDEPENDS?= "${MLPREFIX}fontconfig-utils"
I picked one of these to validate this as I didn't quite believe we didn't use qemu there. fontconfig.bbclass has:
fontcache_common() {
if [ -n "$D" ] ; then
$INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} \in it's postinstall script. Then in scripts/postinst- intercepts/update_font_cache we have:
PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D -E ${fontconfigcacheenv} $D${libexecdir}/${binprefix}fc-cache --sysroot=$D --system-only ${fontconfigcacheparams}
so I'm afraid it does use qemu and you can't simply drop the class inherit or dependency as it is used.
Cheers,
Richard
Hi Richard,
The postinst uses qemuwrapper which in turns uses qemu-native. But the postinst runs at do_rootfs time. And this dependency is ensured by the following line:
meta/classes-recipe/image.bbclass:DEPENDS += "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross depmodwrapper-cross cross-localedef-native"
PACKAGE_WRITE_DEPS is for do_package_write_rpm/deb/ipk. These tasks do not run postinst and thus not using qemu-native. So 'qemu-native' can be removed from PACKAGE_WRITE_DEPS safely.
For the removal of qemu.bbclass inherit, these classes/recipes do not really use any function from this qemu.bbclass. So we can safely remove 'inherit qemu' for them.
My test for this patch 1/2 is: qemux86-64 + systemd + bitbake core-image-sato. There's no error.
Regards,
Qi
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Thursday, April 10, 2025 2:15 PM
To: Chen, Qi <[email protected]>; [email protected]
Subject: Re: [OE-core][PATCH 1/2] classes/recipes: remove unnecessary qemu inherit and qemu-native dependency
Quoted 29 lines · Chen Qi via lists.openembedded.org
From: Chen Qi <[email protected]>
Some classes/recipes inherit qemu.bbclass but does not actually use anything from it. Besides, putting qemu-native in
PACKAGE_WRITE_DEPSis not needed because the process of generating package does not need qemu-native.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.4.bb | 3 +-- meta/recipes-core/udev/eudev_3.2.14.bb | 2 +-7 files changed, 3 insertions(+), 19 deletions(-)meta/classes-recipe/fontcache.bbclass +0
-0@@ -9,9 +9,6 @@ # packages. #meta/classes-recipe/fontcache.bbclass +0
-3-PACKAGE_WRITE_DEPS += "qemu-native" -inherit qemu -
Quoted 3 lines
FONT_PACKAGES ??= "${PN}" FONT_PACKAGES:class-native = ""
FONT_EXTRA_RDEPENDS?= "${MLPREFIX}fontconfig-utils"
I picked one of these to validate this as I didn't quite believe we didn't use qemu there. fontconfig.bbclass has:
fontcache_common() {
if [ -n "$D" ] ; then
$INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} \in it's postinstall script. Then in scripts/postinst- intercepts/update_font_cache we have:
PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D -E ${fontconfigcacheenv} $D${libexecdir}/${binprefix}fc-cache --sysroot=$D --system-only ${fontconfigcacheparams}
so I'm afraid it does use qemu and you can't simply drop the class inherit or dependency as it is used.
Cheers,
Richard
Quoted 12 lines · Qi
The postinst uses qemuwrapper which in turns uses qemu-native. But the postinst runs at
do_rootfstime. And this dependency is ensured by the following line:
meta/classes-recipe/image.bbclass:DEPENDS += "${@' '.join(["%s- qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross depmodwrapper-cross cross-localedef-native"PACKAGE_WRITE_DEPS is for do_package_write_rpm/deb/ipk. These tasks do not run postinst and thus not using qemu-native. So 'qemu-native' can be removed from
PACKAGE_WRITE_DEPSsafely.
Quoted 6 lines
For the removal of qemu.bbclass inherit, these classes/recipes do not really use any function from this qemu.bbclass. So we can safely remove 'inherit qemu' for them.
My test for this patch 1/2 is: qemux86-64 + systemd + bitbake core- image-sato. There's no error.
Something needs to trigger the system to have qemu-native available at do_rootfs time since these recipes write a postinstall which can use qemu. That is what PACKAGE_WRITE_DEPS is for. I suspect you're pulling in qemu through other dependencies but that doesn't mean this one is unneeded.
package.bbclass has a comment about this:
# If your postinstall can execute at rootfs creation time rather than on
# target but depends on a native/cross tool in order to execute, you need to # list that tool in PACKAGE_WRITE_DEPS. Target package dependencies belong # in the package dependencies as normal, this is just for native/cross support # tools at rootfs build time. PACKAGE_WRITE_DEPS ??= ""
As for the qemu class inherit, the code used to write the qemu binary call into the postinst but it uses qemuwrapper now which comes from qemuwrapper-cross. I suspect you're right that it means the qemu inherit is no longer needed however we should probably change the inherit qemu for a PACKAGE_WRITE_DEPS += "qemuwrapper-cross"?
(and see if we could remove the dependency in image.bbclass?)
Cheers,
Richard
Got it. Thanks for the detailed explanation.
I'll check and send out V2.
Regards,
Qi
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Thursday, April 10, 2025 2:42 PM
To: Chen, Qi <[email protected]>; [email protected]
Subject: Re: [OE-core][PATCH 1/2] classes/recipes: remove unnecessary qemu inherit and qemu-native dependency
Quoted 12 lines · Qi
The postinst uses qemuwrapper which in turns uses qemu-native. But the postinst runs at
do_rootfstime. And this dependency is ensured by the following line:
meta/classes-recipe/image.bbclass:DEPENDS += "${@' '.join(["%s- qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross depmodwrapper-cross cross-localedef-native"PACKAGE_WRITE_DEPS is for do_package_write_rpm/deb/ipk. These tasks do not run postinst and thus not using qemu-native. So 'qemu-native' can be removed from
PACKAGE_WRITE_DEPSsafely.
Quoted 6 lines
For the removal of qemu.bbclass inherit, these classes/recipes do not really use any function from this qemu.bbclass. So we can safely remove 'inherit qemu' for them.
My test for this patch 1/2 is: qemux86-64 + systemd + bitbake core- image-sato. There's no error.
Something needs to trigger the system to have qemu-native available at do_rootfs time since these recipes write a postinstall which can use qemu. That is what PACKAGE_WRITE_DEPS is for. I suspect you're pulling in qemu through other dependencies but that doesn't mean this one is unneeded.
package.bbclass has a comment about this:
# If your postinstall can execute at rootfs creation time rather than on # target but depends on a native/cross tool in order to execute, you need to # list that tool in PACKAGE_WRITE_DEPS. Target package dependencies belong # in the package dependencies as normal, this is just for native/cross support # tools at rootfs build time. PACKAGE_WRITE_DEPS ??= ""
As for the qemu class inherit, the code used to write the qemu binary call into the postinst but it uses qemuwrapper now which comes from qemuwrapper-cross. I suspect you're right that it means the qemu inherit is no longer needed however we should probably change the inherit qemu for a PACKAGE_WRITE_DEPS += "qemuwrapper-cross"?
(and see if we could remove the dependency in image.bbclass?)
Cheers,
Richard
Quoted 7 lines
As for the qemu class inherit, the code used to write the qemu binary call into the postinst but it uses qemuwrapper now which comes from qemuwrapper-cross. I suspect you're right that it means the qemu inherit is no longer needed however we should probably change the inherit qemu for a
PACKAGE_WRITE_DEPS+= "qemuwrapper-cross"?(and see if we could remove the dependency in image.bbclass?)
I was thinking about this further and I think we could replace the qemu-native dependency for a qemuwrapper-cross dependency since that has the correct qemu-native dependency.
Cheers,
Richard