license info - revert r43155

turns out that r43155 adds duplicate info. Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43167 3c298f89-4303-0410-b956-a3cf2f4a3e73
2025-10-29 16:57:19 +00:00 · 2014-11-03 09:56:44 +00:00
parent b8df8ca970
commit 85c10a8a6a
124 changed files with 24 additions and 331 deletions
--- a/package/network/utils/arptables/Makefile
+++ b/package/network/utils/arptables/Makefile
@@ -15,9 +15,6 @@ PKG_SOURCE_URL:=@SF/ebtables
 PKG_MD5SUM:=c2e99c3aa9d78c9dfa30710ca3168182
 PKG_LICENSE:=GPL-2.0

-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)

 include $(INCLUDE_DIR)/package.mk
--- a/package/network/utils/comgt/Makefile
+++ b/package/network/utils/comgt/Makefile
@@ -18,9 +18,6 @@ PKG_MD5SUM:=db2452680c3d953631299e331daf49ef
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 PKG_LICENSE:=GPL-2.0+

-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=gpl.txt
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
 PKG_CHECK_FORMAT_SECURITY:=0

--- a/package/network/utils/conntrack-tools/Makefile
+++ b/package/network/utils/conntrack-tools/Makefile
@@ -21,9 +21,6 @@ PKG_MD5SUM:=5add24d4761baf17af630d5627a71752
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 PKG_LICENSE:=GPL-2.0

-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1

--- a/package/network/utils/dante/Makefile
+++ b/package/network/utils/dante/Makefile
@@ -18,9 +18,6 @@ PKG_MD5SUM:=69b9d6234154d7d6a91fcbd98c68e62a
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 PKG_LICENSE:=BSD-4-Clause

-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1

--- a/package/network/utils/ebtables/Makefile
+++ b/package/network/utils/ebtables/Makefile
@@ -15,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ebtables
 PKG_MD5SUM:=506742a3d44b9925955425a659c1a8d0

-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0

--- a/package/network/utils/ifenslave/Makefile
+++ b/package/network/utils/ifenslave/Makefile
@@ -12,9 +12,6 @@ PKG_NAME:=ifenslave
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0

-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=
-
 include $(INCLUDE_DIR)/package.mk

 define Package/ifenslave
--- a/package/network/utils/iftop/Makefile
+++ b/package/network/utils/iftop/Makefile
@@ -18,9 +18,6 @@ PKG_MD5SUM:=fef521a49ec0122458d02c64212af3c5
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 PKG_LICENSE:=GPL-2.0

-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
 include $(INCLUDE_DIR)/package.mk

 define Package/iftop
--- a/package/network/utils/iperf/Makefile
+++ b/package/network/utils/iperf/Makefile
@@ -19,9 +19,6 @@ PKG_MD5SUM:=44b5536b67719f4250faed632a3cd016
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 PKG_LICENSE:=BSD-3-Clause

-PKG_LICENSE:=NCSA
-PKG_LICENSE_FILES:=COPYING
-
 PKG_BUILD_PARALLEL:=1
 PKG_CHECK_FORMAT_SECURITY:=0

--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -17,9 +17,6 @@ PKG_MD5SUM:=6c823b40fdcfa7b8120743349a52ac18
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0

-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

 include $(INCLUDE_DIR)/package.mk
--- a/package/network/utils/ipset/Makefile
+++ b/package/network/utils/ipset/Makefile
@@ -19,9 +19,6 @@ PKG_MD5SUM:=8af741492752fbf24d3a28a9d1473d40
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 PKG_LICENSE:=GPL-2.0

-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1

--- a/package/network/utils/iptables/Makefile
+++ b/package/network/utils/iptables/Makefile
@@ -19,9 +19,6 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
 	ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
 PKG_MD5SUM:=536d048c8e8eeebcd9757d0863ebb0c0

-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
--- a/package/network/utils/iputils/Makefile
+++ b/package/network/utils/iputils/Makefile
@@ -18,9 +18,6 @@ PKG_MD5SUM:=a36c25e9ec17e48be514dc0485e7376c
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 PKG_LICENSE:=GPL-2.0+

