From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20200316191646.GE16217@lenoch>
MIME-Version: 1.0
Message-Id: <E1jHlf4-0000Ag-4w@dude02.lab.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Fri, 27 Mar 2020 10:52:22 +0100
Subject: Re: [ptxdist] [4/4] dnsmasq: optionally enable DBus support
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de

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