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/utils/admswconfig/Makefile | 3 --- package/utils/busybox/Makefile | 2 +- package/utils/e2fsprogs/Makefile | 3 --- package/utils/fbtest/Makefile | 3 --- package/utils/fuse/Makefile | 2 +- package/utils/hostap-utils/Makefile | 3 --- package/utils/jsonfilter/Makefile | 3 --- package/utils/mdadm/Makefile | 3 --- package/utils/mkelfimage/Makefile | 3 --- package/utils/nvram/Makefile | 3 --- package/utils/px5g-standalone/Makefile | 3 --- package/utils/px5g/Makefile | 3 --- package/utils/robocfg/Makefile | 3 --- package/utils/spidev_test/Makefile | 3 --- package/utils/ubi-utils/Makefile | 2 +- package/utils/usbreset/Makefile | 3 --- package/utils/usbutils/Makefile | 3 --- package/utils/util-linux/Makefile | 2 +- package/utils/xfsprogs/Makefile | 6 +----- 19 files changed, 5 insertions(+), 51 deletions(-) (limited to 'package/utils') diff --git a/package/utils/admswconfig/Makefile b/package/utils/admswconfig/Makefile index de3683d..e16258f 100644 --- a/package/utils/admswconfig/Makefile +++ b/package/utils/admswconfig/Makefile @@ -15,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.openwrt.org/sources PKG_MD5SUM:=faafd4618f970119a665b11b21ac6a26 -PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILES:= - include $(INCLUDE_DIR)/package.mk define Package/admswconfig diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile index b46af22..c546405 100644 --- a/package/utils/busybox/Makefile +++ b/package/utils/busybox/Makefile @@ -21,7 +21,7 @@ PKG_BUILD_DEPENDS:=BUSYBOX_USE_LIBRPC:librpc BUSYBOX_CONFIG_PAM:libpam PKG_BUILD_PARALLEL:=1 PKG_CHECK_FORMAT_SECURITY:=0 -PKG_LICENSE:=GPL-2.0 BSD-4-Clause +PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE archival/libarchive/bz/LICENSE include $(INCLUDE_DIR)/package.mk diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index 5d5ad90..5dc8786 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -18,9 +18,6 @@ PKG_SOURCE_URL:=@SF/e2fsprogs PKG_BUILD_DEPENDS:=util-linux PKG_INSTALL:=1 -PKG_LICENSE:=GPL-2.0 LGPL-2.0 BSD-3-Clause MIT -PKG_LICENSE_FILES:=COPYING - include $(INCLUDE_DIR)/package.mk define Package/e2fsprogs/Default diff --git a/package/utils/fbtest/Makefile b/package/utils/fbtest/Makefile index 05ed999..05e67cb 100644 --- a/package/utils/fbtest/Makefile +++ b/package/utils/fbtest/Makefile @@ -12,9 +12,6 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -PKG_LICENSE:=GPL-2.0+ -PKG_LICENSE_FILES:= - include $(INCLUDE_DIR)/package.mk define Package/fbtest diff --git a/package/utils/fuse/Makefile b/package/utils/fuse/Makefile index 5edfb7f..0620b6c 100644 --- a/package/utils/fuse/Makefile +++ b/package/utils/fuse/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_MD5SUM:=894ee11674f89a915ae87524aed55bc4 -PKG_LICENSE:=LGPL-2.1 GPL-2.0 +PKG_LICENSE:=LGPLv2.1 GPLv2 PKG_LICENSE_FILES:=COPYING.LIB COPYING PKG_INSTALL:=1 diff --git a/package/utils/hostap-utils/Makefile b/package/utils/hostap-utils/Makefile index a3e27fa..1d7b221 100644 --- a/package/utils/hostap-utils/Makefile +++ b/package/utils/hostap-utils/Makefile @@ -14,9 +14,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ PKG_MD5SUM:=afe041581b8f01666e353bec20917c85 -PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILES:=COPYING - include $(INCLUDE_DIR)/package.mk define Package/hostap-utils diff --git a/package/utils/jsonfilter/Makefile b/package/utils/jsonfilter/Makefile index d5e677c..34020df 100644 --- a/package/utils/jsonfilter/Makefile +++ b/package/utils/jsonfilter/Makefile @@ -14,9 +14,6 @@ CMAKE_INSTALL:=1 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC -PKG_LICENSE:=ISC -PKG_LICENSE_FILES:= - include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk diff --git a/package/utils/mdadm/Makefile b/package/utils/mdadm/Makefile index 92ac85c..69eec5b 100644 --- a/package/utils/mdadm/Makefile +++ b/package/utils/mdadm/Makefile @@ -17,9 +17,6 @@ PKG_MD5SUM:=2fd33dedcdb06f0d1461f50ddabb7e4a PKG_MAINTAINER:=Felix Fietkau -PKG_LICENSE:=GPL-2.0+ -PKG_LICENSE_FILES:=COPYING - PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/utils/mkelfimage/Makefile b/package/utils/mkelfimage/Makefile index a5c04b2..2433c72 100644 --- a/package/utils/mkelfimage/Makefile +++ b/package/utils/mkelfimage/Makefile @@ -13,9 +13,6 @@ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/m/mkelfimage/ PKG_MD5SUM:=e505cb87e9c0cdc44cf03d2c4ea8c74b -PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILES:=COPYING - include $(INCLUDE_DIR)/package.mk define Package/mkelfimage diff --git a/package/utils/nvram/Makefile b/package/utils/nvram/Makefile index 27a49c5..fe70e34 100644 --- a/package/utils/nvram/Makefile +++ b/package/utils/nvram/Makefile @@ -12,9 +12,6 @@ PKG_RELEASE:=9 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -PKG_LICENSE:=GPL-2.0+ -PKG_LICENSE_FILES:= - include $(INCLUDE_DIR)/package.mk define Package/nvram diff --git a/package/utils/px5g-standalone/Makefile b/package/utils/px5g-standalone/Makefile index e575bd4..d6843b0 100644 --- a/package/utils/px5g-standalone/Makefile +++ b/package/utils/px5g-standalone/Makefile @@ -10,9 +10,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=px5g PKG_RELEASE:=2 -PKG_LICENSE:=LGPL-2.1 -PKG_LICENSE_FILES:= - PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_CHECK_FORMAT_SECURITY:=0 diff --git a/package/utils/px5g/Makefile b/package/utils/px5g/Makefile index 9bf290a..9c0caa7 100644 --- a/package/utils/px5g/Makefile +++ b/package/utils/px5g/Makefile @@ -10,9 +10,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=px5g PKG_RELEASE:=1 -PKG_LICENSE:=LGPL-2.1 -PKG_LICENSE_FILES:= - PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT) PKG_USE_MIPS16:=0 diff --git a/package/utils/robocfg/Makefile b/package/utils/robocfg/Makefile index 48f91ba..4bc72f5 100644 --- a/package/utils/robocfg/Makefile +++ b/package/utils/robocfg/Makefile @@ -11,9 +11,6 @@ PKG_NAME:=robocfg PKG_VERSION:=0.01 PKG_RELEASE:=1 -PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILES:= - PKG_BUILD_DIR:=$(BUILD_DIR)/robocfg include $(INCLUDE_DIR)/package.mk diff --git a/package/utils/spidev_test/Makefile b/package/utils/spidev_test/Makefile index e0ed020..807039a 100644 --- a/package/utils/spidev_test/Makefile +++ b/package/utils/spidev_test/Makefile @@ -11,9 +11,6 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=spidev-test PKG_RELEASE:=$(LINUX_VERSION) -PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILES:= - include $(INCLUDE_DIR)/package.mk define Package/spidev-test diff --git a/package/utils/ubi-utils/Makefile b/package/utils/ubi-utils/Makefile index 3d2a7dc..80085c4 100644 --- a/package/utils/ubi-utils/Makefile +++ b/package/utils/ubi-utils/Makefile @@ -22,7 +22,7 @@ PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=util-linux liblzo zlib -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=GPLv2 PKG_LICENSE_FILES:= PKG_MAINTAINER:=John Crispin diff --git a/package/utils/usbreset/Makefile b/package/utils/usbreset/Makefile index bc00200..d8efa54 100644 --- a/package/utils/usbreset/Makefile +++ b/package/utils/usbreset/Makefile @@ -10,9 +10,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usbreset PKG_RELEASE:=4 -PKG_LICENSE:=GPL-2.0 -PKG_LICENSE_FILES:= - include $(INCLUDE_DIR)/package.mk define Package/usbreset diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile index bab383f..b1c058b 100644 --- a/package/utils/usbutils/Makefile +++ b/package/utils/usbutils/Makefile @@ -22,9 +22,6 @@ USB_IDS_FILE:=usb.ids.$(USB_IDS_VERSION).gz PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 -PKG_LICENSE:=GPL-2.0+ -PKG_LICENSE_FILES:=COPYING - PKG_MAINTAINER := Felix Fietkau include $(INCLUDE_DIR)/package.mk diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index 95c3e49..877ccc5 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.24 PKG_MD5SUM:=88d46ae23ca599ac5af9cf96b531590f -PKG_LICENSE:=GPL-2.0 LGPL-2.1 BSD-3-Clause +PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING getopt/COPYING libblkid/COPYING libmount/COPYING Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.LGPLv2.1 libuuid/COPYING Documentation/licenses/COPYING.BSD-3 PKG_BUILD_PARALLEL:=1 diff --git a/package/utils/xfsprogs/Makefile b/package/utils/xfsprogs/Makefile index 0ba972e..7fc9a64 100644 --- a/package/utils/xfsprogs/Makefile +++ b/package/utils/xfsprogs/Makefile @@ -10,14 +10,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xfsprogs PKG_RELEASE:=1 PKG_VERSION:=3.1.7 - PKG_SOURCE_URL:=ftp://oss.sgi.com/projects/xfs/previous/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_MD5SUM:=049cf9873794ea49d0bb3f12d45748a4 -PKG_LICENSE:=GPL-2.0 LGPL-2.1 -PKG_LICENSE_FILES:=debian/copyright - +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_INSTALL:=1 PKG_FIXUP:=autoreconf PKG_CHECK_FORMAT_SECURITY:=0 -- cgit v1.1