license info - revert r43155

turns out that r43155 adds duplicate info.

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 43167

13 files changed, 3 insertions, 36 deletions

diff --git a/package/network/services/authsae/Makefile b/package/network/services/authsae/Makefile
index d46ef2a908..29550214fa 100644
--- a/package/network/services/authsae/Makefile
+++ b/package/network/services/authsae/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=8531ab158910a525d4bcbb3ad02c08342f6987f2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=
-
 PKG_BUILD_PARALLEL:=1
 CMAKE_INSTALL:=1
 
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index bf9fc8f588..a5302255b1 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -15,8 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
 PKG_MD5SUM:=cf82f81cf09ad3d47612985012240483
 
-PKG_LICENSE:=GPL-2.0 GPL-3.0
-PKG_LICENSE_FILES:=COPYING COPYING-v3
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/package/network/services/ead/Makefile b/package/network/services/ead/Makefile
index 163c6b89bf..c7432533cf 100644
--- a/package/network/services/ead/Makefile
+++ b/package/network/services/ead/Makefile
@@ -16,9 +16,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/ead
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index d8178b89cd..d698c050a3 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -19,9 +19,6 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git
 # PKG_MIRROR_MD5SUM:=4e7c1f97edd7514535056fce54ae053a
 
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=README
-
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 PKG_LICENSE:=BSD-3-Clause
 
diff --git a/package/network/services/igmpproxy/Makefile b/package/network/services/igmpproxy/Makefile
index 36b35e0e24..33ed014040 100644
--- a/package/network/services/igmpproxy/Makefile
+++ b/package/network/services/igmpproxy/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE_URL:=@SF/igmpproxy
 PKG_MD5SUM:=c56f41ec195bc1fe016369bf74efc5a1
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=GPL.txt
-
 include $(INCLUDE_DIR)/package.mk
 
 PKG_FIXUP:=autoreconf
diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile
index c597440ed2..3a2e41122d 100644
--- a/package/network/services/lldpd/Makefile
+++ b/package/network/services/lldpd/Makefile
@@ -18,9 +18,6 @@ PKG_MD5SUM:=9031734c69940dd79a0a175123275f83
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 PKG_LICENSE:=ISC
 
-PKG_LICENSE:=ISC
-PKG_LICENSE_FILES:=README.md
-
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile
index e0372f58cb..a2f9f9a20c 100644
--- a/package/network/services/odhcpd/Makefile
+++ b/package/network/services/odhcpd/Makefile
@@ -20,9 +20,6 @@ PKG_SOURCE_VERSION:=b461334ab277b6e8fd1622ab7c8a655363bd3f6c
 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 PKG_LICENSE:=GPL-2.0
 
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
diff --git a/package/network/services/openvpn-easy-rsa/Makefile b/package/network/services/openvpn-easy-rsa/Makefile
index 47cf84243d..487b61c81f 100644
--- a/package/network/services/openvpn-easy-rsa/Makefile
+++ b/package/network/services/openvpn-easy-rsa/Makefile
@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0
 
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYRIGHT.GPL
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile
index e8187d33f4..27f831b6d5 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -18,9 +18,6 @@ PKG_MD5SUM:=04d47237907faabe9d046970ffe44b2e
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYRIGHT.GPL
-
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index d8cecc4c59..33b71ffe82 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -18,9 +18,6 @@ PKG_MD5SUM:=78818f40e6d33a1d1de68a1551f6595a
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 PKG_LICENSE:=BSD-4-Clause
 
-PKG_LICENSE:=BSD-3-Clause BSD-4-Clause
-PKG_LICENSE_FILES:=
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DEPENDS:=libpcap
diff --git a/package/network/services/relayd/Makefile b/package/network/services/relayd/Makefile
index c1ff51b2a9..8c5d33866f 100644
--- a/package/network/services/relayd/Makefile
+++ b/package/network/services/relayd/Makefile
@@ -17,9 +17,6 @@ PKG_SOURCE_URL:=git://nbd.name/relayd.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=767c54d5957a2db0b847add771e8e890b82569c0
 
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=
-
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 PKG_LICENSE:=GPL-2.0
 
diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index 8bf9202c95..4dff34b3c9 100644
--- a/package/network/services/samba36/Makefile
+++ b/package/network/services/samba36/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MD5SUM:=d98425c0c2b73e08f048d31ffc727fb0
 
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index 765f4ffb74..e6e6753a68 100644
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -19,9 +19,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 PKG_LICENSE:=ISC
 
-PKG_LICENSE:=ISC
-PKG_LICENSE_FILES:=
-
 PKG_BUILD_DEPENDS = ustream-ssl
 
 include $(INCLUDE_DIR)/package.mk