License report: unify all license lists

If a package uses more than one license at a time, the keyword "AND" should illustrate this. Follow this rule for all packages with more than one license in their list. Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
author: Juergen Borleis <jbe@pengutronix.de> 2017-12-06 13:02:39 +0100
committer: Juergen Borleis <jbe@pengutronix.de> 2017-12-08 15:25:10 +0100
commit: 00c6e91b6b8a54cdfc7af0d75e4eb7637981e63d (patch)
tree: 215cd056fb8dfd70a73e497e45cb396f11f2e527
parent: 8667d660578723d854b9855830211d84eb45afbb (diff)
download: ptxdist-00c6e91b6b8a54cdfc7af0d75e4eb7637981e63d.tar.gz
ptxdist-00c6e91b6b8a54cdfc7af0d75e4eb7637981e63d.tar.xz
73 files changed, 73 insertions, 73 deletions
diff --git a/rules/acl.make b/rules/acl.make
index 4ba7fe4f7..d30fe7f86 100644
--- a/rules/acl.make
+++ b/rules/acl.make
@@ -23,7 +23,7 @@ ACL_SUFFIX	:= tar.gz
 ACL_URL		:= http://download.savannah.gnu.org/releases/acl/$(ACL).src.$(ACL_SUFFIX)
 ACL_SOURCE	:= $(SRCDIR)/$(ACL).src.$(ACL_SUFFIX)
 ACL_DIR		:= $(BUILDDIR)/$(ACL)
-ACL_LICENSE	:= GPL-2.0, LGPL-2.1
+ACL_LICENSE	:= GPL-2.0 AND LGPL-2.1
 ACL_LICENSE_FILES := \
 	file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
 	file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764
diff --git a/rules/attr.make b/rules/attr.make
index b029c1458..8eeea393c 100644
--- a/rules/attr.make
+++ b/rules/attr.make
@@ -22,7 +22,7 @@ ATTR		:= attr-$(ATTR_VERSION)
 ATTR_SUFFIX	:= tar.gz
 ATTR_SOURCE	:= $(SRCDIR)/$(ATTR).src.$(ATTR_SUFFIX)
 ATTR_DIR	:= $(BUILDDIR)/$(ATTR)
-ATTR_LICENSE	:= GPL-2.0, LGPL-2.0
+ATTR_LICENSE	:= GPL-2.0 AND LGPL-2.0
 ATTR_LICENSE_FILES := \
 	file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \
 	file://doc/COPYING.LGPL;md5=b8d31f339300bc239d73461d68e77b9c
diff --git a/rules/audiofile.make b/rules/audiofile.make
index 9f31e4153..d7953b9c8 100644
--- a/rules/audiofile.make
+++ b/rules/audiofile.make
@@ -23,7 +23,7 @@ AUDIOFILE_SUFFIX	:= tar.gz
 AUDIOFILE_URL		:= http://audiofile.68k.org/$(AUDIOFILE).$(AUDIOFILE_SUFFIX)
 AUDIOFILE_SOURCE	:= $(SRCDIR)/$(AUDIOFILE).$(AUDIOFILE_SUFFIX)
 AUDIOFILE_DIR		:= $(BUILDDIR)/$(AUDIOFILE)
-AUDIOFILE_LICENSE	:= GPL-2.0, LGPL-2.0
+AUDIOFILE_LICENSE	:= GPL-2.0 AND LGPL-2.0
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/bustle.make b/rules/bustle.make
index fdbc4eedf..843c69045 100644
--- a/rules/bustle.make
+++ b/rules/bustle.make
@@ -23,7 +23,7 @@ BUSTLE_SUFFIX	:= tar.gz
 BUSTLE_URL	:= http://www.willthompson.co.uk/bustle/releases/$(BUSTLE).$(BUSTLE_SUFFIX)
 BUSTLE_SOURCE	:= $(SRCDIR)/$(BUSTLE).$(BUSTLE_SUFFIX)
 BUSTLE_DIR	:= $(BUILDDIR)/$(BUSTLE)
-BUSTLE_LICENSE	:= GPL-2.0+, LGPL-2.1+
+BUSTLE_LICENSE	:= GPL-2.0+ AND LGPL-2.1+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/cairo.make b/rules/cairo.make
index 5014ea85a..7503247a4 100644
--- a/rules/cairo.make
+++ b/rules/cairo.make
@@ -23,7 +23,7 @@ CAIRO_SUFFIX	:= tar.xz
 CAIRO_URL	:= http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
 CAIRO_SOURCE	:= $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX)
 CAIRO_DIR	:= $(BUILDDIR)/$(CAIRO)
-CAIRO_LICENSE	:= LGPL-2.1, MPL-1.1
+CAIRO_LICENSE	:= LGPL-2.1 AND MPL-1.1
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/collectd.make b/rules/collectd.make
index 2af8c1e2c..f97d03230 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -24,7 +24,7 @@ COLLECTD_URL		:= https://collectd.org/files/${COLLECTD}.${COLLECTD_SUFFIX}
 COLLECTD_MD5		:= 5da2b69c286a064db35c6cc1e758b039
 COLLECTD_DIR		:= $(BUILDDIR)/$(COLLECTD)
 COLLECTD_SOURCE		:= $(SRCDIR)/$(COLLECTD).$(COLLECTD_SUFFIX)
-COLLECTD_LICENSE	:= MIT, GPL-2.0
+COLLECTD_LICENSE	:= MIT AND GPL-2.0
 COLLECTD_LICENSE_FILES	:= file://COPYING;md5=1bd21f19f7f0c61a7be8ecacb0e28854
 
 # ----------------------------------------------------------------------------
diff --git a/rules/crda.make b/rules/crda.make
index 9e98883ff..89e69da64 100644
--- a/rules/crda.make
+++ b/rules/crda.make
@@ -23,7 +23,7 @@ CRDA_SUFFIX	:= tar.xz
 CRDA_URL	:= $(call ptx/mirror, KERNEL, ../software/network/crda/$(CRDA).$(CRDA_SUFFIX))
 CRDA_SOURCE	:= $(SRCDIR)/$(CRDA).$(CRDA_SUFFIX)
 CRDA_DIR	:= $(BUILDDIR)/$(CRDA)
-CRDA_LICENSE	:= ISC, copyleft-next-0.3.0
+CRDA_LICENSE	:= ISC AND copyleft-next-0.3.0
 CRDA_LICENSE_FILES := \
 	file://LICENSE;md5=ef8b69b43141352d821fd66b64ff0ee7 \
 	file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe
diff --git a/rules/dbus-glib.make b/rules/dbus-glib.make
index f01acb4ef..4e4891afd 100644
--- a/rules/dbus-glib.make
+++ b/rules/dbus-glib.make
@@ -24,7 +24,7 @@ DBUS_GLIB_SUFFIX	:= tar.gz
 DBUS_GLIB_URL		:= http://dbus.freedesktop.org/releases/dbus-glib/$(DBUS_GLIB).$(DBUS_GLIB_SUFFIX)
 DBUS_GLIB_SOURCE	:= $(SRCDIR)/$(DBUS_GLIB).$(DBUS_GLIB_SUFFIX)
 DBUS_GLIB_DIR		:= $(BUILDDIR)/$(DBUS_GLIB)
-DBUS_GLIB_LICENSE	:= AFL-2.1, GPL-2.0+
+DBUS_GLIB_LICENSE	:= AFL-2.1 AND GPL-2.0+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/dbus-python.make b/rules/dbus-python.make
index 1d3b71a6b..0b283f147 100644
--- a/rules/dbus-python.make
+++ b/rules/dbus-python.make
@@ -23,7 +23,7 @@ DBUS_PYTHON_SUFFIX	:= tar.gz
 DBUS_PYTHON_URL		:= http://dbus.freedesktop.org/releases/dbus-python/$(DBUS_PYTHON).$(DBUS_PYTHON_SUFFIX)
 DBUS_PYTHON_SOURCE	:= $(SRCDIR)/$(DBUS_PYTHON).$(DBUS_PYTHON_SUFFIX)
 DBUS_PYTHON_DIR		:= $(BUILDDIR)/$(DBUS_PYTHON)
