From: Michael Olbrich <mol@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [4/4] dnsmasq: optionally enable DBus support
Date: Fri, 27 Mar 2020 10:52:22 +0100 [thread overview]
Message-ID: <E1jHlf4-0000Ag-4w@dude02.lab.pengutronix.de> (raw)
In-Reply-To: <20200316191646.GE16217@lenoch>
Thanks, applied.
Michael
[sent from post-receive hook]
On Fri, 27 Mar 2020 10:52:22 +0100, Ladislav Michl <ladis@linux-mips.org> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> rules/dnsmasq.in | 10 +++++-----
> rules/dnsmasq.make | 1 +
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/rules/dnsmasq.in b/rules/dnsmasq.in
> index 3336bf5bc..12de6e27f 100644
> --- a/rules/dnsmasq.in
> +++ b/rules/dnsmasq.in
> @@ -33,12 +33,12 @@ comment "build options ---"
>
> config DNSMASQ_DBUS
> bool
> - prompt "include DBUS support [BROKEN]"
> - depends on BROKEN
> + prompt "include DBUS support"
> help
> - This enables DBUS support in dnsmasq. This is not only a build
> - option. You also have to enable it at runtime. FIXME: Show how,
> - see DBUS document in dnsmasq packet
> + This enables DBUS support in dnsmasq. To enable it at runtime
> + /etc/dnsmasq.conf needs to contain the line
> +
> + enable-dbus
>
> config DNSMASQ_TFTP
> bool
> diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
> index 37039cf10..07268e6de 100644
> --- a/rules/dnsmasq.make
> +++ b/rules/dnsmasq.make
> @@ -36,6 +36,7 @@ DNSMASQ_LICENSE_FILES := \
> DNSMASQ_CONF_TOOL := NO
>
> DNSMASQ_COPT :=
> +DNSMASQ_COPT += $(call ptx/ifdef,PTXCONF_DNSMASQ_DBUS,-DHAVE_DBUS,)
> DNSMASQ_COPT += $(call ptx/ifdef,PTXCONF_DNSMASQ_TFTP,,-DNO_TFTP)
> DNSMASQ_COPT += $(call ptx/ifdef,PTXCONF_GLOBAL_IPV6,,-DNO_IPV6)
> DNSMASQ_COPT += $(call ptx/ifdef,PTXCONF_DNSMASQ_DNSSEC,-DHAVE_DNSSEC,)
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2020-03-27 9:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 19:14 [ptxdist] [PATCH 0/4] dnsmasq fixes Ladislav Michl
2020-03-16 19:15 ` [ptxdist] [PATCH 1/4] dnsmasq: fix nettle dependency Ladislav Michl
2020-03-27 9:52 ` [ptxdist] [1/4] " Michael Olbrich
2020-03-16 19:15 ` [ptxdist] [PATCH 2/4] dnsmasq: use ptx/ifdef Ladislav Michl
2020-03-27 9:52 ` [ptxdist] [2/4] " Michael Olbrich
2020-03-16 19:16 ` [ptxdist] [PATCH 3/4] dnsmasq: install dnsmasq.conf from package source Ladislav Michl
2020-03-27 9:52 ` [ptxdist] [3/4] " Michael Olbrich
2020-03-16 19:16 ` [ptxdist] [PATCH 4/4] dnsmasq: optionally enable DBus support Ladislav Michl
2020-03-27 9:52 ` 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=E1jHlf4-0000Ag-4w@dude02.lab.pengutronix.de \
--to=mol@pengutronix.de \
--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