[ptxdist] [PATCH v2] rules/syslogng.make: Use CROSS_LIB_DIR for module paths

[ptxdist] [PATCH v2] rules/syslogng.make: Use CROSS_LIB_DIR for module paths

[Christian Melki]

Be more specific about where modules (.so files) end up and searched for.
Let them land in a CROSS_LIB_DIR path.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/syslogng.make | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rules/syslogng.make b/rules/syslogng.make
index d5ac92797..41bdec766 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -41,6 +41,8 @@ SYSLOGNG_ENV 	= \
 SYSLOGNG_AUTOCONF = \
 	$(CROSS_AUTOCONF_USR) \
 	--localstatedir=/var/run \
+	--with-module-dir=/usr/$(CROSS_LIB_DIR)/syslog-ng \
+	--with-module-path=/usr/$(CROSS_LIB_DIR)/syslog-ng \
 	--enable-forced-server-mode \
 	--disable-debug \
 	--enable-force-gnu99 \
@@ -99,7 +101,7 @@ $(STATEDIR)/syslogng.install:
 	@$(call targetinfo)
 	@$(call world/install, SYSLOGNG)
 #	# test plugins, not needed on the target
-	@rm -r "$(SYSLOGNG_PKGDIR)/usr/lib/syslog-ng/loggen"
+	@rm -r "$(SYSLOGNG_PKGDIR)/usr/$(CROSS_LIB_DIR)/syslog-ng/loggen"
 	@$(call touch)
 
 
@@ -122,7 +124,7 @@ $(STATEDIR)/syslogng.targetinstall:
 	@$(call install_lib, syslogng, 0, 0, 0644, libsyslog-ng-$(SYSLOG_LIBVERSION))
 	@$(call install_lib, syslogng, 0, 0, 0644, libevtlog-$(SYSLOG_LIBVERSION))
 	@$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage)
-	@$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng, *.so)
+	@$(call install_glob, syslogng, 0, 0, -, /usr/$(CROSS_LIB_DIR)/syslog-ng, *.so)
 
 #	# config
 ifdef PTXCONF_SYSLOGNG_CONFIG
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] syslogng: Use CROSS_LIB_DIR for module paths

[Michael Olbrich]

Thanks, applied as b1f105188231b3b0938cf68f1247e6a07e24b4d9.

Michael

[sent from post-receive hook]

On Thu, 07 Oct 2021 12:18:38 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Be more specific about where modules (.so files) end up and searched for.
> Let them land in a CROSS_LIB_DIR path.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20210903183452.2754560-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/syslogng.make b/rules/syslogng.make
> index d5ac92797e5b..41bdec766dd1 100644
> --- a/rules/syslogng.make
> +++ b/rules/syslogng.make
> @@ -41,6 +41,8 @@ SYSLOGNG_ENV 	= \
>  SYSLOGNG_AUTOCONF = \
>  	$(CROSS_AUTOCONF_USR) \
>  	--localstatedir=/var/run \
> +	--with-module-dir=/usr/$(CROSS_LIB_DIR)/syslog-ng \
> +	--with-module-path=/usr/$(CROSS_LIB_DIR)/syslog-ng \
>  	--enable-forced-server-mode \
>  	--disable-debug \
>  	--enable-force-gnu99 \
> @@ -99,7 +101,7 @@ $(STATEDIR)/syslogng.install:
>  	@$(call targetinfo)
>  	@$(call world/install, SYSLOGNG)
>  #	# test plugins, not needed on the target
> -	@rm -r "$(SYSLOGNG_PKGDIR)/usr/lib/syslog-ng/loggen"
> +	@rm -r "$(SYSLOGNG_PKGDIR)/usr/$(CROSS_LIB_DIR)/syslog-ng/loggen"
>  	@$(call touch)
>  
>  
> @@ -122,7 +124,7 @@ $(STATEDIR)/syslogng.targetinstall:
>  	@$(call install_lib, syslogng, 0, 0, 0644, libsyslog-ng-$(SYSLOG_LIBVERSION))
>  	@$(call install_lib, syslogng, 0, 0, 0644, libevtlog-$(SYSLOG_LIBVERSION))
>  	@$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage)
> -	@$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng, *.so)
> +	@$(call install_glob, syslogng, 0, 0, -, /usr/$(CROSS_LIB_DIR)/syslog-ng, *.so)
>  
>  #	# config
>  ifdef PTXCONF_SYSLOGNG_CONFIG

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de