diff mbox

[1/3] dnsmasq: separate licenses with 'or' keyword

Message ID 1456379324-7666-1-git-send-email-rahul.bedarkar@imgtec.com
State Accepted
Headers show

Commit Message

Rahul Bedarkar Feb. 25, 2016, 5:48 a.m. UTC 
dnsmasq is dual licensed so separate licenses with 'or' keyword.

Reviewed-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
 package/dnsmasq/dnsmasq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Petazzoni Feb. 25, 2016, 9:36 p.m. UTC | #1 
Dear Rahul Bedarkar,

On Thu, 25 Feb 2016 11:18:42 +0530, Rahul Bedarkar wrote:
> dnsmasq is dual licensed so separate licenses with 'or' keyword.
> 
> Reviewed-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
> Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
> ---
>  package/dnsmasq/dnsmasq.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

All three patches applied to master, thanks!

Thomas
diff mbox

Patch

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index a0db81b..b3e8c4c 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -11,7 +11,7 @@  DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
 DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
 DNSMASQ_DEPENDENCIES = host-pkgconf
-DNSMASQ_LICENSE = Dual GPLv2/GPLv3
+DNSMASQ_LICENSE = GPLv2 or GPLv3
 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
 
 ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y)