MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

classes/recipes: remove unnecessary qemu inherit and use qemuwrapper-cross

Browse Source 
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.

Also, in meta/conf/layer.conf, exclude qemuwrapper-cross deps for all arch
recipes that depend on it. This it ensure allarch recipes have the same
signature across different machines.

(From OE-Core rev: 6f3ce94f4c03e7b26f1fcdf78ea969f57717ec56)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chen Qi 2025-04-20 12:05:24 +08:00 committed by Richard Purdie
parent 87c2effeb9
commit 741e12d5b9
8 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta/classes-recipe/fontcache.bbclass
View File

@ -9,8 +9,7 @@
# packages.
#
PACKAGE_WRITE_DEPS += "qemu-native"
inherit qemu
PACKAGE_WRITE_DEPS += "qemuwrapper-cross"
FONT_PACKAGES ??= "${PN}"
FONT_PACKAGES:class-native = ""

3
meta/classes-recipe/gio-module-cache.bbclass
View File

@ -4,8 +4,7 @@
# SPDX-License-Identifier: MIT
#
PACKAGE_WRITE_DEPS += "qemu-native"
inherit qemu
PACKAGE_WRITE_DEPS += "qemuwrapper-cross"
GIO_MODULE_PACKAGES ??= "${PN}"

4
meta/classes-recipe/gtk-immodules-cache.bbclass
View File

@ -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}"

2
meta/classes-recipe/manpages.bbclass
View File

@ -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"

5
meta/classes-recipe/pixbufcache.bbclass
View File

@ -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

3
meta/conf/layer.conf
View File

@ -89,6 +89,9 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
adwaita-icon-theme->gdk-pixbuf \
adwaita-icon-theme->gtk+3 \
run-postinsts->util-linux \
cantarell-fonts->qemuwrapper-cross \
liberation-fonts->qemuwrapper-cross \
ttf-bitstream-vera->qemuwrapper-cross \
"
# Avoid adding bison-native to the sysroot without a specific

5
meta/recipes-core/systemd/systemd_257.5.bb
View File

@ -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} \

4
meta/recipes-core/udev/eudev_3.2.14.bb
View File

@ -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}