diff mbox series

[meta,v2] dropbear: add xauth runtime recommends dependency on x11 DISTRO_FEATURE

Message ID 20250616073742.47439-1-andrej.v@skyrain.eu
State New
Headers show
Series [meta,v2] dropbear: add xauth runtime recommends dependency on x11 DISTRO_FEATURE | expand

Commit Message

Andrej Valek June 16, 2025, 7:37 a.m. UTC 
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 <andrej.v@skyrain.eu>
---
 meta/recipes-core/dropbear/dropbear_2025.88.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Mathieu Dubois-Briand June 17, 2025, 8:06 a.m. UTC | #1 
On Mon Jun 16, 2025 at 9:37 AM CEST, Andrej Valek wrote:
> 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 <andrej.v@skyrain.eu>
> ---

Hi Andrej,

It looks like the v2 depends on the v1 here. I would have been happy to
squash them, but the commit message is different, so I don't want to
interfere too much here.

Do you mind sending a v3 with a single commit?
diff mbox series

Patch

diff --git a/meta/recipes-core/dropbear/dropbear_2025.88.bb b/meta/recipes-core/dropbear/dropbear_2025.88.bb
index a1317d3b73..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] = ",,,xauth"
+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
 }