diff options
| author | Pavel Zhukov <pavel@zhukoff.net> | 2022-09-05 18:24:48 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-16 17:53:22 +0100 |
| commit | f604ff9de4b3a77f88bd662030ffb34e8a55633d (patch) | |
| tree | 37a1a7422acac64abd685ec9b9890e7fa75f1210 | |
| parent | 5367b62d7cdb6c9aa787f7b19801a59c53f57509 (diff) | |
| download | poky-f604ff9de4b3a77f88bd662030ffb34e8a55633d.tar.gz | |
core-image.bbclass: Exclude openssh complementary packages
Openssh (main) package may be marked for installation via complementary
packages mechanism if sftp-server is installed
and this causes conflict with dropbear [Yocto #14858] [1].
Excluding openssh complementary packages if packagegroup-core-ssh-dropbear
is in PACKAGE_INSTALL fixes this issue.
To install openssh complementary packages in the images with
ssh-server-dropbear they may be added manually into the list because
they will be excluded from the installation even if corresonding class
(dev-pkg or dbg-pkgs) inherited.
[1]
Error:
Problem: problem with installed package dropbear-2020.81-r0.core2_64
- package dropbear-2020.81-r0.core2_64 conflicts with openssh provided by openssh-8.9p1-r0.core2_64
- package openssh-8.9p1-r0.core2_64 conflicts with dropbear provided by dropbear-2020.81-r0.core2_64
- package openssh-ptest-8.9p1-r0.core2_64 requires openssh, but none of the providers can be installed
- conflicting requests
(try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
(From OE-Core rev: a09725442d4b53bb9d417ef9f43b12db2545aa54)
Signed-off-by: Pavel Zhukov <pavel@zhukoff.net>
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit fa08030b32c2bf77889c23f964892f46e84994a3)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/core-image.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 84fd3eeb38..740a6c1d3d 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass | |||
| @@ -59,6 +59,10 @@ FEATURE_PACKAGES_hwcodecs = "${MACHINE_HWCODECS}" | |||
| 59 | # IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2' | 59 | # IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2' |
| 60 | # Including image feature foo would replace the image features bar1 and bar2 | 60 | # Including image feature foo would replace the image features bar1 and bar2 |
| 61 | IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" | 61 | IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" |
| 62 | # Do not install openssh complementary packages if either packagegroup-core-ssh-dropbear or dropbear | ||
| 63 | # is installed # to avoid openssh-dropbear conflict | ||
| 64 | # see [Yocto #14858] for more information | ||
| 65 | PACKAGE_EXCLUDE_COMPLEMENTARY:append = "${@bb.utils.contains_any('PACKAGE_INSTALL', 'packagegroup-core-ssh-dropbear dropbear', 'openssh', '' , d)}" | ||
| 62 | 66 | ||
| 63 | # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' | 67 | # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' |
| 64 | # An error exception would be raised if both image features foo and bar1(or bar2) are included | 68 | # An error exception would be raised if both image features foo and bar1(or bar2) are included |