-DBUS_PYTHON_LICENSE	:= AFL-2.1, GPL-2.0+
+DBUS_PYTHON_LICENSE	:= AFL-2.1 AND GPL-2.0+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/dbus.make b/rules/dbus.make
index d209547f6..bbf602625 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -25,7 +25,7 @@ DBUS_SUFFIX	:= tar.gz
 DBUS_URL	:= http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
 DBUS_SOURCE	:= $(SRCDIR)/$(DBUS).$(DBUS_SUFFIX)
 DBUS_DIR	:= $(BUILDDIR)/$(DBUS)
-DBUS_LICENSE	:= AFL-2.1, GPL-2.0+
+DBUS_LICENSE	:= AFL-2.1 AND GPL-2.0+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 48806973b..a6c7fb8a5 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -24,7 +24,7 @@ E2FSPROGS_SUFFIX	:= tar.gz
 E2FSPROGS_URL		:= $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
 E2FSPROGS_SOURCE	:= $(SRCDIR)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)
 E2FSPROGS_DIR		:= $(BUILDDIR)/$(E2FSPROGS)
-E2FSPROGS_LICENSE	:= GPL-2.0+, LGPL-2.0+, BSD-3-Clause, MIT
+E2FSPROGS_LICENSE	:= GPL-2.0+ AND LGPL-2.0+ AND BSD-3-Clause AND MIT
 E2FSPROGS_LICENSE_FILES	:= \
 	file://NOTICE;md5=b48f21d765b875bd10400975d12c1ca2 \
 	file://lib/uuid/gen_uuid.c;startline=4;endline=31;md5=697cf5d1be275fa2588beaaf2bb481bd
diff --git a/rules/file.make b/rules/file.make
index 027486ba1..44cf09607 100644
--- a/rules/file.make
+++ b/rules/file.make
@@ -23,7 +23,7 @@ FILE_SUFFIX	:= tar.gz
 FILE_URL	:= ftp://ftp.astron.com/pub/file/$(FILE).$(FILE_SUFFIX)
 FILE_SOURCE	:= $(SRCDIR)/$(FILE).$(FILE_SUFFIX)
 FILE_DIR	:= $(BUILDDIR)/$(FILE)
-FILE_LICENSE	:= BSD, 2-term BSD
+FILE_LICENSE	:= BSD AND 2-term BSD
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/flup.make b/rules/flup.make
index e7d2baf67..402a00870 100644
--- a/rules/flup.make
+++ b/rules/flup.make
@@ -23,7 +23,7 @@ FLUP_SUFFIX	:= tar.gz
 FLUP_URL	:= https://pypi.python.org/packages/source/f/flup/$(FLUP).$(FLUP_SUFFIX)
 FLUP_SOURCE	:= $(SRCDIR)/$(FLUP).$(FLUP_SUFFIX)
 FLUP_DIR	:= $(BUILDDIR)/$(FLUP)
-FLUP_LICENSE	:= BSD, MIT
+FLUP_LICENSE	:= BSD AND MIT
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/flup6.make b/rules/flup6.make
index 6fa1aaf54..c045fe185 100644
--- a/rules/flup6.make
+++ b/rules/flup6.make
@@ -23,7 +23,7 @@ FLUP6_SUFFIX	:= tar.gz
 FLUP6_URL	:= https://pypi.python.org/packages/source/f/flup6/$(FLUP6).$(FLUP6_SUFFIX)
 FLUP6_SOURCE	:= $(SRCDIR)/$(FLUP6).$(FLUP6_SUFFIX)
 FLUP6_DIR	:= $(BUILDDIR)/$(FLUP6)
-FLUP6_LICENSE	:= BSD, MIT
+FLUP6_LICENSE	:= BSD AND MIT
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/fontconfig.make b/rules/fontconfig.make
index 29d02fafa..33c761033 100644
--- a/rules/fontconfig.make
+++ b/rules/fontconfig.make
@@ -23,7 +23,7 @@ FONTCONFIG_SUFFIX	:= tar.gz
 FONTCONFIG_URL		:= http://fontconfig.org/release/$(FONTCONFIG).$(FONTCONFIG_SUFFIX)
 FONTCONFIG_SOURCE	:= $(SRCDIR)/$(FONTCONFIG).$(FONTCONFIG_SUFFIX)
 FONTCONFIG_DIR		:= $(BUILDDIR)/$(FONTCONFIG)
-FONTCONFIG_LICENSE	:= MIT, Unicode-TOU, public_domain
+FONTCONFIG_LICENSE	:= MIT AND Unicode-TOU AND public_domain
 
 
 # ----------------------------------------------------------------------------
diff --git a/rules/freetype.make b/rules/freetype.make
index 7fc3e65c3..0d35b99a1 100644
--- a/rules/freetype.make
+++ b/rules/freetype.make
@@ -23,7 +23,7 @@ FREETYPE		:= freetype-$(FREETYPE_VERSION)
 FREETYPE_SUFFIX		:= tar.bz2
 FREETYPE_SOURCE		:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX)
 FREETYPE_DIR		:= $(BUILDDIR)/$(FREETYPE)
-FREETYPE_LICENSE	:= BSD-2-Clause, FTL, GPL-2.0+
+FREETYPE_LICENSE	:= BSD-2-Clause AND FTL AND GPL-2.0+
 FREETYPE_LICENSE_FILES	:= \
 	file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \
 	file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \
diff --git a/rules/gdbserver.make b/rules/gdbserver.make
index cb786d33f..881504657 100644
--- a/rules/gdbserver.make
+++ b/rules/gdbserver.make
@@ -21,7 +21,7 @@ GDBSERVER		:= gdb-$(GDBSERVER_VERSION)
 GDBSERVER_SUFFIX	:= tar.gz
 GDBSERVER_SOURCE	:= $(SRCDIR)/$(GDBSERVER).$(GDBSERVER_SUFFIX)
 GDBSERVER_DIR		:= $(BUILDDIR)/gdbserver-$(GDBSERVER_VERSION)
-GDBSERVER_LICENSE	:= GPL-2.0, GPL-3.0+
+GDBSERVER_LICENSE	:= GPL-2.0 AND GPL-3.0+
 GDBSERVER_LICENSE_FILES	:= \
 	file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 	file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
diff --git a/rules/gettext.make b/rules/gettext.make
index 053f90fa9..5ce806a3f 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -25,7 +25,7 @@ GETTEXT_SUFFIX	:= tar.xz
 GETTEXT_URL	:= $(call ptx/mirror, GNU, gettext/$(GETTEXT).$(GETTEXT_SUFFIX))
 GETTEXT_SOURCE	:= $(SRCDIR)/$(GETTEXT).$(GETTEXT_SUFFIX)
 GETTEXT_DIR	:= $(BUILDDIR)/$(GETTEXT)
-GETTEXT_LICENSE	:= GPL-3.0+, LGPL-2.1+
+GETTEXT_LICENSE	:= GPL-3.0+ AND LGPL-2.1+
 GETTEXT_LICENSE_FILES := \
 	file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 	file://gettext-runtime/intl/COPYING.LIB;md5=a4b192f7208753fc0fc8d88c733e6106 \
diff --git a/rules/glew.make b/rules/glew.make
index 01431fcb9..0aec8990c 100644
--- a/rules/glew.make
+++ b/rules/glew.make
@@ -23,7 +23,7 @@ GLEW_SUFFIX	:= tgz
 GLEW_URL	:= $(call ptx/mirror, SF, glew/$(GLEW_VERSION)/$(GLEW).$(GLEW_SUFFIX))
 GLEW_SOURCE	:= $(SRCDIR)/$(GLEW).$(GLEW_SUFFIX)
 GLEW_DIR	:= $(BUILDDIR)/$(GLEW)
-GLEW_LICENSE	:= BSD-3-Clause, MIT
+GLEW_LICENSE	:= BSD-3-Clause AND MIT
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/glmark2.make b/rules/glmark2.make
index 4ab073dc9..0f09bbf71 100644
--- a/rules/glmark2.make
+++ b/rules/glmark2.make
@@ -24,7 +24,7 @@ GLMARK2_SUFFIX	:= tar.xz
 GLMARK2_URL	:= https://github.com/glmark2/glmark2.git;tag=$(GLMARK2_VERSION)
 GLMARK2_SOURCE	:= $(SRCDIR)/$(GLMARK2).$(GLMARK2_SUFFIX)
 GLMARK2_DIR	:= $(BUILDDIR)/$(GLMARK2)
-GLMARK2_LICENSE	:= GPL-3.0, SGIv1
+GLMARK2_LICENSE	:= GPL-3.0 AND SGIv1
 GLMARK2_LICENSE_FILES := \
 	file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 	file://COPYING.SGI;md5=7125c8894bd29eddfd44ede5ce3ab1e4
diff --git a/rules/glu.make b/rules/glu.make
index 8a03afbad..b0dce801a 100644
--- a/rules/glu.make
+++ b/rules/glu.make
@@ -23,7 +23,7 @@ GLU_SUFFIX	:= tar.bz2
 GLU_URL		:= ftp://ftp.freedesktop.org/pub/mesa/glu/$(GLU).$(GLU_SUFFIX)
 GLU_SOURCE	:= $(SRCDIR)/$(GLU).$(GLU_SUFFIX)
 GLU_DIR		:= $(BUILDDIR)/$(GLU)
-GLU_LICENSE	:= SGI-B-2.0, SGI-B-1.1
+GLU_LICENSE	:= SGI-B-2.0 AND SGI-B-1.1
 GLU_LICENSE_FILES := \
 	file://src/libutil/glue.c;startline=2;endline=28;md5=76832a1e3b436747980ebbc1cd89bfac \
 	file://src/libnurbs/internals/bin.cc;startline=2;endline=32;md5=f2807b3ac0a293c6faaac74d8933bb1f
