* [ptxdist] [PATCH] rules/syslogng.make:
@ 2021-08-30 11:54 Christian Melki
2021-09-03 15:27 ` Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2021-08-30 11:54 UTC (permalink / raw)
To: ptxdist
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [PATCH] rules/syslogng.make:
2021-08-30 11:54 [ptxdist] [PATCH] rules/syslogng.make: Christian Melki
@ 2021-09-03 15:27 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2021-09-03 15:27 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
Please write a useful Subject. In general, the subject usually starts with
'<package-name>:' and then a brief summary. Probably about installing to
CROSS_LIB_DIR.
Michael
On Mon, Aug 30, 2021 at 01:54:23PM +0200, Christian Melki 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>
> ---
> 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
>
--
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 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-03 15:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-30 11:54 [ptxdist] [PATCH] rules/syslogng.make: Christian Melki
2021-09-03 15:27 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox