From 74a3a77bcd6842b03806dcbdcd49e0bce8767174 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 3 Nov 2014 09:56:44 +0000 Subject: license info - revert r43155 turns out that r43155 adds duplicate info. Signed-off-by: John Crispin SVN-Revision: 43167 --- package/network/services/authsae/Makefile | 3 --- package/network/services/dnsmasq/Makefile | 4 ++-- package/network/services/ead/Makefile | 3 --- package/network/services/hostapd/Makefile | 3 --- package/network/services/igmpproxy/Makefile | 3 --- package/network/services/lldpd/Makefile | 3 --- package/network/services/odhcpd/Makefile | 3 --- package/network/services/openvpn-easy-rsa/Makefile | 3 --- package/network/services/openvpn/Makefile | 3 --- package/network/services/ppp/Makefile | 3 --- package/network/services/relayd/Makefile | 3 --- package/network/services/samba36/Makefile | 2 +- package/network/services/uhttpd/Makefile | 3 --- 13 files changed, 3 insertions(+), 36 deletions(-) (limited to 'package/network/services') diff --git a/package/network/services/authsae/Makefile b/package/network/services/authsae/Makefile index d46ef2a..2955021 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 bf9fc8f..a530225 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 163c6b8..c743253 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 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 d8178b8..d698c05 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 PKG_LICENSE:=BSD-3-Clause diff --git a/package/network/services/igmpproxy/Makefile b/package/network/services/igmpproxy/Makefile index 36b35e0..33ed014 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 -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 c597440..3a2e411 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 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 e0372f5..a2f9f9a 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 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 47cf842..487b61c 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 e8187d3..27f831b 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 d8cecc4..33b71ff 100644 --- a/package/network/services/ppp/Makefile +++ b/package/network/services/ppp/Makefile @@ -18,9 +18,6 @@ PKG_MD5SUM:=78818f40e6d33a1d1de68a1551f6595a PKG_MAINTAINER:=Felix Fietkau 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 c1ff51b..8c5d338 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 PKG_LICENSE:=GPL-2.0 diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile index 8bf9202..4dff34b 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 diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 765f4ff..e6e6753 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 PKG_LICENSE:=ISC -PKG_LICENSE:=ISC -PKG_LICENSE_FILES:= - PKG_BUILD_DEPENDS = ustream-ssl include $(INCLUDE_DIR)/package.mk -- cgit v1.1