diff mbox series

package/dnsmasq: bump version to 2.80

Message ID 20190618052415.27541-1-j.w.janssen@lxtreme.nl
State Accepted
Headers show
Series package/dnsmasq: bump version to 2.80 | expand

Commit Message

Jan Willem Janssen June 18, 2019, 5:24 a.m. UTC 
Also automatically enable UBus support when UBus itself is enabled.

Signed-off-by: Jan Willem Janssen <j.w.janssen@lxtreme.nl>
---
 package/dnsmasq/dnsmasq.hash | 1 +
 package/dnsmasq/dnsmasq.mk   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni June 19, 2019, 11:57 a.m. UTC | #1 
On Tue, 18 Jun 2019 07:24:15 +0200
Jan Willem Janssen <j.w.janssen@lxtreme.nl> wrote:

> Also automatically enable UBus support when UBus itself is enabled.
> 
> Signed-off-by: Jan Willem Janssen <j.w.janssen@lxtreme.nl>
> ---
>  package/dnsmasq/dnsmasq.hash | 1 +
>  package/dnsmasq/dnsmasq.mk   | 7 ++++++-
>  2 files changed, 7 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash
index 322f8df5cc..18a539277e 100644
--- a/package/dnsmasq/dnsmasq.hash
+++ b/package/dnsmasq/dnsmasq.hash
@@ -1,6 +1,7 @@ 
 # Locally calculated after checking pgp signature
 # http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.79.tar.xz.asc
 sha256	78ad74f5ca14fd85a8bac93f764cd9d60b27579e90eabd3687ca7b030e67861f	dnsmasq-2.79.tar.xz
+sha256	cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb	dnsmasq-2.80.tar.xz
 # Locally calculated
 sha256	dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa	COPYING
 sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING-v3
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 79c5619966..366cebf012 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-DNSMASQ_VERSION = 2.79
+DNSMASQ_VERSION = 2.80
 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
@@ -67,6 +67,11 @@  define DNSMASQ_INSTALL_DBUS
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_UBUS),y)
+DNSMASQ_DEPENDENCIES += ubus
+DNSMASQ_COPTS += -DHAVE_UBUS
+endif
+
 define DNSMASQ_FIX_PKGCONFIG
 	$(SED) 's^PKG_CONFIG = pkg-config^PKG_CONFIG = $(PKG_CONFIG_HOST_BINARY)^' \
 		$(DNSMASQ_DIR)/Makefile