diff options
| author | Andrej Valek <andrej.v@skyrain.eu> | 2025-06-18 10:04:39 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-19 21:54:43 +0100 |
| commit | a2dad2ce9a9a673991e75185e76b675bfe21905c (patch) | |
| tree | b88263b305e7f70ee450b160524f95e6af6ed11c | |
| parent | 2fad5f4f0454ff9683d32e04a0915fef0f7597eb (diff) | |
| download | poky-a2dad2ce9a9a673991e75185e76b675bfe21905c.tar.gz | |
dropbear: add xauth runtime recommends dependency on x11 DISTRO_FEATURE
Change enable-x11-forwarding PACKAGECONFIG to x11, while we can rely
directly on X11 DISTRO_FEATURE. Previously when enable-x11-forwarding was
used, the XAUTH_COMMAND failed due to missing xauth. So add xauth to
runtime recommends dependency and enable this behavior as default.
(From OE-Core rev: f0d2374b94a0e5d60ceed17998cd97f85b0486f6)
Signed-off-by: Andrej Valek <andrej.v@skyrain.eu>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear_2025.88.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/dropbear/dropbear_2025.88.bb b/meta/recipes-core/dropbear/dropbear_2025.88.bb index f203763b17..72a886d907 100644 --- a/meta/recipes-core/dropbear/dropbear_2025.88.bb +++ b/meta/recipes-core/dropbear/dropbear_2025.88.bb | |||
| @@ -48,10 +48,10 @@ SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" | |||
| 48 | BINCOMMANDS = "dbclient ssh scp" | 48 | BINCOMMANDS = "dbclient ssh scp" |
| 49 | EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' | 49 | EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' |
| 50 | 50 | ||
| 51 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" | 51 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam x11', d)}" |
| 52 | PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}" | 52 | PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}" |
| 53 | PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt" | 53 | PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt" |
| 54 | PACKAGECONFIG[enable-x11-forwarding] = "" | 54 | PACKAGECONFIG[x11] = ",,,,xauth" |
| 55 | 55 | ||
| 56 | # This option appends to CFLAGS and LDFLAGS from OE | 56 | # This option appends to CFLAGS and LDFLAGS from OE |
| 57 | # This is causing [textrel] QA warning | 57 | # This is causing [textrel] QA warning |
| @@ -62,7 +62,7 @@ EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" | |||
| 62 | 62 | ||
| 63 | do_configure:append() { | 63 | do_configure:append() { |
| 64 | echo "/* Dropbear features */" > ${B}/localoptions.h | 64 | echo "/* Dropbear features */" > ${B}/localoptions.h |
| 65 | if ${@bb.utils.contains('PACKAGECONFIG', 'enable-x11-forwarding', 'true', 'false', d)}; then | 65 | if ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'true', 'false', d)}; then |
| 66 | echo "#define DROPBEAR_X11FWD 1" >> ${B}/localoptions.h | 66 | echo "#define DROPBEAR_X11FWD 1" >> ${B}/localoptions.h |
| 67 | fi | 67 | fi |
| 68 | } | 68 | } |
