diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2025-04-20 12:05:24 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-04-23 09:47:42 +0100 |
| commit | 741e12d5b9e4a8d1c9935b0ac6f0bd5d3d0f7f27 (patch) | |
| tree | c7d297b7e3ba21b0a9dbf22ca9c96447235237e7 /meta/recipes-core/systemd | |
| parent | 87c2effeb91e288f0ddc71f344d8b4a70c99820c (diff) | |
| download | poky-741e12d5b9e4a8d1c9935b0ac6f0bd5d3d0f7f27.tar.gz | |
classes/recipes: remove unnecessary qemu inherit and use qemuwrapper-cross
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>
Diffstat (limited to 'meta/recipes-core/systemd')
| -rw-r--r-- | meta/recipes-core/systemd/systemd_257.5.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd_257.5.bb b/meta/recipes-core/systemd/systemd_257.5.bb index bd57f1f5a5..1379b21889 100644 --- a/meta/recipes-core/systemd/systemd_257.5.bb +++ b/meta/recipes-core/systemd/systemd_257.5.bb | |||
| @@ -8,7 +8,7 @@ DEPENDS = "gperf-native libcap util-linux python3-jinja2-native" | |||
| 8 | 8 | ||
| 9 | SECTION = "base/shell" | 9 | SECTION = "base/shell" |
| 10 | 10 | ||
| 11 | inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check mime | 11 | inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives systemd gettext bash-completion manpages features_check mime |
| 12 | 12 | ||
| 13 | # unmerged-usr support is deprecated upstream, taints the system and will be | 13 | # unmerged-usr support is deprecated upstream, taints the system and will be |
| 14 | # removed in the near future. Fail the build if it is not enabled. | 14 | # removed in the near future. Fail the build if it is not enabled. |
| @@ -932,7 +932,8 @@ pkg_prerm:${PN}:libc-glibc () { | |||
| 932 | fi | 932 | fi |
| 933 | } | 933 | } |
| 934 | 934 | ||
| 935 | PACKAGE_WRITE_DEPS += "qemu-native" | 935 | PACKAGE_WRITE_DEPS += "qemuwrapper-cross" |
| 936 | |||
| 936 | pkg_postinst:udev-hwdb () { | 937 | pkg_postinst:udev-hwdb () { |
| 937 | if test -n "$D"; then | 938 | if test -n "$D"; then |
| 938 | $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} \ | 939 | $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} \ |
