[ptxdist] [PATCH] Fix mosquitto installation

[ptxdist] [PATCH] Fix mosquitto installation

[Tamino Bauknecht]

Because the previous MOSQUITTO_CONF_OPT configuration used
CROSS_CMAKE_USR, the installation of /etc/mosquitto/mosquitto.conf
failed since the source was located at
/usr/etc/mosquitto/mosquitto.conf.
Using CROSS_CMAKE_ROOT instead fixes this issue and all files are
installed to the correct location.

Signed-off-by: Tamino Bauknecht <dev@tb6.eu>
---
 rules/mosquitto.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/mosquitto.make b/rules/mosquitto.make
index eedb5ca58..f8887e019 100644
--- a/rules/mosquitto.make
+++ b/rules/mosquitto.make
@@ -34,7 +34,7 @@ MOSQUITTO_LICENSE_FILES	:= \
 
 MOSQUITTO_CONF_TOOL	:= cmake
 MOSQUITTO_CONF_OPT	:= \
-	$(CROSS_CMAKE_USR) \
+	$(CROSS_CMAKE_ROOT) \
 	-DDOCUMENTATION=OFF \
 	-DINC_BRIDGE_SUPPORT=ON \
 	-DINC_DB_UPGRADE=ON \
-- 
2.37.3

Re: [ptxdist] [PATCH] Fix mosquitto installation

[Michael Olbrich]

On Thu, Sep 15, 2022 at 09:30:24PM +0200, Tamino Bauknecht wrote:
> Because the previous MOSQUITTO_CONF_OPT configuration used
> CROSS_CMAKE_USR, the installation of /etc/mosquitto/mosquitto.conf
> failed since the source was located at
> /usr/etc/mosquitto/mosquitto.conf.
> Using CROSS_CMAKE_ROOT instead fixes this issue and all files are
> installed to the correct location.

Sorry, I missed this patch somehow.

I'm not seeing the issue here. Maybe you backported the rule to an older
PTXdist version? The file is installed into CMAKE_INSTALL_SYSCONFDIR and
"-DCMAKE_INSTALL_SYSCONFDIR=/etc" was added to CROSS_CMAKE_USR in PTXdist
2021.02.0.

Michael

> Signed-off-by: Tamino Bauknecht <dev@tb6.eu>
> ---
>  rules/mosquitto.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/mosquitto.make b/rules/mosquitto.make
> index eedb5ca58..f8887e019 100644
> --- a/rules/mosquitto.make
> +++ b/rules/mosquitto.make
> @@ -34,7 +34,7 @@ MOSQUITTO_LICENSE_FILES	:= \
>  
>  MOSQUITTO_CONF_TOOL	:= cmake
>  MOSQUITTO_CONF_OPT	:= \
> -	$(CROSS_CMAKE_USR) \
> +	$(CROSS_CMAKE_ROOT) \
>  	-DDOCUMENTATION=OFF \
>  	-DINC_BRIDGE_SUPPORT=ON \
>  	-DINC_DB_UPGRADE=ON \
> -- 
> 2.37.3
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |