Comma separate licenses
cover Comma separate licenses
This series sanitizes the PKG_LICENSE entries.
No attempt is made to interpret and/or improve upton the conditions of each license, it's just a style fix.
Gustavo Zacarias (45):
elfutils: comma separate licenses
gstreamer1: comma separate licenses
gst1-plugins-base: comma separate licenses
dtv-scan-tables: comma separate licenses
dbus-glib: comma separate licenses
trace-cmd: comma separate licenses
bluez5_utils: comma separate licenses
qemu: comma separate licenses
lvm2: comma separate licenses
libbsd: comma separate licenses
liboping: comma separate licenses
gdb: comma separate licenses
xz: comma separate licenses
bc: comma separate licenses
omniorb: comma separate licenses
libfuse: comma separate licenses
collectd: comma separate licenses
libiscsi: comma separate licenses
pppd: comma separate licenses
minidlna: comma separate licenses
ustr: comma separate licenses
python-pyzmq: comma separate licenses
ntfs-3g: comma separate licenses
bluez_utils: comma separate licenses
dvb_apps: comma separate licenses
keyutils: comma separate licenses
dbus: comma separate licenses
rsyslog: comma separate licenses
webkitgtk24: comma separate licenses
iputils: comma separate licenses
libidn: comma separate licenses
olsr: comma separate licenses
libtasn1: comma separate licenses
gnutls: comma separate licenses
fmlib: comma separate licenses
vde2: comma separate licenses
ltp-testsuite: comma separate licenses
taglib: comma separate licenses
setools: comma separate licenses
swig: comma separate licenses
audiofile: comma separate licenses
lttng-babeltrace: comma separate licenses
lttng-libust: comma separate licenses
lttng-modules: comma separate licenses
lttng-tools: comma separate licenses
package/audiofile/audiofile.mk | 2 +- package/bc/bc.mk | 2 +- package/bluez5_utils/bluez5_utils.mk | 2 +- package/bluez_utils/bluez_utils.mk | 2 +- package/collectd/collectd.mk | 2 +- package/dbus-glib/dbus-glib.mk | 2 +- package/dbus/dbus.mk | 2 +- package/dtv-scan-tables/dtv-scan-tables.mk | 2 +- package/dvb-apps/dvb-apps.mk | 2 +- package/elfutils/elfutils.mk | 2 +- package/fmlib/fmlib.mk | 2 +- package/gdb/gdb.mk | 2 +- package/gnutls/gnutls.mk | 2 +- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- package/iputils/iputils.mk | 2 +- package/keyutils/keyutils.mk | 2 +- package/libbsd/libbsd.mk | 2 +- package/libfuse/libfuse.mk | 2 +- package/libidn/libidn.mk | 2 +- package/libiscsi/libiscsi.mk | 2 +- package/liboping/liboping.mk | 2 +- package/libtasn1/libtasn1.mk | 2 +- package/ltp-testsuite/ltp-testsuite.mk | 2 +- package/lttng-babeltrace/lttng-babeltrace.mk | 2 +- package/lttng-libust/lttng-libust.mk | 2 +- package/lttng-modules/lttng-modules.mk | 2 +- package/lttng-tools/lttng-tools.mk | 2 +- package/lvm2/lvm2.mk | 2 +- package/minidlna/minidlna.mk | 2 +- package/ntfs-3g/ntfs-3g.mk | 2 +- package/olsr/olsr.mk | 2 +- package/omniorb/omniorb.mk | 2 +- package/pppd/pppd.mk | 2 +- package/python-pyzmq/python-pyzmq.mk | 2 +- package/qemu/qemu.mk | 2 +- package/rsyslog/rsyslog.mk | 2 +- package/setools/setools.mk | 2 +- package/swig/swig.mk | 2 +- package/taglib/taglib.mk | 2 +- package/trace-cmd/trace-cmd.mk | 2 +- package/ustr/ustr.mk | 2 +- package/vde2/vde2.mk | 2 +- package/webkitgtk24/webkitgtk24.mk | 2 +- package/xz/xz.mk | 2 +- 46 files changed, 46 insertions(+), 46 deletions(-)
Signature · 1 line
2.4.10
PATCH 1/45 elfutils: comma separate licenses
--- package/elfutils/elfutils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/elfutils/elfutils.mk +1 -1
@@ -8,7 +8,7 @@ ELFUTILS_VERSION = 0.161 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION) ELFUTILS_INSTALL_STAGING = YES -ELFUTILS_LICENSE = GPLv3 GPLv2 LGPLv3 +ELFUTILS_LICENSE = GPLv3, GPLv2, LGPLv3 ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3 ELFUTILS_PATCH = elfutils-portability-0.161.patch
Signature · 1 line
2.4.10
PATCH 2/45 gstreamer1: comma separate licenses
In reply to Gustavo Zacarias--- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/gstreamer1/gstreamer1/gstreamer1.mk +1 -1
@@ -9,7 +9,7 @@ GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = http://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES GSTREAMER1_LICENSE_FILES = COPYING -GSTREAMER1_LICENSE = LGPLv2+ LGPLv2.1+ +GSTREAMER1_LICENSE = LGPLv2+, LGPLv2.1+ # Checking if unaligned memory access works correctly cannot be done when cross # compiling. For the following architectures there is no information available
Signature · 1 line
2.4.10
PATCH 3/45 gst1-plugins-base: comma separate licenses
In reply to Gustavo Zacarias--- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +1 -1
@@ -7,7 +7,7 @@ GST1_PLUGINS_BAD_VERSION = 1.6.1 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad -GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB +GST1_PLUGINS_BAD_LICENSE_FILES = COPYING, COPYING.LIB # Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if # enabled. GST1_PLUGINS_BAD_LICENSE = LGPLv2+ LGPLv2.1+
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +1 -1
@@ -9,7 +9,7 @@ GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB -GST1_PLUGINS_BASE_LICENSE = LGPLv2+ LGPLv2.1+ +GST1_PLUGINS_BASE_LICENSE = LGPLv2+, LGPLv2.1+ # freetype is only used by examples, but if it is not found # and the host has a freetype-config script, then the host
Signature · 1 line
2.4.10
PATCH 3/45 gst1-plugins-base: comma separate licenses
Dear Gustavo Zacarias,
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk line 10
Quoted 2 lines · Gustavo Zacarias
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +1
-1-GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB +GST1_PLUGINS_BAD_LICENSE_FILES = COPYING, COPYING.LIB
Wrong: the list of license files is space separated, not comma separated.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 3/45 gst1-plugins-base: comma separate licenses
Quoted 9 lines · Thomas Petazzoni
Dear Gustavo Zacarias,
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk line 10
Quoted 2 lines · Gustavo Zacarias
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +1
-1-GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB +GST1_PLUGINS_BAD_LICENSE_FILES = COPYING, COPYING.LIBWrong: the list of license files is space separated, not comma separated.
Fixed in v2, another change leaked in by mistake.
Regards.
PATCH 4/45 dtv-scan-tables: comma separate licenses
In reply to Gustavo Zacarias--- package/dtv-scan-tables/dtv-scan-tables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/dtv-scan-tables/dtv-scan-tables.mk +1 -1
@@ -14,7 +14,7 @@ DTV_SCAN_TABLES_SITE_METHOD = git # However, the package prominently contains the COPYING and COPYING.LIB # license files (respectively for the GPLv2 and the LGPLv2.1), so we use # that as the licensing information. -DTV_SCAN_TABLES_LICENSE = GPLv2 LGPLv2.1 +DTV_SCAN_TABLES_LICENSE = GPLv2, LGPLv2.1 DTV_SCAN_TABLES_LICENSE_FILES = COPYING COPYING.LGPL define DTV_SCAN_TABLES_INSTALL_TARGET_CMDS
Signature · 1 line
2.4.10
PATCH 5/45 dbus-glib: comma separate licenses
In reply to Gustavo Zacarias--- package/dbus-glib/dbus-glib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/dbus-glib/dbus-glib.mk +1 -1
@@ -7,7 +7,7 @@ DBUS_GLIB_VERSION = 0.104 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib DBUS_GLIB_INSTALL_STAGING = YES -DBUS_GLIB_LICENSE = AFLv2.1 GPLv2+ +DBUS_GLIB_LICENSE = AFLv2.1, GPLv2+ DBUS_GLIB_LICENSE_FILES = COPYING DBUS_GLIB_CONF_ENV = \
Signature · 1 line
2.4.10
PATCH 6/45 trace-cmd: comma separate licenses
In reply to Gustavo Zacarias--- package/trace-cmd/trace-cmd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/trace-cmd/trace-cmd.mk +1 -1
@@ -8,7 +8,7 @@ TRACE_CMD_VERSION = trace-cmd-v2.3.2 TRACE_CMD_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/rostedt/trace-cmd.git TRACE_CMD_SITE_METHOD = git TRACE_CMD_INSTALL_STAGING = YES -TRACE_CMD_LICENSE = GPLv2 LGPLv2.1 +TRACE_CMD_LICENSE = GPLv2, LGPLv2.1 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB TRACE_CMD_DEPENDENCIES = host-pkgconf
Signature · 1 line
2.4.10
PATCH 7/45 bluez5_utils: comma separate licenses
In reply to Gustavo Zacarias--- package/bluez5_utils/bluez5_utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/bluez5_utils/bluez5_utils.mk +1 -1
@@ -9,7 +9,7 @@ BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2 -BLUEZ5_UTILS_LICENSE = GPLv2+ LGPLv2.1+ +BLUEZ5_UTILS_LICENSE = GPLv2+, LGPLv2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB # 0001-Link-mcaptest-with-lrt.patch
Signature · 1 line
2.4.10
PATCH 8/45 qemu: comma separate licenses
In reply to Gustavo Zacarias--- package/qemu/qemu.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/qemu/qemu.mk +1 -1
@@ -7,7 +7,7 @@ QEMU_VERSION = 2.4.0.1 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2 QEMU_SITE = http://wiki.qemu.org/download -QEMU_LICENSE = GPLv2 LGPLv2.1 MIT BSD-3c BSD-2c Others/BSD-1c +QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c QEMU_LICENSE_FILES = COPYING COPYING.LIB #?NOTE: there is no top-level license file for non-(L)GPL licenses; # the non-(L)GPL license texts are specified in the affected
Signature · 1 line
2.4.10
PATCH 9/45 lvm2: comma separate licenses
In reply to Gustavo Zacarias--- package/lvm2/lvm2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lvm2/lvm2.mk +1 -1
@@ -8,7 +8,7 @@ LVM2_VERSION = 2.02.137 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_INSTALL_STAGING = YES -LVM2_LICENSE = GPLv2 LGPLv2.1 +LVM2_LICENSE = GPLv2, LGPLv2.1 LVM2_LICENSE_FILES = COPYING COPYING.LIB # Make sure that binaries and libraries are installed with write
Signature · 1 line
2.4.10
PATCH 10/45 libbsd: comma separate licenses
In reply to Gustavo Zacarias--- package/libbsd/libbsd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/libbsd/libbsd.mk +1 -1
@@ -7,7 +7,7 @@ LIBBSD_VERSION = 0.6.0 LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz LIBBSD_SITE = http://libbsd.freedesktop.org/releases -LIBBSD_LICENSE = BSD-3c MIT +LIBBSD_LICENSE = BSD-3c, MIT LIBBSD_LICENSE_FILES = COPYING LIBBSD_INSTALL_STAGING = YES
Signature · 1 line
2.4.10
PATCH 11/45 liboping: comma separate licenses
In reply to Gustavo Zacarias--- package/liboping/liboping.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/liboping/liboping.mk +1 -1
@@ -9,7 +9,7 @@ LIBOPING_SITE = http://noping.cc/files LIBOPING_INSTALL_STAGING = YES LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses) LIBOPING_CONF_OPTS = --without-perl-bindings -LIBOPING_LICENSE = LGPLv2.1+ GPLv2 +LIBOPING_LICENSE = LGPLv2.1+, GPLv2 LIBOPING_LICENSE_FILES = COPYING $(eval $(autotools-package))
Signature · 1 line
2.4.10
PATCH 12/45 gdb: comma separate licenses
In reply to Gustavo Zacarias--- package/gdb/gdb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/gdb/gdb.mk +1 -1
@@ -23,7 +23,7 @@ ifneq ($(filter 7.7.%,$(GDB_VERSION)),) GDB_SOURCE = gdb-$(GDB_VERSION).tar.bz2 endif -GDB_LICENSE = GPLv2+ LGPLv2+ GPLv3+ LGPLv3+ +GDB_LICENSE = GPLv2+, LGPLv2+, GPLv3+, LGPLv3+ GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB # We only want gdbserver and not the entire debugger.
Signature · 1 line
2.4.10
PATCH 13/45 xz: comma separate licenses
In reply to Gustavo Zacarias--- package/xz/xz.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/xz/xz.mk +1 -1
@@ -9,7 +9,7 @@ XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 XZ_SITE = http://tukaani.org/xz XZ_INSTALL_STAGING = YES XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -XZ_LICENSE = GPLv2+ GPLv3+ LGPLv2.1+ +XZ_LICENSE = GPLv2+, GPLv3+, LGPLv2.1+ XZ_LICENSE_FILES = COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
Signature · 1 line
2.4.10
PATCH 14/45 bc: comma separate licenses
In reply to Gustavo Zacarias--- package/bc/bc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/bc/bc.mk +1 -1
@@ -8,7 +8,7 @@ BC_VERSION = 1.06.95 BC_SOURCE = bc-$(BC_VERSION).tar.bz2 BC_SITE = http://alpha.gnu.org/gnu/bc BC_DEPENDENCIES = host-flex -BC_LICENSE = GPLv2+ LGPLv2.1+ +BC_LICENSE = GPLv2+, LGPLv2.1+ BC_LICENSE_FILES = COPYING COPYING.LIB # Build after busybox so target ends up with bc's "dc" version
Signature · 1 line
2.4.10
PATCH 15/45 omniorb: comma separate licenses
In reply to Gustavo Zacarias--- package/omniorb/omniorb.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/omniorb/omniorb.mk +1 -1
@@ -8,7 +8,7 @@ OMNIORB_VERSION = 4.2.0 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 OMNIORB_INSTALL_STAGING = YES -OMNIORB_LICENSE = GPL2+ LGPLv2.1+ +OMNIORB_LICENSE = GPL2+, LGPLv2.1+ OMNIORB_LICENSE_FILES = COPYING COPYING.LIB OMNIORB_DEPENDENCIES = host-omniorb HOST_OMNIORB_DEPENDENCIES = host-python
Signature · 1 line
2.4.10
PATCH 16/45 libfuse: comma separate licenses
In reply to Gustavo Zacarias--- package/libfuse/libfuse.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/libfuse/libfuse.mk +1 -1
@@ -7,7 +7,7 @@ LIBFUSE_VERSION = 2.9.4 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz LIBFUSE_SITE = http://downloads.sourceforge.net/project/fuse/fuse-2.X/$(LIBFUSE_VERSION) -LIBFUSE_LICENSE = GPLv2 LGPLv2.1 +LIBFUSE_LICENSE = GPLv2, LGPLv2.1 LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB LIBFUSE_INSTALL_STAGING = YES LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
Signature · 1 line
2.4.10
PATCH 17/45 collectd: comma separate licenses
In reply to Gustavo Zacarias--- package/collectd/collectd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/collectd/collectd.mk +1 -1
@@ -9,7 +9,7 @@ COLLECTD_SITE = http://collectd.org/files COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes COLLECTD_INSTALL_STAGING = YES -COLLECTD_LICENSE = GPLv2 LGPLv2.1 +COLLECTD_LICENSE = GPLv2, LGPLv2.1 COLLECTD_LICENSE_FILES = COPYING # For 0001-build-add-libavltree-libcommon-libheap-dependencies.patch COLLECTD_AUTORECONF = YES
Signature · 1 line
2.4.10
PATCH 18/45 libiscsi: comma separate licenses
In reply to Gustavo Zacarias--- package/libiscsi/libiscsi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/libiscsi/libiscsi.mk +1 -1
@@ -6,7 +6,7 @@ LIBISCSI_VERSION = 1.15.0 LIBISCSI_SITE = https://sites.google.com/site/libiscsitarballs/libiscsitarballs -LIBISCSI_LICENSE = GPLv2+ LGPLv2.1+ +LIBISCSI_LICENSE = GPLv2+, LGPLv2.1+ LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt LIBISCSI_INSTALL_STAGING = YES
Signature · 1 line
2.4.10
PATCH 19/45 pppd: comma separate licenses
In reply to Gustavo Zacarias--- package/pppd/pppd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/pppd/pppd.mk +1 -1
@@ -7,7 +7,7 @@ PPPD_VERSION = 2.4.7 PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz PPPD_SITE = https://download.samba.org/pub/ppp -PPPD_LICENSE = LGPLv2+ LGPL BSD-4c BSD-3c GPLv2+ +PPPD_LICENSE = LGPLv2+, LGPL, BSD-4c, BSD-3c, GPLv2+ PPPD_LICENSE_FILES = \ pppd/tdb.c pppd/plugins/pppoatm/COPYING \ pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c
Signature · 1 line
2.4.10
PATCH 20/45 minidlna: comma separate licenses
In reply to Gustavo Zacarias--- package/minidlna/minidlna.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/minidlna/minidlna.mk +1 -1
@@ -6,7 +6,7 @@ MINIDLNA_VERSION = 1.1.5 MINIDLNA_SITE = http://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION) -MINIDLNA_LICENSE = GPLv2 BSD-3c +MINIDLNA_LICENSE = GPLv2, BSD-3c MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd MINIDLNA_DEPENDENCIES = \
Signature · 1 line
2.4.10
PATCH 21/45 ustr: comma separate licenses
In reply to Gustavo Zacarias--- package/ustr/ustr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/ustr/ustr.mk +1 -1
@@ -7,7 +7,7 @@ USTR_VERSION = 1.0.4 USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2 USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION) -USTR_LICENSE = BSD-2c MIT LGPLv2+ +USTR_LICENSE = BSD-2c, MIT, LGPLv2+ USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT USTR_AUTORECONF = YES USTR_PATCH = \
Signature · 1 line
2.4.10
PATCH 22/45 python-pyzmq: comma separate licenses
In reply to Gustavo Zacarias--- package/python-pyzmq/python-pyzmq.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/python-pyzmq/python-pyzmq.mk +1 -1
@@ -7,7 +7,7 @@ PYTHON_PYZMQ_VERSION = 14.3.1 PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz PYTHON_PYZMQ_SITE = http://pypi.python.org/packages/source/p/pyzmq -PYTHON_PYZMQ_LICENSE = LGPLv3+ BSD-3c Apache-2.0 +PYTHON_PYZMQ_LICENSE = LGPLv3+, BSD-3c, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD PYTHON_PYZMQ_DEPENDENCIES = zeromq
Signature · 1 line
2.4.10
PATCH 23/45 ntfs-3g: comma separate licenses
In reply to Gustavo Zacarias--- package/ntfs-3g/ntfs-3g.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/ntfs-3g/ntfs-3g.mk +1 -1
@@ -10,7 +10,7 @@ NTFS_3G_SITE = http://tuxera.com/opensource NTFS_3G_CONF_OPTS = --disable-ldconfig NTFS_3G_INSTALL_STAGING = YES NTFS_3G_DEPENDENCIES = host-pkgconf -NTFS_3G_LICENSE = GPLv2+ LGPLv2+ +NTFS_3G_LICENSE = GPLv2+, LGPLv2+ NTFS_3G_LICENSE_FILES = COPYING COPYING.LIB ifeq ($(BR2_PACKAGE_LIBFUSE),y)
Signature · 1 line
2.4.10
PATCH 24/45 bluez_utils: comma separate licenses
In reply to Gustavo Zacarias--- package/bluez_utils/bluez_utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/bluez_utils/bluez_utils.mk +1 -1
@@ -11,7 +11,7 @@ BLUEZ_UTILS_INSTALL_STAGING = YES BLUEZ_UTILS_DEPENDENCIES = dbus libglib2 BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools BLUEZ_UTILS_AUTORECONF = YES -BLUEZ_UTILS_LICENSE = GPLv2+ LGPLv2.1+ +BLUEZ_UTILS_LICENSE = GPLv2+, LGPLv2.1+ BLUEZ_UTILS_LICENSE_FILES = COPYING COPYING.LIB # BlueZ 3.x compatibility
Signature · 1 line
2.4.10
PATCH 25/45 dvb_apps: comma separate licenses
In reply to Gustavo Zacarias--- package/dvb-apps/dvb-apps.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/dvb-apps/dvb-apps.mk +1 -1
@@ -7,7 +7,7 @@ DVB_APPS_VERSION = 3d43b280298c39a67d1d889e01e173f52c12da35 DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps DVB_APPS_SITE_METHOD = hg -DVB_APPS_LICENSE = GPLv2 GPLv2+ LGPLv2.1+ +DVB_APPS_LICENSE = GPLv2, GPLv2+, LGPLv2.1+ DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL ifeq ($(BR2_ENABLE_LOCALE),)
Signature · 1 line
2.4.10
PATCH 26/45 keyutils: comma separate licenses
In reply to Gustavo Zacarias--- package/keyutils/keyutils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/keyutils/keyutils.mk +1 -1
@@ -7,7 +7,7 @@ KEYUTILS_VERSION = 1.5.9 KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2 KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils -KEYUTILS_LICENSE = GPLv2+ LGPLv2.1+ +KEYUTILS_LICENSE = GPLv2+, LGPLv2.1+ KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL KEYUTILS_INSTALL_STAGING = YES
Signature · 1 line
2.4.10
PATCH 27/45 dbus: comma separate licenses
In reply to Gustavo Zacarias--- package/dbus/dbus.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/dbus/dbus.mk +1 -1
@@ -6,7 +6,7 @@ DBUS_VERSION = 1.10.6 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus -DBUS_LICENSE = AFLv2.1 GPLv2+ +DBUS_LICENSE = AFLv2.1, GPLv2+ DBUS_LICENSE_FILES = COPYING DBUS_INSTALL_STAGING = YES
Signature · 1 line
2.4.10
PATCH 28/45 rsyslog: comma separate licenses
In reply to Gustavo Zacarias--- package/rsyslog/rsyslog.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/rsyslog/rsyslog.mk +1 -1
@@ -6,7 +6,7 @@ RSYSLOG_VERSION = 8.9.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog -RSYSLOG_LICENSE = GPLv3 LGPLv3 Apache-2.0 +RSYSLOG_LICENSE = GPLv3, LGPLv3, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c host-pkgconf RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
Signature · 1 line
2.4.10
PATCH 29/45 webkitgtk24: comma separate licenses
In reply to Gustavo Zacarias--- package/webkitgtk24/webkitgtk24.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/webkitgtk24/webkitgtk24.mk +1 -1
@@ -8,7 +8,7 @@ WEBKITGTK24_VERSION = 2.4.9 WEBKITGTK24_SITE = http://www.webkitgtk.org/releases WEBKITGTK24_SOURCE = webkitgtk-$(WEBKITGTK24_VERSION).tar.xz WEBKITGTK24_INSTALL_STAGING = YES -WEBKITGTK24_LICENSE = LGPLv2+ BSD-2c +WEBKITGTK24_LICENSE = LGPLv2+, BSD-2c WEBKITGTK24_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2
Signature · 1 line
2.4.10
PATCH 30/45 iputils: comma separate licenses
In reply to Gustavo Zacarias--- package/iputils/iputils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/iputils/iputils.mk +1 -1
@@ -7,7 +7,7 @@ IPUTILS_VERSION = s20121011 IPUTILS_SITE = http://www.skbuff.net/iputils IPUTILS_SOURCE = iputils-$(IPUTILS_VERSION).tar.bz2 -IPUTILS_LICENSE = GPLv2+ BSD-3c +IPUTILS_LICENSE = GPLv2+, BSD-3c # Only includes a license file for BSD IPUTILS_LICENSE_FILES = ninfod/COPYING IPUTILS_DEPENDENCIES = openssl
Signature · 1 line
2.4.10
PATCH 31/45 libidn: comma separate licenses
In reply to Gustavo Zacarias--- package/libidn/libidn.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/libidn/libidn.mk +1 -1
@@ -10,7 +10,7 @@ LIBIDN_INSTALL_STAGING = YES LIBIDN_CONF_ENV = EMACS="no" LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv) -LIBIDN_LICENSE = GPLv2+ GPLv3+ LGPLv3+ +LIBIDN_LICENSE = GPLv2+, GPLv3+, LGPLv3+ LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3 define LIBIDN_REMOVE_BINARY
Signature · 1 line
2.4.10
PATCH 32/45 olsr: comma separate licenses
In reply to Gustavo Zacarias--- package/olsr/olsr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/olsr/olsr.mk +1 -1
@@ -12,7 +12,7 @@ OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \ mdns nameservice p2pd pgraph secure txtinfo watchdog # Doesn't really need quagga but not very useful without it OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga) -OLSR_LICENSE = BSD-3c LGPLv2.1+ +OLSR_LICENSE = BSD-3c, LGPLv2.1+ OLSR_LICENSE_FILES = license.txt lib/pud/nmealib/LICENSE OLSR_DEPENDENCIES = host-flex host-bison
Signature · 1 line
2.4.10
PATCH 33/45 libtasn1: comma separate licenses
In reply to Gustavo Zacarias--- package/libtasn1/libtasn1.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/libtasn1/libtasn1.mk +1 -1
@@ -7,7 +7,7 @@ LIBTASN1_VERSION = 4.6 LIBTASN1_SITE = http://ftp.gnu.org/gnu/libtasn1 LIBTASN1_DEPENDENCIES = host-bison -LIBTASN1_LICENSE = GPLv3+ LGPLv2.1+ +LIBTASN1_LICENSE = GPLv3+, LGPLv2.1+ LIBTASN1_LICENSE_FILES = COPYING COPYING.LIB LIBTASN1_INSTALL_STAGING = YES # 'missing' fallback logic botched so disable it completely
Signature · 1 line
2.4.10
PATCH 34/45 gnutls: comma separate licenses
In reply to Gustavo Zacarias--- package/gnutls/gnutls.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/gnutls/gnutls.mk +1 -1
@@ -8,7 +8,7 @@ GNUTLS_VERSION_MAJOR = 3.4 GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).7 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) -GNUTLS_LICENSE = GPLv3+ LGPLv2.1+ +GNUTLS_LICENSE = GPLv3+, LGPLv2.1+ GNUTLS_LICENSE_FILES = COPYING COPYING.LESSER GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre GNUTLS_CONF_OPTS = \
Signature · 1 line
2.4.10
PATCH 35/45 fmlib: comma separate licenses
In reply to Gustavo Zacarias--- package/fmlib/fmlib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/fmlib/fmlib.mk +1 -1
@@ -6,7 +6,7 @@ FMLIB_VERSION = fsl-sdk-v1.5-rc3 FMLIB_SITE = git://git.freescale.com/ppc/sdk/fmlib.git -FMLIB_LICENSE = BSD-3c GPLv2+ +FMLIB_LICENSE = BSD-3c, GPLv2+ FMLIB_LICENSE_FILES = COPYING FMLIB_DEPENDENCIES = linux FMLIB_INSTALL_STAGING = YES
Signature · 1 line
2.4.10
PATCH 36/45 vde2: comma separate licenses
In reply to Gustavo Zacarias--- package/vde2/vde2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/vde2/vde2.mk +1 -1
@@ -7,7 +7,7 @@ VDE2_VERSION = 2.3.2 VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2 VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION) -VDE2_LICENSE = GPLv2+ LGPLv2.1+ BSD-3c +VDE2_LICENSE = GPLv2+, LGPLv2.1+, BSD-3c VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde VDE2_INSTALL_STAGING = YES
Signature · 1 line
2.4.10
PATCH 37/45 ltp-testsuite: comma separate licenses
In reply to Gustavo Zacarias--- package/ltp-testsuite/ltp-testsuite.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/ltp-testsuite/ltp-testsuite.mk +1 -1
@@ -7,7 +7,7 @@ LTP_TESTSUITE_VERSION = 20150903 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) -LTP_TESTSUITE_LICENSE = GPLv2 GPLv2+ +LTP_TESTSUITE_LICENSE = GPLv2, GPLv2+ LTP_TESTSUITE_LICENSE_FILES = COPYING LTP_TESTSUITE_CONF_OPTS += \ --with-power-management-testsuite \
Signature · 1 line
2.4.10
PATCH 38/45 taglib: comma separate licenses
In reply to Gustavo Zacarias--- package/taglib/taglib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/taglib/taglib.mk +1 -1
@@ -7,7 +7,7 @@ TAGLIB_VERSION = 1.9.1 TAGLIB_SITE = http://taglib.github.io/releases TAGLIB_INSTALL_STAGING = YES -TAGLIB_LICENSE = LGPLv2.1 MPL +TAGLIB_LICENSE = LGPLv2.1, MPL TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL ifeq ($(BR2_PACKAGE_ZLIB),y)
Signature · 1 line
2.4.10
PATCH 39/45 setools: comma separate licenses
In reply to Gustavo Zacarias--- package/setools/setools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/setools/setools.mk +1 -1
@@ -9,7 +9,7 @@ SETOOLS_SOURCE = setools-$(SETOOLS_VERSION).tar.bz2 SETOOLS_SITE = https://raw.githubusercontent.com/wiki/TresysTechnology/setools3/files/dists/setools-$(SETOOLS_VERSION) SETOOLS_DEPENDENCIES = libselinux libsepol sqlite libxml2 bzip2 host-bison host-flex SETOOLS_INSTALL_STAGING = YES -SETOOLS_LICENSE = GPLv2+ LGPLv2.1+ +SETOOLS_LICENSE = GPLv2+, LGPLv2.1+ SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL # configure.ac is patched by the cross compile patch,
Signature · 1 line
2.4.10
PATCH 40/45 swig: comma separate licenses
In reply to Gustavo Zacarias--- package/swig/swig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/swig/swig.mk +1 -1
@@ -12,7 +12,7 @@ HOST_SWIG_CONF_OPTS = \ --without-pcre \ --disable-ccache \ --without-octave -SWIG_LICENSE = GPLv3+ BSD-2c BSD-3c +SWIG_LICENSE = GPLv3+, BSD-2c, BSD-3c SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES # CMake looks first at swig3.0, then swig2.0 and then swig. However,
Signature · 1 line
2.4.10
PATCH 41/45 audiofile: comma separate licenses
In reply to Gustavo Zacarias--- package/audiofile/audiofile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/audiofile/audiofile.mk +1 -1
@@ -12,7 +12,7 @@ AUDIOFILE_CONF_OPTS = --disable-examples AUDIOFILE_DEPENDENCIES = host-pkgconf # configure is outdated and has old bugs because of it AUDIOFILE_AUTORECONF = YES -AUDIOFILE_LICENSE = GPLv2+ LGPLv2.1+ +AUDIOFILE_LICENSE = GPLv2+, LGPLv2.1+ AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL ifeq ($(BR2_PACKAGE_FLAC),y)
Signature · 1 line
2.4.10
PATCH 42/45 lttng-babeltrace: comma separate licenses
In reply to Gustavo Zacarias--- package/lttng-babeltrace/lttng-babeltrace.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-babeltrace/lttng-babeltrace.mk +1 -1
@@ -7,7 +7,7 @@ LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace LTTNG_BABELTRACE_VERSION = 1.2.4 LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 -LTTNG_BABELTRACE_LICENSE = MIT; LGPLv2.1 for include/babeltrace/list.h; GPLv2 for test code +LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 for include/babeltrace/list.h, GPLv2 for test code LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
Signature · 1 line
2.4.10
PATCH 43/45 lttng-libust: comma separate licenses
In reply to Gustavo Zacarias--- package/lttng-libust/lttng-libust.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-libust/lttng-libust.mk +1 -1
@@ -7,7 +7,7 @@ LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust LTTNG_LIBUST_VERSION = 2.7.1 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 -LTTNG_LIBUST_LICENSE = LGPLv2.1; MIT for system headers; GPLv2 for liblttng-ust-ctl/ustctl.c (used by lttng-sessiond) +LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT for system headers, GPLv2 for liblttng-ust-ctl/ustctl.c (used by lttng-sessiond) LTTNG_LIBUST_LICENSE_FILES = COPYING LTTNG_LIBUST_INSTALL_STAGING = YES
Signature · 1 line
2.4.10
PATCH 44/45 lttng-modules: comma separate licenses
In reply to Gustavo Zacarias--- package/lttng-modules/lttng-modules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-modules/lttng-modules.mk +1 -1
@@ -7,7 +7,7 @@ LTTNG_MODULES_VERSION = 2.7.0 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 -LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for lib/bitfield.h and lib/prio_heap/* +LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules, MIT for lib/bitfield.h and lib/prio_heap/* LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE $(eval $(kernel-module))
Signature · 1 line
2.4.10
PATCH 45/45 lttng-tools: comma separate licenses
In reply to Gustavo Zacarias--- package/lttng-tools/lttng-tools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-tools/lttng-tools.mk +1 -1
@@ -7,7 +7,7 @@ LTTNG_TOOLS_VERSION = 2.7.0 LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 -LTTNG_TOOLS_LICENSE = GPLv2+; LGPLv2.1+ for include/lttng/* and src/lib/lttng-ctl/* +LTTNG_TOOLS_LICENSE = GPLv2+, LGPLv2.1+ for include/lttng/* and src/lib/lttng-ctl/* LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr # Need autoreconf because of a patch touching configure.ac
Signature · 1 line
2.4.10
cover Comma separate licenses
In reply to Gustavo ZacariasDear Gustavo Zacarias,
Quoted 3 lines · Gustavo Zacarias
This series sanitizes the
PKG_LICENSEentries.
No attempt is made to interpret and/or improve upton the conditions of each license, it's just a style fix.
I've applied the 44 patches (i.e all of them except 03/45, which had a typo, and for which I had already applied your v2).
Regarding the last four patches (lttng-*), I also changed the description to put what is covered by each license between parenthesis. I.e instead of:
GPLv2 for foo, LGPLv2 for baz
I've used:
GPLv2 (foo), LGPLv2 (baz)
Which is more consistent with what we do in other packages.
Thanks for this cleanup!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com