From: Andrej Valek Date: Wed, 18 Jun 2025 08:04:39 +0000 (+0200) Subject: dropbear: add xauth runtime recommends dependency on x11 DISTRO_FEATURE X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0d2374b94a0e5d60ceed17998cd97f85b0486f6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Andrej Valek Signed-off-by: Richard Purdie --- 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" BINCOMMANDS = "dbclient ssh scp" EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam x11', d)}" PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}" PACKAGECONFIG[system-libtom] = "--disable-bundled-libtom,--enable-bundled-libtom,libtommath libtomcrypt" -PACKAGECONFIG[enable-x11-forwarding] = "" +PACKAGECONFIG[x11] = ",,,,xauth" # This option appends to CFLAGS and LDFLAGS from OE # This is causing [textrel] QA warning @@ -62,7 +62,7 @@ EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" do_configure:append() { echo "/* Dropbear features */" > ${B}/localoptions.h - if ${@bb.utils.contains('PACKAGECONFIG', 'enable-x11-forwarding', 'true', 'false', d)}; then + if ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'true', 'false', d)}; then echo "#define DROPBEAR_X11FWD 1" >> ${B}/localoptions.h fi }