From dea81ee76cb2fe8e1014c997c4b23fba923e4683 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 13 Sep 2026 14:16:28 +0200 Subject: [PATCH] package/kodi: fix definition of BR2_PACKAGE_KODI_ARCH_SUPPORTS The definition of BR2_PACKAGE_KODI_ARCH_SUPPORTS is incorrect, it goes like this: bool default y if BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS default y if BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS so it means it would be "y" if either BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS *OR* BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS is true. While clearly what we need is for both to be true: ffmpeg should be available for the target architecture, and openjdk should be available for the host architecture. One option was to change to: bool default y if BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS && BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS Or: bool default y if BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS But we preferred: bool default y depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS Fixes: b6a2f494290d85a26798564992ddd1ac46c1a48d ("package/kodi: depend on host-openjdk-bin instead of selecting BR2_NEEDS_HOST_JAVA") Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain (cherry picked from commit 00e83bc24ded9d40ed7a128de0ce381394cd0a18) Signed-off-by: Thomas Perale --- package/kodi/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 0b13136d82..d64a6fee7e 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS bool - default y if BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - default y if BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS + default y + depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS # i386: needs sse (see upstream PR 10351) depends on !(BR2_i386 && !BR2_X86_CPU_HAS_SSE) # m68k not supported upstream