-PKG_LICENSE:=GPL-2.0+ BSD-4-Clause
-PKG_LICENSE_FILES:=
-
 PKG_BUILD_DEPENDS:=sysfsutils
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-s$(PKG_VERSION)

--- a/package/network/utils/iw/Makefile
+++ b/package/network/utils/iw/Makefile
@@ -15,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.kernel.org/pub/software/network/iw
 PKG_MD5SUM:=3b77ad7ec44a865a3bb2ab6c1c463bba

-PKG_LICENSE:=ISC
-PKG_LICENSE_FILES:=COPYING
-
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 PKG_LICENSE:=GPL-2.0

--- a/package/network/utils/iwcap/Makefile
+++ b/package/network/utils/iwcap/Makefile
@@ -10,9 +10,6 @@ PKG_NAME:=iwcap
 PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0

-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=
-
 include $(INCLUDE_DIR)/package.mk


--- a/package/network/utils/iwinfo/Makefile
+++ b/package/network/utils/iwinfo/Makefile
@@ -25,9 +25,6 @@ PKG_CONFIG_DEPENDS := \
 	CONFIG_PACKAGE_kmod-madwifi \
 	CONFIG_PACKAGE_kmod-cfg80211

-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
 include $(INCLUDE_DIR)/package.mk


--- a/package/network/utils/linux-atm/Makefile
+++ b/package/network/utils/linux-atm/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=d49499368c3cf15f73a05d9bce8824a8

-PKG_LICENSE:=GPL-2.0 LGPL-2.0
-PKG_LICENSE_FILES:=COPYING COPYING.GPL COPYING.LGPL
-
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 PKG_CHECK_FORMAT_SECURITY:=0
--- a/package/network/utils/maccalc/Makefile
+++ b/package/network/utils/maccalc/Makefile
@@ -13,9 +13,6 @@ PKG_LICENSE:=GPL-2.0

 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=
-
 include $(INCLUDE_DIR)/package.mk

 define Package/maccalc
--- a/package/network/utils/owipcalc/Makefile
+++ b/package/network/utils/owipcalc/Makefile
@@ -10,9 +10,6 @@ PKG_NAME:=owipcalc
 PKG_RELEASE:=3
 PKG_LICENSE:=Apache-2.0

-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=
-
 include $(INCLUDE_DIR)/package.mk


--- a/package/network/utils/resolveip/Makefile
+++ b/package/network/utils/resolveip/Makefile
@@ -11,9 +11,6 @@ PKG_NAME:=resolveip
 PKG_RELEASE:=2
 PKG_LICENSE:=GPL-2.0

-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=
-
 include $(INCLUDE_DIR)/package.mk

 define Package/resolveip
--- a/package/network/utils/rssileds/Makefile
+++ b/package/network/utils/rssileds/Makefile
@@ -12,9 +12,6 @@ PKG_VERSION:=0.2
 PKG_RELEASE:=1
 PKG_LICNESE:=GPL-2.0+

-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=
-
 include $(INCLUDE_DIR)/package.mk

 define Package/rssileds
--- a/package/network/utils/tcpdump/Makefile
+++ b/package/network/utils/tcpdump/Makefile
@@ -24,9 +24,6 @@ PKG_BUILD_PARALLEL:=1
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 PKG_LICENSE:=BSD-3-Clause

-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
 PKG_INSTALL:=1

 include $(INCLUDE_DIR)/package.mk
--- a/package/network/utils/wireless-tools/Makefile
+++ b/package/network/utils/wireless-tools/Makefile
@@ -20,9 +20,6 @@ TAR_OPTIONS += || true
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 PKG_LICENSE:=GPL-2.0

-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.$(PKG_VERSION)

 include $(INCLUDE_DIR)/package.mk
--- a/package/network/utils/xtables-addons/Makefile
+++ b/package/network/utils/xtables-addons/Makefile
@@ -23,9 +23,6 @@ PKG_CHECK_FORMAT_SECURITY:=0
 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
 PKG_LICENSE:=GPL-2.0

-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=LICENSE
-
 PKG_FIXUP:=autoreconf

 include $(INCLUDE_DIR)/package.mk