diff --git a/rules/host-autotools-autoconf.make b/rules/host-autotools-autoconf.make
index 9ff83acce..fe7aa3a89 100644
--- a/rules/host-autotools-autoconf.make
+++ b/rules/host-autotools-autoconf.make
@@ -24,7 +24,7 @@ HOST_AUTOTOOLS_AUTOCONF_URL	:= $(call ptx/mirror, GNU, autoconf/$(HOST_AUTOTOOLS
 HOST_AUTOTOOLS_AUTOCONF_SOURCE	:= $(SRCDIR)/$(HOST_AUTOTOOLS_AUTOCONF).$(HOST_AUTOTOOLS_AUTOCONF_SUFFIX)
 HOST_AUTOTOOLS_AUTOCONF_DIR	:= $(HOST_BUILDDIR)/$(HOST_AUTOTOOLS_AUTOCONF)
 HOST_AUTOTOOLS_AUTOCONF_DEVPKG	:= NO
-HOST_AUTOTOOLS_AUTOCONF_LICENSE	:= GPL-2.0, GPL-3.0, Autoconf-exception-3.0
+HOST_AUTOTOOLS_AUTOCONF_LICENSE	:= GPL-2.0 AND GPL-3.0 AND Autoconf-exception-3.0
 HOST_AUTOTOOLS_AUTOCONF_LICENSE_FILES := \
 	file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 	file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
diff --git a/rules/host-gtk-doc.make b/rules/host-gtk-doc.make
index 6b927e8be..6fb04a1e6 100644
--- a/rules/host-gtk-doc.make
+++ b/rules/host-gtk-doc.make
@@ -23,7 +23,7 @@ HOST_GTK_DOC_SUFFIX	:= tar.bz2
 HOST_GTK_DOC_URL	:= http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/$(HOST_GTK_DOC_VERSION)/$(HOST_GTK_DOC).$(HOST_GTK_DOC_SUFFIX)
 HOST_GTK_DOC_SOURCE	:= $(SRCDIR)/$(HOST_GTK_DOC).$(HOST_GTK_DOC_SUFFIX)
 HOST_GTK_DOC_DIR	:= $(HOST_BUILDDIR)/$(HOST_GTK_DOC)
-HOST_GTK_DOC_LICENSE	:= GPL-3.0, GFDL-1.1
+HOST_GTK_DOC_LICENSE	:= GPL-3.0 AND GFDL-1.1
 HOST_GTK_DOC_LICENSE_FILES := \
 	file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 	file://COPYING-DOCS;md5=18ba770020b624031bc7c8a7b055d776
diff --git a/rules/host-localedef.make b/rules/host-localedef.make
index ebec529d7..337a8f585 100644
--- a/rules/host-localedef.make
+++ b/rules/host-localedef.make
@@ -24,7 +24,7 @@ HOST_LOCALEDEF_SUFFIX	:= tar.bz2
 HOST_LOCALEDEF_URL	:= http://www.pengutronix.de/software/ptxdist/temporary-src/$(HOST_LOCALEDEF).$(HOST_LOCALEDEF_SUFFIX)
 HOST_LOCALEDEF_SOURCE	:= $(SRCDIR)/$(HOST_LOCALEDEF).$(HOST_LOCALEDEF_SUFFIX)
 HOST_LOCALEDEF_DIR	:= $(HOST_BUILDDIR)/$(HOST_LOCALEDEF)
-HOST_LOCALEDEF_LICENSE	:= LGPL-2.1+, GPL-2.0+
+HOST_LOCALEDEF_LICENSE	:= LGPL-2.1+ AND GPL-2.0+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/host-python-setuptools.make b/rules/host-python-setuptools.make
index 66a7784ab..f8ffc32cd 100644
--- a/rules/host-python-setuptools.make
+++ b/rules/host-python-setuptools.make
@@ -23,7 +23,7 @@ HOST_PYTHON_SETUPTOOLS_SUFFIX	:= zip
 HOST_PYTHON_SETUPTOOLS_URL	:= https://pypi.python.org/packages/source/s/setuptools/setuptools-$(HOST_PYTHON_SETUPTOOLS_VERSION).$(HOST_PYTHON_SETUPTOOLS_SUFFIX)
 HOST_PYTHON_SETUPTOOLS_SOURCE	:= $(SRCDIR)/$(HOST_PYTHON_SETUPTOOLS).$(HOST_PYTHON_SETUPTOOLS_SUFFIX)
 HOST_PYTHON_SETUPTOOLS_DIR	:= $(HOST_BUILDDIR)/$(HOST_PYTHON_SETUPTOOLS)
-HOST_PYTHON_SETUPTOOLS_LICENSE	:= PSF, ZPL
+HOST_PYTHON_SETUPTOOLS_LICENSE	:= PSF AND ZPL
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/host-python3-setuptools.make b/rules/host-python3-setuptools.make
index 26692598b..4d9ffe1dd 100644
--- a/rules/host-python3-setuptools.make
+++ b/rules/host-python3-setuptools.make
@@ -23,7 +23,7 @@ HOST_PYTHON3_SETUPTOOLS_SUFFIX	:= zip
 HOST_PYTHON3_SETUPTOOLS_URL	:= https://pypi.python.org/packages/source/s/setuptools/$(HOST_PYTHON3_SETUPTOOLS).$(HOST_PYTHON3_SETUPTOOLS_SUFFIX)
 HOST_PYTHON3_SETUPTOOLS_SOURCE	:= $(SRCDIR)/$(HOST_PYTHON3_SETUPTOOLS).$(HOST_PYTHON3_SETUPTOOLS_SUFFIX)
 HOST_PYTHON3_SETUPTOOLS_DIR	:= $(HOST_BUILDDIR)/$(HOST_PYTHON3_SETUPTOOLS)
-HOST_PYTHON3_SETUPTOOLS_LICENSE	:= PSF, ZPL
+HOST_PYTHON3_SETUPTOOLS_LICENSE	:= PSF AND ZPL
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/icu.make b/rules/icu.make
index a0e26c5b8..c80cccf1b 100644
--- a/rules/icu.make
+++ b/rules/icu.make
@@ -24,7 +24,7 @@ ICU_URL		:= http://download.icu-project.org/files/icu4c/$(ICU_VERSION)/$(ICU).$(
 ICU_SOURCE	:= $(SRCDIR)/$(ICU).$(ICU_SUFFIX)
 ICU_DIR		:= $(BUILDDIR)/$(ICU)
 ICU_SUBDIR	:= source
-ICU_LICENSE	:= MIT, Unicode-TOU, public_domain
+ICU_LICENSE	:= MIT AND Unicode-TOU AND public_domain
 ICU_LICENSE_FILES := \
 	file://license.html;md5=3a0605ebb7852070592fbd57e8967f3f
 
diff --git a/rules/keyutils.make b/rules/keyutils.make
index 781ce80dc..cb171e311 100644
--- a/rules/keyutils.make
+++ b/rules/keyutils.make
@@ -15,7 +15,7 @@ KEYUTILS_SUFFIX		:= tar.bz2
 KEYUTILS_URL		:= http://people.redhat.com/~dhowells/keyutils/$(KEYUTILS).$(KEYUTILS_SUFFIX)
 KEYUTILS_SOURCE		:= $(SRCDIR)/$(KEYUTILS).$(KEYUTILS_SUFFIX)
 KEYUTILS_DIR		:= $(BUILDDIR)/$(KEYUTILS)
-KEYUTILS_LICENSE	:= GPL-2.0+, LGPL-2.1+
+KEYUTILS_LICENSE	:= GPL-2.0+ AND LGPL-2.1+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/less.make b/rules/less.make
index ac4d4b02a..ff9fbd179 100644
--- a/rules/less.make
+++ b/rules/less.make
@@ -23,7 +23,7 @@ LESS_SUFFIX	:= tar.gz
 LESS_URL	:= $(call ptx/mirror, GNU, less/$(LESS).$(LESS_SUFFIX))
 LESS_SOURCE	:= $(SRCDIR)/$(LESS).$(LESS_SUFFIX)
 LESS_DIR	:= $(BUILDDIR)/$(LESS)
-LESS_LICENSE	:= GPL-3.0+, BSD-2-Clause
+LESS_LICENSE	:= GPL-3.0+ AND BSD-2-Clause
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/libassuan.make b/rules/libassuan.make
index 46bf3e359..b569a8845 100644
--- a/rules/libassuan.make
+++ b/rules/libassuan.make
@@ -23,7 +23,7 @@ LIBASSUAN_SUFFIX	:= tar.bz2
 LIBASSUAN_URL		:= ftp://ftp.gnupg.org/gcrypt/libassuan/$(LIBASSUAN).$(LIBASSUAN_SUFFIX)
 LIBASSUAN_SOURCE	:= $(SRCDIR)/$(LIBASSUAN).$(LIBASSUAN_SUFFIX)
 LIBASSUAN_DIR		:= $(BUILDDIR)/$(LIBASSUAN)
-LIBASSUAN_LICENSE	:= GPL-3.0, LGPL-2.1
+LIBASSUAN_LICENSE	:= GPL-3.0 AND LGPL-2.1
 LIBASSUAN_LICENSE_FILES	:= \
 	file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
diff --git a/rules/libbsd.make b/rules/libbsd.make
index 8ebbe4649..ec79f2bf1 100644
--- a/rules/libbsd.make
+++ b/rules/libbsd.make
@@ -23,7 +23,7 @@ LIBBSD_SUFFIX	:= tar.xz
 LIBBSD_URL	:= http://libbsd.freedesktop.org/releases/$(LIBBSD).$(LIBBSD_SUFFIX)
 LIBBSD_SOURCE	:= $(SRCDIR)/$(LIBBSD).$(LIBBSD_SUFFIX)
 LIBBSD_DIR	:= $(BUILDDIR)/$(LIBBSD)
-LIBBSD_LICENSE	:= BSD-4-Clause, BSD-3-Clause, BSD-2-Clause-NetBSD, ISC, MIT, BEER-WARE, public_domain
+LIBBSD_LICENSE	:= BSD-4-Clause AND BSD-3-Clause AND BSD-2-Clause-NetBSD AND ISC AND MIT AND Beerware AND public_domain
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/libcap-ng.make b/rules/libcap-ng.make
index 1d7620115..d570a7c32 100644
--- a/rules/libcap-ng.make
+++ b/rules/libcap-ng.make
@@ -23,7 +23,7 @@ LIBCAP_NG_SUFFIX	:= tar.gz
 LIBCAP_NG_URL		:= http://people.redhat.com/sgrubb/libcap-ng/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX)
 LIBCAP_NG_SOURCE	:= $(SRCDIR)/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX)
 LIBCAP_NG_DIR		:= $(BUILDDIR)/$(LIBCAP_NG)
-LIBCAP_NG_LICENSE	:= LGPL-2.1+,GPL-2.0+
+LIBCAP_NG_LICENSE	:= LGPL-2.1+ AND GPL-2.0+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/libcap.make b/rules/libcap.make
index ca703e493..519156ad0 100644
--- a/rules/libcap.make
+++ b/rules/libcap.make
@@ -24,7 +24,7 @@ LIBCAP_URL	:= \
 	$(call ptx/mirror, KERNEL, libs/security/linux-privs/libcap2/$(LIBCAP).$(LIBCAP_SUFFIX))
 LIBCAP_SOURCE	:= $(SRCDIR)/$(LIBCAP).$(LIBCAP_SUFFIX)
 LIBCAP_DIR	:= $(BUILDDIR)/$(LIBCAP)
-LIBCAP_LICENSE	:= BSD-3-Clause, GPL-2.0
+LIBCAP_LICENSE	:= BSD-3-Clause AND GPL-2.0
 LIBCAP_LICENSE_FILES := file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1
 
 # ----------------------------------------------------------------------------
diff --git a/rules/libcoap.make b/rules/libcoap.make
index f860ec550..eaee08fcb 100644
--- a/rules/libcoap.make
+++ b/rules/libcoap.make
@@ -23,7 +23,7 @@ LIBCOAP_SUFFIX	:= tar.gz
 LIBCOAP_URL	:= $(call ptx/mirror, SF, libcoap/$(LIBCOAP).$(LIBCOAP_SUFFIX))
 LIBCOAP_SOURCE	:= $(SRCDIR)/$(LIBCOAP).$(LIBCOAP_SUFFIX)
 LIBCOAP_DIR	:= $(BUILDDIR)/$(LIBCOAP)
-LIBCOAP_LICENSE	:= BSD, GPL-2.0
+LIBCOAP_LICENSE	:= BSD AND GPL-2.0
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/libevent.make b/rules/libevent.make
index 1d1181df3..0dd280057 100644
--- a/rules/libevent.make
+++ b/rules/libevent.make
@@ -24,7 +24,7 @@ LIBEVENT_SUFFIX		:= tar.gz
 LIBEVENT_URL		:= https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION)-stable/$(LIBEVENT).$(LIBEVENT_SUFFIX)
 LIBEVENT_SOURCE		:= $(SRCDIR)/$(LIBEVENT).$(LIBEVENT_SUFFIX)
 LIBEVENT_DIR		:= $(BUILDDIR)/$(LIBEVENT)
-LIBEVENT_LICENSE	:= BSD-3-Clause, 0BSD
+LIBEVENT_LICENSE	:= BSD-3-Clause AND 0BSD
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make
index 8052ccbbb..b3bf59c36 100644
--- a/rules/libgcrypt.make
+++ b/rules/libgcrypt.make
@@ -24,7 +24,7 @@ LIBGCRYPT_SUFFIX	:= tar.bz2
 LIBGCRYPT_URL		:= http://artfiles.org/gnupg.org/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) ftp://ftp.gnupg.org/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX)
 LIBGCRYPT_SOURCE	:= $(SRCDIR)/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX)
 LIBGCRYPT_DIR		:= $(BUILDDIR)/$(LIBGCRYPT)
-LIBGCRYPT_LICENSE	:= GPL-2.0, LGPL-2.0
+LIBGCRYPT_LICENSE	:= GPL-2.0 AND LGPL-2.0
 LIBGCRYPT_LICENSE_FILES	:= \
 	file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 	file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff
diff --git a/rules/libgmp.make b/rules/libgmp.make
index a0c94c5c0..51a91f810 100644
--- a/rules/libgmp.make
+++ b/rules/libgmp.make
@@ -24,7 +24,7 @@ LIBGMP_SUFFIX	:= tar.bz2
 LIBGMP_URL	:= $(call ptx/mirror, GNU, gmp/$(LIBGMP).$(LIBGMP_SUFFIX))
 LIBGMP_SOURCE	:= $(SRCDIR)/$(LIBGMP).$(LIBGMP_SUFFIX)
 LIBGMP_DIR	:= $(BUILDDIR)/$(LIBGMP)
-LIBGMP_LICENSE	:= GPL-3.0, LGPL-3.0
+LIBGMP_LICENSE	:= GPL-3.0 AND LGPL-3.0
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
index 30d097093..4ad170c38 100644
--- a/rules/libgpg-error.make
+++ b/rules/libgpg-error.make
@@ -27,7 +27,7 @@ LIBGPG_ERROR_URL	:= \
 	ftp://ftp.gnupg.org/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
 LIBGPG_ERROR_SOURCE	:= $(SRCDIR)/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX)
 LIBGPG_ERROR_DIR	:= $(BUILDDIR)/$(LIBGPG_ERROR)
-LIBGPG_ERROR_LICENSE	:= GPL-2.0, LGPL-2.0
+LIBGPG_ERROR_LICENSE	:= GPL-2.0 AND LGPL-2.0
 LIBGPG_ERROR_LICENSE_FILES := \
 	file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 	file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1
diff --git a/rules/libiodbc.make b/rules/libiodbc.make
index 093e82f2c..31d0ca909 100644
--- a/rules/libiodbc.make
+++ b/rules/libiodbc.make
@@ -24,7 +24,7 @@ LIBIODBC_SUFFIX		:= tar.gz
 LIBIODBC_URL		:= $(call ptx/mirror, SF, iodbc/$(LIBIODBC).$(LIBIODBC_SUFFIX))
 LIBIODBC_SOURCE		:= $(SRCDIR)/$(LIBIODBC).$(LIBIODBC_SUFFIX)
 LIBIODBC_DIR		:= $(BUILDDIR)/$(LIBIODBC)
