[ptxdist] [PATCH] fuse3: fix copy/paste error selecting an option from fuse instead of fuse3

[ptxdist] [PATCH] fuse3: fix copy/paste error selecting an option from fuse instead of fuse3

[Bastian Krause]

Separate packages for fuse and fuse3 exist. fuse3 was copied from fuse. A
previous commit 91d340dec ("fuse3: fix copy/paste error") fixed
copy/paste errors, but there is another one configuring the utils
option:

If FUSE and FUSE_UTIL are not selected, fuse3's utils are not built
resulting in targetinstall errors for fusermount3, mount.fuse3 and
99-fuse3.rules. This again is only triggered since 91d340dec
("fuse3: fix copy/paste error"). Before that, no meson build options
were provided, so the default utils=true was used.

Since fuse3's tools and library were always installed unconditionally,
just enable the utils option unconditionally.

Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
 rules/fuse3.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/fuse3.make b/rules/fuse3.make
index 8af8f7282..d4925f2dd 100644
--- a/rules/fuse3.make
+++ b/rules/fuse3.make
@@ -36,7 +36,7 @@ FUSE3_CONF_OPT	:= \
 	-Ddisable-mtab=true \
 	-Dexamples=false \
 	-Dudevrulesdir=/usr/lib/udev/rules.d \
-	-Dutils=$(call ptx/truefalse,PTXCONF_FUSE_UTIL)
+	-Dutils=true
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.30.2

Re: [ptxdist] [APPLIED] fuse3: fix copy/paste error selecting an option from fuse instead of fuse3

[Michael Olbrich]

Thanks, applied as 30e605784a786096515703f67da216e5acb37d18.

Michael

[sent from post-receive hook]

On Fri, 01 Jul 2022 07:10:38 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Separate packages for fuse and fuse3 exist. fuse3 was copied from fuse. A
> previous commit 91d340dec ("fuse3: fix copy/paste error") fixed
> copy/paste errors, but there is another one configuring the utils
> option:
> 
> If FUSE and FUSE_UTIL are not selected, fuse3's utils are not built
> resulting in targetinstall errors for fusermount3, mount.fuse3 and
> 99-fuse3.rules. This again is only triggered since 91d340dec
> ("fuse3: fix copy/paste error"). Before that, no meson build options
> were provided, so the default utils=true was used.
> 
> Since fuse3's tools and library were always installed unconditionally,
> just enable the utils option unconditionally.
> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20220624100633.3198888-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/fuse3.make b/rules/fuse3.make
> index 8af8f7282e28..d4925f2dd83e 100644
> --- a/rules/fuse3.make
> +++ b/rules/fuse3.make
> @@ -36,7 +36,7 @@ FUSE3_CONF_OPT	:= \
>  	-Ddisable-mtab=true \
>  	-Dexamples=false \
>  	-Dudevrulesdir=/usr/lib/udev/rules.d \
> -	-Dutils=$(call ptx/truefalse,PTXCONF_FUSE_UTIL)
> +	-Dutils=true
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install