[Buildroot] [PATCH v2 1/1] package/kodi: fix filenames of kodi host utils

[Buildroot] [PATCH v2 1/1] package/kodi: fix filenames of kodi host utils

[Bernd Kuhls]

The variables WITH_JSONSCHEMABUILDER & WITH_TEXTUREPACKER are defined as
directories:
https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindJsonSchemaBuilder.cmake
https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindTexturePacker.cmake

and during configure kodi searches these directories for usable binaries
with the name scheme.

${APP_NAME_LC}-JsonSchemaBuilder
${APP_NAME_LC}-TexturePacker

which translates to kodi-JsonSchemaBuilder and kodi-TexturePacker.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
v2: also updated kodi-skin-confluence.mk

 package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +-
 package/kodi-skin-confluence/kodi-skin-confluence.mk     | 2 +-
 package/kodi-texturepacker/kodi-texturepacker.mk         | 2 +-
 package/kodi/kodi.mk                                     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
index 569bde8cd2..e017aa8d9c 100644
--- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
+++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
@@ -20,7 +20,7 @@ HOST_KODI_JSONSCHEMABUILDER_CONF_OPTS = \
 define HOST_KODI_JSONSCHEMABUILDER_INSTALL_CMDS
 	$(INSTALL) -m 755 -D \
 		$(@D)/tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \
-		$(HOST_DIR)/bin/JsonSchemaBuilder
+		$(HOST_DIR)/bin/kodi-JsonSchemaBuilder
 endef
 
 $(eval $(host-cmake-package))
diff --git a/package/kodi-skin-confluence/kodi-skin-confluence.mk b/package/kodi-skin-confluence/kodi-skin-confluence.mk
index 43d0c4bff6..58e51ffc8a 100644
--- a/package/kodi-skin-confluence/kodi-skin-confluence.mk
+++ b/package/kodi-skin-confluence/kodi-skin-confluence.mk
@@ -11,7 +11,7 @@ KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt
 KODI_SKIN_CONFLUENCE_DEPENDENCIES = kodi
 
 define KODI_SKIN_CONFLUENCE_BUILD_CMDS
-	$(HOST_DIR)/bin/TexturePacker -input $(@D)/media/ -output $(@D)/media/Textures.xbt -dupecheck -use_none
+	$(HOST_DIR)/bin/kodi-TexturePacker -input $(@D)/media/ -output $(@D)/media/Textures.xbt -dupecheck -use_none
 endef
 
 define KODI_SKIN_CONFLUENCE_INSTALL_TARGET_CMDS
diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk
index 44eba85d75..c0bc767dd4 100644
--- a/package/kodi-texturepacker/kodi-texturepacker.mk
+++ b/package/kodi-texturepacker/kodi-texturepacker.mk
@@ -35,7 +35,7 @@ HOST_KODI_TEXTUREPACKER_CONF_OPTS += \
 define HOST_KODI_TEXTUREPACKER_INSTALL_CMDS
 	$(INSTALL) -m 755 -D \
 		$(@D)/tools/depends/native/TexturePacker/TexturePacker \
-		$(HOST_DIR)/bin/TexturePacker
+		$(HOST_DIR)/bin/kodi-TexturePacker
 endef
 
 $(eval $(host-cmake-package))
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 54b7673150..c8555788b7 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -87,8 +87,8 @@ KODI_CONF_OPTS += \
 	-DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
 	-DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \
 	-DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \
-	-DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \
-	-DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \
+	-DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/ \
+	-DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/ \
 	-DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \
 	-DLIBDVDNAV_URL=$(KODI_DL_DIR)/kodi-libdvdnav-$(KODI_LIBDVDNAV_VERSION).tar.gz \
 	-DLIBDVDREAD_URL=$(KODI_DL_DIR)/kodi-libdvdread-$(KODI_LIBDVDREAD_VERSION).tar.gz
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/kodi: fix filenames of kodi host utils

[Thomas Petazzoni via buildroot]

On Wed, 19 Jul 2023 00:11:20 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> The variables WITH_JSONSCHEMABUILDER & WITH_TEXTUREPACKER are defined as
> directories:
> https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindJsonSchemaBuilder.cmake
> https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindTexturePacker.cmake
> 
> and during configure kodi searches these directories for usable binaries
> with the name scheme.
> 
> ${APP_NAME_LC}-JsonSchemaBuilder
> ${APP_NAME_LC}-TexturePacker
> 
> which translates to kodi-JsonSchemaBuilder and kodi-TexturePacker.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> v2: also updated kodi-skin-confluence.mk

Is this just an improvement, or an actual fix for a build or runtime
issue?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/kodi: fix filenames of kodi host utils

[Bernd Kuhls]

Am Sat, 22 Jul 2023 23:31:10 +0200 schrieb Thomas Petazzoni via buildroot:

> Is this just an improvement, or an actual fix for a build or runtime
> issue?

Hi Thomas.

its an improvement by following upstream's expections and does neither fix 
a build nor a runtime error.

Regards, Bernd

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] package/kodi: fix filenames of kodi host utils

[Thomas Petazzoni via buildroot]

On Wed, 19 Jul 2023 00:11:20 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:

> The variables WITH_JSONSCHEMABUILDER & WITH_TEXTUREPACKER are defined as
> directories:
> https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindJsonSchemaBuilder.cmake
> https://github.com/xbmc/xbmc/blob/master/cmake/modules/buildtools/FindTexturePacker.cmake
> 
> and during configure kodi searches these directories for usable binaries
> with the name scheme.
> 
> ${APP_NAME_LC}-JsonSchemaBuilder
> ${APP_NAME_LC}-TexturePacker
> 
> which translates to kodi-JsonSchemaBuilder and kodi-TexturePacker.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> v2: also updated kodi-skin-confluence.mk

Applied to next with an improved commit log that explains this is just
an improvement and it doesn't fix any build/runtime issue.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot