From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Christian Melki <christian.melki@t2data.com>
Subject: Re: [ptxdist] [APPLIED] syslogng: Use CROSS_LIB_DIR for module paths
Date: Thu, 7 Oct 2021 12:18:38 +0200 [thread overview]
Message-ID: <20211007101838.3925822-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210903183452.2754560-1-christian.melki@t2data.com>
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
prev parent reply other threads:[~2021-10-07 10:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 18:34 [ptxdist] [PATCH v2] rules/syslogng.make: " Christian Melki
2021-10-07 10:18 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211007101838.3925822-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox