[Buildroot] [PATCH 1/2] package/tio: install bash-completions

[Buildroot] [PATCH 1/2] package/tio: install bash-completions

[Marcus Hoffmann via buildroot]

See meson_options.txt file [1].

[1] https://github.com/tio/tio/blob/master/meson_options.txt

Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>
---
 package/tio/tio.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/tio/tio.mk b/package/tio/tio.mk
index d7b554ee84..a7d3537850 100644
--- a/package/tio/tio.mk
+++ b/package/tio/tio.mk
@@ -10,5 +10,10 @@ TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION)
 TIO_LICENSE = GPL-2.0+
 TIO_LICENSE_FILES = LICENSE
 TIO_DEPENDENCIES = inih
+ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)
+TIO_CONF_OPTS +=-Dbashcompletiondir=/usr/share/bash-completion/completions/
+else
+TIO_CONF_OPTS +=-Dbashcompletiondir=no
+endif
 
 $(eval $(meson-package))
-- 
2.34.1

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

[Buildroot] [PATCH 2/2] package/tio: disable installing man page

[Marcus Hoffmann via buildroot]

Remove the man subdir from inclusion in the main meson.build file.

Reported upstream to get an option to disable this properly:
https://github.com/tio/tio/issues/222

Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>
---
 package/tio/tio.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/tio/tio.mk b/package/tio/tio.mk
index a7d3537850..66ce69db2f 100644
--- a/package/tio/tio.mk
+++ b/package/tio/tio.mk
@@ -16,4 +16,10 @@ else
 TIO_CONF_OPTS +=-Dbashcompletiondir=no
 endif
 
+define TIO_DISABLE_BUILDING_MAN_PAGE
+	sed -i -e "/subdir('man')/d" $(@D)/meson.build
+endef
+
+TIO_POST_PATCH_HOOKS += TIO_DISABLE_BUILDING_MAN_PAGE
+
 $(eval $(meson-package))
-- 
2.34.1

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

Re: [Buildroot] [PATCH 2/2] package/tio: disable installing man page

[Thomas Petazzoni via buildroot]

Hello Marcus,

On Tue, 13 Feb 2024 12:49:32 +0100
Marcus Hoffmann via buildroot <buildroot@buildroot.org> wrote:

> Remove the man subdir from inclusion in the main meson.build file.
> 
> Reported upstream to get an option to disable this properly:
> https://github.com/tio/tio/issues/222
> 
> Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>

I did not apply this patch. Indeed, man pages are anyway removed at the
end of the build, so we don't really care that much if they are
installed. Of course, if there's a convenient option to disable
installing manpages we can use it (and upstream has added one following
your bug report, and therefore once we upgrade to a newer release that
has this option, we can use it). But when we don't go through great
lengths to disable manpages otherwise, *except* if building the
manpages requires some additional tools that would bring in extra
dependencies into the build.

So I've marked your patch as Rejected. Feel free to use the new option
to disable manpages at the next version bump of tio.

Thanks!

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

Re: [Buildroot] [PATCH 1/2] package/tio: install bash-completions

[Thomas Petazzoni via buildroot]

Hello Marcus,

On Tue, 13 Feb 2024 12:49:31 +0100
Marcus Hoffmann via buildroot <buildroot@buildroot.org> wrote:

> See meson_options.txt file [1].
> 
> [1] https://github.com/tio/tio/blob/master/meson_options.txt
> 
> Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>
> ---
>  package/tio/tio.mk | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/package/tio/tio.mk b/package/tio/tio.mk
> index d7b554ee84..a7d3537850 100644
> --- a/package/tio/tio.mk
> +++ b/package/tio/tio.mk
> @@ -10,5 +10,10 @@ TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION)
>  TIO_LICENSE = GPL-2.0+
>  TIO_LICENSE_FILES = LICENSE
>  TIO_DEPENDENCIES = inih
> +ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y)

Added an empty line between the TIO_DEPENDENCIES line and the condition.

> +TIO_CONF_OPTS +=-Dbashcompletiondir=/usr/share/bash-completion/completions/

Dropped the final / to match with other usage of
/usr/share/bash-completion/completions in the tree.

Applied with those minor nits fixed. Thanks!

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