-LIBIODBC_LICENSE	:= LGPL-2.0, BSD
+LIBIODBC_LICENSE	:= LGPL-2.0 AND BSD
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/libkmod.make b/rules/libkmod.make
index f039c7def..adf5904d4 100644
--- a/rules/libkmod.make
+++ b/rules/libkmod.make
@@ -24,7 +24,7 @@ LIBKMOD_URL	:= $(call ptx/mirror, KERNEL, utils/kernel/kmod/$(LIBKMOD).$(LIBKMOD
 LIBKMOD_SOURCE	:= $(SRCDIR)/$(LIBKMOD).$(LIBKMOD_SUFFIX)
 LIBKMOD_DIR	:= $(BUILDDIR)/$(LIBKMOD)
 # note: library: LGPLv2, tools: GPLv2
-LIBKMOD_LICENSE	:= GPL-2.0, LGPL-2.0
+LIBKMOD_LICENSE	:= GPL-2.0 AND LGPL-2.0
 LIBKMOD_LICENSE_FILES := \
 	file://tools/COPYING;md5=751419260aa954499f7abaabaa882bbe \
 	file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343
diff --git a/rules/libksba.make b/rules/libksba.make
index 66074ff32..c9501a9df 100644
--- a/rules/libksba.make
+++ b/rules/libksba.make
@@ -23,7 +23,7 @@ LIBKSBA_SUFFIX	:= tar.bz2
 LIBKSBA_URL	:= ftp://ftp.gnupg.org/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX)
 LIBKSBA_SOURCE	:= $(SRCDIR)/$(LIBKSBA).$(LIBKSBA_SUFFIX)
 LIBKSBA_DIR	:= $(BUILDDIR)/$(LIBKSBA)
-LIBKSBA_LICENSE	:= GPL-2.0, GPL-3.0, LGPL-3.0
+LIBKSBA_LICENSE	:= GPL-2.0 AND GPL-3.0 AND LGPL-3.0
 LIBKSBA_LICENSE_FILES := \
 	file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 	file://COPYING.GPLv3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \
diff --git a/rules/liblockfile.make b/rules/liblockfile.make
index dc315ffea..c5861ac87 100644
--- a/rules/liblockfile.make
+++ b/rules/liblockfile.make
@@ -25,7 +25,7 @@ LIBLOCKFILE_TARBALL	:= liblockfile_$(LIBLOCKFILE_VERSION).orig.$(LIBLOCKFILE_SUF
 LIBLOCKFILE_URL		:= http://snapshot.debian.org/archive/debian/20080725T000000Z/pool/main/libl/liblockfile/$(LIBLOCKFILE_TARBALL)
 LIBLOCKFILE_SOURCE	:= $(SRCDIR)/$(LIBLOCKFILE_TARBALL)
 LIBLOCKFILE_DIR		:= $(BUILDDIR)/liblockfile-$(LIBLOCKFILE_VERSION)
-LIBLOCKFILE_LICENSE	:= GPL-2.0+, LGPL-2.0+
+LIBLOCKFILE_LICENSE	:= GPL-2.0+ AND LGPL-2.0+
 LIBLOCKFILE_LICENSE_FILES := file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868b6
 
 # ----------------------------------------------------------------------------
diff --git a/rules/libmbim.make b/rules/libmbim.make
index f79bd5dac..1fc8a8f9c 100644
--- a/rules/libmbim.make
+++ b/rules/libmbim.make
@@ -23,7 +23,7 @@ LIBMBIM_SUFFIX	:= tar.xz
 LIBMBIM_URL	:= http://www.freedesktop.org/software/libmbim/$(LIBMBIM).$(LIBMBIM_SUFFIX)
 LIBMBIM_SOURCE	:= $(SRCDIR)/$(LIBMBIM).$(LIBMBIM_SUFFIX)
 LIBMBIM_DIR	:= $(BUILDDIR)/$(LIBMBIM)
-LIBMBIM_LICENSE	:= GPL-2.0+, LGPL-2.1+
+LIBMBIM_LICENSE	:= GPL-2.0+ AND LGPL-2.1+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/libqmi.make b/rules/libqmi.make
index e24ea5d04..b32206091 100644
--- a/rules/libqmi.make
+++ b/rules/libqmi.make
@@ -23,7 +23,7 @@ LIBQMI_SUFFIX	:= tar.xz
 LIBQMI_URL	:= http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX)
 LIBQMI_SOURCE	:= $(SRCDIR)/$(LIBQMI).$(LIBQMI_SUFFIX)
 LIBQMI_DIR	:= $(BUILDDIR)/$(LIBQMI)
-LIBQMI_LICENSE	:= GPL-2.0+, LGPL-2.1+
+LIBQMI_LICENSE	:= GPL-2.0+ AND LGPL-2.1+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/libqxt.make b/rules/libqxt.make
index e437dbec8..719728236 100644
--- a/rules/libqxt.make
+++ b/rules/libqxt.make
@@ -23,7 +23,7 @@ LIBQXT_SUFFIX	:= tar.bz2
 LIBQXT_URL	:= https://bitbucket.org/libqxt/libqxt/get/v$(LIBQXT_VERSION).$(LIBQXT_SUFFIX)
 LIBQXT_SOURCE	:= $(SRCDIR)/$(LIBQXT).$(LIBQXT_SUFFIX)
 LIBQXT_DIR	:= $(BUILDDIR)/$(LIBQXT)
-LIBQXT_LICENSE	:= LGPL-2.1,CPLv1.0
+LIBQXT_LICENSE	:= LGPL-2.1 AND CPLv1.0
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/libsysfs.make b/rules/libsysfs.make
index 25d5cd70e..dc5cbd598 100644
--- a/rules/libsysfs.make
+++ b/rules/libsysfs.make
@@ -23,7 +23,7 @@ LIBSYSFS_SUFFIX		:= tar.gz
 LIBSYSFS_URL		:= $(call ptx/mirror, SF, linux-diag/$(LIBSYSFS).$(LIBSYSFS_SUFFIX))
 LIBSYSFS_SOURCE		:= $(SRCDIR)/$(LIBSYSFS).$(LIBSYSFS_SUFFIX)
 LIBSYSFS_DIR		:= $(BUILDDIR)/$(LIBSYSFS)
-LIBSYSFS_LICENSE	:= GPL-2.0, LGPL-2.0
+LIBSYSFS_LICENSE	:= GPL-2.0 AND LGPL-2.0
 LIBSYSFS_LICENSE_FILES	:= \
 	file://cmd/GPL;md5=d41d4e2e1e108554e0388ea4aecd8d27 \
 	file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e
diff --git a/rules/libtasn1.make b/rules/libtasn1.make
index 87b3a051e..39de1bafd 100644
--- a/rules/libtasn1.make
+++ b/rules/libtasn1.make
@@ -23,7 +23,7 @@ LIBTASN1_SUFFIX		:= tar.gz
 LIBTASN1_URL		:= $(call ptx/mirror, GNU, libtasn1/$(LIBTASN1).$(LIBTASN1_SUFFIX))
 LIBTASN1_SOURCE		:= $(SRCDIR)/$(LIBTASN1).$(LIBTASN1_SUFFIX)
 LIBTASN1_DIR		:= $(BUILDDIR)/$(LIBTASN1)
-LIBTASN1_LICENSE	:= LGPL-2.1, GPL-3.0
+LIBTASN1_LICENSE	:= LGPL-2.1 AND GPL-3.0
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/libxkbcommon.make b/rules/libxkbcommon.make
index be3ce5a11..b9cc441d6 100644
--- a/rules/libxkbcommon.make
+++ b/rules/libxkbcommon.make
@@ -23,7 +23,7 @@ LIBXKBCOMMON_SUFFIX	:= tar.xz
 LIBXKBCOMMON_URL	:= http://xkbcommon.org/download/$(LIBXKBCOMMON).$(LIBXKBCOMMON_SUFFIX)
 LIBXKBCOMMON_SOURCE	:= $(SRCDIR)/$(LIBXKBCOMMON).$(LIBXKBCOMMON_SUFFIX)
 LIBXKBCOMMON_DIR	:= $(BUILDDIR)/$(LIBXKBCOMMON)
-LIBXKBCOMMON_LICENSE	:= MIT, X11, HPND
+LIBXKBCOMMON_LICENSE	:= MIT AND X11 AND HPND
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/lm_sensors.make b/rules/lm_sensors.make
index d25cb27e8..b9ddaa689 100644
--- a/rules/lm_sensors.make
+++ b/rules/lm_sensors.make
@@ -26,7 +26,7 @@ LM_SENSORS_URL		:= \
 	https://github.com/groeck/lm-sensors/archive/$(LM_SENSORS_TAG).$(LM_SENSORS_SUFFIX)
 LM_SENSORS_SOURCE	:= $(SRCDIR)/$(LM_SENSORS).$(LM_SENSORS_SUFFIX)
 LM_SENSORS_DIR		:= $(BUILDDIR)/$(LM_SENSORS)
-LM_SENSORS_LICENSE	:= GPL-2.0+, LGPL-2.1+
+LM_SENSORS_LICENSE	:= GPL-2.0+ AND LGPL-2.1+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index cbfbfb173..0d55e7232 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -23,7 +23,7 @@ MODEMMANAGER_SUFFIX	:= tar.xz
 MODEMMANAGER_URL	:= http://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
 MODEMMANAGER_SOURCE	:= $(SRCDIR)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
 MODEMMANAGER_DIR	:= $(BUILDDIR)/$(MODEMMANAGER)
-MODEMMANAGER_LICENSE	:= GPL-2.0+, GPL-3.0+, LGPL-2.1+
+MODEMMANAGER_LICENSE	:= GPL-2.0+ AND GPL-3.0+ AND LGPL-2.1+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/openocd.make b/rules/openocd.make
index 50914129a..86dd3fbcd 100644
--- a/rules/openocd.make
+++ b/rules/openocd.make
@@ -18,7 +18,7 @@ OPENOCD_URL	:= $(call ptx/mirror, SF, openocd/$(OPENOCD).$(OPENOCD_SUFFIX))
 OPENOCD_SOURCE	:= $(SRCDIR)/$(OPENOCD).$(OPENOCD_SUFFIX)
 OPENOCD_DIR	:= $(BUILDDIR)/$(OPENOCD)
 # License: OpenOCD: GPLv2+, jimtcl: BSD
-OPENOCD_LICENSE	:= GPL-2.0+, BSD
+OPENOCD_LICENSE	:= GPL-2.0+ AND BSD
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/openssh.make b/rules/openssh.make
index f1faa1224..882611e98 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -27,7 +27,7 @@ OPENSSH_URL	:= \
 
 OPENSSH_SOURCE	:= $(SRCDIR)/$(OPENSSH).$(OPENSSH_SUFFIX)
 OPENSSH_DIR	:= $(BUILDDIR)/$(OPENSSH)
-OPENSSH_LICENSE	:= BSD AND BSD-2-Clause AND BSD-3-Clause AND MIT AND THE BEER-WARE LICENSE AND ISC
+OPENSSH_LICENSE	:= BSD AND BSD-2-Clause AND BSD-3-Clause AND MIT AND Beerware AND ISC
 OPENSSH_LICENSE_FILES := file://LICENCE;md5=429658c6612f3a9b1293782366ab29d8
 
 # ----------------------------------------------------------------------------
diff --git a/rules/orc.make b/rules/orc.make
index 080d17bbc..35ff7ef79 100644
--- a/rules/orc.make
+++ b/rules/orc.make
@@ -23,7 +23,7 @@ ORC_SUFFIX	:= tar.xz
 ORC_URL		:= http://gstreamer.freedesktop.org/data/src/orc/$(ORC).$(ORC_SUFFIX)
 ORC_SOURCE	:= $(SRCDIR)/$(ORC).$(ORC_SUFFIX)
 ORC_DIR		:= $(BUILDDIR)/$(ORC)
-ORC_LICENSE	:= BSD-2-Clause, BSD-3-Clause
+ORC_LICENSE	:= BSD-2-Clause AND BSD-3-Clause
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/owfs.make b/rules/owfs.make
index d5bf2692e..a220b7e94 100644
--- a/rules/owfs.make
+++ b/rules/owfs.make
@@ -23,7 +23,7 @@ OWFS_SUFFIX	:= tar.gz
 OWFS_URL	:= $(call ptx/mirror, SF, owfs/$(OWFS).$(OWFS_SUFFIX))
 OWFS_SOURCE	:= $(SRCDIR)/$(OWFS).$(OWFS_SUFFIX)
 OWFS_DIR	:= $(BUILDDIR)/$(OWFS)
-OWFS_LICENSE	:= GPL-2.0+, LGPL-2.0+
+OWFS_LICENSE	:= GPL-2.0+ AND LGPL-2.0+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/ppp.make b/rules/ppp.make
index d3e20fbe1..5ed8ad6df 100644
--- a/rules/ppp.make
+++ b/rules/ppp.make
@@ -25,7 +25,7 @@ PPP_SUFFIX	:= tar.gz
 PPP_URL		:= http://ftp.samba.org/pub/ppp/$(PPP).$(PPP_SUFFIX)
 PPP_SOURCE	:= $(SRCDIR)/$(PPP).$(PPP_SUFFIX)
 PPP_DIR		:= $(BUILDDIR)/$(PPP)
-PPP_LICENSE	:= BSD,GPL-2.0
+PPP_LICENSE	:= BSD AND GPL-2.0
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
index 34b6aae16..4ecae2664 100644
--- a/rules/pulseaudio.make
+++ b/rules/pulseaudio.make
@@ -23,7 +23,7 @@ PULSEAUDIO_SUFFIX	:= tar.xz
 PULSEAUDIO_URL		:= http://freedesktop.org/software/pulseaudio/releases/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX)
 PULSEAUDIO_SOURCE	:= $(SRCDIR)/$(PULSEAUDIO).$(PULSEAUDIO_SUFFIX)
 PULSEAUDIO_DIR		:= $(BUILDDIR)/$(PULSEAUDIO)
-PULSEAUDIO_LICENSE	:= MIT, GPL-2.0+, LGPL-2.1+, Rdisc, ADRIAN
+PULSEAUDIO_LICENSE	:= MIT AND GPL-2.0+ AND LGPL-2.1+ AND Rdisc AND ADRIAN
 PULSEAUDIO_LICENSE_FILES	:= \
 	file://LICENSE;md5=d9ae089c8dc5339f8ac9d8563038a29f \
 	file://GPL;md5=4325afd396febcb659c36b49533135d4 \
diff --git a/rules/qt4.make b/rules/qt4.make
index ec3549b98..2ba0fd00a 100644
--- a/rules/qt4.make
+++ b/rules/qt4.make
@@ -27,7 +27,7 @@ QT4_URL		:= \
 QT4_SOURCE	:= $(SRCDIR)/$(QT4).$(QT4_SUFFIX)
 QT4_DIR		:= $(BUILDDIR)/$(QT4)
 QT4_BUILD_OOT	:= YES
-QT4_LICENSE	:= GPL3, LGPL-2.1
+QT4_LICENSE	:= GPL3 AND LGPL-2.1
 ifdef PTXCONF_QT4_EXAMPLES
 QT4_DEVPKG	:= NO
 endif
diff --git a/rules/qt5.make b/rules/qt5.make
index af6651ff7..9b6550f60 100644
--- a/rules/qt5.make
+++ b/rules/qt5.make
@@ -26,7 +26,7 @@ QT5_URL		:= \
 QT5_SOURCE	:= $(SRCDIR)/$(QT5).$(QT5_SUFFIX)
 QT5_DIR		:= $(BUILDDIR)/$(QT5)
 QT5_BUILD_OOT	:= YES
-QT5_LICENSE	:= LGPL-2.1, Nokia-Qt-exception-1.1, LGPL-3.0, GFDL-1.3
+QT5_LICENSE	:= LGPL-2.1 AND Nokia-Qt-exception-1.1 AND LGPL-3.0 AND GFDL-1.3
 QT5_LICENSE_FILES := \
 	file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
 	file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
diff --git a/rules/qwt5.make b/rules/qwt5.make
index e678fdfd8..f4dfe884b 100644
--- a/rules/qwt5.make
+++ b/rules/qwt5.make
@@ -24,7 +24,7 @@ QWT5_URL	:= $(call ptx/mirror, SF, qwt/$(QWT5).$(QWT5_SUFFIX))
 QWT5_SOURCE	:= $(SRCDIR)/$(QWT5).$(QWT5_SUFFIX)
 QWT5_DIR	:= $(BUILDDIR)/$(QWT5)
 QWT5_BUILD_OOT	:= YES
-QWT5_LICENSE	:= LGPL-2.1, QWT-1.0
+QWT5_LICENSE	:= LGPL-2.1 AND QWT-1.0
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/rt-tests.make b/rules/rt-tests.make
index 5274c83c4..4bc33e315 100644
--- a/rules/rt-tests.make
+++ b/rules/rt-tests.make
@@ -21,7 +21,7 @@ PACKAGES-$(PTXCONF_RT_TESTS) += rt-tests
 #
 RT_TESTS_VERSION	:= 1.0
 RT_TESTS_MD5		:= 3818d2d0a3069291864bf85fde40883b
-RT_TESTS_LICENSE	:= GPL-2.0, GPL-2.0+
+RT_TESTS_LICENSE	:= GPL-2.0 AND GPL-2.0+
 RT_TESTS		:= rt-tests-$(RT_TESTS_VERSION)
 RT_TESTS_SUFFIX		:= tar.xz
 RT_TESTS_URL		:= \
diff --git a/rules/rtmpdump.make b/rules/rtmpdump.make
index 98b94a1c2..5c82a10f8 100644
--- a/rules/rtmpdump.make
+++ b/rules/rtmpdump.make
@@ -24,7 +24,7 @@ RTMPDUMP_SUFFIX		:= tar.xz
 RTMPDUMP_URL		:= git://git.ffmpeg.org/rtmpdump.git;tag=$(RTMPDUMP_VERSION)
 RTMPDUMP_SOURCE		:= $(SRCDIR)/$(RTMPDUMP).$(RTMPDUMP_SUFFIX)
 RTMPDUMP_DIR		:= $(BUILDDIR)/$(RTMPDUMP)
-RTMPDUMP_LICENSE	:= LGPL-2.1+,GPL-2.0+
+RTMPDUMP_LICENSE	:= LGPL-2.1+ AND GPL-2.0+
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/sed.make b/rules/sed.make
index 0faa1544c..e672230aa 100644
--- a/rules/sed.make
+++ b/rules/sed.make
@@ -24,7 +24,7 @@ SED_SUFFIX	:= tar.bz2
 SED_URL		:= $(call ptx/mirror, GNU, sed/$(SED).$(SED_SUFFIX))
 SED_SOURCE	:= $(SRCDIR)/$(SED).$(SED_SUFFIX)
 SED_DIR		:= $(BUILDDIR)/$(SED)
-SED_LICENSE	:= GPL-3.0, GNU Free Documentation License
+SED_LICENSE	:= GPL-3.0 AND GNU Free Documentation License
 SED_LICENSE_FILES := \
 	file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
 	file://COPYING.DOC;md5=10b9de612d532fdeeb7fe8fcd1435cc6
diff --git a/rules/sudo.make b/rules/sudo.make
index 87ebd2c14..35f0b0046 100644
--- a/rules/sudo.make
+++ b/rules/sudo.make
@@ -26,7 +26,7 @@ SUDO_URL	:= \
 	http://www.sudo.ws/sudo/dist/OLD/$(SUDO).$(SUDO_SUFFIX)
 SUDO_SOURCE	:= $(SRCDIR)/$(SUDO).$(SUDO_SUFFIX)
 SUDO_DIR	:= $(BUILDDIR)/$(SUDO)
-SUDO_LICENSE	:= BSD, ISC
+SUDO_LICENSE	:= BSD AND ISC
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/syslogng.make b/rules/syslogng.make
index 64b7d591e..8378b48c1 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -26,7 +26,7 @@ SYSLOGNG_SUFFIX		:= tar.gz
 SYSLOGNG_URL		:= https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
 SYSLOGNG_SOURCE		:= $(SRCDIR)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
 SYSLOGNG_DIR		:= $(BUILDDIR)/$(SYSLOGNG)
-SYSLOGNG_LICENSE	:= GPL-2.0+, LGPL-2.1
+SYSLOGNG_LICENSE	:= GPL-2.0+ AND LGPL-2.1
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/systemd-bootchart.make b/rules/systemd-bootchart.make
index 352ce3c02..b46564f0c 100644
--- a/rules/systemd-bootchart.make
+++ b/rules/systemd-bootchart.make
@@ -23,7 +23,7 @@ SYSTEMD_BOOTCHART_SUFFIX	:= tar.xz
 SYSTEMD_BOOTCHART_URL		:= https://github.com/systemd/systemd-bootchart/releases/download/v$(SYSTEMD_BOOTCHART_VERSION)/$(SYSTEMD_BOOTCHART).$(SYSTEMD_BOOTCHART_SUFFIX)
 SYSTEMD_BOOTCHART_SOURCE	:= $(SRCDIR)/$(SYSTEMD_BOOTCHART).$(SYSTEMD_BOOTCHART_SUFFIX)
 SYSTEMD_BOOTCHART_DIR		:= $(BUILDDIR)/$(SYSTEMD_BOOTCHART)
-SYSTEMD_BOOTCHART_LICENSE	:= GPL-2.0+, LGPL-2.1
+SYSTEMD_BOOTCHART_LICENSE	:= GPL-2.0+ AND LGPL-2.1
 SYSTEMD_BOOTCHART_LICENSE_FILES := \
 	file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
 	file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c
diff --git a/rules/systemd.make b/rules/systemd.make
index c3e243004..deaaa04a8 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -24,7 +24,7 @@ SYSTEMD_SUFFIX	:= tar.gz
 SYSTEMD_URL	:= https://github.com/systemd/systemd/archive/v$(SYSTEMD_VERSION).$(SYSTEMD_SUFFIX)
 SYSTEMD_SOURCE	:= $(SRCDIR)/$(SYSTEMD).$(SYSTEMD_SUFFIX)
 SYSTEMD_DIR	:= $(BUILDDIR)/$(SYSTEMD)
-SYSTEMD_LICENSE	:= GPL-2.0+, LGPL-2.1
+SYSTEMD_LICENSE	:= GPL-2.0+ AND LGPL-2.1
 SYSTEMD_LICENSE_FILES := \
 	file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
 	file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c
diff --git a/rules/totd.make b/rules/totd.make
index 82ca73b9b..c1f704dc0 100644
--- a/rules/totd.make
+++ b/rules/totd.make
@@ -23,7 +23,7 @@ TOTD_SUFFIX	:= tar.gz
 TOTD_URL	:= http://www.dillema.net/software/totd/$(TOTD).$(TOTD_SUFFIX)
 TOTD_SOURCE	:= $(SRCDIR)/$(TOTD).$(TOTD_SUFFIX)
 TOTD_DIR	:= $(BUILDDIR)/$(TOTD)
-PTRTD_LICENSE  	:= multiple, BSD Style
+PTRTD_LICENSE  	:= multiple AND BSD Style
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/ustr.make b/rules/ustr.make
index de8967864..b1693bd06 100644
--- a/rules/ustr.make
+++ b/rules/ustr.make
@@ -23,7 +23,7 @@ USTR_SUFFIX	:= tar.bz2
 USTR_URL	:= http://www.and.org/ustr/$(USTR_VERSION)/$(USTR).$(USTR_SUFFIX)
 USTR_SOURCE	:= $(SRCDIR)/$(USTR).$(USTR_SUFFIX)
 USTR_DIR	:= $(BUILDDIR)/$(USTR)
-USTR_LICENSE	:= LGPL-2.0+,MIT,BSD
+USTR_LICENSE	:= LGPL-2.0+ AND MIT AND BSD
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 32c428731..009fbcb85 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -25,7 +25,7 @@ UTIL_LINUX_NG_BASENAME	:= v$(shell echo $(UTIL_LINUX_NG_VERSION) | sed -e 's/\([
 UTIL_LINUX_NG_URL	:= $(call ptx/mirror, KERNEL, utils/util-linux/$(UTIL_LINUX_NG_BASENAME)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX))
 UTIL_LINUX_NG_SOURCE	:= $(SRCDIR)/$(UTIL_LINUX_NG).$(UTIL_LINUX_NG_SUFFIX)
 UTIL_LINUX_NG_DIR	:= $(BUILDDIR)/$(UTIL_LINUX_NG)
-UTIL_LINUX_NG_LICENSE	:= GPL-2.0, GPL-2.0+, GPL-3.0+, LGPL-2.0+, BSD-3-Clause, BSD-4-Clause, public_domain
+UTIL_LINUX_NG_LICENSE	:= GPL-2.0 AND GPL-2.0+ AND GPL-3.0+ AND LGPL-2.0+ AND BSD-3-Clause AND BSD-4-Clause AND public_domain
 UTIL_LINUX_NG_LICENSE_FILES := \
 	file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 	file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \
diff --git a/rules/xfsprogs.make b/rules/xfsprogs.make
index 755c7f697..b63776d7e 100644
--- a/rules/xfsprogs.make
+++ b/rules/xfsprogs.make
@@ -24,7 +24,7 @@ XFSPROGS_SUFFIX	:= tar.gz
 XFSPROGS_URL	:= ftp://oss.sgi.com/projects/xfs/cmd_tars/$(XFSPROGS).$(XFSPROGS_SUFFIX)
 XFSPROGS_SOURCE	:= $(SRCDIR)/$(XFSPROGS).$(XFSPROGS_SUFFIX)
 XFSPROGS_DIR	:= $(BUILDDIR)/$(XFSPROGS)
-XFSPROGS_LICENSE:= GPL-2.0, LGPL-2.1
+XFSPROGS_LICENSE:= GPL-2.0 AND LGPL-2.1
 
 # ----------------------------------------------------------------------------
 # Prepare
diff --git a/rules/xorg-font-ttf-dejavu.make b/rules/xorg-font-ttf-dejavu.make
index ce2f48674..bfe95bbd4 100644
--- a/rules/xorg-font-ttf-dejavu.make
+++ b/rules/xorg-font-ttf-dejavu.make
@@ -23,7 +23,7 @@ XORG_FONT_TTF_DEJAVU_SUFFIX	:= tar.bz2
 XORG_FONT_TTF_DEJAVU_URL	:= http://sourceforge.net/projects/dejavu/files/dejavu/$(XORG_FONT_TTF_DEJAVU_VERSION)/$(XORG_FONT_TTF_DEJAVU).$(XORG_FONT_TTF_DEJAVU_SUFFIX)
 XORG_FONT_TTF_DEJAVU_SOURCE	:= $(SRCDIR)/$(XORG_FONT_TTF_DEJAVU).$(XORG_FONT_TTF_DEJAVU_SUFFIX)
 XORG_FONT_TTF_DEJAVU_DIR	:= $(BUILDDIR)/$(XORG_FONT_TTF_DEJAVU)
-XORG_FONT_TTF_DEJAVU_LICENSE	:= Bitstream-Vera, public_domain
+XORG_FONT_TTF_DEJAVU_LICENSE	:= Bitstream-Vera AND public_domain
 
 ifdef PTXCONF_XORG_FONT_TTF_DEJAVU
 $(STATEDIR)/xorg-fonts.targetinstall.post: $(STATEDIR)/xorg-font-ttf-dejavu.targetinstall
diff --git a/rules/xorg-font-ttf-vlgothic.make b/rules/xorg-font-ttf-vlgothic.make
index cbc5d5651..c2ab41bd0 100644
--- a/rules/xorg-font-ttf-vlgothic.make
+++ b/rules/xorg-font-ttf-vlgothic.make
@@ -23,7 +23,7 @@ XORG_FONT_TTF_VLGOTHIC_SUFFIX	:= tar.xz
 XORG_FONT_TTF_VLGOTHIC_URL	:= http://osdn.jp/frs/redir.php?m=iij&f=%2Fvlgothic%2F62375%2F$(XORG_FONT_TTF_VLGOTHIC).$(XORG_FONT_TTF_VLGOTHIC_SUFFIX)
 XORG_FONT_TTF_VLGOTHIC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_TTF_VLGOTHIC).$(XORG_FONT_TTF_VLGOTHIC_SUFFIX)
 XORG_FONT_TTF_VLGOTHIC_DIR	:= $(BUILDDIR)/$(XORG_FONT_TTF_VLGOTHIC)
-XORG_FONT_TTF_VLGOTHIC_LICENSE	:= public_domain, mplus, BSD-3-Clause
+XORG_FONT_TTF_VLGOTHIC_LICENSE	:= public_domain AND mplus AND BSD-3-Clause
 XORG_FONT_TTF_VLGOTHIC_LICENSE_FILES := \
 	file://LICENSE;md5=d2da3d6412686a977e837cae4988b624 \
 	file://LICENSE_E.mplus;md5=1c4767416f20215f1e61b970f2117db9 \
diff --git a/rules/xz.make b/rules/xz.make
index 993f7771c..f969bc7b2 100644
--- a/rules/xz.make
+++ b/rules/xz.make
@@ -23,7 +23,7 @@ XZ_SUFFIX	:= tar.bz2
 XZ_URL		:= http://tukaani.org/xz/$(XZ).$(XZ_SUFFIX)
 XZ_SOURCE	:= $(SRCDIR)/$(XZ).$(XZ_SUFFIX)
 XZ_DIR		:= $(BUILDDIR)/$(XZ)
-XZ_LICENSE	:= public_domain, LGPL-2.1+, GPL-2.0+, GPL-3.0+
+XZ_LICENSE	:= public_domain AND LGPL-2.1+ AND GPL-2.0+ AND GPL-3.0+
 XZ_LICENSE_FILES := \
 	file://COPYING;md5=c475b6c7dca236740ace4bba553e8e1c \
 	file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
author	Juergen Borleis <jbe@pengutronix.de>	2017-12-06 13:02:39 +0100
committer	Juergen Borleis <jbe@pengutronix.de>	2017-12-08 15:25:10 +0100
commit	00c6e91b6b8a54cdfc7af0d75e4eb7637981e63d (patch)
tree	215cd056fb8dfd70a73e497e45cb396f11f2e527
parent	8667d660578723d854b9855830211d84eb45afbb (diff)
download	ptxdist-00c6e91b6b8a54cdfc7af0d75e4eb7637981e63d.tar.gz ptxdist-00c6e91b6b8a54cdfc7af0d75e4eb7637981e63d.tar.xz